Fix re-activated accounts being deleted by AccountDeletionWorker (#25711)

11 months ago · 4658263b4a
parent 182fd93a07
commit 4658263b4a
1 changed files with 4 additions and 1 deletions
--- 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