diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-16 13:00:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 13:00:30 +0200 |
| commit | 70da6d663078fb7d04aed387ac085afb2e9e2cd2 (patch) | |
| tree | aca79c42569a43f9ecbf3460243dd7a03ee55f6f /app/services | |
| parent | 6e872c6dabf12fdd2619d4042495e52edd6079bd (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')
| -rw-r--r-- | app/services/account_search_service.rb | 2 | ||||
| -rw-r--r-- | app/services/search_service.rb | 2 |
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 |