mirror of
https://github.com/whippyshou/mastodon
synced 2024-11-24 15:16:26 +09:00
Fix hashtag timeline REST API accepting too many hashtags (#12091)
This commit is contained in:
parent
a582185625
commit
8386d9ec10
@ -1,6 +1,8 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class HashtagQueryService < BaseService
|
||||
LIMIT_PER_MODE = 4
|
||||
|
||||
def call(tag, params, account = nil, local = false)
|
||||
tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
|
||||
all = tags_for(params[:all])
|
||||
@ -15,6 +17,6 @@ class HashtagQueryService < BaseService
|
||||
private
|
||||
|
||||
def tags_for(names)
|
||||
Tag.matching_name(names) if names.presence
|
||||
Tag.matching_name(Array(names).take(LIMIT_PER_MODE)) if names.present?
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user