feat(booru): improve and fix some actions

Rule-34 · Jul 21, 2020 · 31b613d · 31b613d
1 parent 01edbb0
commit 31b613d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/components/pages/posts/domain/Selector.vue b/components/pages/posts/domain/Selector.vue
@@ -91,9 +91,8 @@ export default {
       'fetchPosts',
     ]),
 
-    // Changes that we have to do when changing domain so request is not malformed
     async changeDomain(domain) {
-      await this.activeBooruManager(domain)
+      await this.activeBooruManager({ operation: 'search', value: domain })
 
       await this.pidManager({ operation: 'reset' })
 

diff --git a/store/booru/index.js b/store/booru/index.js
@@ -92,17 +92,29 @@ export const mutations = {
 }
 
 export const actions = {
-  activeBooruManager({ state, commit }, domain) {
-    // Search for the domain
-    const booruData = findBoorusWithValueByKey(
-      domain,
-      'domain',
-      state.booru.list
-    )[0]
+  activeBooruManager({ state, commit, getters }, { operation, value }) {
+    switch (operation) {
+      case 'search': {
+        // Search for the domain
+        const booruData = findBoorusWithValueByKey(
+          value,
+          'domain',
+          getters.getBooruList
+        )[0]
+
+        const booruIndex = getters.getBooruList.indexOf(booruData) // findIndex could be used
+
+        commit('setActiveBooru', booruIndex)
+        break
+      }
 
-    const booruIndex = state.booru.list.indexOf(booruData) // findIndex could be used
+      case 'reset':
+        commit('setActiveBooru', 0)
+        break
 
-    commit('setActiveBooru', booruIndex)
+      default:
+        throw new Error('No operation specified')
+    }
   },
 
   postsManager({ state, commit }, { operation, value }) {
@@ -112,7 +124,7 @@ export const actions = {
         break
 
       case 'concat':
-        commit('setPostsData', [...new Set(state.posts.data.concat(value))])
+        commit('setPostsData', [...new Set([...state.posts.data, ...value])])
         break
 
       default: