hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exclude-other-silenced-accounts (#7528)

signup-info-prompt
masarakki 2018-08-22 20:20:50 +09:00 committed by Eugen Rochko
parent 2374a00c10
commit 4bdab203ac
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/status.rb
View File

@ -384,7 +384,8 @@ class Status < ApplicationRecord
def account_silencing_filter(account) def account_silencing_filter(account)
if account.silenced? if account.silenced?
including_silenced_accounts including_myself = left_outer_joins(:account).where(account_id: account.id).references(:accounts)
excluding_silenced_accounts.or(including_myself)
else else
excluding_silenced_accounts excluding_silenced_accounts
end end

11
spec/models/status_spec.rb
View File

@ -573,17 +573,6 @@ RSpec.describe Status, type: :model do
expect(results).to include(es_status) expect(results).to include(es_status)
end end
end end
context 'where that account is silenced' do
it 'includes statuses from other accounts that are silenced' do
@account.update(silenced: true)
other_silenced_account = Fabricate(:account, silenced: true)
other_status = Fabricate(:status, account: other_silenced_account)
results = Status.as_public_timeline(@account)
expect(results).to include(other_status)
end
end
end end
end end