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

Fix PrecomputeFeedService for filtered statuses (#4148)

rebase/4.0.0rc2
Akihiko Odaki (@fn_aki@pawoo.net) 2017-07-11 08:00:01 +09:00 committed by Eugen Rochko
parent 958fe0f7db
commit 7bacdd718a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/precompute_feed_service.rb
View File

@ -13,7 +13,7 @@ class PrecomputeFeedService < BaseService
attr_reader :account attr_reader :account
def populate_feed def populate_feed
pairs = statuses.reverse_each.map(&method(:process_status)) pairs = statuses.reverse_each.lazy.reject(&method(:status_filtered?)).map(&method(:process_status)).to_a
redis.pipelined do redis.pipelined do
redis.zadd(account_home_key, pairs) if pairs.any? redis.zadd(account_home_key, pairs) if pairs.any?
@ -22,7 +22,7 @@ class PrecomputeFeedService < BaseService
end end
def process_status(status) def process_status(status)
[status.id, status.reblog? ? status.reblog_of_id : status.id] unless status_filtered?(status) [status.id, status.reblog? ? status.reblog_of_id : status.id]
end end
def status_filtered?(status) def status_filtered?(status)

12
spec/services/precompute_feed_service_spec.rb
View File

@ -23,5 +23,17 @@ RSpec.describe PrecomputeFeedService do
account = Fabricate(:account) account = Fabricate(:account)
subject.call(account) subject.call(account)
end end
it 'filters statuses' do
account = Fabricate(:account)
muted_account = Fabricate(:account)
Fabricate(:mute, account: account, target_account: muted_account)
reblog = Fabricate(:status, account: muted_account)
status = Fabricate(:status, account: account, reblog: reblog)
subject.call(account)
expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq nil
end
end end
end end