From 5d710b1139b34f2ed6bd556f448fa7248354e758 Mon Sep 17 00:00:00 2001 From: Eugen Date: Sun, 16 Apr 2017 12:51:30 +0200 Subject: Make file attachment on MediaAttachment optional (#1865) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI --- app/services/block_domain_service.rb | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'app/services/block_domain_service.rb') diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb index 6c131bd34..97d2ebcd7 100644 --- a/app/services/block_domain_service.rb +++ b/app/services/block_domain_service.rb @@ -3,12 +3,34 @@ class BlockDomainService < BaseService def call(domain_block) if domain_block.silence? - Account.where(domain: domain_block.domain).update_all(silenced: true) + silence_accounts!(domain_block.domain) + clear_media!(domain_block.domain) if domain_block.reject_media? else - Account.where(domain: domain_block.domain).find_each do |account| - account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed? - SuspendAccountService.new.call(account) - end + suspend_accounts!(domain_block.domain) + end + end + + private + + def silence_accounts!(domain) + Account.where(domain: domain).update_all(silenced: true) + end + + def clear_media!(domain) + Account.where(domain: domain).find_each do |account| + account.avatar.destroy + account.header.destroy + end + + MediaAttachment.where(account: Account.where(domain: domain)).find_each do |attachment| + attachment.file.destroy + end + end + + def suspend_accounts!(domain) + Account.where(domain: domain).where(suspended: false).find_each do |account| + account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed? + SuspendAccountService.new.call(account) end end end -- cgit