From: href <href@random.sh>
Date: Sat, 8 Dec 2018 16:34:13 +0000 (+0100)
Subject: Push: add missing notification_type field
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d8984b7bf83e1ee076a73aab682db0f2673e3735;p=akkoma

Push: add missing notification_type field
---

diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push/push.ex
index 4af3e159a..8b59e54cb 100644
--- a/lib/pleroma/web/push/push.ex
+++ b/lib/pleroma/web/push/push.ex
@@ -58,14 +58,15 @@ defmodule Pleroma.Web.Push do
       body =
         Jason.encode!(%{
           title: format_title(notification),
+          access_token: record.token.token,
           body: format_body(notification, actor),
           notification_id: notification.id,
+          notification_type: format_type(notification),
           icon: User.avatar_url(actor),
-          preferred_locale: "en",
-          access_token: record.token.token
+          preferred_locale: "en"
         })
 
-      case WebPushEncryption.send_web_push(body, subscription, @gcm_api_key) do
+      case WebPushEncryption.send_web_push(body, subscription) do
         {:ok, %{status_code: code}} when 400 <= code and code < 500 ->
           Logger.debug("Removing subscription record")
           Repo.delete!(record)
@@ -92,6 +93,16 @@ defmodule Pleroma.Web.Push do
     {:noreply, state}
   end
 
+  # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
+  defp format_type(%{activity: %{data: %{"type" => type}}}) do
+    case type do
+      "Create" -> "mention"
+      "Follow" -> "follow"
+      "Announce" -> "reblog"
+      "Favorite" -> "favourite"
+    end
+  end
+
   defp format_title(%{activity: %{data: %{"type" => type}}}) do
     case type do
       "Create" -> "New Mention"