From e625425c8feb611e037c62855845b38ceb4b35c1 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 21 Nov 2018 17:02:58 +0100
Subject: [PATCH] Include replies to list owner and replies to list members in
list statuses (#9324)
---
app/lib/feed_manager.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 3d7db27211a..31ff53860b4 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -40,7 +40,11 @@ class FeedManager
end
def push_to_list(list, status)
- return false if status.reply? && status.in_reply_to_account_id != status.account_id
+ if status.reply? && status.in_reply_to_account_id != status.account_id
+ should_filter = status.in_reply_to_account_id != list.account_id
+ should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?
+ return false if should_filter
+ end
return false unless add_to_feed(:list, list.id, status)
trim(:list, list.id)
PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}") if push_update_required?("timeline:list:#{list.id}")
--
GitLab