diff options
Diffstat (limited to 'app/models/public_feed.rb')
| -rw-r--r-- | app/models/public_feed.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb index 2528ef1b6..a987bb72c 100644 --- a/app/models/public_feed.rb +++ b/app/models/public_feed.rb @@ -29,6 +29,7 @@ class PublicFeed scope.merge!(remote_only_scope) if remote_only? scope.merge!(account_filters_scope) if account? scope.merge!(media_only_scope) if media_only? + scope.merge!(language_scope) if account&.chosen_languages.present? scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id) end @@ -97,10 +98,13 @@ class PublicFeed Status.not_local_only end + def language_scope + Status.where(language: account.chosen_languages) + end + def account_filters_scope Status.not_excluded_by_account(account).tap do |scope| scope.merge!(Status.not_domain_blocked_by_account(account)) unless local_only? - scope.merge!(Status.in_chosen_languages(account)) if account.chosen_languages.present? end end end |