From fc1f34b85125b24a8094aaa963acb46acacd8eee Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Mon, 6 Jul 2020 00:01:25 +0300
Subject: [PATCH] Delete activity before sending response to client

---
 .../mastodon_api/controllers/status_controller.ex  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index 3f4c53437..12be530c9 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -201,15 +201,13 @@ def show(%{assigns: %{user: user}} = conn, %{id: id}) do
   @doc "DELETE /api/v1/statuses/:id"
   def delete(%{assigns: %{user: user}} = conn, %{id: id}) do
     with %Activity{} = activity <- Activity.get_by_id_with_object(id),
-         render <-
-           try_render(conn, "show.json",
-             activity: activity,
-             for: user,
-             with_direct_conversation_id: true,
-             with_source: true
-           ),
          {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
-      render
+      try_render(conn, "show.json",
+        activity: activity,
+        for: user,
+        with_direct_conversation_id: true,
+        with_source: true
+      )
     else
       _e -> {:error, :not_found}
     end