mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-23 14:35:41 +00:00
14f6ce2885
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
77 lines
3.1 KiB
Ruby
77 lines
3.1 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe BlockDomainService, 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')) }
|
|
let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
|
|
|
|
subject { BlockDomainService.new }
|
|
|
|
describe 'for a suspension' do
|
|
before do
|
|
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 'records suspension date appropriately' do
|
|
expect(Account.find_remote('badguy666', 'evil.org').suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
|
|
end
|
|
|
|
it 'keeps already-banned accounts banned' do
|
|
expect(Account.find_remote('badguy', 'evil.org').suspended?).to be true
|
|
end
|
|
|
|
it 'does not overwrite suspension date of already-banned accounts' do
|
|
expect(Account.find_remote('badguy', 'evil.org').suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
|
|
end
|
|
|
|
it 'removes the remote accounts\'s statuses and media attachments' do
|
|
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
|
|
|
|
describe 'for a silence with reject media' do
|
|
before do
|
|
subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
|
|
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 'records suspension date appropriately' do
|
|
expect(Account.find_remote('badguy666', 'evil.org').silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
|
|
end
|
|
|
|
it 'keeps already-banned accounts banned' do
|
|
expect(Account.find_remote('badguy', 'evil.org').silenced?).to be true
|
|
end
|
|
|
|
it 'does not overwrite suspension date of already-banned accounts' do
|
|
expect(Account.find_remote('badguy', 'evil.org').silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
|
|
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
|