feat: change tag separator

Rule-34 · Oct 18, 2022 · c6d3c1f · c6d3c1f
1 parent 03b27da
commit c6d3c1f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/assets/js/RouterHelper.js b/assets/js/RouterHelper.js
@@ -7,7 +7,7 @@ export class RouterHelper {
   static generatePostsRoute(domain, page, tags) {
     const route = {
       path: '/',
-      query: {},
+      query: {}
     }
 
     if (domain != null) {
@@ -20,7 +20,7 @@ export class RouterHelper {
 
     // Fix: separate tags by commas instead of repeating `tags`, like so: `&tags=example1&tags=example2`
     if (tags != null && Array.isArray(tags) && tags.length) {
-      route.query.tags = tags.join(',')
+      route.query.tags = tags.join('|')
     }
 
     return route

diff --git a/store/booru.js b/store/booru.js
@@ -1,14 +1,18 @@
-import { booruTypeList, defaultBooruList, findBoorusWithValueByKey, } from '~/assets/lib/rule-34-shared-resources/src/util/BooruUtils.js'
+import {
+  booruTypeList,
+  defaultBooruList,
+  findBoorusWithValueByKey
+} from '~/assets/lib/rule-34-shared-resources/src/util/BooruUtils.js'
 import { RouterHelper } from '~/assets/js/RouterHelper'
 
 export const state = () => ({
   history: {
-    lastDomainUsed: defaultBooruList[0].domain,
+    lastDomainUsed: defaultBooruList[0].domain
   },
 
   posts: {
-    data: [],
-  },
+    data: []
+  }
 })
 
 export const getters = {
@@ -73,8 +77,8 @@ export const getters = {
       return []
     }
 
-    return tags.split(',')
-  },
+    return tags.split('|')
+  }
 }
 
 export const mutations = {
@@ -84,7 +88,7 @@ export const mutations = {
 
   setPostsData(state, value) {
     state.posts.data = Object.freeze(value)
-  },
+  }
 }
 
 export const actions = {
@@ -101,12 +105,12 @@ export const actions = {
 
         if (booru == null) {
           this.$sentry.captureException(
-            new Error(`Could not find booru with domain: ${ value }`),
+            new Error(`Could not find booru with domain: ${value}`),
             {
               extra: {
                 domain: value,
-                booruList: getters.getBooruList,
-              },
+                booruList: getters.getBooruList
+              }
             }
           )
           return
@@ -205,15 +209,15 @@ export const actions = {
       posts: {
         limit: rootState.user.settings.postsPerPage.value,
         pageID: getters.getPageID,
-        tags: getters.getTags.join(','),
-        score: rootState.user.settings.score.value,
+        tags: getters.getTags.join('|'),
+        score: rootState.user.settings.score.value
       },
 
       singlePost: {
-        id: postID,
+        id: postID
       },
 
-      tags: { tag, limit: 15, order: 'count' },
+      tags: { tag, limit: 15, order: 'count' }
     }
 
     const urlToFetch = new URL(
@@ -297,22 +301,23 @@ export const actions = {
     const ACTIVE_BOORU_DOMAIN = getters.getActiveBooru.domain
 
     try {
-      const response = await dispatch('simpleApiFetch',
+      const response = await dispatch(
+        'simpleApiFetch',
         {
-          url,
+          url
         },
         { root: true }
       )
 
       // This is how a final booru object looks like
       const POSTS = response.data.map((POST) => {
         return {
-          id: `${ ACTIVE_BOORU_DOMAIN }-${ POST.id }`,
+          id: `${ACTIVE_BOORU_DOMAIN}-${POST.id}`,
           data: POST,
           meta_data: {
             booru_domain: ACTIVE_BOORU_DOMAIN,
-            created_at: null,
-          },
+            created_at: null
+          }
         }
       })
 
@@ -324,8 +329,7 @@ export const actions = {
 
       //
     } catch (error) {
-
-      this.$toast.error(`Could not fetch posts: "${ error.message }"`)
+      this.$toast.error(`Could not fetch posts: "${error.message}"`)
     }
   },
 
@@ -338,26 +342,25 @@ export const actions = {
       const response = await dispatch(
         'simpleApiFetch',
         {
-          url,
+          url
         },
         { root: true }
       )
 
       // This is how a final Booru Tag object looks like
       const TAGS = response.data.map((TAG) => {
         return {
-          id: `${ ACTIVE_BOORU_DOMAIN }-${ TAG.name }`,
+          id: `${ACTIVE_BOORU_DOMAIN}-${TAG.name}`,
           name: TAG.name,
-          count: TAG.count,
+          count: TAG.count
         }
       })
 
       return TAGS
 
       //
     } catch (error) {
-
       // this.$toast.error(`Could not search tags: "${ error.message }"`)
     }
-  },
+  }
 }