Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / web / push / impl.ex

diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
index 89d45b2e1f985f0a6f7d85000f4cc0725ce2e123..a9f893f7be1bc3302975827ccd4f6458bb7c1906 100644 (file)
--- a/lib/pleroma/web/push/impl.ex
+++ b/lib/pleroma/web/push/impl.ex
@@ -55,11 +55,12 @@ defmodule Pleroma.Web.Push.Impl do
       |> Jason.encode!()
       |> push_message(build_sub(subscription), gcm_api_key, subscription)
     end
+    |> (&{:ok, &1}).()
   end
 
   def perform(_) do
     Logger.warn("Unknown notification type")
-    :error
+    {:error, :unknown_type}
   end
 
   @doc "Push message to web"
@@ -153,10 +154,10 @@ defmodule Pleroma.Web.Push.Impl do
       when type in ["Follow", "Like"] do
     mastodon_type = mastodon_type || mastodon_notification_type(notification.activity)
 
-    case {type, mastodon_type} do
-      {"Follow", "follow"} -> "@#{actor.nickname} has followed you"
-      {"Follow", "follow_request"} -> "@#{actor.nickname} has requested to follow you"
-      {"Like", _} -> "@#{actor.nickname} has favorited your post"
+    case mastodon_type do
+      "follow" -> "@#{actor.nickname} has followed you"
+      "follow_request" -> "@#{actor.nickname} has requested to follow you"
+      "favourite" -> "@#{actor.nickname} has favorited your post"
     end
   end
 
@@ -166,15 +167,16 @@ defmodule Pleroma.Web.Push.Impl do
     "New Direct Message"
   end
 
-  def format_title(%{activity: %{data: %{"type" => type}}} = notification, mastodon_type) do
-    mastodon_type = mastodon_type || mastodon_notification_type(notification.activity)
+  def format_title(%{activity: activity}, mastodon_type) do
+    mastodon_type = mastodon_type || mastodon_notification_type(activity)
 
-    case {type, mastodon_type} do
-      {"Create", _} -> "New Mention"
-      {"Follow", "follow"} -> "New Follower"
-      {"Follow", "follow_request"} -> "New Follow Request"
-      {"Announce", _} -> "New Repeat"
-      {"Like", _} -> "New Favorite"
+    case mastodon_type do
+      "mention" -> "New Mention"
+      "follow" -> "New Follower"
+      "follow_request" -> "New Follow Request"
+      "reblog" -> "New Repeat"
+      "favourite" -> "New Favorite"
+      type -> "New #{String.capitalize(type || "event")}"
     end
   end
 end