about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-11-04 12:02:04 +0100
committerThibG <thib@sitedethib.com>2018-11-28 14:46:07 +0100
commit53d0293d259f3b4e8fcfd96aca33867c6af3dd50 (patch)
tree35532d46eda0fb8058197d8aae05147499d44ae5 /app/lib
parent74a281475a96be66bfa6a14ed9108f41ac451856 (diff)
Add database support for list show-reply preferences
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/feed_manager.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 31ff53860..0cdb178c1 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -42,7 +42,8 @@ class FeedManager
   def push_to_list(list, status)
     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?
+      should_filter &&= !list.show_all_replies?
+      should_filter &&= !(list.show_list_replies? && 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)