diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
| commit | 7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch) | |
| tree | 84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/services/block_domain_service.rb | |
| parent | 852acbd7385a640d9e00e462d58a847851744034 (diff) | |
| parent | 7232cdf7e8249f79078005931b1165e54e413fa9 (diff) | |
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'app/services/block_domain_service.rb')
| -rw-r--r-- | app/services/block_domain_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb index e8b3a870d..a6b3c4cdb 100644 --- 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! |