diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-08 14:20:35 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-08 14:20:35 +0100 |
| commit | 0437d70628bcd852c303432562c74202554fe9cb (patch) | |
| tree | 27b6ff5abf280517ae6a8abd585f15e02d35fd58 /app/workers | |
| parent | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (diff) | |
| parent | 3134691948aeacb16b7386ed77bbea4581beec40 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/account_deletion_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/account_deletion_worker.rb b/app/workers/account_deletion_worker.rb index 0f6be71e1..b6016bf8c 100644 --- a/app/workers/account_deletion_worker.rb +++ b/app/workers/account_deletion_worker.rb @@ -5,8 +5,8 @@ class AccountDeletionWorker sidekiq_options queue: 'pull' - def perform(account_id) - DeleteAccountService.new.call(Account.find(account_id), reserve_username: true, reserve_email: false) + def perform(account_id, reserve_username: true) + DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, reserve_email: false) rescue ActiveRecord::RecordNotFound true end |