Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-10-02 01:49:10 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix deleted-because-of-suspension accounts being marked as manually deleted (#40645)

Browse Source
This commit is contained in:
Claire
2026-09-22 09:04:55 +00:00
parent 899f77836e
commit 79206902e9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/workers/admin/account_deletion_worker.rb
View File

@@ -6,10 +6,10 @@ class Admin::AccountDeletionWorker
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i
def perform(account_id)
delete_account = Account.find(account_id)
return unless delete_account.unavailable?
account = Account.find(account_id)
return unless account.unavailable?
DeleteAccountService.new.call(delete_account, reserve_username: true, reserve_email: true)
DeleteAccountService.new.call(account, reserve_username: true, reserve_email: true, suspended_at: account.suspended_at)
rescue ActiveRecord::RecordNotFound
true
end

2
spec/workers/admin/account_deletion_worker_spec.rb
View File

@@ -13,7 +13,7 @@ RSpec.describe Admin::AccountDeletionWorker do
allow(DeleteAccountService).to receive(:new).and_return(service)
worker.perform(account.id)
expect(service).to have_received(:call).with(account, { reserve_email: true, reserve_username: true })
expect(service).to have_received(:call).with(account, { reserve_email: true, reserve_username: true, suspended_at: account.reload.suspended_at })
end
end
end