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

Replace on-the-fly callbacks with dataCallback everywhere

Browse Source 
Also fixes various code-style and comment issues I've noticed.
This commit is contained in:
meew0
2015-12-31 20:19:25 +01:00
parent d668ec8632
commit a0ffbdb208
1 changed files with 90 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
src/Client/Client.js
View File

@@ -82,20 +82,17 @@ export default 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(dataCallback(callback), errorCallback(callback));
callback(null, token);
return token;
}, errorCallback(callback));
} }
// def logout // def logout
logout(callback = (/*err*/) => { }) { logout(callback = (/*err, {}*/) => { }) {
return this.internal.logout() return this.internal.logout()
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def destroy // def destroy
destroy(callback = (/*err*/) => { }) { destroy(callback = (/*err, {}*/) => { }) {
this.internal.logout() this.internal.logout()
.then(() => { .then(() => {
this.internal.disconnected(true); this.internal.disconnected(true);
@@ -103,30 +100,24 @@ export default class Client extends EventEmitter {
} }
// def sendMessage // def sendMessage
sendMessage(where, content, options = {}, callback = (/*e, m*/) => { }) { sendMessage(where, content, options = {}, callback = (/*err, msg*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.sendMessage(where, content, options) return this.internal.sendMessage(where, content, options)
.then(m => { .then(dataCallback(callback), errorCallback(callback));
callback(null, m);
return m;
}, errorCallback(callback));
} }
// def sendTTSMessage // def sendTTSMessage
sendTTSMessage(where, content, callback = (/*e, m*/) => { }) { sendTTSMessage(where, content, callback = (/*err, msg*/) => { }) {
return this.sendMessage(where, content, { tts: true }) return this.sendMessage(where, content, { tts: true })
.then(m => { .then(dataCallback(callback), errorCallback(callback));
callback(null, m);
return m;
}, errorCallback(callback));
} }
// def reply
reply(where, content, options = {}, callback = (/*e, m*/) => { }) {
// def reply
reply(where, content, options = {}, callback = (/*err, msg*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
@@ -138,10 +129,7 @@ export default class Client extends EventEmitter {
content = msg.author + ", " + content; content = msg.author + ", " + content;
} }
return this.internal.sendMessage(msg, content, options) return this.internal.sendMessage(msg, content, options)
.then(m => { .then(dataCallback(callback), errorCallback(callback));
callback(null, m);
return m;
}, errorCallback(callback));
} }
var err = new Error("Destination not resolvable to a message!"); var err = new Error("Destination not resolvable to a message!");
callback(err); callback(err);
@@ -149,22 +137,20 @@ export default class Client extends EventEmitter {
} }
// def replyTTS // def replyTTS
replyTTS(where, content, callback = (/**/) => { }) { replyTTS(where, content, callback = (/*err, msg*/) => { }) {
return this.reply(where, content, { tts: true }) return this.reply(where, content, { tts: true })
.then(m => { .then(dataCallback(callback), errorCallback(callback));
callback(null, m);
return m;
}, errorCallback(callback));
} }
// def deleteMessage // def deleteMessage
deleteMessage(msg, options = {}, callback = (/*e*/) => { }) { deleteMessage(msg, options = {}, callback = (/*err, {}*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.deleteMessage(msg, options) return this.internal.deleteMessage(msg, options)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def updateMessage //def updateMessage
updateMessage(msg, content, options = {}, callback = (/*err, msg*/) => { }) { updateMessage(msg, content, options = {}, callback = (/*err, msg*/) => { }) {
@@ -174,10 +160,7 @@ export default class Client extends EventEmitter {
} }
return this.internal.updateMessage(msg, content, options) return this.internal.updateMessage(msg, content, options)
.then(msg => { .then(dataCallback(callback), errorCallback(callback));
callback(null, msg);
return msg;
}, errorCallback(callback));
} }
// def getChannelLogs // def getChannelLogs
@@ -188,58 +171,43 @@ export default class Client extends EventEmitter {
} }
return this.internal.getChannelLogs(where, limit, options) return this.internal.getChannelLogs(where, limit, options)
.then(logs => { .then(dataCallback(callback), errorCallback(callback));
callback(null, logs);
return logs;
}, errorCallback(callback));
} }
// def getBans // def getBans
getBans(where, callback = (/*err, bans*/) => { }) { getBans(where, callback = (/*err, bans*/) => { }) {
return this.internal.getBans(where) return this.internal.getBans(where)
.then(bans => { .then(dataCallback(callback), errorCallback(callback));
callback(null, bans);
return bans;
}, errorCallback(callback));
} }
// def sendFile // def sendFile
sendFile(where, attachment, name = "image.png", callback = (/*err, m*/) => { }) { sendFile(where, attachment, name = "image.png", callback = (/*err, m*/) => { }) {
return this.internal.sendFile(where, attachment, name) return this.internal.sendFile(where, attachment, name)
.then(m => { .then(dataCallback(callback), errorCallback(callback));
callback(null, m);
return m;
}, errorCallback(callback));
} }
// def joinServer // def joinServer
joinServer(invite, callback = (/*err, srv*/) => { }) { joinServer(invite, callback = (/*err, srv*/) => { }) {
return this.internal.joinServer(invite) return this.internal.joinServer(invite)
.then(srv => { .then(dataCallback(callback), errorCallback(callback));
callback(null, srv);
return srv;
}, errorCallback(callback));
} }
// def createServer // def createServer
createServer(name, region = "london", callback = (/*err, srv*/) => { }) { createServer(name, region = "london", callback = (/*err, srv*/) => { }) {
return this.internal.createServer(name, region) return this.internal.createServer(name, region)
.then(srv => { .then(dataCallback(callback), errorCallback(callback));
callback(null, srv);
return srv;
}, errorCallback(callback));
} }
// def leaveServer // def leaveServer
leaveServer(server, callback = (/*err*/) => { }) { leaveServer(server, callback = (/*err, {}*/) => { }) {
return this.internal.leaveServer(server) return this.internal.leaveServer(server)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def deleteServer // def deleteServer
deleteServer(server, callback = (/*err*/) => { }) { deleteServer(server, callback = (/*err, {}*/) => { }) {
return this.internal.leaveServer(server) return this.internal.leaveServer(server)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def createChannel // def createChannel
@@ -248,21 +216,19 @@ export default class Client extends EventEmitter {
// options is the callback // options is the callback
callback = type; callback = type;
} }
return this.internal.createChannel(server, name, type) return this.internal.createChannel(server, name, type)
.then(channel => { .then(dataCallback(callback), errorCallback(callback));
callback(channel);
return channel;
}, errorCallback(callback));
} }
// def deleteChannel // def deleteChannel
deleteChannel(channel, callback = (/*err*/) => { }) { deleteChannel(channel, callback = (/*err, {}*/) => { }) {
return this.internal.deleteChannel(channel) return this.internal.deleteChannel(channel)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def banMember //def banMember
banMember(user, server, length = 1, callback = (/*err*/) => { }) { banMember(user, server, length = 1, callback = (/*err, {}*/) => { }) {
if (typeof length === "function") { if (typeof length === "function") {
// length is the callback // length is the callback
callback = length; callback = length;
@@ -273,122 +239,113 @@ export default class Client extends EventEmitter {
} }
//def unbanMember //def unbanMember
unbanMember(user, server, callback = (/*err*/) => { }) { unbanMember(user, server, callback = (/*err, {}*/) => { }) {
return this.internal.unbanMember(user, server) return this.internal.unbanMember(user, server)
.then(dataCallback(callback), errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def kickMember //def kickMember
kickMember(user, server, callback = (/*err*/) => { }) { kickMember(user, server, callback = (/*err, {}*/) => { }) {
return this.internal.kickMember(user, server) return this.internal.kickMember(user, server)
.then(dataCallback(callback), errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def createRole //def createRole
createRole(server, data = null, callback = (/*err, res*/) => { }) { createRole(server, data = null, callback = (/*err, role*/) => { }) {
if (typeof data === "function") { if (typeof data === "function") {
// data is the callback // data is the callback
callback = data; callback = data;
} }
return this.internal.createRole(server, data) return this.internal.createRole(server, data)
.then(role => { .then(dataCallback(callback), errorCallback(callback));
callback(null, role);
return role;
}, errorCallback(callback));
} }
//def updateRole //def updateRole
updateRole(role, data = null, callback = (/*err, res*/) => { }) { updateRole(role, data = null, callback = (/*err, role*/) => { }) {
if (typeof data === "function") { if (typeof data === "function") {
// data is the callback // data is the callback
callback = data; callback = data;
} }
return this.internal.updateRole(role, data) return this.internal.updateRole(role, data)
.then(role => { .then(dataCallback(callback), errorCallback(callback));
callback(null, role);
return role;
}, errorCallback(callback));
} }
//def deleteRole //def deleteRole
deleteRole(role, callback = (/*err*/) => { }) { deleteRole(role, callback = (/*err, {}*/) => { }) {
return this.internal.deleteRole(role) return this.internal.deleteRole(role)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def addMemberToRole //def addMemberToRole
addMemberToRole(member, role, callback = (/*err*/) => { }) { addMemberToRole(member, role, callback = (/*err, {}*/) => { }) {
return this.internal.addMemberToRole(member, role) return this.internal.addMemberToRole(member, role)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def addUserToRole // def addUserToRole
addUserToRole(member, role, callback = (/*err*/) => { }) { addUserToRole(member, role, callback = (/*err, {}*/) => { }) {
return this.addMemberToRole(member, role, callback); return this.addMemberToRole(member, role, callback);
} }
// def removeMemberFromRole // def removeMemberFromRole
removeMemberFromRole(member, role, callback = (/*err*/) => { }) { removeMemberFromRole(member, role, callback = (/*err, {}*/) => { }) {
return this.internal.removeMemberFromRole(member, role) return this.internal.removeMemberFromRole(member, role)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def removeUserFromRole // def removeUserFromRole
removeUserFromRole(member, role, callback = (/*err*/) => { }) { removeUserFromRole(member, role, callback = (/*err, {}*/) => { }) {
return this.removeMemberFromRole(member, role, callback); return this.removeMemberFromRole(member, role, callback);
} }
//def addMemberToRole //def addMemberToRole
addMemberToRoles(member, roles, callback = (/*err*/) => { }) { addMemberToRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.internal.addMemberToRoles(member, roles) return this.internal.addMemberToRoles(member, roles)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def addUserToRole // def addUserToRole
addUserToRoles(member, roles, callback = (/*err*/) => { }) { addUserToRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.addMemberToRoles(member, roles, callback); return this.addMemberToRoles(member, roles, callback);
} }
// def removeMemberFromRole // def removeMemberFromRole
removeMemberFromRoles(member, roles, callback = (/*err*/) => { }) { removeMemberFromRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.internal.removeMemberFromRoles(member, roles) return this.internal.removeMemberFromRoles(member, roles)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def removeUserFromRole // def removeUserFromRole
removeUserFromRoles(member, roles, callback = (/*err*/) => { }) { removeUserFromRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.removeMemberFromRoles(member, roles, callback); return this.removeMemberFromRoles(member, roles, callback);
} }
// def createInvite // def createInvite
createInvite(chanServ, options, callback = (/*err, invite*/) => { }) { createInvite(chanServ, options, callback = (/*err, invite*/) => { }) {
if (typeof options === "function") { if (typeof options === "function") {
// length is the callback // options is the callback
callback = options; callback = options;
} }
return this.internal.createInvite(chanServ, options) return this.internal.createInvite(chanServ, options)
.then(invite => { .then(dataCallback(callback), errorCallback(callback));
callback(null, invite);
}, errorCallback(callback));
} }
// def deleteInvite // def deleteInvite
deleteInvite(invite, callback = (/*err*/) => { }) { deleteInvite(invite, callback = (/*err, {}*/) => { }) {
return this.internal.deleteInvite(invite) return this.internal.deleteInvite(invite)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def overwritePermissions // def overwritePermissions
overwritePermissions(channel, role, options = {}, callback = (/*err*/) => { }) { overwritePermissions(channel, role, options = {}, callback = (/*err, {}*/) => { }) {
return this.internal.overwritePermissions(channel, role, options) return this.internal.overwritePermissions(channel, role, options)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setStatus //def setStatus
setStatus(idleStatus, gameID, callback = (/*err*/) => { }) { setStatus(idleStatus, gameID, callback = (/*err, {}*/) => { }) {
if (typeof gameID === "function") { if (typeof gameID === "function") {
// gameID is the callback // gameID is the callback
callback = gameID; callback = gameID;
@@ -398,93 +355,89 @@ export default class Client extends EventEmitter {
} }
return this.internal.setStatus(idleStatus, gameID) return this.internal.setStatus(idleStatus, gameID)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def sendTyping //def sendTyping
sendTyping(channel, callback = (/*err*/) => { }) { sendTyping(channel, callback = (/*err, {}*/) => { }) {
return this.internal.sendTyping(channel) return this.internal.sendTyping(channel)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def setTopic // def setTopic
setChannelTopic(channel, topic, callback = (/*err*/) => { }) { setChannelTopic(channel, topic, callback = (/*err, {}*/) => { }) {
return this.internal.setChannelTopic(channel, topic) return this.internal.setChannelTopic(channel, topic)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setChannelName //def setChannelName
setChannelName(channel, name, callback = (/*err*/) => { }) { setChannelName(channel, name, callback = (/*err, {}*/) => { }) {
return this.internal.setChannelName(channel, name) return this.internal.setChannelName(channel, name)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setChannelNameAndTopic //def setChannelNameAndTopic
setChannelNameAndTopic(channel, name, topic, callback = (/*err*/) => { }) { setChannelNameAndTopic(channel, name, topic, callback = (/*err, {}*/) => { }) {
return this.internal.setChannelNameAndTopic(channel, name, topic) return this.internal.setChannelNameAndTopic(channel, name, topic)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setChannelPosition //def setChannelPosition
setChannelPosition(channel, position, callback = (/*err*/) => { }) { setChannelPosition(channel, position, callback = (/*err, {}*/) => { }) {
return this.internal.setChannelPosition(channel, position) return this.internal.setChannelPosition(channel, position)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def updateChannel //def updateChannel
updateChannel(channel, data, callback = (/*err*/) => { }) { updateChannel(channel, data, callback = (/*err, {}*/) => { }) {
return this.internal.updateChannel(channel, data) return this.internal.updateChannel(channel, data)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def startTyping //def startTyping
startTyping(channel, callback = (/*err*/) => { }) { startTyping(channel, callback = (/*err, {}*/) => { }) {
return this.internal.startTyping(channel) return this.internal.startTyping(channel)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def stopTyping //def stopTyping
stopTyping(channel, callback = (/*err*/) => { }) { stopTyping(channel, callback = (/*err, {}*/) => { }) {
return this.internal.stopTyping(channel) return this.internal.stopTyping(channel)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def updateDetails //def updateDetails
updateDetails(details, callback = (/*err*/) => { }) { updateDetails(details, callback = (/*err, {}*/) => { }) {
return this.internal.updateDetails(details) return this.internal.updateDetails(details)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setUsername //def setUsername
setUsername(name, callback = (/*err*/) => { }) { setUsername(name, callback = (/*err, {}*/) => { }) {
return this.internal.setUsername(name) return this.internal.setUsername(name)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def setAvatar //def setAvatar
setAvatar(avatar, callback = (/*err*/) => { }) { setAvatar(avatar, callback = (/*err, {}*/) => { }) {
return this.internal.setAvatar(avatar) return this.internal.setAvatar(avatar)
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
//def joinVoiceChannel //def joinVoiceChannel
joinVoiceChannel(channel, callback = (/*err*/) => { }) { joinVoiceChannel(channel, callback = (/*err, channel*/) => { }) {
return this.internal.joinVoiceChannel(channel) return this.internal.joinVoiceChannel(channel)
.then(chan => { .then(dataCallback(callback), errorCallback(callback));
callback(null, chan);
return chan;
}, errorCallback(callback));
} }
// def leaveVoiceChannel // def leaveVoiceChannel
leaveVoiceChannel(callback = (/*err*/) => { }) { leaveVoiceChannel(callback = (/*err, {}*/) => { }) {
return this.internal.leaveVoiceChannel() return this.internal.leaveVoiceChannel()
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
// def awaitResponse // def awaitResponse
awaitResponse(msg, toSend = null, options = null, callback = (/*e, newMsg*/) => { }) { awaitResponse(msg, toSend = null, options = null, callback = (/*e, newMsg*/) => { }) {
var ret; var ret;
if (toSend) { if (toSend) {
@@ -520,14 +473,14 @@ export default class Client extends EventEmitter {
}, errorCallback(callback)); }, errorCallback(callback));
} }
setStatusIdle(callback = (/*err*/) => { }) { setStatusIdle(callback = (/*err, {}*/) => { }) {
return this.internal.setStatus("idle") return this.internal.setStatus("idle")
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
setStatusOnline(callback = (/*err*/) => { }) { setStatusOnline(callback = (/*err, {}*/) => { }) {
return this.internal.setStatus("online") return this.internal.setStatus("online")
.then(callback, errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }
setStatusActive(callback) { setStatusActive(callback) {