From d4f0b0120723d5037a9cf579543b0aa8cf4b3939 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 5 Feb 2025 16:08:12 +0100
Subject: [PATCH] Fix filtering for lists (#33842)
---
app/lib/feed_manager.rb | 2 +-
spec/lib/feed_manager_spec.rb | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 895d45ce69..1a558cacbe 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -42,7 +42,7 @@ class FeedManager
when :home
filter_from_home(status, receiver.id, build_crutches(receiver.id, [status]), :home)
when :list
- (filter_from_list?(status, receiver) ? :filter : nil) || filter_from_home(status, receiver.account_id, build_crutches(receiver.account_id, [status], list: list), :list, stl_home: stl_home)
+ (filter_from_list?(status, receiver) ? :filter : nil) || filter_from_home(status, receiver.account_id, build_crutches(receiver.account_id, [status], list: receiver), :list, stl_home: stl_home)
when :mentions
filter_from_mentions?(status, receiver.id) ? :filter : nil
when :tags
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index ad7913c758..48defa1f83 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -233,6 +233,28 @@ RSpec.describe FeedManager do
end
end
+ context 'with list feed' do
+ let(:list) { Fabricate(:list, account: bob) }
+
+ before do
+ bob.follow!(alice)
+ list.list_accounts.create!(account: alice)
+ end
+
+ it "returns false for followee's status" do
+ status = Fabricate(:status, text: 'Hello world', account: alice)
+
+ expect(subject.filter?(:list, status, list)).to be false
+ end
+
+ it 'returns false for reblog by followee' do
+ status = Fabricate(:status, text: 'Hello world', account: jeff)
+ reblog = Fabricate(:status, reblog: status, account: alice)
+
+ expect(subject.filter?(:list, reblog, list)).to be false
+ end
+ end
+
context 'with mentions feed' do
it 'returns true for status that mentions blocked account' do
bob.block!(jeff)