Merge branch 'features/add-credo-to-ci' into 'develop'

[akkoma] / lib / pleroma / object.ex

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 7b46a3b05266fd47d8a3fa928975c4d9cc54e018..58e46ef1d4dcb1771ca1b377f1360abfae7bf2d4 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -4,8 +4,15 @@
 
 defmodule Pleroma.Object do
   use Ecto.Schema
-  alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
-  import Ecto.{Query, Changeset}
+
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.ObjectTombstone
+  alias Pleroma.Repo
+  alias Pleroma.User
+
+  import Ecto.Query
+  import Ecto.Changeset
 
   schema "objects" do
     field(:data, :map)
@@ -79,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