Merge remote-tracking branch 'origin/develop' into reactions

[akkoma] / lib / pleroma / web / pleroma_api / controllers / pleroma_api_controller.ex

diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
index 474b8d079bb5edabde423f0c38cc8492cc1e779b..8aee7d7c573cd22faae613b05ceb4bf8594874d2 100644 (file)
--- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@ -23,17 +23,12 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
     with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id),
          %Object{data: %{"reactions" => emoji_reactions}} <- Object.normalize(activity) do
       reactions =
-        Enum.reduce(emoji_reactions, %{}, fn {emoji, users}, res ->
-          users =
-            users
-            |> Enum.map(&User.get_cached_by_ap_id/1)
-
-          res
-          |> Map.put(
-            emoji,
-            AccountView.render("accounts.json", %{users: users, for: user, as: :user})
-          )
+        emoji_reactions
+        |> Enum.map(fn {emoji, users} ->
+          users = Enum.map(users, &User.get_cached_by_ap_id/1)
+          {emoji, AccountView.render("index.json", %{users: users, for: user, as: :user})}
         end)
+        |> Enum.into(%{})
 
       conn
       |> json(reactions)
@@ -46,10 +41,22 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
 
   def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
     with {:ok, _activity, _object} <- CommonAPI.react_with_emoji(activity_id, user, emoji),
-         activity = Activity.get_by_id(activity_id) do
+         activity <- Activity.get_by_id(activity_id) do
       conn
       |> put_view(StatusView)
-      |> render("status.json", %{activity: activity, for: user, as: :activity})
+      |> render("show.json", %{activity: activity, for: user, as: :activity})
+    end
+  end
+
+  def unreact_with_emoji(%{assigns: %{user: user}} = conn, %{
+        "id" => activity_id,
+        "emoji" => emoji
+      }) do
+    with {:ok, _activity, _object} <- CommonAPI.unreact_with_emoji(activity_id, user, emoji),
+         activity <- Activity.get_by_id(activity_id) do
+      conn
+      |> put_view(StatusView)
+      |> render("show.json", %{activity: activity, for: user, as: :activity})
     end
   end