cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Prevent multiple handlers for Delete of Actor from running (#9292)

Browse source
This commit is contained in:
Eugen Rochko 2018-11-16 19:46:23 +01:00
parent 6d4438a6ae
commit ecc58c0f23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/activitypub/activity.rb
View file

@ -129,4 +129,10 @@ class ActivityPub::Activity
::FetchRemoteStatusService.new.call(@object['url']) ::FetchRemoteStatusService.new.call(@object['url'])
end end
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 end

2
app/lib/activitypub/activity/delete.rb
View file

@ -12,9 +12,11 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
private private
def delete_person def delete_person
lock_or_return("delete_in_progress:#{@account.id}") do
SuspendAccountService.new.call(@account) SuspendAccountService.new.call(@account)
@account.destroy! @account.destroy!
end end
end
def delete_note def delete_note
return if object_uri.nil? return if object_uri.nil?