mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-12-12 21:58:20 +09:00
Code

Fix boosts of local users being filtered in account timelines (#27204)

Browse Source
This commit is contained in:
Claire 2023-10-03 12:21:42 +02:00
parent 451884a36b
commit 0619ec1592
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/account_statuses_filter.rb
View File

@ -60,8 +60,12 @@ class AccountStatusesFilter
.where(reblog_of_id: nil) .where(reblog_of_id: nil)
.or( .or(
scope scope
# This is basically `Status.not_domain_blocked_by_account(current_account)`
# and `Status.not_excluded_by_account(current_account)` but on the
# `reblog` association. Unfortunately, there seem to be no clean way
# to re-use those scopes in our case.
.where(reblog: { accounts: { domain: nil } }).or(scope.where.not(reblog: { accounts: { domain: current_account.excluded_from_timeline_domains } }))
.where.not(reblog: { account_id: current_account.excluded_from_timeline_account_ids }) .where.not(reblog: { account_id: current_account.excluded_from_timeline_account_ids })
.where.not(reblog: { accounts: { domain: current_account.excluded_from_timeline_domains } })
) )
end end

16
spec/models/account_statuses_filter_spec.rb → spec/lib/account_statuses_filter_spec.rb
View File

@ -202,7 +202,7 @@ RSpec.describe AccountStatusesFilter do
context 'when blocking a reblogged domain' do context 'when blocking a reblogged domain' do
let(:other_account) { Fabricate(:account, domain: 'example.com') } let(:other_account) { Fabricate(:account, domain: 'example.com') }
let(:reblogging_status) { Fabricate(:status, account: other_account) } let(:reblogging_status) { Fabricate(:status, account: other_account) }
let(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) } let!(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) }
before do before do
current_account.block_domain!(other_account.domain) current_account.block_domain!(other_account.domain)
@ -213,6 +213,20 @@ RSpec.describe AccountStatusesFilter do
end end
end end
context 'when blocking an unrelated domain' do
let(:other_account) { Fabricate(:account, domain: nil) }
let(:reblogging_status) { Fabricate(:status, account: other_account, visibility: 'public') }
let!(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) }
before do
current_account.block_domain!('example.com')
end
it 'returns the reblog from the non-blocked domain' do
expect(subject.results.pluck(:id)).to include(reblog.id)
end
end
context 'when muting a reblogged account' do context 'when muting a reblogged account' do
let(:reblog) { status_with_reblog!('public') } let(:reblog) { status_with_reblog!('public') }