diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 19:56:38 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 19:56:38 +0100 |
commit | 08faeedff7838e339488cfcddf02d95241557ffb (patch) | |
tree | f7f2fd55bf288b5380732b03460750e2ba519ec1 /app/assets/javascripts/components/actions/search.jsx | |
parent | 22e06a4077bef6317e72385a05052105f3804d68 (diff) | |
parent | d6ed2eb512f09600d7cd8150bb9b547442a9d68b (diff) |
Merge branch 'feature-omnisearch'
Diffstat (limited to 'app/assets/javascripts/components/actions/search.jsx')
-rw-r--r-- | app/assets/javascripts/components/actions/search.jsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/actions/search.jsx b/app/assets/javascripts/components/actions/search.jsx index ceb0e4a0c..e4af716ee 100644 --- a/app/assets/javascripts/components/actions/search.jsx +++ b/app/assets/javascripts/components/actions/search.jsx @@ -18,11 +18,13 @@ export function clearSearchSuggestions() { }; }; -export function readySearchSuggestions(value, accounts) { +export function readySearchSuggestions(value, { accounts, hashtags, statuses }) { return { type: SEARCH_SUGGESTIONS_READY, value, - accounts + accounts, + hashtags, + statuses }; }; @@ -32,7 +34,7 @@ export function fetchSearchSuggestions(value) { return; } - api(getState).get('/api/v1/accounts/search', { + api(getState).get('/api/v1/search', { params: { q: value, resolve: true, |