diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
commit | f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190 (patch) | |
tree | 928e06a97ccd3c3eeef3b3c0ac03c8f59d516e59 /app/services/hashtag_query_service.rb | |
parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
parent | 496a6b3dc5274cca08fe58c1d9a7cdc7d10d325b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Diffstat (limited to 'app/services/hashtag_query_service.rb')
-rw-r--r-- | app/services/hashtag_query_service.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/services/hashtag_query_service.rb b/app/services/hashtag_query_service.rb index 86558a446..5773d78c6 100644 --- a/app/services/hashtag_query_service.rb +++ b/app/services/hashtag_query_service.rb @@ -2,15 +2,14 @@ class HashtagQueryService < BaseService 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]) none = tags_for(params[:none]) - @query = Status.as_tag_timeline(tag, account, local) - .tagged_with_all(all) - .tagged_with_none(none) - @query = @query.distinct.or(self.class.new.call(any, params.except(:any), account, local).distinct) if any - @query + Status.distinct + .as_tag_timeline(tags, account, local) + .tagged_with_all(all) + .tagged_with_none(none) end private |