about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-11-21 17:02:58 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-11-21 17:02:58 +0100
commit466e3d710ce216030502c6a6b0dbd93becd13d02 (patch)
tree47bfcfb58a171abba16819f6e4efdf9adc599ff8 /app
parent384e953b75abdb15333bf3053cc3d27be88a0cef (diff)
Include replies to list owner and replies to list members in list statuses (#9324)
Diffstat (limited to 'app')
-rw-r--r--app/lib/feed_manager.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 3d7db2721..31ff53860 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}")