pleroma

commit: f9a9639015b1ca50096bd7f7cedea3c77bd6ffe2
parent: 9ce97d454c488747cd83cc5a452d474de617de50
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 11 Mar 2019 21:43:06 +0000

Merge branch 'add-activity-id-to-push-messages' into 'develop'

WebPush: Add activity id to the push messages.

See merge request pleroma/pleroma!925
Diffstat:
M
lib/pleroma/web/push/impl.ex
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
@@ -20,7 +20,10 @@ defmodule Pleroma.Web.Push.Impl do
 
   @doc "Performs sending notifications for user subscriptions"
   @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
     actor = User.get_cached_by_ap_id(notif.activity.data["actor"])
 
@@ -37,7 +40,10 @@ defmodule Pleroma.Web.Push.Impl do
         notification_id: notif.id,
         notification_type: type,
         icon: avatar_url,
-        preferred_locale: "en"
+        preferred_locale: "en",
+        pleroma: %{
+          activity_id: activity_id
+        }
       }
       |> Jason.encode!()
       |> push_message(build_sub(subscription), gcm_api_key, subscription)