diff options
| author | Starfall <us@starfall.systems> | 2020-12-10 18:39:04 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-10 18:39:04 -0600 |
| commit | ab127fd7941b7c84e6d6fe3071d41f52affb143c (patch) | |
| tree | 7daabe20eb581a2b9215ed9c4f161bcab89019bd /app/lib | |
| parent | e68391fbaaf409cc01f74c8cf7076520a43ae06e (diff) | |
| parent | 4acb5c90a271779a050c4d3b54562bd29359e5c0 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 3c1f8d6e2..ebd25b398 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -403,8 +403,8 @@ class FeedManager def filter_from_list?(status, list) 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 &&= !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?) + should_filter &&= !list.show_followed? + should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?) return !!should_filter end |