astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert filtering public timelines by locale by default (#20294)

pull/20675/head
Eugen Rochko 2022-11-10 05:34:42 +01:00 committed by GitHub
parent b280a255c4
commit 0cd0786aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/v1/timelines/public_controller.rb
View File

@ -35,7 +35,6 @@ class Api::V1::Timelines::PublicController < Api::BaseController
def public_feed def public_feed
PublicFeed.new( PublicFeed.new(
current_account, current_account,
locale: content_locale,
local: truthy_param?(:local), local: truthy_param?(:local),
remote: truthy_param?(:remote), remote: truthy_param?(:remote),
only_media: truthy_param?(:only_media) only_media: truthy_param?(:only_media)

9
app/models/public_feed.rb
View File

@ -8,7 +8,6 @@ class PublicFeed
# @option [Boolean] :local # @option [Boolean] :local
# @option [Boolean] :remote # @option [Boolean] :remote
# @option [Boolean] :only_media # @option [Boolean] :only_media
# @option [String] :locale
def initialize(account, options = {}) def initialize(account, options = {})
@account = account @account = account
@options = options @options = options
@ -28,7 +27,7 @@ class PublicFeed
scope.merge!(remote_only_scope) if remote_only? scope.merge!(remote_only_scope) if remote_only?
scope.merge!(account_filters_scope) if account? scope.merge!(account_filters_scope) if account?
scope.merge!(media_only_scope) if media_only? 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) scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end end
@ -86,13 +85,7 @@ class PublicFeed
end end
def language_scope def language_scope
if account&.chosen_languages.present?
Status.where(language: account.chosen_languages) Status.where(language: account.chosen_languages)
elsif @options[:locale].present?
Status.where(language: @options[:locale])
else
Status.all
end
end end
def account_filters_scope def account_filters_scope

1
app/models/tag_feed.rb
View File

@ -12,7 +12,6 @@ class TagFeed < PublicFeed
# @option [Boolean] :local # @option [Boolean] :local
# @option [Boolean] :remote # @option [Boolean] :remote
# @option [Boolean] :only_media # @option [Boolean] :only_media
# @option [String] :locale
def initialize(tag, account, options = {}) def initialize(tag, account, options = {})
@tag = tag @tag = tag
super(account, options) super(account, options)