fix: tags being joined with encoded characters

CHANGELOG.md

@@ -1,5 +1,9 @@
 # booru Changelog
 
+## 2.6.1
+
+- Fixed tags being incorrectly joined with an encoded `+`/`,` (#93)
+
 ## 2.6.0
 
 - Added credential support

package.json

@@ -1,6 +1,6 @@
 {
   "name": "booru",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Search (and do other things) on a bunch of different boorus!",
   "author": "AtoraSuunva (https://github.com/AtoraSuunva/)",
   "license": "MIT",

src/Constants.ts

@@ -102,12 +102,17 @@ export function searchURI(
   page = 0,
   credentials: BooruCredentials = {},
 ): string {
-  const query = querystring({
-    [site.tagQuery]: expandTags(tags).join(site.tagJoin),
-    limit,
-    [site.paginate]: page,
-    ...credentials,
-  })
+  const query = querystring(
+    {
+      [site.tagQuery]: expandTags(tags),
+      limit,
+      [site.paginate]: page,
+      ...credentials,
+    },
+    {
+      arrayJoin: site.tagJoin,
+    },
+  )
 
   return (
     `http${site.insecure ? '' : 's'}://` +

src/Utils.ts

@@ -193,6 +193,14 @@ export function compareArrays(arr1: string[], arr2: string[]): string[] {
 type URIEncodable = string | number | boolean
 type QueryValue = URIEncodable | URIEncodable[]
 
+interface QuerystringOptions {
+  arrayJoin?: string
+}
+
+interface EncodeURIQueryValueOptions {
+  arrayJoin?: string
+}
+
 /**
  * Turns an object into a query string, correctly encoding uri components
  *
@@ -204,11 +212,16 @@ type QueryValue = URIEncodable | URIEncodable[]
  * @param query An object with key/value pairs that will be turned into a string
  * @returns A string that can be appended to a url (after `?`)
  */
-export function querystring(query: Record<string, QueryValue>): string {
+export function querystring(
+  query: Record<string, QueryValue>,
+  { arrayJoin = '+' }: QuerystringOptions = {},
+): string {
   return Object.entries(query)
     .map(
       ([key, value]) =>
-        `${encodeURIComponent(key)}=${encodeURIQueryValue(value)}`,
+        `${encodeURIComponent(key)}=${encodeURIQueryValue(value, {
+          arrayJoin,
+        })}`,
     )
     .join('&')
 }
@@ -219,9 +232,12 @@ export function querystring(query: Record<string, QueryValue>): string {
  * @param value The value to encode
  * @returns An encoded value that can be passed to a querystring
  */
-export function encodeURIQueryValue(value: QueryValue): string {
+export function encodeURIQueryValue(
+  value: QueryValue,
+  { arrayJoin = '+' }: EncodeURIQueryValueOptions = {},
+): string {
   if (Array.isArray(value)) {
-    return value.map(encodeURIComponent).join('+')
+    return value.map(encodeURIComponent).join(arrayJoin)
   } else {
     return encodeURIComponent(value)
   }