From 4658263b4adeafa337d31fe93339fc809ce62e26 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 4 Jul 2023 18:36:24 +0200 Subject: [PATCH] Fix re-activated accounts being deleted by AccountDeletionWorker (#25711) --- app/workers/account_deletion_worker.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/workers/account_deletion_worker.rb b/app/workers/account_deletion_worker.rb index fdf013e010..b501511728 100644 --- a/app/workers/account_deletion_worker.rb +++ b/app/workers/account_deletion_worker.rb @@ -6,9 +6,12 @@ class AccountDeletionWorker sidekiq_options queue: 'pull', lock: :until_executed def perform(account_id, options = {}) + account = Account.find(account_id) + return unless account.suspended? + reserve_username = options.with_indifferent_access.fetch(:reserve_username, true) 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) + DeleteAccountService.new.call(account, reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false) rescue ActiveRecord::RecordNotFound true end