Make changes

Author: kaimoe

lib/character.js

@@ -14,8 +14,8 @@ class Character extends Lib {
 	*/
 	async search(name, params={}) {
 		if(!name)
-			throw this.throwError('Character.search()', 'a name');
-		return this.req(`/character/search`, Object.assign({}, params, {name}));
+			throw this.throwError('character.search()', 'a name')
+		return this.req('/character/search', Object.assign(params, {name}))
 	}
 
 	/*
@@ -25,10 +25,10 @@ class Character extends Lib {
 	}
 	*/
 	async get(id, params={}) {
-		if(!id) 
-			throw this.throwError('Character.get()','an ID');
-		
-		return this.req(`/character/${id}`, params);
+		if(!id)
+			throw this.throwError('character.get()','an ID')
+
+		return this.req(`/character/${id}`, params)
 	}
 }
 

lib/data.js

@@ -7,7 +7,7 @@ class Content extends Lib {
 	}
 
 	async content() {
-		return this.req(`/content`);
+		return this.req('/content')
 	}
 
 	/*
@@ -17,32 +17,32 @@ class Content extends Lib {
 	}
 	*/
 	async list(name, params={}) {
-		if(typeof name==="undefined")
-			throw this.throwError('Content.list()','a name');
-		
-		params.ids = this.parent.utils.makeCSV(params.ids);
+		if(typeof name==='undefined')
+			throw this.throwError('data.list()','a name')
 
-		return this.req(`/${name}`, params);
+		params.ids = this.parent.utils.makeCSV(params.ids)
+
+		return this.req(`/${name}`, params)
 	}
 
 	async get(name, id) {
-		const missing_params = [];
-		if(typeof name==="undefined") 
-			missing_params.push('a name');
-		if(typeof id==="undefined") 
-			missing_params.push('an ID');
+		const missing_params = []
+		if(typeof name==='undefined')
+			missing_params.push('a name')
+		if(typeof id==='undefined')
+			missing_params.push('an ID')
 		if(missing_params.length>0)
-			throw this.throwError(`Content.get()`, missing_params.join(","));
-		
-		return this.req(`/${name}/${id}`);
+			throw this.throwError('data.get()', missing_params.join(','))
+
+		return this.req(`/${name}/${id}`)
 	}
 
 	servers() {
-		return this.req(`/servers`);
+		return this.req('/servers')
 	}
 
 	datacenters() {
-		return this.req(`/servers/dc`);
+		return this.req('/servers/dc')
 	}
 
 

lib/freecompany.js

@@ -14,8 +14,8 @@ class FreeCompany extends Lib {
 	*/
 	async search(name, params={}) {
 		if(typeof(name) === 'undefined')
-			throw this.throwError('FreeCompany.search()','a name');
-		return this.req(`/freecompany/search`, Object.assign({}, params, {name}));
+			throw this.throwError('freecompany.search()','a name')
+		return this.req('/freecompany/search', Object.assign(params, {name}))
 	}
 
 	/*
@@ -25,12 +25,12 @@ class FreeCompany extends Lib {
 	}
 	*/
 	async get(id, params={}) {
-		if(typeof(id) === 'undefined') 
-			throw this.throwError('FreeCompany.get()', 'an ID');
+		if(typeof(id) === 'undefined')
+			throw this.throwError('freecompany.get()', 'an ID')
 
-		params.data = this.makeCSV(params.data);
+		params.data = this.makeCSV(params.data)
 
-		return this.req(`/freecompany/${id}`, params);
+		return this.req(`/freecompany/${id}`, params)
 	}
 }
 

lib/linkshell.js

@@ -14,14 +14,14 @@ class Linkshell extends Lib {
 	*/
 	async search(name, params={}) {
 		if(typeof(name) === 'undefined')
-			throw this.throwError('LinkShell.search()','a name');
-		return this.req(`/linkshell/search`, Object.assign({}, params, {name}));
+			throw this.throwError('linkshell.search()','a name')
+		return this.req('/linkshell/search', Object.assign(params, {name}))
 	}
 
 	async get(id) {
-		if(typeof(id) === 'undefined') 
-			throw this.throwError('LinkShell.get()', 'an ID');
-		return this.req(`/linkshell/${id}`);
+		if(typeof(id) === 'undefined')
+			throw this.throwError('linkshell.get()', 'an ID')
+		return this.req(`/linkshell/${id}`)
 	}
 }
 

lib/pvpteam.js

@@ -13,17 +13,17 @@ class PvPTeam extends Lib {
 	}
 	*/
 	async search(name, params={}) {
-		if(typeof name==="undefined")
-			throw this.throwError(`PvPTeam.search()`, 'a name');
-		
-		return this.req(`/pvpteam/search`,Object.assign({}, params, {name}));
+		if(typeof name==='undefined')
+			throw this.throwError('pvpteam.search()', 'a name')
+
+		return this.req('/pvpteam/search',Object.assign(params, {name}))
 	}
 
 	async get(id) {
-		if(typeof id==="undefined") 
-			throw this.throwError(`PvPTeam.get()`, 'an ID');
-		
-		return this.req(`/pvpteam/${id}`);
+		if(typeof id==='undefined')
+			throw this.throwError('pvpteam.get()', 'an ID')
+
+		return this.req(`/pvpteam/${id}`)
 	}
 }
 

lib/search.js

@@ -11,8 +11,8 @@ let { req, reqJSON, makeCSV, throwError } = require('../utils')
 }
 */
 module.exports = async function(input, params = {}) {
-	req = req.bind(this);
-	reqJSON = reqJSON.bind(this);
+	req = req.bind(this)
+	reqJSON = reqJSON.bind(this)
 
 	if(typeof(input) === 'undefined')
 		throw throwError('search()', 'any input')
@@ -22,15 +22,15 @@ module.exports = async function(input, params = {}) {
 	switch(typeof(input)) {
 		// GET method
 		case 'string':
-			params.indexes = makeCSV(params.indexes);
-			return req(path, Object.assign(params, {"string": input}));
+			params.indexes = makeCSV(params.indexes)
+			return req(path, Object.assign(params, {'string': input}))
 
 		// ElasticSearch JSON method
 		case 'object':
-			input.indexes = makeCSV(params.indexes);
-			return reqJSON(path, input);
+			input.indexes = makeCSV(params.indexes)
+			return reqJSON(path, input)
 
 		default:
-			throw new Error(`Unexpected input type for search: '${typeof(input)}'`);
+			throw new Error(`Unexpected input type for search: '${typeof(input)}'`)
 	}
 }

utils.js

@@ -2,9 +2,13 @@ const request = require('request-promise-native')
 
 module.exports = {
 	//standard request function
-	req(path, params) {
-		if(params && typeof params.snake_case !== 'undefined')
-			params.snake_case = params.snake_case ? 1 : 0
+	req(path, params={}) {
+		let convs = ['snake_case', 'extended']
+		for (const c of convs) {
+			if(typeof params[c] !== 'undefined')
+				params[c] = params[c] ? 1 : 0
+		}
+
 
 		params = Object.assign({}, this.globalParams, params)