chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Allow domain blocks that only reject media without silencing or suspending (#4325)

Browse source 
* Allow domain blocks to reject media without silencing or suspending

* Fix typo

* Hide 'Reject media' button when superfluous, instead of disabling it

* Properly hide 'reject media' checkbox on page load if needed

This may happen when resubmitting the domain block form after an error.

* Don't ask whether undoing a media-only block should be retroactive

* Rename :media_only block to :noop

* Display :noop block as None in frontend, allow blocks that do nothing

* Remove 'coding' line auto-added by emacs
This commit is contained in:
sdukhovni 2017-07-24 22:26:55 +10:00 • committed by Eugen Rochko
commit 06d905f415
5 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/block_domain_service.rb
View file

@ -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!