Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)

Make it so normal search returns even unreviewed matches, but
autosuggestions do not.

Fix #11960
master
Eugen Rochko 5 years ago committed by GitHub
parent 234c729c52
commit ab33c4df94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/controllers/api/v2/search_controller.rb
  2. 1
      app/javascript/mastodon/actions/compose.js
  3. 13
      app/models/tag.rb
  4. 3
      app/services/search_service.rb
  5. 16
      app/services/tag_search_service.rb
  6. 4
      spec/services/search_service_spec.rb

@ -22,7 +22,7 @@ class Api::V2::SearchController < Api::BaseController
params[:q],
current_account,
limit_param(RESULTS_LIMIT),
search_params.merge(resolve: truthy_param?(:resolve))
search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
)
end

@ -369,6 +369,7 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
q: token.slice(1),
resolve: false,
limit: 4,
exclude_unreviewed: true,
},
}).then(({ data }) => {
dispatch(readyComposeSuggestionsTags(token, data.hashtags));

@ -124,16 +124,15 @@ class Tag < ApplicationRecord
end
end
def search_for(term, limit = 5, offset = 0)
def search_for(term, limit = 5, offset = 0, options = {})
normalized_term = normalize(term.strip).mb_chars.downcase.to_s
pattern = sanitize_sql_like(normalized_term) + '%'
query = Tag.listable.where(arel_table[:name].lower.matches(pattern))
query = query.where(arel_table[:name].lower.eq(normalized_term).or(arel_table[:reviewed_at].not_eq(nil))) if options[:exclude_unreviewed]
Tag.listable
.where(arel_table[:name].lower.matches(pattern))
.where(arel_table[:name].lower.eq(normalized_term).or(arel_table[:reviewed_at].not_eq(nil)))
.order(Arel.sql('length(name) ASC, name ASC'))
.limit(limit)
.offset(offset)
query.order(Arel.sql('length(name) ASC, name ASC'))
.limit(limit)
.offset(offset)
end
def find_normalized(name)

@ -60,7 +60,8 @@ class SearchService < BaseService
TagSearchService.new.call(
@query,
limit: @limit,
offset: @offset
offset: @offset,
exclude_unreviewed: @options[:exclude_unreviewed]
)
end

@ -2,11 +2,12 @@
class TagSearchService < BaseService
def call(query, options = {})
@query = query.strip.gsub(/\A#/, '')
@offset = options[:offset].to_i
@limit = options[:limit].to_i
@query = query.strip.gsub(/\A#/, '')
@offset = options.delete(:offset).to_i
@limit = options.delete(:limit).to_i
@options = options
results = from_elasticsearch if Chewy.enabled?
results = from_elasticsearch if Chewy.enabled?
results ||= from_database
results
@ -72,12 +73,15 @@ class TagSearchService < BaseService
},
}
TagsIndex.query(query).filter(filter).limit(@limit).offset(@offset).objects.compact
definition = TagsIndex.query(query)
definition = definition.filter(filter) if @options[:exclude_unreviewed]
definition.limit(@limit).offset(@offset).objects.compact
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
nil
end
def from_database
Tag.search_for(@query, @limit, @offset)
Tag.search_for(@query, @limit, @offset, @options)
end
end

@ -77,10 +77,10 @@ describe SearchService, type: :service do
it 'includes the tag in the results' do
query = '#tag'
tag = Tag.new
allow(Tag).to receive(:search_for).with('tag', 10, 0).and_return([tag])
allow(Tag).to receive(:search_for).with('tag', 10, 0, exclude_unreviewed: nil).and_return([tag])
results = subject.call(query, nil, 10)
expect(Tag).to have_received(:search_for).with('tag', 10, 0)
expect(Tag).to have_received(:search_for).with('tag', 10, 0, exclude_unreviewed: nil)
expect(results).to eq empty_results.merge(hashtags: [tag])
end
it 'does not include tag when starts with @ character' do

Loading…
Cancel
Save