Merge branch 'main' into glitch-soc/merge-upstream

2021-07-02 16:12:11 +02:00
parent f4b9d94ce7 38b3419950
commit 1e2097afd4
5 changed files with 119 additions and 115 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -572,7 +572,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!