Move to node-fetch & code cleanup

AtoraSuunva · Oct 3, 2018 · 41ad7a8 · 41ad7a8
1 parent 22084b1
commit 41ad7a8
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 391 deletions.
diff --git a/.sample.js b/.sample.js
diff --git a/index.js b/index.js
@@ -1,7 +1,5 @@
 //@ts-check
 // Declare the dependencies
-const snekfetch = require('snekfetch')
-
 const Constants = require('./src/Constants.js')
 const { BooruError } = Constants
 const Utils = require('./src/Utils.js')

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/AtlasTheBot/booru#readme",
   "dependencies": {
-    "snekfetch": "^3.6.4",
+    "node-fetch": "^2.2.0",
     "xml2js": "^0.4.17"
   }
 }
diff --git a/src/Constants.js b/src/Constants.js
@@ -6,6 +6,7 @@
     => .userAgent
     => .searchURI(site, tags, limit)
 */
+const Site = require('./structures/Site.js')
 const sites = require('./sites.json')
 const pkg = require('../package.json')
 
@@ -50,7 +51,7 @@ module.exports.BooruError = BooruError
  * The user-agent to use for searches
  * @private
  */
-module.exports.userAgent = `Booru v${pkg.version}, a node package for booru searching (by AtlasTheBot)`
+module.exports.userAgent = `booru/${pkg.version} (+https://github.com/AtlasTheBot/booru)`
 
 /**
  * Create a full uri to search with
@@ -94,5 +95,8 @@ function expandTags(tags) {
  * @private
  */
 module.exports.defaultOptions = {
-  headers: { 'User-Agent': module.exports.userAgent }
+  headers: {
+    'Accept': 'application/json, application/xml;q=0.9, */*;q=0.8',
+    'User-Agent': module.exports.userAgent
+  }
 }