diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-25 12:32:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-25 12:32:29 +0000 |
| commit | e351f8630c74865eba520e109e395bf3f7e81864 (patch) | |
| tree | 55597f6800ffb0e8f4f56b9dae1801cd4a00bb2c /src/modules/users.js | |
| parent | c8f967d5c0424c7dd504ad4afeaefb7c745eed31 (diff) | |
| parent | 445b54c55310802d561ab1438f8207b59d35d505 (diff) | |
Merge branch '492' into 'develop'
Fix Follow/Mute/Block not functional issue in the user search page
Closes #492
See merge request pleroma/pleroma-fe!754
Diffstat (limited to 'src/modules/users.js')
| -rw-r--r-- | src/modules/users.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/users.js b/src/modules/users.js index c98e353a..adcab233 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -1,4 +1,5 @@ import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js' +import userSearchApi from '../services/new_api/user_search.js' import { compact, map, each, merge, last, concat, uniq } from 'lodash' import { set } from 'vue' import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js' @@ -341,6 +342,14 @@ const users = { store.commit('setUserForNotification', notification) }) }, + searchUsers (store, query) { + // TODO: Move userSearch api into api.service + return userSearchApi.search({query, store: { state: store.rootState }}) + .then((users) => { + store.commit('addNewUsers', users) + return users + }) + }, async signUp (store, userInfo) { store.commit('signUpPending') |
