Merge branch 'main' into glitch-soc/merge-upstream
commit
1fe4e5e38c
|
@ -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],
|
||||
|
|
|
@ -34,7 +34,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
|
||||
|
|
Loading…
Reference in New Issue