Browse Source

Add limit to search results

pull/4/head
Eugen Rochko 5 years ago
parent
commit
afded319d2
3 changed files with 12 additions and 14 deletions
  1. +2
    -1
      app/assets/javascripts/components/actions/compose.jsx
  2. +2
    -1
      app/controllers/api/v1/accounts_controller.rb
  3. +8
    -12
      app/services/search_service.rb

+ 2
- 1
app/assets/javascripts/components/actions/compose.jsx View File

@ -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));

+ 2
- 1
app/controllers/api/v1/accounts_controller.rb View File

@ -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

+ 8
- 12
app/services/search_service.rb View File

@ -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

Loading…
Cancel
Save