pleroma

commit: 6d688f14fa0e1f15893e39bcbff2ba0aac4b085c
parent 8be0c04b403c82a72deaf2147589c4a5c603edc5
Author: lain <lain@soykaf.club>
Date:   Thu,  9 Jul 2020 09:37:52 +0000

Merge branch 'bugfix/status-deletion' into 'develop'

#1920 fix activity deletion

See merge request pleroma/pleroma!2721
Diffstat:
M
lib/pleroma/web/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
@@ -201,15 +201,13 @@ defmodule Pleroma.Web.MastodonAPI.StatusController 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