From 6068d2254e2ed00260dc840f18824dc0e0835afa Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 30 Sep 2019 15:13:25 +0200
Subject: [PATCH] PleromaAPIController: Fixes and refactoring.

---
 .../controllers/pleroma_api_controller.ex       | 17 ++++++-----------
 test/web/activity_pub/transmogrifier_test.exs   |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

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 474b8d079..39d371ff7 100644
--- 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 @@ def emoji_reactions_by(%{assigns: %{user: user}} = conn, %{"id" => activity_id})
     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("accounts.json", %{users: users, for: user, as: :user})}
         end)
+        |> Enum.into(%{})
 
       conn
       |> json(reactions)
@@ -49,7 +44,7 @@ def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "e
          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
 
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index ba2a43296..f1ceb20d2 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -1263,7 +1263,7 @@ test "it can handle Listen activities" do
 
       {:ok, activity} = CommonAPI.listen(user, %{"title" => "lain radio episode 1"})
 
-      {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
+      {:ok, _modified} = Transmogrifier.prepare_outgoing(activity.data)
     end
   end