Prevent multiple handlers for Delete of Actor from running (mastodon#…

…9292)
dwango · Nov 23, 2018 · ecc58c0 · ecc58c0
1 parent 6d4438a
commit ecc58c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
@@ -129,4 +129,10 @@ def fetch_remote_original_status
       ::FetchRemoteStatusService.new.call(@object['url'])
     end
   end
+
+  def lock_or_return(key, expire_after = 7.days.seconds)
+    yield if redis.set(key, true, nx: true, ex: expire_after)
+  ensure
+    redis.del(key)
+  end
 end
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
@@ -12,8 +12,10 @@ def perform
   private
 
   def delete_person
-    SuspendAccountService.new.call(@account)
-    @account.destroy!
+    lock_or_return("delete_in_progress:#{@account.id}") do
+      SuspendAccountService.new.call(@account)
+      @account.destroy!
+    end
   end
 
   def delete_note