Add limit to search results
This commit is contained in:
parent
09218d4c01
commit
afded319d2
|
@ -148,7 +148,8 @@ export function fetchComposeSuggestions(token) {
|
|||
api(getState).get('/api/v1/accounts/search', {
|
||||
params: {
|
||||
q: token,
|
||||
resolve: false
|
||||
resolve: false,
|
||||
limit: 4
|
||||
}
|
||||
}).then(response => {
|
||||
dispatch(readyComposeSuggestions(token, response.data));
|
||||
|
|
|
@ -92,7 +92,8 @@ class Api::V1::AccountsController < ApiController
|
|||
end
|
||||
|
||||
def search
|
||||
@accounts = SearchService.new.call(params[:q], params[:resolve] == 'true')
|
||||
limit = params[:limit] ? [DEFAULT_ACCOUNTS_LIMIT, params[:limit].to_i].min : DEFAULT_ACCOUNTS_LIMIT
|
||||
@accounts = SearchService.new.call(params[:q], limit, params[:resolve] == 'true')
|
||||
render action: :index
|
||||
end
|
||||
|
||||
|
|
|
@ -1,25 +1,21 @@
|
|||
class SearchService < BaseService
|
||||
def call(query, resolve = false)
|
||||
def call(query, limit, resolve = false)
|
||||
return if query.blank?
|
||||
|
||||
username, domain = query.split('@')
|
||||
|
||||
if domain.nil?
|
||||
search_all(username)
|
||||
results = if domain.nil?
|
||||
Account.search_for(username)
|
||||
else
|
||||
search_or_resolve(username, domain, resolve)
|
||||
Account.search_for("#{username} #{domain}")
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
results = results.limit(limit).with_counters
|
||||
|
||||
def search_all(username)
|
||||
Account.search_for(username)
|
||||
end
|
||||
if resolve && results.empty? && !domain.nil?
|
||||
results = [FollowRemoteAccountService.new.call("#{username}@#{domain}")]
|
||||
end
|
||||
|
||||
def search_or_resolve(username, domain, resolve)
|
||||
results = Account.search_for("#{username} #{domain}")
|
||||
return [FollowRemoteAccountService.new.call("#{username}@#{domain}")] if results.empty? && resolve
|
||||
results
|
||||
end
|
||||
end
|
||||
|
|
Reference in a new issue