cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix hashtag timeline REST API accepting too many hashtags (#12091)

This commit is contained in:
Eugen Rochko 2019-10-07 03:56:21 +02:00 committed by GitHub
parent a582185625
commit 8386d9ec10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/hashtag_query_service.rb
View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class HashtagQueryService < BaseService class HashtagQueryService < BaseService
LIMIT_PER_MODE = 4
def call(tag, params, account = nil, local = false) def call(tag, params, account = nil, local = false)
tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id) tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
all = tags_for(params[:all]) all = tags_for(params[:all])
@ -15,6 +17,6 @@ class HashtagQueryService < BaseService
private private
def tags_for(names) 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
end end