Merge branch '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 39d371ff706f4313b11f2e5abccefb51fc52e820..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
@@ -26,7 +26,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
         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})}
+          {emoji, AccountView.render("index.json", %{users: users, for: user, as: :user})}
         end)
         |> Enum.into(%{})
 
@@ -41,7 +41,19 @@ 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("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})