Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Filter direct statuses in Status.as_home_timeline (#3842)

Browse source 
The classes using Status.as_home_timeline, namely Feed and
PrecomputeFeedService are expected to filter direct statuses as
FanOutWriteService does, but their filtering were incomplete or missing.

This commit solves the problem by filtering direct statuses in
as_home_timeline as the other similar methods such as as_public_timeline
does.
This commit is contained in:
Akihiko Odaki (@fn_aki@pawoo.net) 2017-06-21 03:41:23 +09:00 • committed by Eugen Rochko
parent a20cf3b64e
commit bab5a18232
3 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spec/models/status_spec.rb
View file

@ -181,15 +181,18 @@ RSpec.describe Status, type: :model do
end
describe '.as_home_timeline' do
let(:account) { Fabricate(:account) }
let(:followed) { Fabricate(:account) }
let(:not_followed) { Fabricate(:account) }
before do
account = Fabricate(:account)
followed = Fabricate(:account)
not_followed = Fabricate(:account)
Fabricate(:follow, account: account, target_account: followed)
@self_status = Fabricate(:status, account: account)
@followed_status = Fabricate(:status, account: followed)
@not_followed_status = Fabricate(:status, account: not_followed)
@self_status = Fabricate(:status, account: account, visibility: :public)
@self_direct_status = Fabricate(:status, account: account, visibility: :direct)
@followed_status = Fabricate(:status, account: followed, visibility: :public)
@followed_direct_status = Fabricate(:status, account: followed, visibility: :direct)
@not_followed_status = Fabricate(:status, account: not_followed, visibility: :public)
@results = Status.as_home_timeline(account)
end
@ -198,10 +201,23 @@ RSpec.describe Status, type: :model do
expect(@results).to include(@self_status)
end
it 'includes direct statuses from self' do
expect(@results).to include(@self_direct_status)
end
it 'includes statuses from followed' do
expect(@results).to include(@followed_status)
end
it 'includes direct statuses mentioning recipient from followed' do
Fabricate(:mention, account: account, status: @followed_direct_status)
expect(@results).to include(@followed_direct_status)
end
it 'does not include direct statuses not mentioning recipient from followed' do
expect(@results).not_to include(@followed_direct_status)
end
it 'does not include statuses from non-followed' do
expect(@results).not_to include(@not_followed_status)
end