vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* Add tests

* Fix user email address being banned on self-deletion

Fixes #16498
This commit is contained in:
Claire 2021-07-14 05:35:49 +02:00 • committed by Eugen Rochko
parent 986397b3a2
commit c3a6f7b941
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/account.rb
View file

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