aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/activity_pub
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-10-12 15:49:33 +0200
committerlain <lain@soykaf.club>2020-10-12 15:49:33 +0200
commitd3552636ce546bd91458ac06a3e1772d90508070 (patch)
treef77d21923eba5e47229ca5cf4824319489d2372d /lib/pleroma/web/activity_pub
parentbc3cf0fee0b93eb3cf8d2ba0f9a0dcc09b01331d (diff)
downloadpleroma-2232-double-delete.tar.gz
SideEffects: Don't delete a deleted object twice.2232-double-delete
Diffstat (limited to 'lib/pleroma/web/activity_pub')
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index b9a83a544..a3db72a4c 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -253,6 +253,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
result =
case deleted_object do
+ %Object{data: %{"type" => "Tombstone"}} ->
+ :ok
+
%Object{} ->
with {:ok, deleted_object, activity} <- Object.delete(deleted_object),
{_, actor} when is_binary(actor) <- {:actor, deleted_object.data["actor"]},