Merge branch 'docs_updating' into 'develop'

[akkoma] / lib / pleroma / web / mastodon_api / views / notification_view.ex

diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex
index ddd7f531826d4bb18bc944770abd31b83be66b7a..360ec10f0cdc864b25f91dd628231b433ed49fc6 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex
@@ -37,18 +37,37 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
       }
 
       case mastodon_type do
-        "mention" -> put_status(response, activity, user)
-        "favourite" -> put_status(response, parent_activity, user)
-        "reblog" -> put_status(response, parent_activity, user)
-        "move" -> put_target(response, activity, user)
-        "follow" -> response
-        _ -> nil
+        "mention" ->
+          put_status(response, activity, user)
+
+        "favourite" ->
+          put_status(response, parent_activity, user)
+
+        "reblog" ->
+          put_status(response, parent_activity, user)
+
+        "move" ->
+          put_target(response, activity, user)
+
+        "follow" ->
+          response
+
+        "pleroma:emoji_reaction" ->
+          put_status(response, parent_activity, user) |> put_emoji(activity)
+
+        _ ->
+          nil
       end
     else
       _ -> nil
     end
   end
 
+  defp put_emoji(response, activity) do
+    response
+    |> Map.put(:emoji, activity.data["content"])
+  end
+
   defp put_status(response, activity, user) do
     Map.put(response, :status, StatusView.render("show.json", %{activity: activity, for: user}))
   end