Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 19:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stack overflow in removeUserFromRole, removed redudant argument grouping, removed redudant error callback wrap

Browse Source
This commit is contained in:
Simon Schick
2015-11-24 03:27:56 +01:00
parent 0b1a165139
commit fd54dc4f1f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Client/Client.js
View File

@@ -56,7 +56,7 @@ class Client extends EventEmitter {
// def login // def login
login(email, password, callback = (/*err, token*/) => {}) { login(email, password, callback = (/*err, token*/) => {}) {
return this.internal.login(email, password) return this.internal.login(email, password)
.then((token) => { .then(token => {
callback(null, token); callback(null, token);
return token; return token;
}, errCB(callback)); }, errCB(callback));
@@ -206,7 +206,7 @@ class Client extends EventEmitter {
callback = type; callback = type;
} }
return this.internal.createChannel(server, name, type) return this.internal.createChannel(server, name, type)
.then((channel) => { .then(channel => {
callback(channel); callback(channel);
return channel; return channel;
}, errCB(callback)); }, errCB(callback));
@@ -248,7 +248,7 @@ class Client extends EventEmitter {
callback = data; callback = data;
} }
return this.internal.createRole(server, data) return this.internal.createRole(server, data)
.then((role) => { .then(role => {
callback(null, role); callback(null, role);
return role; return role;
}, errCB(callback)); }, errCB(callback));
@@ -261,7 +261,7 @@ class Client extends EventEmitter {
callback = data; callback = data;
} }
return this.internal.updateRole(role, data) return this.internal.updateRole(role, data)
.then((role) => { .then(role => {
callback(null, role); callback(null, role);
return role; return role;
}, errCB(callback)); }, errCB(callback));
@@ -281,7 +281,7 @@ class Client extends EventEmitter {
// def addUserToRole // def addUserToRole
addUserToRole(member, role, callback = (/*err*/) => {}) { addUserToRole(member, role, callback = (/*err*/) => {}) {
return this.addMemberToRole(member, role, errCB(callback)); return this.addMemberToRole(member, role, callback);
} }
// def removeMemberFromRole // def removeMemberFromRole
@@ -292,7 +292,7 @@ class Client extends EventEmitter {
// def removeUserFromRole // def removeUserFromRole
removeUserFromRole(member, role, callback = (/*err*/) => {}) { removeUserFromRole(member, role, callback = (/*err*/) => {}) {
return this.removeUserFromRole(member, role, errCB(callback)); return this.removeMemberFromRole(member, role, callback);
} }
// def createInvite // def createInvite
@@ -443,7 +443,7 @@ class Client extends EventEmitter {
} }
// (msg) promise // (msg) promise
return ret.then(() => this.internal.awaitResponse(msg)) return ret.then(() => this.internal.awaitResponse(msg))
.then((newMsg) => { .then(newMsg => {
callback(null, newMsg); callback(null, newMsg);
return newMsg; return newMsg;
}, errCB(callback)); }, errCB(callback));