Merge branch 'fix/backup-url-on-s3' 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 f91cb1d40718eabcebbceb57139935dcc30a2511..a9c46f63ad102793025d0ba7eccc02688e8b1a09 100644 (file)
--- a/lib/pleroma/web/push/impl.ex
+++ b/lib/pleroma/web/push/impl.ex
@@ -32,7 +32,7 @@ defmodule Pleroma.Web.Push.Impl do
     mastodon_type = notification.type
     gcm_api_key = Application.get_env(:web_push_encryption, :gcm_api_key)
     avatar_url = User.avatar_url(actor)
-    object = Object.normalize(activity, false)
+    object = Object.normalize(activity, fetch: false)
     user = User.get_cached_by_id(user_id)
     direct_conversation_id = Activity.direct_conversation_id(activity, user)
 
@@ -155,7 +155,7 @@ defmodule Pleroma.Web.Push.Impl do
         _object,
         _mastodon_type
       ) do
-    "@#{actor.nickname} has reacted with #{content}"
+    "@#{actor.nickname} reacted with #{content}"
   end
 
   def format_body(