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

2017-09-01 21:12:59 +02:00
parent a75aa62f5b
commit c2980d5b17
2 changed files with 7 additions and 14 deletions
--- 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)