Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 2 insertions, 9 deletions

diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index bc8281ef2..a987bb72c 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -9,7 +9,6 @@ class PublicFeed
   # @option [Boolean] :remote
   # @option [Boolean] :only_media
   # @option [Boolean] :allow_local_only
-  # @option [String]  :locale
   def initialize(account, options = {})
     @account = account
     @options = options
@@ -30,7 +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)
+    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
@@ -100,13 +99,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
+    Status.where(language: account.chosen_languages)
   end
 
   def account_filters_scope