about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
Diffstat (limited to 'app/services')
-rw-r--r--app/services/account_search_service.rb2
-rw-r--r--app/services/search_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 2d602a31d..d7bccdfe0 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -67,7 +67,7 @@ class AccountSearchService < BaseService
   end
 
   def from_elasticsearch
-    must_clauses   = [{ multi_match: { query: terms_for_query, fields: likely_acct? ? %w(acct) : %w(acct^2 display_name), type: 'best_fields' } }]
+    must_clauses   = [{ multi_match: { query: terms_for_query, fields: likely_acct? ? %w(acct.edge_ngram acct) : %w(acct.edge_ngram acct display_name.edge_ngram display_name), type: 'most_fields', operator: 'and' } }]
     should_clauses = []
 
     if account
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 769d1ac7a..786d34b15 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -52,7 +52,7 @@ class SearchService < BaseService
     preloaded_relations = relations_map_for_account(@account, account_ids, account_domains)
 
     results.reject { |status| StatusFilter.new(status, @account, preloaded_relations).filtered? }
-  rescue Faraday::ConnectionFailed
+  rescue Faraday::ConnectionFailed, Parslet::ParseFailed
     []
   end