From 4cb603e1df7c9d13db1aa4285e2a18b9be71cd78 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 2 Oct 2019 18:19:16 +0200
Subject: [PATCH] PleromaAPI: Add unreacting.

---
 .../controllers/pleroma_api_controller.ex          | 14 +++++++++++++-
 lib/pleroma/web/router.ex                          |  1 +
 .../controllers/pleroma_api_controller_test.exs    |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

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 884b3d877..8aee7d7c5 100644
--- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@ -41,7 +41,19 @@ def emoji_reactions_by(%{assigns: %{user: user}} = conn, %{"id" => activity_id})
 
   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})
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index ff3dc273e..87d373f55 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -305,6 +305,7 @@ defmodule Pleroma.Web.Router do
       pipe_through(:oauth_write)
       patch("/conversations/:id", PleromaAPIController, :update_conversation)
       post("/statuses/:id/react_with_emoji", PleromaAPIController, :react_with_emoji)
+      post("/statuses/:id/unreact_with_emoji", PleromaAPIController, :unreact_with_emoji)
       post("/notifications/read", PleromaAPIController, :read_notification)
 
       patch("/accounts/update_avatar", AccountController, :update_avatar)
diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 82d23ea5b..3a5dbdeea 100644
--- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
 
   alias Pleroma.Conversation.Participation
   alias Pleroma.Notification
+  alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.Web.CommonAPI
 
@@ -41,6 +42,10 @@ test "POST /api/v1/pleroma/statuses/:id/unreact_with_emoji", %{conn: conn} do
 
     assert %{"id" => id} = json_response(result, 200)
     assert to_string(activity.id) == id
+
+    object = Object.normalize(activity)
+
+    assert object.data["reaction_count"] == 0
   end
 
   test "GET /api/v1/pleroma/statuses/:id/emoji_reactions_by", %{conn: conn} do