|
|
|
@ -12,7 +12,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity |
|
|
|
|
private |
|
|
|
|
|
|
|
|
|
def delete_person |
|
|
|
|
with_lock("delete_in_progress:#{@account.id}", autorelease: 2.hours, raise_on_failure: false) do |
|
|
|
|
with_redis_lock("delete_in_progress:#{@account.id}", autorelease: 2.hours, raise_on_failure: false) do |
|
|
|
|
DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true) |
|
|
|
|
end |
|
|
|
|
end |
|
|
|
@ -20,14 +20,14 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity |
|
|
|
|
def delete_note |
|
|
|
|
return if object_uri.nil? |
|
|
|
|
|
|
|
|
|
with_lock("delete_status_in_progress:#{object_uri}", raise_on_failure: false) do |
|
|
|
|
with_redis_lock("delete_status_in_progress:#{object_uri}", raise_on_failure: false) do |
|
|
|
|
unless non_matching_uri_hosts?(@account.uri, object_uri) |
|
|
|
|
# This lock ensures a concurrent `ActivityPub::Activity::Create` either |
|
|
|
|
# does not create a status at all, or has finished saving it to the |
|
|
|
|
# database before we try to load it. |
|
|
|
|
# Without the lock, `delete_later!` could be called after `delete_arrived_first?` |
|
|
|
|
# and `Status.find` before `Status.create!` |
|
|
|
|
with_lock("create:#{object_uri}") { delete_later!(object_uri) } |
|
|
|
|
with_redis_lock("create:#{object_uri}") { delete_later!(object_uri) } |
|
|
|
|
|
|
|
|
|
Tombstone.find_or_create_by(uri: object_uri, account: @account) |
|
|
|
|
end |
|
|
|
|