djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 00:54:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix not being able to suspend accounts that already have a canonical e-mail block (#16455)

Browse Source
This commit is contained in:
Eugen Rochko 2021-07-02 12:03:15 +02:00 committed by GitHub
parent 92c8c30e17
commit 38b3419950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/account.rb
View File

@ -570,7 +570,11 @@ class Account < ApplicationRecord
def create_canonical_email_block! def create_canonical_email_block!
return unless local? && user_email.present? return unless local? && user_email.present?
CanonicalEmailBlock.create(reference_account: self, email: user_email) begin
CanonicalEmailBlock.create(reference_account: self, email: user_email)
rescue ActiveRecord::RecordNotUnique
# A canonical e-mail block may already exist for the same e-mail
end
end end
def destroy_canonical_email_block! def destroy_canonical_email_block!