Make account search blazing fast and rank followers/followees higher in the results

This commit is contained in:
Eugen Rochko 2017-03-17 20:47:38 +01:00
parent 22f9399cc3
commit ad0d82d3ce
6 changed files with 50 additions and 15 deletions

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class SearchService < BaseService
def call(query, limit, resolve = false)
def call(query, limit, resolve = false, account = nil)
return if query.blank? || query.start_with?('#')
username, domain = query.gsub(/\A@/, '').split('@')
@ -9,13 +9,12 @@ class SearchService < BaseService
if domain.nil?
exact_match = Account.find_local(username)
results = Account.search_for(username)
results = account.nil? ? Account.search_for(username, limit) : Account.advanced_search_for(username, account, limit)
else
exact_match = Account.find_remote(username, domain)
results = Account.search_for("#{username} #{domain}")
results = account.nil? ? Account.search_for("#{username} #{domain}", limit) : Account.advanced_search_for("#{username} #{domain}", account, limit)
end
results = results.limit(limit).to_a
results = [exact_match] + results.reject { |a| a.id == exact_match.id } if exact_match
if resolve && !exact_match && !domain.nil?