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

4 years ago · 38b3419950
parent 92c8c30e17
commit 38b3419950
1 changed files with 5 additions and 1 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -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!