squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WebPush: Add activity id to the push messages.

Browse Source 
Makes it easier to relate the push to a given status.
This commit is contained in:
lain 2019-03-11 19:23:21 +01:00
parent 2c8deecdd2
commit 600f428db4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/push/impl.ex
View File

@ -20,7 +20,7 @@ defmodule Pleroma.Web.Push.Impl do
@doc "Performs sending notifications for user subscriptions" @doc "Performs sending notifications for user subscriptions"
@spec perform_send(Notification.t()) :: list(any) @spec perform_send(Notification.t()) :: list(any)
def perform_send(%{activity: %{data: %{"type" => activity_type}}, user_id: user_id} = notif) def perform_send(%{activity: %{data: %{"type" => activity_type}, id: activity_id}, user_id: user_id} = notif)
when activity_type in @types do when activity_type in @types do
actor = User.get_cached_by_ap_id(notif.activity.data["actor"]) actor = User.get_cached_by_ap_id(notif.activity.data["actor"])
@ -37,7 +37,10 @@ defmodule Pleroma.Web.Push.Impl do
notification_id: notif.id, notification_id: notif.id,
notification_type: type, notification_type: type,
icon: avatar_url, icon: avatar_url,
preferred_locale: "en" preferred_locale: "en",
pleroma: %{
activity_id: activity_id
}
} }
|> Jason.encode!() |> Jason.encode!()
|> push_message(build_sub(subscription), gcm_api_key, subscription) |> push_message(build_sub(subscription), gcm_api_key, subscription)