Use url-parse instead of whatwg-url

js/crsearch/crsearch.js

@@ -6,7 +6,7 @@ import {IndexType as IType} from './index-type'
 import {Database} from './database'
 import {Index} from './index'
 
-import {URL} from 'whatwg-url'
+import URL from 'url-parse'
 
 
 class CRSearch {
@@ -129,16 +129,20 @@ class CRSearch {
   }
 
   database(base_url) {
+    const autoSuffix = (url) => {
+      if (url.pathname === '/') url.pathname = '/crsearch.json'
+      return url
+    }
+
     try {
       const url = new URL(base_url)
-      this.pendingDB.add(url.toString())
+      this.pendingDB.add(autoSuffix(url).toString())
 
     } catch (e) {
       const a = document.createElement('a')
       a.href = base_url
-      if (a.pathname == '/') a.pathname = '/crsearch.json'
 
-      const url = new URL(a.toString())
+      const url = new URL(autoSuffix(a).toString())
       this.pendingDB.add(url)
     }
   }
@@ -276,7 +280,7 @@ class CRSearch {
 
   make_google_url(q, site) {
     let url = this.opts.google_url
-    url.searchParams.set('q', `${q} site:${site}`)
+    url.set('query', {q: `${q} site:${site}`})
     return url
   }
 

js/crsearch/database.js

@@ -5,7 +5,7 @@ import {Namespace} from './namespace'
 import {Dictionary} from './dictionary'
 import {Priority, SiteCategory} from './kunai-config'
 
-import {URL} from 'whatwg-url'
+import URL from 'url-parse'
 
 import * as Query from './query'
 

package.json

@@ -62,6 +62,6 @@
     "jquery": "^3.2.1",
     "marked": "^0.3.6",
     "nagato": "^1.8.2",
-    "whatwg-url": "^6.3.0"
+    "url-parse": "^1.2.0"
   }
 }