merge develop & resolve conflict

1 files changed, 6 insertions, 3 deletions

diff --git a/src/services/new_api/user_search.js b/src/services/new_api/user_search.js
index ce7da88e..869afa9c 100644
--- a/src/services/new_api/user_search.js
+++ b/src/services/new_api/user_search.js
@@ -1,13 +1,16 @@
 import utils from './utils.js'
+import { parseUser } from '../entity_normalizer/entity_normalizer.service.js'
 
 const search = ({query, store}) => {
   return utils.request({
     store,
-    url: '/api/pleroma/search_user',
+    url: '/api/v1/accounts/search',
     params: {
-      query
+      q: query
     }
-  }).then((data) => data.json())
+  })
+  .then((data) => data.json())
+  .then((data) => data.map(parseUser))
 }
 const UserSearch = {
   search