Skip to content

Commit 6ed6fe8

Browse files
author
Kimon Kar
committed
Fix search bug, small inconsistencies
1 parent a05e2f0 commit 6ed6fe8

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

lib/character.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://xivapi.com/docs/Character
22
const Lib = require('./Lib')
3-
let { makeStatus, correctCase } = require('../utils')
3+
let { firstCapital, makeStatus, correctCase } = require('../utils')
44

55
class Character extends Lib {
66
constructor(parent) {
@@ -18,7 +18,7 @@ class Character extends Lib {
1818
return new Promise((resolve, reject) => {
1919
if(!name)
2020
reject(Error('name must be defined'))
21-
if(params.server && !this.parent.resources.servers.includes(this.parent.utils.firstCapital(params.server)))
21+
if(params.server && !this.parent.resources.servers.includes(firstCapital(params.server)))
2222
return(Error('server not valid'))
2323

2424
this.req(

lib/freecompany.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://xivapi.com/docs/Free-Company
22
const Lib = require('./Lib')
3-
let { makeStatus, sanitizeInt, correctCase, makeCSV } = require('../utils')
3+
let { firstCapital, makeStatus, sanitizeInt, correctCase, makeCSV } = require('../utils')
44

55
class FreeCompany extends Lib {
66
constructor(parent) {
@@ -18,7 +18,7 @@ class FreeCompany extends Lib {
1818
return new Promise((resolve, reject) => {
1919
if(typeof(name) === 'undefined')
2020
reject(Error('name must be defined'))
21-
if(params.server && !this.parent.resources.servers.includes(this.parent.utils.firstCapital(params.server)))
21+
if(params.server && !this.parent.resources.servers.includes(firstCapital(params.server)))
2222
reject(Error('server not valid'))
2323

2424
this.req(

lib/linkshell.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://xivapi.com/docs/Linkshell
22
const Lib = require('./Lib')
3-
let { makeStatus, sanitizeInt, correctCase } = require('../utils')
3+
let { firstCapital, makeStatus, sanitizeInt, correctCase } = require('../utils')
44

55
class Linkshell extends Lib {
66
constructor(parent) {
@@ -19,7 +19,7 @@ class Linkshell extends Lib {
1919
if(typeof(name) === 'undefined')
2020
reject(Error('name must be defined'))
2121

22-
if(params.server && !this.parent.resources.servers.includes(this.parent.utils.firstCapital(params.server)))
22+
if(params.server && !this.parent.resources.servers.includes(firstCapital(params.server)))
2323
reject(Error('server not valid'))
2424

2525
this.req(

lib/market.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://xivapi.com/docs/Welcome#section-4
22
const Lib = require('./Lib')
3-
let { cleanContent, correctCase } = require('../utils')
3+
let { firstCapital, cleanContent, correctCase } = require('../utils')
44

55
class Content extends Lib {
66
constructor(parent) {
@@ -9,13 +9,13 @@ class Content extends Lib {
99
cleanContent = cleanContent.bind(parent)
1010
}
1111

12-
prices(id, server, params) {
12+
prices(id, server, params = {}) {
1313
return new Promise((resolve, reject) => {
1414
if(typeof(id) === 'undefined')
1515
reject(Error('id must be defined'))
1616
if(typeof(server) === 'undefined')
1717
reject(Error('server must be defined'))
18-
if(!this.parent.resources.servers.includes(this.parent.utils.firstCapital(server)))
18+
if(!this.parent.resources.servers.includes(firstCapital(server)))
1919
reject(Error('server not valid'))
2020

2121
this.req(
@@ -44,7 +44,7 @@ class Content extends Lib {
4444
reject(Error('id must be defined'))
4545
if(typeof(server) === 'undefined')
4646
reject(Error('server must be defined'))
47-
if(!this.parent.resources.servers.includes(this.parent.utils.firstCapital(server)))
47+
if(!this.parent.resources.servers.includes(firstCapital(server)))
4848
reject(Error('server not valid'))
4949

5050

@@ -68,13 +68,13 @@ class Content extends Lib {
6868
})
6969
}
7070

71-
stock(category, server, params) {
71+
stock(category, server, params = {}) {
7272
return new Promise((resolve, reject) => {
7373
if(typeof(category) === 'undefined')
7474
reject(Error('category must be defined'))
7575
if(typeof(server) === 'undefined')
7676
reject(Error('server must be defined'))
77-
if(!this.parent.resources.servers.includes(this.parent.utils.firstCapital(server)))
77+
if(!this.parent.resources.servers.includes(firstCapital(server)))
7878
reject(Error('server not valid'))
7979

8080
this.req(
@@ -93,7 +93,7 @@ class Content extends Lib {
9393
})
9494
}
9595

96-
categories(params) {
96+
categories(params = {}) {
9797
return new Promise((resolve, reject) => {
9898
this.req(
9999
'/market/categories',

lib/pvpteam.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const Lib = require('./Lib')
2-
let { makeStatus, sanitizeInt, correctCase } = require('../utils')
2+
let { firstCapital, makeStatus, sanitizeInt, correctCase } = require('../utils')
33

44
class PvPTeam extends Lib {
55
constructor(parent) {
@@ -18,7 +18,7 @@ class PvPTeam extends Lib {
1818
if(typeof(name) === 'undefined')
1919
reject(Error('name must be defined'))
2020

21-
if(params.server && !this.parent.resources.servers.includes(this.parent.utils.firstCapital(params.server)))
21+
if(params.server && !this.parent.resources.servers.includes(firstCapital(params.server)))
2222
reject(Error('server not valid'))
2323

2424
this.req(

lib/search.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ let { req, reqJSON, cleanContent, correctCase, makeCSV } = require('../utils')
1212
*/
1313
module.exports = function(input, params = {}) {
1414
req = req.bind(this)
15+
reqJSON = reqJSON.bind(this)
1516
cleanContent = cleanContent.bind(this)
1617

1718
return new Promise((resolve, reject) => {

0 commit comments

Comments
 (0)