Commit 8857cabc authored by Matt Jankowski's avatar Matt Jankowski Committed by Eugen Rochko
Browse files

Domain block service cleanup (#2490)

* Add coverage for domain block service with silence

* Get rid of warning about find_each and order

* Move domain_block to attr_reader

* Move optional clear_media into silence_accounts method

* Use blocked_domain method to reduce passed vars

* Extract blocked_domain_accounts method to find accounts on the domain

* Extract media_from_blocked_domain method to find relevant attachments

* Separate destruction of account images and account attachments
parent affd7593
# frozen_string_literal: true # frozen_string_literal: true
class BlockDomainService < BaseService class BlockDomainService < BaseService
attr_reader :domain_block
def call(domain_block) def call(domain_block)
@domain_block = domain_block
process_domain_block
end
private
def process_domain_block
if domain_block.silence? if domain_block.silence?
silence_accounts!(domain_block.domain) silence_accounts!
clear_media!(domain_block.domain) if domain_block.reject_media?
else else
suspend_accounts!(domain_block.domain) suspend_accounts!
end end
end end
private def silence_accounts!
blocked_domain_accounts.update_all(silenced: true)
clear_media! if domain_block.reject_media?
end
def silence_accounts!(domain) def clear_media!
Account.where(domain: domain).update_all(silenced: true) clear_account_images
clear_account_attachments
end
def suspend_accounts!
blocked_domain_accounts.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
def clear_media!(domain) def clear_account_images
Account.where(domain: domain).find_each do |account| blocked_domain_accounts.find_each do |account|
account.avatar.destroy account.avatar.destroy
account.header.destroy account.header.destroy
end end
end
MediaAttachment.where(account: Account.where(domain: domain)).find_each do |attachment| def clear_account_attachments
media_from_blocked_domain.find_each do |attachment|
attachment.file.destroy attachment.file.destroy
end end
end end
def suspend_accounts!(domain) def blocked_domain
Account.where(domain: domain).where(suspended: false).find_each do |account| domain_block.domain
account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed? end
SuspendAccountService.new.call(account)
end def blocked_domain_accounts
Account.where(domain: blocked_domain)
end
def media_from_blocked_domain
MediaAttachment.where(account: blocked_domain_accounts).reorder(nil)
end end
end end
...@@ -13,21 +13,46 @@ RSpec.describe BlockDomainService do ...@@ -13,21 +13,46 @@ RSpec.describe BlockDomainService do
bad_status1 bad_status1
bad_status2 bad_status2
bad_attachment bad_attachment
subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
end end
it 'creates a domain block' do describe 'for a suspension' do
expect(DomainBlock.blocked?('evil.org')).to be true before do
end subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
end
it 'creates a domain block' do
expect(DomainBlock.blocked?('evil.org')).to be true
end
it 'removes remote accounts from that domain' do
expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true
end
it 'removes remote accounts from that domain' do it 'removes the remote accounts\'s statuses and media attachments' do
expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true expect { bad_status1.reload }.to raise_exception ActiveRecord::RecordNotFound
expect { bad_status2.reload }.to raise_exception ActiveRecord::RecordNotFound
expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
end
end end
it 'removes the remote accounts\'s statuses and media attachments' do describe 'for a silence with reject media' do
expect { bad_status1.reload }.to raise_exception ActiveRecord::RecordNotFound before do
expect { bad_status2.reload }.to raise_exception ActiveRecord::RecordNotFound subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound end
it 'does not create a domain block' do
expect(DomainBlock.blocked?('evil.org')).to be false
end
it 'silences remote accounts from that domain' do
expect(Account.find_remote('badguy666', 'evil.org').silenced?).to be true
end
it 'leaves the domains status and attachements, but clears media' do
expect { bad_status1.reload }.not_to raise_error
expect { bad_status2.reload }.not_to raise_error
expect { bad_attachment.reload }.not_to raise_error
expect(bad_attachment.file.exists?).to be false
end
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment