diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2022-10-05 03:48:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-05 03:48:06 +0200 |
commit | 9f65909f42c14d1e56c5f916eb76b156709ac147 (patch) | |
tree | 134f577aafb52c6aeee91b3b51c87eab4e0ba5ca /app/models/tag_feed.rb | |
parent | d2528b26b6da34f34b5d7a392e263428d3c09d69 (diff) |
Change public timelines to be filtered by current locale by default (#19291)
In the absence of an opt-in to multiple specific languages in the preferences, it makes more sense to filter by the user's presumed language only (interface language or `lang` override)
Diffstat (limited to 'app/models/tag_feed.rb')
-rw-r--r-- | app/models/tag_feed.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb index b8cd63557..58216bddc 100644 --- a/app/models/tag_feed.rb +++ b/app/models/tag_feed.rb @@ -12,6 +12,7 @@ class TagFeed < PublicFeed # @option [Boolean] :local # @option [Boolean] :remote # @option [Boolean] :only_media + # @option [String] :locale def initialize(tag, account, options = {}) @tag = tag super(account, options) @@ -32,6 +33,7 @@ class TagFeed < 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) scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id) end |