aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex17
1 files changed, 6 insertions, 11 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 @@ 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("accounts.json", %{users: users, for: user, as: :user})}
end)
+ |> Enum.into(%{})
conn
|> json(reactions)
@@ -49,7 +44,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController 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