Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00
parent 852acbd738 7232cdf7e8
commit 7e5691804d
139 changed files with 1196 additions and 758 deletions
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -11,16 +11,16 @@ class BlockDomainService < BaseService
  private

  def process_domain_block
+    clear_media! if domain_block.reject_media?
    if domain_block.silence?
      silence_accounts!
-    else
+    elsif domain_block.suspend?
      suspend_accounts!
    end
  end

  def silence_accounts!
    blocked_domain_accounts.in_batches.update_all(silenced: true)
-    clear_media! if domain_block.reject_media?
  end

  def clear_media!
--- a/app/services/unblock_domain_service.rb
+++ b/app/services/unblock_domain_service.rb
@@ -10,7 +10,7 @@ class UnblockDomainService < BaseService
  end

  def process_retroactive_updates
-    blocked_accounts.in_batches.update_all(update_options)
+    blocked_accounts.in_batches.update_all(update_options) unless domain_block.noop?
  end

  def blocked_accounts