diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-05 23:02:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 23:02:27 +0100 |
| commit | e20895f251d28b3631b1f5768302517a5b687b04 (patch) | |
| tree | 88e86cef53df51df32e964921d444c08f34dd3a5 /app/services/account_search_service.rb | |
| parent | 12cea76634d8380e24c3b218b18955b551995e1e (diff) | |
Add list of lists component to web UI (#5811)
* Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404
Diffstat (limited to 'app/services/account_search_service.rb')
| -rw-r--r-- | app/services/account_search_service.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index b0c663d02..ce25c3620 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true class AccountSearchService < BaseService - attr_reader :query, :limit, :resolve, :account + attr_reader :query, :limit, :options, :account - def call(query, limit, resolve = false, account = nil) - @query = query - @limit = limit - @resolve = resolve + def call(query, limit, account = nil, options = {}) + @query = query + @limit = limit + @options = options @account = account search_service_results @@ -25,7 +25,7 @@ class AccountSearchService < BaseService end def resolving_non_matching_remote_account? - resolve && !exact_match && !domain_is_local? + options[:resolve] && !exact_match && !domain_is_local? end def search_results_and_exact_match @@ -79,7 +79,7 @@ class AccountSearchService < BaseService end def advanced_search_results - Account.advanced_search_for(terms_for_query, account, limit) + Account.advanced_search_for(terms_for_query, account, limit, options[:following]) end def simple_search_results |