gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix #329 - avatar errors no longer prevent remote accounts from being saved

Browse source 
(without avatar). Also improved search position of exact matches
This commit is contained in:
Eugen Rochko 2016-12-02 14:14:49 +01:00
parent 2b2797d6a5
commit 58b3f4fd67
7 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/services/search_service.rb
View file

@ -6,13 +6,16 @@ class SearchService < BaseService
username, domain = query.gsub(/\A@/, '').split('@')
results = if domain.nil?
Account.search_for(username)
else
Account.search_for("#{username} #{domain}")
end
if domain.nil?
exact_match = Account.find_local(username)
results = Account.search_for(username)
else
exact_match = Account.find_remote(username, domain)
results = Account.search_for("#{username} #{domain}")
end
results = results.limit(limit)
results = results.limit(limit).to_a
results = [exact_match] + results.reject { |a| a.id == exact_match.id } if exact_match
if resolve && results.empty? && !domain.nil?
results = [FollowRemoteAccountService.new.call("#{username}@#{domain}")]