mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 04:25:06 +01: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
133 lines
4.7 KiB
Ruby
133 lines
4.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe StatusThreadingConcern do
|
|
describe '#ancestors' do
|
|
let!(:alice) { Fabricate(:account, username: 'alice') }
|
|
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
|
let!(:jeff) { Fabricate(:account, username: 'jeff') }
|
|
let!(:status) { Fabricate(:status, account: alice) }
|
|
let!(:reply1) { Fabricate(:status, thread: status, account: jeff) }
|
|
let!(:reply2) { Fabricate(:status, thread: reply1, account: bob) }
|
|
let!(:reply3) { Fabricate(:status, thread: reply2, account: alice) }
|
|
let!(:viewer) { Fabricate(:account, username: 'viewer') }
|
|
|
|
it 'returns conversation history' do
|
|
expect(reply3.ancestors(4)).to include(status, reply1, reply2)
|
|
end
|
|
|
|
it 'does not return conversation history user is not allowed to see' do
|
|
reply1.update(visibility: :private)
|
|
status.update(visibility: :direct)
|
|
|
|
expect(reply3.ancestors(4, viewer)).to_not include(reply1, status)
|
|
end
|
|
|
|
it 'does not return conversation history from blocked users' do
|
|
viewer.block!(jeff)
|
|
expect(reply3.ancestors(4, viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from muted users' do
|
|
viewer.mute!(jeff)
|
|
expect(reply3.ancestors(4, viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from silenced and not followed users' do
|
|
jeff.silence!
|
|
expect(reply3.ancestors(4, viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from blocked domains' do
|
|
viewer.block_domain!('example.com')
|
|
expect(reply3.ancestors(4, viewer)).to_not include(reply2)
|
|
end
|
|
|
|
it 'ignores deleted records' do
|
|
first_status = Fabricate(:status, account: bob)
|
|
second_status = Fabricate(:status, thread: first_status, account: alice)
|
|
|
|
# Create cache and delete cached record
|
|
second_status.ancestors(4)
|
|
first_status.destroy
|
|
|
|
expect(second_status.ancestors(4)).to eq([])
|
|
end
|
|
|
|
it 'can return more records than previously requested' do
|
|
first_status = Fabricate(:status, account: bob)
|
|
second_status = Fabricate(:status, thread: first_status, account: alice)
|
|
third_status = Fabricate(:status, thread: second_status, account: alice)
|
|
|
|
# Create cache
|
|
second_status.ancestors(1)
|
|
|
|
expect(third_status.ancestors(2)).to eq([first_status, second_status])
|
|
end
|
|
|
|
it 'can return fewer records than previously requested' do
|
|
first_status = Fabricate(:status, account: bob)
|
|
second_status = Fabricate(:status, thread: first_status, account: alice)
|
|
third_status = Fabricate(:status, thread: second_status, account: alice)
|
|
|
|
# Create cache
|
|
second_status.ancestors(2)
|
|
|
|
expect(third_status.ancestors(1)).to eq([second_status])
|
|
end
|
|
end
|
|
|
|
describe '#descendants' do
|
|
let!(:alice) { Fabricate(:account, username: 'alice') }
|
|
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
|
let!(:jeff) { Fabricate(:account, username: 'jeff') }
|
|
let!(:status) { Fabricate(:status, account: alice) }
|
|
let!(:reply1) { Fabricate(:status, thread: status, account: alice) }
|
|
let!(:reply2) { Fabricate(:status, thread: status, account: bob) }
|
|
let!(:reply3) { Fabricate(:status, thread: reply1, account: jeff) }
|
|
let!(:viewer) { Fabricate(:account, username: 'viewer') }
|
|
|
|
it 'returns replies' do
|
|
expect(status.descendants(4)).to include(reply1, reply2, reply3)
|
|
end
|
|
|
|
it 'does not return replies user is not allowed to see' do
|
|
reply1.update(visibility: :private)
|
|
reply3.update(visibility: :direct)
|
|
|
|
expect(status.descendants(4, viewer)).to_not include(reply1, reply3)
|
|
end
|
|
|
|
it 'does not return replies from blocked users' do
|
|
viewer.block!(jeff)
|
|
expect(status.descendants(4, viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from muted users' do
|
|
viewer.mute!(jeff)
|
|
expect(status.descendants(4, viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from silenced and not followed users' do
|
|
jeff.silence!
|
|
expect(status.descendants(4, viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from blocked domains' do
|
|
viewer.block_domain!('example.com')
|
|
expect(status.descendants(4, viewer)).to_not include(reply2)
|
|
end
|
|
|
|
it 'promotes self-replies to the top while leaving the rest in order' do
|
|
a = Fabricate(:status, account: alice)
|
|
d = Fabricate(:status, account: jeff, thread: a)
|
|
e = Fabricate(:status, account: bob, thread: d)
|
|
c = Fabricate(:status, account: alice, thread: a)
|
|
f = Fabricate(:status, account: bob, thread: c)
|
|
|
|
expect(a.descendants(20)).to eq [c, d, e, f]
|
|
end
|
|
end
|
|
end
|