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

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 14e3ca784b67cce106c93d9018c967a49b86058a..b06dd619460ae1069e66e6dc6063382b4cfbb875 100644 (file)
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -97,14 +97,7 @@ class ActivityPub::Activity
   end
 
   def delete_arrived_first?(uri)
-    key = "delete_upon_arrival:#{@account.id}:#{uri}"
-
-    if redis.exists(key)
-      redis.del(key)
-      true
-    else
-      false
-    end
+    redis.exists("delete_upon_arrival:#{@account.id}:#{uri}")
   end
 
   def delete_later!(uri)

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index afa9a807995b4a5a4b7d2ed76b522f3345d5fdd3..767909fb11a1468d1c09c64448d4d940d5c957f1 100644 (file)
--- 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