diff options
author | ThibG <thib@sitedethib.com> | 2020-11-20 15:11:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 15:11:43 +0100 |
commit | 24696458bf22c8529b49f89b2791e3e07583b7e0 (patch) | |
tree | 65e4711917b343a38c6e9f498f8d36e71dcde7c4 /app/workers/account_deletion_worker.rb | |
parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
parent | 3281c9b4c0935a9296e0ea5f359243d732605832 (diff) |
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 81c3b91ad..98b67419d 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 |