From 26478f461cafc42d39bc0baf235989e1df7ee0bb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 30 Oct 2022 21:29:23 +0100
Subject: [PATCH] Remove language filtering from hashtag timelines (#19563)
---
app/controllers/api/v1/timelines/tag_controller.rb | 1 -
app/models/tag_feed.rb | 1 -
2 files changed, 2 deletions(-)
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 9f3a5b3f12e..64a1db58df3 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -36,7 +36,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
TagFeed.new(
@tag,
current_account,
- locale: content_locale,
any: params[:any],
all: params[:all],
none: params[:none],
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index 58216bddcb6..8502b79afa3 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -33,7 +33,6 @@ 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
--
GitLab