From 7bacdd718a143f54f47ddc3afa39504636be65c0 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 11 Jul 2017 08:00:01 +0900
Subject: [PATCH] Fix PrecomputeFeedService for filtered statuses (#4148)
---
app/services/precompute_feed_service.rb | 4 ++--
spec/services/precompute_feed_service_spec.rb | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index a32ba1dae4..85635a0082 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -13,7 +13,7 @@ class PrecomputeFeedService < BaseService
attr_reader :account
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.zadd(account_home_key, pairs) if pairs.any?
@@ -22,7 +22,7 @@ class PrecomputeFeedService < BaseService
end
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
def status_filtered?(status)
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index e2294469c0..dbd08ac1b0 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -23,5 +23,17 @@ RSpec.describe PrecomputeFeedService do
account = Fabricate(:account)
subject.call(account)
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
--
GitLab