gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix user email address being banned on self-deletion (#16503) 

* Add tests

* Fix user email address being banned on self-deletion

Fixes #16498
gh/stable
Claire 2021-07-14 05:35:49 +02:00 committed by GitHub
parent 31593d1426
commit 30ce6e395c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/deletes_controller.rb
View File

@ -42,7 +42,7 @@ class Settings::DeletesController < Settings::BaseController
end end
def destroy_account! def destroy_account!
current_account.suspend!(origin: :local) current_account.suspend!(origin: :local, block_email: false)
AccountDeletionWorker.perform_async(current_user.account_id) AccountDeletionWorker.perform_async(current_user.account_id)
sign_out sign_out
end end

4
app/models/account.rb
View File

@ -232,11 +232,11 @@ class Account < ApplicationRecord
suspended? && deletion_request.present? suspended? && deletion_request.present?
end end
def suspend!(date: Time.now.utc, origin: :local) def suspend!(date: Time.now.utc, origin: :local, block_email: true)
transaction do transaction do
create_deletion_request! create_deletion_request!
update!(suspended_at: date, suspension_origin: origin) update!(suspended_at: date, suspension_origin: origin)
create_canonical_email_block! create_canonical_email_block! if block_email
end end
end end

4
spec/controllers/settings/deletes_controller_spec.rb
View File

@ -59,6 +59,10 @@ describe Settings::DeletesController do
expect(user.account.reload).to be_suspended expect(user.account.reload).to be_suspended
end end
it 'does not create an email block' do
expect(CanonicalEmailBlock.block?(user.email)).to be false
end
context 'when suspended' do context 'when suspended' do
let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) } let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }