Push v0.3.0

Author: kaimoe

XIVAPI.js

@@ -1,13 +1,10 @@
 const resources = require('./resources/'),
-
 	Search = require('./lib/search'),
 	Data = require('./lib/data'),
 	Character = require('./lib/character'),
 	FreeCompany = require('./lib/freecompany'),
 	Linkshell = require('./lib/linkshell'),
-	PvPTeam = require('./lib/pvpteam'),
-	Lodestone = require('./lib/lodestone'),
-	Market = require('./lib/market')
+	PvPTeam = require('./lib/pvpteam')
 
 class XIVAPI {
 	/*{
@@ -45,15 +42,14 @@ See how in https://github.com/xivapi/xivapi-js/releases/tag/v0.1.3.\n\
 		this.verbose = options.verbose
 
 		this.resources = resources
+		this.utils = require('./utils')
 
 		this.search = Search.bind(this)
 		this.data = new Data(this)
 		this.character = new Character(this)
 		this.freecompany = new FreeCompany(this)
 		this.linkshell = new Linkshell(this)
 		this.pvpteam = new PvPTeam(this)
-		this.lodestone = Lodestone.bind(this)
-		this.market = new Market(this)
 	}
 }
 

lib/Lib.js

@@ -1,10 +1,13 @@
-const { req } = require('../utils')
+const utils = require('../utils')
 
 class Lib {
 	constructor(parent) {
 		this.parent = parent
 
-		this.req = req.bind(parent)
+		this.req = utils.req.bind(parent)
+		this.reqJSON = utils.reqJSON.bind(parent)
+		this.makeCSV = utils.makeCSV
+		this.throwError = utils.throwError
 	}
 }
 

lib/character.js

@@ -1,23 +1,21 @@
 // https://xivapi.com/docs/Character
 const Lib = require('./Lib')
-let { makeStatus, correctCase } = require('../utils')
 
 class Character extends Lib {
 	constructor(parent) {
 		super(parent)
-		makeStatus = makeStatus.bind(parent)
 	}
 
 	/*
 	{
-		server	string	optional
-		page		int			optional
+		server
+		page
 	}
 	*/
 	search(name, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(!name)
-				reject(Error('The name must be defined for Character searching.'))
+				reject(this.throwError('character.search()', 'a name'))
 
 			this.req(
 				'/character/search',
@@ -39,57 +37,21 @@ class Character extends Lib {
 	get(id, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(!id)
-				reject(Error('The id must be defined for get() in Character.'))
+				reject(this.throwError('character.get()', 'an ID'))
 
 			params.extended = params.extended ? 1 : 0
 
 			this.req(
 				'/character/' + id,
 				params
 			).then((res) => {
-				res = makeStatus(res, 'character')
 				resolve(res)
 			}).catch((err) => {
 				reject(err)
 			})
 		})
 	}
 
-	/*
-	token	optional
-	*/
-	verification(id, token) {
-		return new Promise((resolve, reject) => {
-			if(!id)
-				reject(Error('The id must be defined for Character verification.'))
-
-			this.req(
-				`/character/${id}/verification`,
-				{token: token}
-			).then((res) => {
-				if(token)
-					resolve(res[correctCase('pass', this.parent.globalParams.snake_case)])
-				else
-					resolve(res[correctCase('bio', this.parent.globalParams.snake_case)])
-			}).catch((err) => {
-				reject(err)
-			})
-		})
-	}
-
-	update(id) {
-		return new Promise((resolve, reject) => {
-			if(!id)
-				reject(Error('The id must be defined for Character update.'))
-
-			this.req(`/character/${id}/update`).then((res) => {
-				resolve(res === 1)
-			}).catch((err) => {
-				reject(err)
-			})
-		})
-	}
-
 }
 
 module.exports = Character

lib/data.js

@@ -1,12 +1,9 @@
 // https://xivapi.com/docs/Welcome#section-4
 const Lib = require('./Lib')
-let { cleanContent, makeCSV } = require('../utils')
 
 class Content extends Lib {
 	constructor(parent) {
 		super(parent)
-
-		cleanContent = cleanContent.bind(parent)
 	}
 
 	content() {
@@ -28,9 +25,9 @@ class Content extends Lib {
 	list(name, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(typeof(name) === 'undefined')
-				reject(Error('The name must be defined for Content list.'))
+				reject(this.throwError('content.list()', 'a name'))
 
-			params.ids = makeCSV(params.ids)
+			params.ids = this.parent.utils.makeCSV(params.ids)
 
 			this.req(
 				`/${name}`,
@@ -43,28 +40,35 @@ class Content extends Lib {
 		})
 	}
 
-	schema(name) {
+	get(name, id) {
 		return new Promise((resolve, reject) => {
 			if(typeof(name) === 'undefined')
-				reject(Error('The name must be defined for Content schema.'))
+				reject(this.throwError('content.get()', 'a name'))
+			if(typeof(id) === 'undefined')
+				reject(this.throwError('content.get()', 'an ID'))
 
-			this.req(`/${name}/schema`).then((res) => {
+			this.req(`/${name}/${id}`).then((res) => {
 				resolve(res)
 			}).catch((err) => {
 				reject(err)
 			})
 		})
 	}
 
-	get(name, id) {
+	servers() {
 		return new Promise((resolve, reject) => {
-			if(typeof(name) === 'undefined')
-				reject(Error('The name must be defined for get() in Content.'))
-			if(typeof(id) === 'undefined')
-				reject(Error('The id must be defined for get() in Content.'))
+			this.req('/servers').then((res) => {
+				resolve(res)
+			}).catch((err) => {
+				reject(err)
+			})
+		})
+	}
 
-			this.req(`/${name}/${id}`).then((res) => {
-				resolve(cleanContent(res, this.parent.globalParams.snake_case))
+	datacenters() {
+		return new Promise((resolve, reject) => {
+			this.req('/servers/dc').then((res) => {
+				resolve(res)
 			}).catch((err) => {
 				reject(err)
 			})

lib/freecompany.js

@@ -1,11 +1,9 @@
 // https://xivapi.com/docs/Free-Company
 const Lib = require('./Lib')
-let { makeStatus, sanitizeInt, makeCSV } = require('../utils')
 
 class FreeCompany extends Lib {
 	constructor(parent) {
 		super(parent)
-		makeStatus = makeStatus.bind(parent)
 	}
 
 	/*
@@ -17,7 +15,7 @@ class FreeCompany extends Lib {
 	search(name, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(typeof(name) === 'undefined')
-				reject(Error('The name must be defined for FreeCompany search.'))
+				reject(this.throwError('freecompany.search()', 'a name'))
 
 			this.req(
 				'/freecompany/search',
@@ -39,16 +37,14 @@ class FreeCompany extends Lib {
 	get(id, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(typeof(id) === 'undefined')
-				reject(Error('The id must be defined for get() in FreeCompany.'))
+				reject(this.throwError('freecompany.get()', 'an ID'))
 
-			id = sanitizeInt(id)
-			params.data = makeCSV(params.data)
+			params.data = this.makeCSV(params.data)
 
 			this.req(
 				'/freecompany/' + id,
 				params
 			).then((res) => {
-				res = makeStatus(res, 'free_company')
 				resolve(res)
 			}).catch((err) => {
 				reject(err)

lib/linkshell.js

@@ -1,11 +1,9 @@
 // https://xivapi.com/docs/Linkshell
 const Lib = require('./Lib')
-let { makeStatus, sanitizeInt } = require('../utils')
 
 class Linkshell extends Lib {
 	constructor(parent) {
 		super(parent)
-		makeStatus = makeStatus.bind(parent)
 	}
 
 	/*
@@ -17,7 +15,7 @@ class Linkshell extends Lib {
 	search(name, params = {}) {
 		return new Promise((resolve, reject) => {
 			if(typeof(name) === 'undefined')
-				reject(Error('The name must be defined for Linkshell search.'))
+				reject(this.throwError('linkshell.search()', 'a name'))
 
 			this.req(
 				'/linkshell/search',
@@ -33,11 +31,9 @@ class Linkshell extends Lib {
 	get(id) {
 		return new Promise((resolve, reject) => {
 			if(typeof(id) === 'undefined')
-				reject(Error('The id must be defined for get() in Linkshell.'))
-			id = sanitizeInt(id)
+				reject(this.throwError('linkshell.get()', 'an ID'))
 
 			this.req('/linkshell/' + id).then((res) => {
-				res = makeStatus(res, 'linkshell')
 				resolve(res)
 			}).catch((err) => {
 				reject(err)