Revert filtering public timelines by locale by default (#20294)
This commit is contained in:
		| @@ -35,7 +35,6 @@ class Api::V1::Timelines::PublicController < Api::BaseController | ||||
|   def public_feed | ||||
|     PublicFeed.new( | ||||
|       current_account, | ||||
|       locale: content_locale, | ||||
|       local: truthy_param?(:local), | ||||
|       remote: truthy_param?(:remote), | ||||
|       only_media: truthy_param?(:only_media) | ||||
|   | ||||
| @@ -8,7 +8,6 @@ class PublicFeed | ||||
|   # @option [Boolean] :local | ||||
|   # @option [Boolean] :remote | ||||
|   # @option [Boolean] :only_media | ||||
|   # @option [String]  :locale | ||||
|   def initialize(account, options = {}) | ||||
|     @account = account | ||||
|     @options = options | ||||
| @@ -28,7 +27,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) | ||||
|     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 | ||||
| @@ -86,13 +85,7 @@ class PublicFeed | ||||
|   end | ||||
|  | ||||
|   def language_scope | ||||
|     if account&.chosen_languages.present? | ||||
|     Status.where(language: account.chosen_languages) | ||||
|     elsif @options[:locale].present? | ||||
|       Status.where(language: @options[:locale]) | ||||
|     else | ||||
|       Status.all | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def account_filters_scope | ||||
|   | ||||
| @@ -12,7 +12,6 @@ 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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user