From f8f0572ee09122dd8fda51aec899f939c6ab03bf Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sat, 24 Feb 2018 13:40:18 +0900 Subject: Do not push status to feed if its reblog is already inserted (#6488) A complemental change for precompute_feed_service_spec.rb also fixes its random failure which is caused by the Snowlake randomization of the order of an original status and its reblog. --- spec/lib/feed_manager_spec.rb | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'spec/lib') diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb index c6bc388e0..6ead5bbd9 100644 --- a/spec/lib/feed_manager_spec.rb +++ b/spec/lib/feed_manager_spec.rb @@ -157,7 +157,7 @@ RSpec.describe FeedManager do end end - describe '#push' do + describe '#push_to_home' do it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do account = Fabricate(:account) status = Fabricate(:status) @@ -248,6 +248,39 @@ RSpec.describe FeedManager do expect(FeedManager.instance.push_to_home(account, reblogs.last)).to be true end end + + it "does not push when the given status's reblog is already inserted" do + account = Fabricate(:account) + reblog = Fabricate(:status) + status = Fabricate(:status, reblog: reblog) + FeedManager.instance.push_to_home(account, status) + + expect(FeedManager.instance.push_to_home(account, reblog)).to eq false + end + end + + describe '#push_to_list' do + it "does not push when the given status's reblog is already inserted" do + list = Fabricate(:list) + reblog = Fabricate(:status) + status = Fabricate(:status, reblog: reblog) + FeedManager.instance.push_to_list(list, status) + + expect(FeedManager.instance.push_to_list(list, reblog)).to eq false + end + end + + describe '#merge_into_timeline' do + it "does not push source account's statuses whose reblogs are already inserted" do + account = Fabricate(:account, id: 0) + reblog = Fabricate(:status) + status = Fabricate(:status, reblog: reblog) + FeedManager.instance.push_to_home(account, status) + + FeedManager.instance.merge_into_timeline(account, reblog.account) + + expect(Redis.current.zscore("feed:home:0", reblog.id)).to eq nil + end end describe '#trim' do -- cgit