]> cat aescling's git repositories - mastodon.git/commitdiff
Fix not being able to suspend accounts that already have a canonical e-mail block...
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 2 Jul 2021 10:03:15 +0000 (12:03 +0200)
committerGitHub <noreply@github.com>
Fri, 2 Jul 2021 10:03:15 +0000 (12:03 +0200)
app/models/account.rb

index 2c5455d8e57f4caf43cfa8d4a8cd534a4009b47f..8be36bf5b821aca9c21feb1c94444aa6e168d84c 100644 (file)
@@ -570,7 +570,11 @@ class Account < ApplicationRecord
   def create_canonical_email_block!
     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
 
   def destroy_canonical_email_block!