SideEffects: Don't delete a deleted object twice.2232-double-delete

2 files changed, 12 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"]},
diff --git a/test/web/activity_pub/side_effects_test.exs b/test/web/activity_pub/side_effects_test.exs
index 9efbaad04..4c8ed5aed 100644
--- a/test/web/activity_pub/side_effects_test.exs
+++ b/test/web/activity_pub/side_effects_test.exs
@@ -238,6 +238,15 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
                {:error, :no_object_actor} = SideEffects.handle(delete)
              end) =~ "object doesn't have an actor"
     end
+
+    test "it works with double deletions", %{
+      delete: delete,
+      object: object
+    } do
+      assert {:ok, activity, _} = SideEffects.handle(delete)
+      Object.invalid_object_cache(object)
+      assert {:ok, ^activity, _} = SideEffects.handle(delete)
+    end
   end
 
   describe "EmojiReact objects" do