diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-19 17:39:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 17:39:47 +0100 |
| commit | 2f6831f3187af0dfd9cacd7d4cba5664be7a9cbd (patch) | |
| tree | dbbae657480e429be868b0a8c466300caa35e382 /app/workers/account_deletion_worker.rb | |
| parent | df1653174be233f2737d8ec281325dee54011947 (diff) | |
Fix sending spurious Rejects when processing remote account deletion (#15104)
* Fix sending spurious Rejects when processing remote account deletion
* Make skip_side_effects imply skip_activitypub
Diffstat (limited to 'app/workers/account_deletion_worker.rb')
| -rw-r--r-- | app/workers/account_deletion_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/account_deletion_worker.rb b/app/workers/account_deletion_worker.rb index 81c3b91ad8d..98b67419d01 100644 --- a/app/workers/account_deletion_worker.rb +++ b/app/workers/account_deletion_worker.rb @@ -7,7 +7,8 @@ class AccountDeletionWorker def perform(account_id, options = {}) reserve_username = options.with_indifferent_access.fetch(:reserve_username, true) - DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, reserve_email: false) + skip_activitypub = options.with_indifferent_access.fetch(:skip_activitypub, false) + DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false) rescue ActiveRecord::RecordNotFound true end |