Do not rely on activity arriving exactly once after delete arrived (#4754)

1 files changed, 6 insertions, 6 deletions

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index afa9a8079..767909fb1 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -5,12 +5,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
     status   = Status.find_by(uri: object_uri, account: @account)
     status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present?
 
-    if status.nil?
-      delete_later!(object_uri)
-    else
-      forward_for_reblogs(status)
-      delete_now!(status)
-    end
+    delete_later!(object_uri)
+
+    return if status.nil?
+
+    forward_for_reblogs(status)
+    delete_now!(status)
   end
 
   private