From: lain <lain@soykaf.club>
Date: Mon, 11 Mar 2019 18:23:21 +0000 (+0100)
Subject: WebPush: Add activity id to the push messages.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=600f428db4752114cff31283896d960299f80355;p=akkoma

WebPush: Add activity id to the push messages.

Makes it easier to relate the push to a given status.
---

diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
index 33f912d34..4d65ca5d5 100644
--- a/lib/pleroma/web/push/impl.ex
+++ b/lib/pleroma/web/push/impl.ex
@@ -20,7 +20,7 @@ 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 +37,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)