diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-09 19:06:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 19:06:13 +0100 |
| commit | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (patch) | |
| tree | dba9599f5416483c4a9fcad0002e5a2d6bcd4de1 /app/lib | |
| parent | 25f725d67a6d2542cd586ab7c56baca572eb4f88 (diff) | |
| parent | 7d0e45a3be167d95cbc4d5f80fa989a9371802ae (diff) | |
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |