diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 14:47:50 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 14:47:50 +0300 |
commit | 8b97b6f5baa7e0593414fa794ce8059a8e5b95e3 (patch) | |
tree | bfdc8369105af33f42f5b56b197623ce72c6fed5 /lib/pleroma/web/push | |
parent | fb38b7339ccb6c3d7a3a07b74a6471a0f38622fe (diff) | |
parent | 07e7c80bc9e919cd92ca9dda1e21384142e5bd77 (diff) | |
download | pleroma-8b97b6f5baa7e0593414fa794ce8059a8e5b95e3.tar.gz |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'lib/pleroma/web/push')
-rw-r--r-- | lib/pleroma/web/push/subscription.ex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/push/subscription.ex b/lib/pleroma/web/push/subscription.ex index b99b0c5fb..3e401a490 100644 --- a/lib/pleroma/web/push/subscription.ex +++ b/lib/pleroma/web/push/subscription.ex @@ -25,9 +25,9 @@ defmodule Pleroma.Web.Push.Subscription do timestamps() end - @supported_alert_types ~w[follow favourite mention reblog] + @supported_alert_types ~w[follow favourite mention reblog]a - defp alerts(%{"data" => %{"alerts" => alerts}}) do + defp alerts(%{data: %{alerts: alerts}}) do alerts = Map.take(alerts, @supported_alert_types) %{"alerts" => alerts} end @@ -44,9 +44,9 @@ defmodule Pleroma.Web.Push.Subscription do %User{} = user, %Token{} = token, %{ - "subscription" => %{ - "endpoint" => endpoint, - "keys" => %{"auth" => key_auth, "p256dh" => key_p256dh} + subscription: %{ + endpoint: endpoint, + keys: %{auth: key_auth, p256dh: key_p256dh} } } = params ) do |