From 9c884fef11e52541ab64508c9a9e0b8694432cbb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 12:29:13 +0300
Subject: remove search blocker, fix debounce params

---
 src/modules/users.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/modules/users.js')

diff --git a/src/modules/users.js b/src/modules/users.js
index f9329f2a..a640fb3b 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,6 +225,12 @@ export const mutations = {
   signUpFailure (state, errors) {
     state.signUpPending = false
     state.signUpErrors = errors
+  },
+  addRecentQuery (state, query) {
+    state.recentQueries = state.recentQueries.concat(query)
+    if (state.recentQueries.length > 10) {
+      state.recentQueries = state.recentQueries.slice(1)
+    }
   }
 }
 
@@ -251,7 +257,8 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {}
+  relationships: {},
+  recentQueries: []
 }
 
 const users = {
@@ -428,10 +435,15 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, { query }) {
-      return store.rootState.api.backendInteractor.searchUsers({ query })
+    searchUsers ({ rootState, commit }, { query }) {
+      // Don't fetch if this query was already done recently
+      if (rootState.users.recentQueries.includes(query)) {
+        return []
+      }
+      return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          store.commit('addNewUsers', users)
+          commit('addRecentQuery', query)
+          commit('addNewUsers', users)
           return users
         })
     },
-- 
cgit v1.2.3-70-g09d2


From fa7bcb74cecb8af095e6e22271243f2d51835f39 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 13:00:09 +0300
Subject: return the correct promise type from action

---
 src/modules/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/users.js')

diff --git a/src/modules/users.js b/src/modules/users.js
index a640fb3b..df710ac9 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -438,7 +438,7 @@ const users = {
     searchUsers ({ rootState, commit }, { query }) {
       // Don't fetch if this query was already done recently
       if (rootState.users.recentQueries.includes(query)) {
-        return []
+        return Promise.resolve([])
       }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-- 
cgit v1.2.3-70-g09d2


From 4e0b4427a969b2d0584a3a1c1ffd3fe3fbfc2998 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 14:19:21 +0300
Subject: remove recentqueries thing

---
 src/modules/users.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/modules/users.js')

diff --git a/src/modules/users.js b/src/modules/users.js
index df710ac9..5e32bb49 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,12 +225,6 @@ export const mutations = {
   signUpFailure (state, errors) {
     state.signUpPending = false
     state.signUpErrors = errors
-  },
-  addRecentQuery (state, query) {
-    state.recentQueries = state.recentQueries.concat(query)
-    if (state.recentQueries.length > 10) {
-      state.recentQueries = state.recentQueries.slice(1)
-    }
   }
 }
 
@@ -257,8 +251,7 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {},
-  recentQueries: []
+  relationships: {}
 }
 
 const users = {
@@ -436,13 +429,8 @@ const users = {
       })
     },
     searchUsers ({ rootState, commit }, { query }) {
-      // Don't fetch if this query was already done recently
-      if (rootState.users.recentQueries.includes(query)) {
-        return Promise.resolve([])
-      }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          commit('addRecentQuery', query)
           commit('addNewUsers', users)
           return users
         })
-- 
cgit v1.2.3-70-g09d2