diff options
author | William Pitcock <nenolod@dereferenced.org> | 2018-11-01 07:47:50 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2018-11-01 07:47:50 +0000 |
commit | 10f3958468e24ba49178a19435b189a6be0dabfb (patch) | |
tree | 88eb7390645bf9b53bea3a4b4448f48be32b01e5 /lib | |
parent | 68a14056437d2aae6cfd3de7107f93fddc1ef7d9 (diff) | |
download | pleroma-10f3958468e24ba49178a19435b189a6be0dabfb.tar.gz |
object: return the deleted object as well
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/object.ex | 2 | ||||
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
2 files changed, 2 insertions, 2 deletions
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 |