Make domain block/silence/reject-media code more robust (#13424)
* Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.
This commit is contained in:
23
spec/services/clear_domain_media_service_spec.rb
Normal file
23
spec/services/clear_domain_media_service_spec.rb
Normal file
@ -0,0 +1,23 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe ClearDomainMediaService, type: :service do
|
||||
let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
|
||||
let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
|
||||
let!(:bad_status2) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
|
||||
let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status2, file: attachment_fixture('attachment.jpg')) }
|
||||
|
||||
subject { ClearDomainMediaService.new }
|
||||
|
||||
describe 'for a silence with reject media' do
|
||||
before do
|
||||
subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: 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
|
@ -8,7 +8,7 @@ describe DomainBlockWorker do
|
||||
describe 'perform' do
|
||||
let(:domain_block) { Fabricate(:domain_block) }
|
||||
|
||||
it 'returns true for non-existent domain block' do
|
||||
it 'calls domain block service for relevant domain block' do
|
||||
service = double(call: nil)
|
||||
allow(BlockDomainService).to receive(:new).and_return(service)
|
||||
result = subject.perform(domain_block.id)
|
||||
@ -17,7 +17,7 @@ describe DomainBlockWorker do
|
||||
expect(service).to have_received(:call).with(domain_block, false)
|
||||
end
|
||||
|
||||
it 'calls domain block service for relevant domain block' do
|
||||
it 'returns true for non-existent domain block' do
|
||||
result = subject.perform('aaa')
|
||||
|
||||
expect(result).to eq(true)
|
||||
|
26
spec/workers/domain_clear_media_worker_spec.rb
Normal file
26
spec/workers/domain_clear_media_worker_spec.rb
Normal file
@ -0,0 +1,26 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
describe DomainClearMediaWorker do
|
||||
subject { described_class.new }
|
||||
|
||||
describe 'perform' do
|
||||
let(:domain_block) { Fabricate(:domain_block, severity: :silence, reject_media: true) }
|
||||
|
||||
it 'calls domain clear media service for relevant domain block' do
|
||||
service = double(call: nil)
|
||||
allow(ClearDomainMediaService).to receive(:new).and_return(service)
|
||||
result = subject.perform(domain_block.id)
|
||||
|
||||
expect(result).to be_nil
|
||||
expect(service).to have_received(:call).with(domain_block)
|
||||
end
|
||||
|
||||
it 'returns true for non-existent domain block' do
|
||||
result = subject.perform('aaa')
|
||||
|
||||
expect(result).to eq(true)
|
||||
end
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user