about summary refs log tree commit diff
path: root/app/services/account_search_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-08-16 13:00:30 +0200
committerGitHub <noreply@github.com>2019-08-16 13:00:30 +0200
commit70da6d663078fb7d04aed387ac085afb2e9e2cd2 (patch)
treeaca79c42569a43f9ecbf3460243dd7a03ee55f6f /app/services/account_search_service.rb
parent6e872c6dabf12fdd2619d4042495e52edd6079bd (diff)
Fix accounts search by full/partial display name and others (#11580)
- Restrict followers counts to local users to minimize local advantage
- Fix emoji shortcodes causing error in search
- Fix search syntax parse errors not being caught
Diffstat (limited to 'app/services/account_search_service.rb')
-rw-r--r--app/services/account_search_service.rb2
1 files changed, 1 insertions, 1 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