about summary refs log tree commit diff
path: root/app/lib/feed_manager.rb
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-09-21 19:11:28 -0500
committerFire Demon <firedemon@creature.cafe>2020-09-21 19:11:28 -0500
commite503d655859a7541141fdf93e65edd10d0340fd3 (patch)
tree5fc8cdd00bde95139463d78babaa4b3933b3b5be /app/lib/feed_manager.rb
parentb13be4952e4122cf0805e78f433cd14e6a57fa39 (diff)
Include user's filter options when checking list filters
Diffstat (limited to 'app/lib/feed_manager.rb')
-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 1edf6fb6e..9a0a304e5 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -182,9 +182,10 @@ class FeedManager
 
     statuses = query.to_a
     crutches = build_crutches(list.account_id, statuses)
+    filter_options = filter_options_for(list.account.id)
 
     statuses.each do |status|
-      next if filter_from_home?(status, list.account_id, crutches) || filter_from_list?(status, list)
+      next if filter_from_home?(status, list.account_id, crutches, filter_options) || filter_from_list?(status, list)
 
       add_to_feed(:list, list.id, status, aggregate)
     end