From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 1 Nov 2018 07:47:50 +0000 (+0000)
Subject: object: return the deleted object as well
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=10f3958468e24ba49178a19435b189a6be0dabfb;p=akkoma

object: return the deleted object as well
---

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 8f96fd8fb..fddf38450 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -57,7 +57,7 @@ defmodule Pleroma.Object do
     with Repo.delete(object),
          Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
          {:ok, true} <- Cachex.del(:user_cache, "object:#{id}") do
-      :ok
+      {:ok, object}
     end
   end
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 48ae36ebd..32c14995f 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -273,7 +273,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       "to" => [user.follower_address, "https://www.w3.org/ns/activitystreams#Public"]
     }
 
-    with Object.delete(object),
+    with {:ok, _} <- Object.delete(object),
          {:ok, activity} <- insert(data, local),
          :ok <- maybe_federate(activity),
          {:ok, _actor} <- User.decrease_note_count(user) do