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

#1920 fix activity deletion

See merge request pleroma/pleroma!2721

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 <-
+         {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
       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
+      )
     else
       _e -> {:error, :not_found}
     end