Merge branch 'broadcast-activity-id-on-deletion' into 'develop'

Broadcast proper deleted activity id to conform to MastoAPI streaming spec

See merge request pleroma/pleroma!917

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 5f1fc801b..7510a09bb 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -86,9 +86,9 @@ defmodule Pleroma.Object do
 
   def delete(%Object{data: %{"id" => id}} = object) do
     with {:ok, _obj} = swap_object_with_tombstone(object),
-         Repo.delete_all(Activity.by_object_ap_id(id)),
+         deleted_activity = Activity.delete_by_ap_id(id),
          {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
-      {:ok, object}
+      {:ok, object, deleted_activity}
     end
   end