X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=58e46ef1d4dcb1771ca1b377f1360abfae7bf2d4;hb=8cd3eada7dec00f4e2ddd24c6a4286a4450281c1;hp=5f1fc801b592d70da0534fdb9defd34e99880758;hpb=ac72b578da673282b927b945bfe03cd3012444b6;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 5f1fc801b..58e46ef1d 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -5,11 +5,11 @@
 defmodule Pleroma.Object do
   use Ecto.Schema
 
-  alias Pleroma.Repo
-  alias Pleroma.Object
-  alias Pleroma.User
   alias Pleroma.Activity
+  alias Pleroma.Object
   alias Pleroma.ObjectTombstone
+  alias Pleroma.Repo
+  alias Pleroma.User
 
   import Ecto.Query
   import Ecto.Changeset
@@ -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