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

2021-07-17 17:45:35 +02:00
parent e42ed4502f e54a65013d
commit d1c87be8cf
8 changed files with 19 additions and 36 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -236,11 +236,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