nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify hashtag query service, perf increase for 'any' tags (#9298)

This commit is contained in:
James Kiesel 2018-11-20 00:49:50 +13:00 committed by Eugen Rochko
parent 1d38c9750a
commit 6a65d87f4d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/services/hashtag_query_service.rb
View File

@ -2,15 +2,14 @@
class HashtagQueryService < BaseService class HashtagQueryService < BaseService
def call(tag, params, account = nil, local = false) def call(tag, params, account = nil, local = false)
any = tags_for(params[:any]) tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
all = tags_for(params[:all]) all = tags_for(params[:all])
none = tags_for(params[:none]) none = tags_for(params[:none])
@query = Status.as_tag_timeline(tag, account, local) Status.distinct
.tagged_with_all(all) .as_tag_timeline(tags, account, local)
.tagged_with_none(none) .tagged_with_all(all)
@query = @query.distinct.or(self.class.new.call(any, params.except(:any), account, local).distinct) if any .tagged_with_none(none)
@query
end end
private private