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

Fixed compiled version

Browse Source 
Downgraded babel until a working solution found
This commit is contained in:
Amish Shah
2015-11-22 17:13:52 +00:00
parent e5ad0e23aa
commit 213379e669
22 changed files with 3199 additions and 3620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.babelrc
View File

@@ -1,6 +1 @@
{
"presets": [
"es2015",
"es2015-loose"
]
}
{}

416
lib/Client/Client.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var InternalClient = require("./InternalClient.js");
@@ -22,18 +20,14 @@ var Client = (function (_EventEmitter) {
function Client(options) {
_classCallCheck(this, Client);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Client).call(this));
_this.options = options || {};
_this.internal = new InternalClient(_this);
return _this;
_EventEmitter.call(this);
this.options = options || {};
this.internal = new InternalClient(this);
}
_createClass(Client, [{
key: "login",
// def login
value: function login(email, password) {
Client.prototype.login = function login(email, password) {
var cb = arguments.length <= 2 || arguments[2] === undefined ? function (err, token) {} : arguments[2];
var self = this;
@@ -42,18 +36,16 @@ var Client = (function (_EventEmitter) {
self.internal.login(email, password).then(function (token) {
cb(null, token);
resolve(token);
}).catch(function (e) {
})["catch"](function (e) {
cb(e);
reject(e);
});
});
}
};
// def logout
}, {
key: "logout",
value: function logout() {
Client.prototype.logout = function logout() {
var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
var self = this;
@@ -62,17 +54,16 @@ var Client = (function (_EventEmitter) {
self.internal.logout().then(function () {
cb();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
cb(e);
reject(e);
});
});
}
};
// def sendMessage
}, {
key: "sendMessage",
value: function sendMessage(where, content) {
Client.prototype.sendMessage = function sendMessage(where, content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
@@ -87,18 +78,16 @@ var Client = (function (_EventEmitter) {
self.internal.sendMessage(where, content, options).then(function (m) {
callback(null, m);
resolve(m);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def sendTTSMessage
}, {
key: "sendTTSMessage",
value: function sendTTSMessage(where, content) {
Client.prototype.sendTTSMessage = function sendTTSMessage(where, content) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e, m) {} : arguments[2];
var self = this;
@@ -106,17 +95,16 @@ var Client = (function (_EventEmitter) {
self.sendMessage(where, content, { tts: true }).then(function (m) {
callback(null, m);
resolve(m);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def reply
}, {
key: "reply",
value: function reply(where, content) {
Client.prototype.reply = function reply(where, content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, m) {} : arguments[3];
@@ -134,7 +122,7 @@ var Client = (function (_EventEmitter) {
self.internal.sendMessage(msg, content, options).then(function (m) {
callback(null, m);
resolve(m);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
@@ -144,30 +132,27 @@ var Client = (function (_EventEmitter) {
reject(err);
}
});
}
};
// def replyTTS
}, {
key: "replyTTS",
value: function replyTTS(where, content) {
Client.prototype.replyTTS = function replyTTS(where, content) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () {} : arguments[2];
return new Promise(function (resolve, reject) {
self.reply(where, content, { tts: true }).then(function (m) {
callback(null, m);
resolve(m);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def deleteMessage
}, {
key: "deleteMessage",
value: function deleteMessage(msg) {
Client.prototype.deleteMessage = function deleteMessage(msg) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e) {} : arguments[2];
@@ -181,17 +166,16 @@ var Client = (function (_EventEmitter) {
self.internal.deleteMessage(msg, options).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def updateMessage
}, {
key: "updateMessage",
value: function updateMessage(msg, content) {
Client.prototype.updateMessage = function updateMessage(msg, content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
@@ -205,18 +189,16 @@ var Client = (function (_EventEmitter) {
self.internal.updateMessage(msg, content, options).then(function (msg) {
callback(null, msg);
resolve(msg);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def getChannelLogs
}, {
key: "getChannelLogs",
value: function getChannelLogs(where) {
Client.prototype.getChannelLogs = function getChannelLogs(where) {
var limit = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, logs) {} : arguments[3];
@@ -230,18 +212,16 @@ var Client = (function (_EventEmitter) {
self.internal.getChannelLogs(where, limit, options).then(function (logs) {
callback(null, logs);
resolve(logs);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def getBans
}, {
key: "getBans",
value: function getBans(where) {
Client.prototype.getBans = function getBans(where) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, bans) {} : arguments[1];
var self = this;
@@ -249,18 +229,16 @@ var Client = (function (_EventEmitter) {
self.internal.getBans(where).then(function (bans) {
callback(null, bans);
resolve(bans);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def sendFile
}, {
key: "sendFile",
value: function sendFile(where, attachment) {
Client.prototype.sendFile = function sendFile(where, attachment) {
var name = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, m) {} : arguments[3];
@@ -269,18 +247,16 @@ var Client = (function (_EventEmitter) {
self.internal.sendFile(where, attachment, name).then(function (m) {
callback(null, m);
resolve(m);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def joinServer
}, {
key: "joinServer",
value: function joinServer(invite) {
Client.prototype.joinServer = function joinServer(invite) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, srv) {} : arguments[1];
var self = this;
@@ -288,18 +264,16 @@ var Client = (function (_EventEmitter) {
self.internal.joinServer(invite).then(function (srv) {
callback(null, srv);
resolve(srv);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def createServer
}, {
key: "createServer",
value: function createServer(name) {
Client.prototype.createServer = function createServer(name) {
var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, srv) {} : arguments[2];
@@ -308,18 +282,16 @@ var Client = (function (_EventEmitter) {
self.internal.createServer(name, region).then(function (srv) {
callback(null, srv);
resolve(srv);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def leaveServer
}, {
key: "leaveServer",
value: function leaveServer(server) {
Client.prototype.leaveServer = function leaveServer(server) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -327,17 +299,15 @@ var Client = (function (_EventEmitter) {
self.internal.leaveServer(server).then(function () {
callback();resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
// def createChannel
}, {
key: "createChannel",
value: function createChannel(server, name) {
Client.prototype.createChannel = function createChannel(server, name) {
var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, channel) {} : arguments[3];
@@ -349,17 +319,15 @@ var Client = (function (_EventEmitter) {
}
self.internal.createChannel(server, name, type).then(function (channel) {
callback(channel);resolve(channel);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
// def deleteChannel
}, {
key: "deleteChannel",
value: function deleteChannel(channel) {
Client.prototype.deleteChannel = function deleteChannel(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -368,17 +336,15 @@ var Client = (function (_EventEmitter) {
self.internal.deleteChannel(channel).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
//def banMember
}, {
key: "banMember",
value: function banMember(user, server) {
Client.prototype.banMember = function banMember(user, server) {
var length = arguments.length <= 2 || arguments[2] === undefined ? 1 : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
@@ -391,17 +357,15 @@ var Client = (function (_EventEmitter) {
self.internal.banMember(user, server, length).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
//def unbanMember
}, {
key: "unbanMember",
value: function unbanMember(user, server) {
Client.prototype.unbanMember = function unbanMember(user, server) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -409,17 +373,15 @@ var Client = (function (_EventEmitter) {
self.internal.unbanMember(user, server).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
//def kickMember
}, {
key: "kickMember",
value: function kickMember(user, server) {
Client.prototype.kickMember = function kickMember(user, server) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -427,17 +389,15 @@ var Client = (function (_EventEmitter) {
self.internal.kickMember(user, server).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);reject(e);
});
});
}
};
//def createRole
}, {
key: "createRole",
value: function createRole(server) {
Client.prototype.createRole = function createRole(server) {
var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
@@ -450,18 +410,16 @@ var Client = (function (_EventEmitter) {
self.internal.createRole(server, data).then(function (role) {
callback(null, role);
resolve(role);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def updateRole
}, {
key: "updateRole",
value: function updateRole(role) {
Client.prototype.updateRole = function updateRole(role) {
var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
@@ -474,18 +432,16 @@ var Client = (function (_EventEmitter) {
self.internal.updateRole(role, data).then(function (role) {
callback(null, role);
resolve(role);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def deleteRole
}, {
key: "deleteRole",
value: function deleteRole(role) {
Client.prototype.deleteRole = function deleteRole(role) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -494,18 +450,16 @@ var Client = (function (_EventEmitter) {
self.internal.deleteRole(role).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def addMemberToRole
}, {
key: "addMemberToRole",
value: function addMemberToRole(member, role) {
Client.prototype.addMemberToRole = function addMemberToRole(member, role) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -514,28 +468,24 @@ var Client = (function (_EventEmitter) {
self.internal.addMemberToRole(member, role).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def addUserToRole
}, {
key: "addUserToRole",
value: function addUserToRole(member, role) {
Client.prototype.addUserToRole = function addUserToRole(member, role) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
return this.addMemberToRole(member, role, callback);
}
};
// def removeMemberFromRole
}, {
key: "removeMemberFromRole",
value: function removeMemberFromRole(member, role) {
Client.prototype.removeMemberFromRole = function removeMemberFromRole(member, role) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -544,28 +494,24 @@ var Client = (function (_EventEmitter) {
self.internal.removeMemberFromRole(member, role).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def removeUserFromRole
}, {
key: "removeUserFromRole",
value: function removeUserFromRole(member, role) {
Client.prototype.removeUserFromRole = function removeUserFromRole(member, role) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
return this.removeUserFromRole(member, role, callback);
}
};
// def createInvite
}, {
key: "createInvite",
value: function createInvite(chanServ, options) {
Client.prototype.createInvite = function createInvite(chanServ, options) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, invite) {} : arguments[2];
var self = this;
@@ -578,18 +524,16 @@ var Client = (function (_EventEmitter) {
self.internal.createInvite(chanServ, options).then(function (invite) {
callback(null, invite);
resolve(invite);
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def deleteInvite
}, {
key: "deleteInvite",
value: function deleteInvite(invite) {
Client.prototype.deleteInvite = function deleteInvite(invite) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -597,18 +541,16 @@ var Client = (function (_EventEmitter) {
self.internal.deleteInvite(invite).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def overwritePermissions
}, {
key: "overwritePermissions",
value: function overwritePermissions(channel, role) {
Client.prototype.overwritePermissions = function overwritePermissions(channel, role) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
@@ -618,18 +560,16 @@ var Client = (function (_EventEmitter) {
self.internal.overwritePermissions(channel, role, options).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def setStatus
}, {
key: "setStatus",
value: function setStatus(idleStatus, gameID) {
Client.prototype.setStatus = function setStatus(idleStatus, gameID) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -645,18 +585,16 @@ var Client = (function (_EventEmitter) {
self.internal.setStatus(idleStatus, gameID).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def sendTyping
}, {
key: "sendTyping",
value: function sendTyping(channel) {
Client.prototype.sendTyping = function sendTyping(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -665,18 +603,16 @@ var Client = (function (_EventEmitter) {
self.internal.sendTyping(channel).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
// def setTopic
}, {
key: "setTopic",
value: function setTopic(channel, topic) {
Client.prototype.setTopic = function setTopic(channel, topic) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -685,18 +621,16 @@ var Client = (function (_EventEmitter) {
self.internal.setTopic(channel, topic).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def setChannelName
}, {
key: "setChannelName",
value: function setChannelName(channel, name) {
Client.prototype.setChannelName = function setChannelName(channel, name) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -705,18 +639,16 @@ var Client = (function (_EventEmitter) {
self.internal.setChannelName(channel, name).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def setChannelNameAndTopic
}, {
key: "setChannelNameAndTopic",
value: function setChannelNameAndTopic(channel, name, topic) {
Client.prototype.setChannelNameAndTopic = function setChannelNameAndTopic(channel, name, topic) {
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err) {} : arguments[3];
var self = this;
@@ -725,18 +657,16 @@ var Client = (function (_EventEmitter) {
self.internal.setChannelNameAndTopic(channel, name, topic).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def updateChannel
}, {
key: "updateChannel",
value: function updateChannel(channel, data) {
Client.prototype.updateChannel = function updateChannel(channel, data) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err) {} : arguments[2];
var self = this;
@@ -745,18 +675,16 @@ var Client = (function (_EventEmitter) {
self.internal.updateChannel(channel, data).then(function () {
callback();
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def startTyping
}, {
key: "startTyping",
value: function startTyping(channel) {
Client.prototype.startTyping = function startTyping(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -765,18 +693,16 @@ var Client = (function (_EventEmitter) {
self.internal.startTyping(channel).then(function () {
callback(null);
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def stopTyping
}, {
key: "stopTyping",
value: function stopTyping(channel) {
Client.prototype.stopTyping = function stopTyping(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -785,18 +711,16 @@ var Client = (function (_EventEmitter) {
self.internal.stopTyping(channel).then(function () {
callback(null);
resolve();
}).catch(function (e) {
})["catch"](function (e) {
callback(e);
reject(e);
});
});
}
};
//def updateDetails
}, {
key: "updateDetails",
value: function updateDetails(details) {
Client.prototype.updateDetails = function updateDetails(details) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -804,18 +728,16 @@ var Client = (function (_EventEmitter) {
self.internal.updateDetails(details).then(function () {
callback();
resolve();
}).catch(function (err) {
})["catch"](function (err) {
callback(err);
reject(err);
});
});
}
};
//def setUsername
}, {
key: "setUsername",
value: function setUsername(name) {
Client.prototype.setUsername = function setUsername(name) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -823,18 +745,16 @@ var Client = (function (_EventEmitter) {
self.internal.setUsername(name).then(function () {
callback();
resolve();
}).catch(function (err) {
})["catch"](function (err) {
callback(err);
reject(err);
});
});
}
};
//def setAvatar
}, {
key: "setAvatar",
value: function setAvatar(avatar) {
Client.prototype.setAvatar = function setAvatar(avatar) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -842,18 +762,16 @@ var Client = (function (_EventEmitter) {
self.internal.setAvatar(avatar).then(function () {
callback();
resolve();
}).catch(function (err) {
})["catch"](function (err) {
callback(err);
reject(err);
});
});
}
};
//def joinVoiceChannel
}, {
key: "joinVoiceChannel",
value: function joinVoiceChannel(channel) {
Client.prototype.joinVoiceChannel = function joinVoiceChannel(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -862,18 +780,16 @@ var Client = (function (_EventEmitter) {
self.internal.joinVoiceChannel(channel).then(function (chan) {
callback(null, chan);
resolve(chan);
}).catch(function (err) {
})["catch"](function (err) {
callback(err);
reject(err);
});
});
}
};
// def leaveVoiceChannel
}, {
key: "leaveVoiceChannel",
value: function leaveVoiceChannel() {
Client.prototype.leaveVoiceChannel = function leaveVoiceChannel() {
var callback = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
var self = this;
@@ -881,21 +797,19 @@ var Client = (function (_EventEmitter) {
self.internal.leaveVoiceChannel().then(function () {
callback();
resolve();
}).catch(function (err) {
})["catch"](function (err) {
callback(err);
reject(err);
});
});
}
};
// def awaitResponse
}, {
key: "awaitResponse",
value: function awaitResponse(msg) {
Client.prototype.awaitResponse = function awaitResponse(msg) {
var toSend = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var _this2 = this;
var _this = this;
var options = arguments.length <= 2 || arguments[2] === undefined ? null : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (e, newMsg) {} : arguments[3];
@@ -920,14 +834,14 @@ var Client = (function (_EventEmitter) {
if (typeof options === "function") {
//(msg, toSend, callback)
callback = options;
_this2.sendMessage(msg, toSend).then(final).catch(error);
_this.sendMessage(msg, toSend).then(final)["catch"](error);
} else {
//(msg, toSend, options, callback)
_this2.sendMessage(msg, toSend, options).then(final).catch(error);
_this.sendMessage(msg, toSend, options).then(final)["catch"](error);
}
} else {
// (msg, toSend) promise
_this2.sendMessage(msg, toSend).then(final).catch(error);
_this.sendMessage(msg, toSend).then(final)["catch"](error);
}
}
} else {
@@ -939,48 +853,42 @@ var Client = (function (_EventEmitter) {
self.internal.awaitResponse(msg).then(function (newMsg) {
resolve(newMsg);
callback(null, newMsg);
}).catch(error);
})["catch"](error);
}
});
}
}, {
key: "setStatusIdle",
value: function setStatusIdle() {
};
Client.prototype.setStatusIdle = function setStatusIdle() {
this.setStatus("idle");
}
}, {
key: "setStatusOnline",
value: function setStatusOnline() {
};
Client.prototype.setStatusOnline = function setStatusOnline() {
var cb = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
this.setStatus("online");
}
}, {
key: "setStatusActive",
value: function setStatusActive() {
};
Client.prototype.setStatusActive = function setStatusActive() {
this.setStatusOnline();
}
}, {
key: "setStatusHere",
value: function setStatusHere() {
};
Client.prototype.setStatusHere = function setStatusHere() {
this.setStatusOnline();
}
}, {
key: "setStatusAvailable",
value: function setStatusAvailable() {
};
Client.prototype.setStatusAvailable = function setStatusAvailable() {
this.setStatusOnline();
}
}, {
key: "setStatusAway",
value: function setStatusAway() {
};
Client.prototype.setStatusAway = function setStatusAway() {
this.setStatusIdle();
}
}, {
key: "setPlayingGame",
value: function setPlayingGame(game) {
};
Client.prototype.setPlayingGame = function setPlayingGame(game) {
this.setStatus(null, game);
}
}, {
};
_createClass(Client, [{
key: "users",
get: function get() {
return this.internal.users;

396
lib/Client/InternalClient.js
View File

@@ -54,11 +54,9 @@ var InternalClient = (function () {
this.messageAwaits = {};
}
_createClass(InternalClient, [{
key: "leaveVoiceChannel",
//def leaveVoiceChannel
value: function leaveVoiceChannel() {
InternalClient.prototype.leaveVoiceChannel = function leaveVoiceChannel() {
var self = this;
return new Promise(function (resolve, reject) {
if (self.voiceConnection) {
@@ -69,13 +67,11 @@ var InternalClient = (function () {
resolve();
}
});
}
};
//def awaitResponse
}, {
key: "awaitResponse",
value: function awaitResponse(msg) {
InternalClient.prototype.awaitResponse = function awaitResponse(msg) {
var _this = this;
return new Promise(function (resolve, reject) {
@@ -95,13 +91,11 @@ var InternalClient = (function () {
_this.messageAwaits[awaitID].push(resolve);
});
}
};
//def joinVoiceChannel
}, {
key: "joinVoiceChannel",
value: function joinVoiceChannel(chann) {
InternalClient.prototype.joinVoiceChannel = function joinVoiceChannel(chann) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -150,13 +144,11 @@ var InternalClient = (function () {
reject(new Error("voice channel does not exist"));
}
});
}
};
// def createServer
}, {
key: "createServer",
value: function createServer(name) {
InternalClient.prototype.createServer = function createServer(name) {
var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1];
var self = this;
@@ -177,13 +169,11 @@ var InternalClient = (function () {
}
});
});
}
};
//def joinServer
}, {
key: "joinServer",
value: function joinServer(invite) {
InternalClient.prototype.joinServer = function joinServer(invite) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -206,13 +196,11 @@ var InternalClient = (function () {
reject(new Error("Not a valid invite"));
}
});
}
};
//def leaveServer
}, {
key: "leaveServer",
value: function leaveServer(srv) {
InternalClient.prototype.leaveServer = function leaveServer(srv) {
var self = this;
return new Promise(function (resolve, reject) {
var server = self.resolver.resolveServer(srv);
@@ -223,32 +211,23 @@ var InternalClient = (function () {
reject(new Error(err));
} else {
// remove channels of server then the server
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
for (var _iterator = server.channels, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
try {
for (var _iterator = server.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var chan = _step.value;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var chan = _ref;
self.channels.remove(chan);
}
// remove server
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
self.servers.remove(server);
resolve();
}
@@ -257,13 +236,11 @@ var InternalClient = (function () {
reject(new Error("server did not resolve"));
}
});
}
};
// def login
}, {
key: "login",
value: function login(email, password) {
InternalClient.prototype.login = function login(email, password) {
var self = this;
var client = self.client;
return new Promise(function (resolve, reject) {
@@ -289,7 +266,7 @@ var InternalClient = (function () {
self.createWS(url);
resolve(token);
}).catch(function (e) {
})["catch"](function (e) {
self.state = ConnectionState.DISCONNECTED;
client.emit("disconnected");
reject(new Error(err));
@@ -300,13 +277,11 @@ var InternalClient = (function () {
reject(new Error("already logging in/logged in/ready!"));
}
});
}
};
// def logout
}, {
key: "logout",
value: function logout() {
InternalClient.prototype.logout = function logout() {
var _this2 = this;
var self = this;
@@ -333,13 +308,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def startPM
}, {
key: "startPM",
value: function startPM(resUser) {
InternalClient.prototype.startPM = function startPM(resUser) {
var self = this;
return new Promise(function (resolve, reject) {
var user = self.resolver.resolveUser(resUser);
@@ -360,13 +333,11 @@ var InternalClient = (function () {
reject(new Error("Unable to resolve resUser to a User"));
}
});
}
};
// def getGateway
}, {
key: "getGateway",
value: function getGateway() {
InternalClient.prototype.getGateway = function getGateway() {
var self = this;
return new Promise(function (resolve, reject) {
@@ -374,19 +345,17 @@ var InternalClient = (function () {
if (err) reject(err);else resolve(res.body.url);
});
});
}
};
// def sendMessage
}, {
key: "sendMessage",
value: function sendMessage(where, _content) {
InternalClient.prototype.sendMessage = function sendMessage(where, _content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(where).then(next).catch(function (e) {
self.resolver.resolveChannel(where).then(next)["catch"](function (e) {
return reject(new Error("Error resolving destination - " + e));
});
@@ -409,12 +378,11 @@ var InternalClient = (function () {
});
}
});
}
};
// def deleteMessage
}, {
key: "deleteMessage",
value: function deleteMessage(_message) {
InternalClient.prototype.deleteMessage = function deleteMessage(_message) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var self = this;
@@ -423,7 +391,7 @@ var InternalClient = (function () {
var message = self.resolver.resolveMessage(_message);
if (message) {
var _deleteMsg = function _deleteMsg() {
var deleteMsg = function deleteMsg() {
request.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).end(function (err, res) {
if (err) {
reject(new Error(err));
@@ -435,21 +403,19 @@ var InternalClient = (function () {
};
if (options.wait) {
setTimeout(_deleteMsg, options.wait);
setTimeout(deleteMsg, options.wait);
} else {
_deleteMsg();
deleteMsg();
}
} else {
reject(new Error("Supplied message did not resolve to a message!"));
}
});
}
};
// def updateMessage
}, {
key: "updateMessage",
value: function updateMessage(msg, _content) {
InternalClient.prototype.updateMessage = function updateMessage(msg, _content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var self = this;
@@ -477,18 +443,16 @@ var InternalClient = (function () {
reject(new Error("Supplied message did not resolve to a message!"));
}
});
}
};
// def sendFile
}, {
key: "sendFile",
value: function sendFile(where, _file) {
InternalClient.prototype.sendFile = function sendFile(where, _file) {
var name = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(where).then(next).catch(function (e) {
self.resolver.resolveChannel(where).then(next)["catch"](function (e) {
return reject(new Error("couldn't resolve to channel - " + e));
});
@@ -506,20 +470,18 @@ var InternalClient = (function () {
});
}
});
}
};
// def getChannelLogs
}, {
key: "getChannelLogs",
value: function getChannelLogs(_channel) {
InternalClient.prototype.getChannelLogs = function getChannelLogs(_channel) {
var limit = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(_channel).then(next).catch(function (e) {
self.resolver.resolveChannel(_channel).then(next)["catch"](function (e) {
return reject(new Error("couldn't resolve to channel - " + e));
});
@@ -548,13 +510,11 @@ var InternalClient = (function () {
});
}
});
}
};
// def getBans
}, {
key: "getBans",
value: function getBans(server) {
InternalClient.prototype.getBans = function getBans(server) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -572,13 +532,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def createChannel
}, {
key: "createChannel",
value: function createChannel(server, name) {
InternalClient.prototype.createChannel = function createChannel(server, name) {
var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2];
var self = this;
@@ -603,17 +561,15 @@ var InternalClient = (function () {
}
});
});
}
};
// def deleteChannel
}, {
key: "deleteChannel",
value: function deleteChannel(_channel) {
InternalClient.prototype.deleteChannel = function deleteChannel(_channel) {
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(_channel).then(next).catch(reject);
self.resolver.resolveChannel(_channel).then(next)["catch"](reject);
function next(channel) {
request.del(Endpoints.CHANNEL(channel.id)).set("authorization", self.token).end(function (err, res) {
@@ -627,13 +583,11 @@ var InternalClient = (function () {
});
}
});
}
};
// def banMember
}, {
key: "banMember",
value: function banMember(user, server) {
InternalClient.prototype.banMember = function banMember(user, server) {
var length = arguments.length <= 2 || arguments[2] === undefined ? 1 : arguments[2];
var self = this;
@@ -650,13 +604,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def unbanMember
}, {
key: "unbanMember",
value: function unbanMember(user, server) {
InternalClient.prototype.unbanMember = function unbanMember(user, server) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -671,13 +623,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def kickMember
}, {
key: "kickMember",
value: function kickMember(user, server) {
InternalClient.prototype.kickMember = function kickMember(user, server) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -692,13 +642,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def createRole
}, {
key: "createRole",
value: function createRole(server, data) {
InternalClient.prototype.createRole = function createRole(server, data) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -713,19 +661,18 @@ var InternalClient = (function () {
if (data) {
self.updateRole(role, data).then(resolve).catch(reject);
self.updateRole(role, data).then(resolve)["catch"](reject);
} else {
resolve(role);
}
}
});
});
}
};
// def updateRole
}, {
key: "updateRole",
value: function updateRole(role, data) {
InternalClient.prototype.updateRole = function updateRole(role, data) {
var self = this;
data = data || {};
data.permissions = data.permissions || [];
@@ -734,13 +681,19 @@ var InternalClient = (function () {
var server = self.resolver.resolveServer(role.server);
var permissions = 0;
var _iteratorNormalCompletion2 = true;
var _didIteratorError2 = false;
var _iteratorError2 = undefined;
for (var _iterator2 = data.permissions, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
try {
for (var _iterator2 = data.permissions[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var perm = _step2.value;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var perm = _ref2;
if (perm instanceof String || typeof perm === "string") {
permissions |= Constants.Permissions[perm] || 0;
@@ -748,20 +701,6 @@ var InternalClient = (function () {
permissions |= perm;
}
}
} catch (err) {
_didIteratorError2 = true;
_iteratorError2 = err;
} finally {
try {
if (!_iteratorNormalCompletion2 && _iterator2.return) {
_iterator2.return();
}
} finally {
if (_didIteratorError2) {
throw _iteratorError2;
}
}
}
data.color = data.color || 0;
@@ -779,13 +718,11 @@ var InternalClient = (function () {
}
});
});
}
};
// def deleteRole
}, {
key: "deleteRole",
value: function deleteRole(role) {
InternalClient.prototype.deleteRole = function deleteRole(role) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -799,13 +736,11 @@ var InternalClient = (function () {
}
});
});
}
};
//def addMemberToRole
}, {
key: "addMemberToRole",
value: function addMemberToRole(member, role) {
InternalClient.prototype.addMemberToRole = function addMemberToRole(member, role) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -835,13 +770,11 @@ var InternalClient = (function () {
reject(new Error("member not in server"));
}
});
}
};
//def removeMemberFromRole
}, {
key: "removeMemberFromRole",
value: function removeMemberFromRole(member, role) {
InternalClient.prototype.removeMemberFromRole = function removeMemberFromRole(member, role) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -877,13 +810,11 @@ var InternalClient = (function () {
reject(new Error("member not in server"));
}
});
}
};
// def createInvite
}, {
key: "createInvite",
value: function createInvite(chanServ, options) {
InternalClient.prototype.createInvite = function createInvite(chanServ, options) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -924,13 +855,11 @@ var InternalClient = (function () {
}
});
});
}
};
//def deleteInvite
}, {
key: "deleteInvite",
value: function deleteInvite(invite) {
InternalClient.prototype.deleteInvite = function deleteInvite(invite) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -947,16 +876,14 @@ var InternalClient = (function () {
reject(new Error("Not a valid invite"));
}
});
}
};
//def overwritePermissions
}, {
key: "overwritePermissions",
value: function overwritePermissions(channel, role, updated) {
InternalClient.prototype.overwritePermissions = function overwritePermissions(channel, role, updated) {
var self = this;
return new Promise(function (resolve, reject) {
channel = self.resolver.resolveChannel(channel).catch(reject).then(next);
channel = self.resolver.resolveChannel(channel)["catch"](reject).then(next);
function next(channel) {
var user;
@@ -1007,13 +934,11 @@ var InternalClient = (function () {
});
}
});
}
};
//def setStatus
}, {
key: "setStatus",
value: function setStatus(idleStatus, gameID) {
InternalClient.prototype.setStatus = function setStatus(idleStatus, gameID) {
var self = this;
self.idleStatus = idleStatus || self.idleStatus || null;
@@ -1042,17 +967,15 @@ var InternalClient = (function () {
resolve();
});
}
};
//def sendTyping
}, {
key: "sendTyping",
value: function sendTyping(channel) {
InternalClient.prototype.sendTyping = function sendTyping(channel) {
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(channel).then(next).catch(reject);
self.resolver.resolveChannel(channel).then(next)["catch"](reject);
function next(channel) {
@@ -1065,17 +988,15 @@ var InternalClient = (function () {
});
}
});
}
};
//def startTyping
}, {
key: "startTyping",
value: function startTyping(channel) {
InternalClient.prototype.startTyping = function startTyping(channel) {
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(channel).then(next).catch(reject);
self.resolver.resolveChannel(channel).then(next)["catch"](reject);
function next(channel) {
@@ -1092,17 +1013,15 @@ var InternalClient = (function () {
}, 4000);
}
});
}
};
//def stopTyping
}, {
key: "stopTyping",
value: function stopTyping(channel) {
InternalClient.prototype.stopTyping = function stopTyping(channel) {
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(channel).then(next).catch(reject);
self.resolver.resolveChannel(channel).then(next)["catch"](reject);
function next(channel) {
@@ -1116,13 +1035,11 @@ var InternalClient = (function () {
self.typingIntervals[channel.id] = false;
}
});
}
};
//def updateDetails
}, {
key: "updateDetails",
value: function updateDetails(data) {
InternalClient.prototype.updateDetails = function updateDetails(data) {
var self = this;
return new Promise(function (resolve, reject) {
request.patch(Endpoints.ME).set("authorization", self.token).send({
@@ -1139,35 +1056,29 @@ var InternalClient = (function () {
}
});
});
}
};
//def setAvatar
}, {
key: "setAvatar",
value: function setAvatar(avatar) {
InternalClient.prototype.setAvatar = function setAvatar(avatar) {
return this.updateDetails({ avatar: avatar });
}
};
//def setUsername
}, {
key: "setUsername",
value: function setUsername(username) {
InternalClient.prototype.setUsername = function setUsername(username) {
return this.updateDetails({ username: username });
}
};
//def setTopic
}, {
key: "setTopic",
value: function setTopic(chann) {
InternalClient.prototype.setTopic = function setTopic(chann) {
var topic = arguments.length <= 1 || arguments[1] === undefined ? "" : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(chann).then(next).catch(reject);
self.resolver.resolveChannel(chann).then(next)["catch"](reject);
function next(channel) {
@@ -1185,19 +1096,17 @@ var InternalClient = (function () {
});
}
});
}
};
//def setChannelName
}, {
key: "setChannelName",
value: function setChannelName(chann) {
InternalClient.prototype.setChannelName = function setChannelName(chann) {
var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(chann).then(next).catch(reject);
self.resolver.resolveChannel(chann).then(next)["catch"](reject);
function next(channel) {
@@ -1215,20 +1124,18 @@ var InternalClient = (function () {
});
}
});
}
};
//def setChannelNameAndTopic
}, {
key: "setChannelNameAndTopic",
value: function setChannelNameAndTopic(chann) {
InternalClient.prototype.setChannelNameAndTopic = function setChannelNameAndTopic(chann) {
var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1];
var topic = arguments.length <= 2 || arguments[2] === undefined ? "" : arguments[2];
var self = this;
return new Promise(function (resolve, reject) {
self.resolver.resolveChannel(chann).then(next).catch(reject);
self.resolver.resolveChannel(chann).then(next)["catch"](reject);
function next(channel) {
@@ -1247,21 +1154,17 @@ var InternalClient = (function () {
});
}
});
}
};
//def updateChannel
}, {
key: "updateChannel",
value: function updateChannel(chann, data) {
InternalClient.prototype.updateChannel = function updateChannel(chann, data) {
return this.setChannelNameAndTopic(chann, data.name, data.topic);
}
};
//def ack
}, {
key: "ack",
value: function ack(msg) {
InternalClient.prototype.ack = function ack(msg) {
var self = this;
return new Promise(function (resolve, reject) {
@@ -1280,15 +1183,13 @@ var InternalClient = (function () {
reject(new Error("Message does not exist"));
}
});
}
}, {
key: "sendWS",
value: function sendWS(object) {
};
InternalClient.prototype.sendWS = function sendWS(object) {
if (this.websocket) this.websocket.send(JSON.stringify(object));
}
}, {
key: "createWS",
value: function createWS(url) {
};
InternalClient.prototype.createWS = function createWS(url) {
var self = this;
var client = self.client;
@@ -1436,31 +1337,23 @@ var InternalClient = (function () {
case PacketType.SERVER_DELETE:
var server = self.servers.get("id", data.id);
if (server) {
var _iteratorNormalCompletion3 = true;
var _didIteratorError3 = false;
var _iteratorError3 = undefined;
try {
for (var _iterator3 = server.channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
var _ref3;
for (var _iterator3 = server.channels[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
var channel = _step3.value;
if (_isArray3) {
if (_i3 >= _iterator3.length) break;
_ref3 = _iterator3[_i3++];
} else {
_i3 = _iterator3.next();
if (_i3.done) break;
_ref3 = _i3.value;
}
var channel = _ref3;
self.channels.remove(channel);
}
} catch (err) {
_didIteratorError3 = true;
_iteratorError3 = err;
} finally {
try {
if (!_iteratorNormalCompletion3 && _iterator3.return) {
_iterator3.return();
}
} finally {
if (_didIteratorError3) {
throw _iteratorError3;
}
}
}
self.servers.remove(server);
client.emit("serverDeleted", server);
@@ -1726,8 +1619,9 @@ var InternalClient = (function () {
break;
}
};
}
}, {
};
_createClass(InternalClient, [{
key: "uptime",
get: function get() {
return this.readyTime ? Date.now() - this.readyTime : null;

183
lib/Client/Resolver/Resolver.js
View File

@@ -1,10 +1,6 @@
"use strict"
"use strict";
/* global Buffer */
;
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var fs = require("fs");
@@ -27,55 +23,43 @@ var Resolver = (function () {
this.internal = internal;
}
_createClass(Resolver, [{
key: "resolveGameID",
value: function resolveGameID(resource) {
Resolver.prototype.resolveGameID = function resolveGameID(resource) {
if (!isNaN(resource) && parseInt(resource) % 1 === 0) {
return resource;
} else if (typeof resource == "string" || resource instanceof String) {
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
try {
for (var _iterator = Games, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
for (var _iterator = Games[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var game = _step.value;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var game = _ref;
if (game.name.toUpperCase() === resource.toUpperCase()) {
return game.id;
}
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
}
return null;
}
}, {
key: "resolveToBase64",
value: function resolveToBase64(resource) {
};
Resolver.prototype.resolveToBase64 = function resolveToBase64(resource) {
if (resource instanceof Buffer) {
resource = resource.toString("base64");
resource = "data:image/jpg;base64," + resource;
}
return resource;
}
}, {
key: "resolveInviteID",
value: function resolveInviteID(resource) {
};
Resolver.prototype.resolveInviteID = function resolveInviteID(resource) {
if (resource instanceof Invite) {
return resource.id;
} else if (typeof resource == "string" || resource instanceof String) {
@@ -88,10 +72,9 @@ var Resolver = (function () {
}
}
return null;
}
}, {
key: "resolveServer",
value: function resolveServer(resource) {
};
Resolver.prototype.resolveServer = function resolveServer(resource) {
if (resource instanceof Server) {
return resource;
} else if (resource instanceof ServerChannel) {
@@ -104,51 +87,39 @@ var Resolver = (function () {
}
}
return null;
}
}, {
key: "resolveFile",
value: function resolveFile(resource) {
};
Resolver.prototype.resolveFile = function resolveFile(resource) {
if (typeof resource === "string" || resource instanceof String) {
return fs.createReadStream(resource);
} else {
return resource;
}
}
}, {
key: "resolveMentions",
value: function resolveMentions(resource) {
};
Resolver.prototype.resolveMentions = function resolveMentions(resource) {
// resource is a string
var _mentions = [];
var _iteratorNormalCompletion2 = true;
var _didIteratorError2 = false;
var _iteratorError2 = undefined;
for (var _iterator2 = resource.match(/<@[^>]*>/g) || [], _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
try {
for (var _iterator2 = (resource.match(/<@[^>]*>/g) || [])[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var mention = _step2.value;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var mention = _ref2;
_mentions.push(mention.substring(2, mention.length - 1));
}
} catch (err) {
_didIteratorError2 = true;
_iteratorError2 = err;
} finally {
try {
if (!_iteratorNormalCompletion2 && _iterator2.return) {
_iterator2.return();
}
} finally {
if (_didIteratorError2) {
throw _iteratorError2;
}
}
}
return _mentions;
}
}, {
key: "resolveString",
value: function resolveString(resource) {
};
Resolver.prototype.resolveString = function resolveString(resource) {
// accepts Array, Channel, Server, User, Message, String and anything
// toString()-able
@@ -159,10 +130,9 @@ var Resolver = (function () {
}
return final.toString();
}
}, {
key: "resolveUser",
value: function resolveUser(resource) {
};
Resolver.prototype.resolveUser = function resolveUser(resource) {
/*
accepts a Message, Channel, Server, String ID, User, PMChannel
*/
@@ -185,10 +155,9 @@ var Resolver = (function () {
}
return found;
}
}, {
key: "resolveMessage",
value: function resolveMessage(resource) {
};
Resolver.prototype.resolveMessage = function resolveMessage(resource) {
// accepts a Message, PMChannel & TextChannel
var found = null;
@@ -199,19 +168,17 @@ var Resolver = (function () {
}
return found;
}
}, {
key: "resolveVoiceChannel",
value: function resolveVoiceChannel(resource) {
};
Resolver.prototype.resolveVoiceChannel = function resolveVoiceChannel(resource) {
// resolveChannel will also work but this is more apt
if (resource instanceof VoiceChannel) {
return resource;
}
return null;
}
}, {
key: "resolveChannel",
value: function resolveChannel(resource) {
};
Resolver.prototype.resolveChannel = function resolveChannel(resource) {
/*
accepts a Message, Channel, Server, String ID, User
*/
@@ -230,34 +197,25 @@ var Resolver = (function () {
} else if (resource instanceof User) {
// see if a PM exists
var chatFound = false;
var _iteratorNormalCompletion3 = true;
var _didIteratorError3 = false;
var _iteratorError3 = undefined;
for (var _iterator3 = self.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
var _ref3;
try {
for (var _iterator3 = self.internal.private_channels[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
var pmchat = _step3.value;
if (_isArray3) {
if (_i3 >= _iterator3.length) break;
_ref3 = _iterator3[_i3++];
} else {
_i3 = _iterator3.next();
if (_i3.done) break;
_ref3 = _i3.value;
}
var pmchat = _ref3;
if (pmchat.recipient.equals(resource)) {
chatFound = pmchat;
break;
}
}
} catch (err) {
_didIteratorError3 = true;
_iteratorError3 = err;
} finally {
try {
if (!_iteratorNormalCompletion3 && _iterator3.return) {
_iterator3.return();
}
} finally {
if (_didIteratorError3) {
throw _iteratorError3;
}
}
}
if (chatFound) {
// a PM already exists!
found = chatFound;
@@ -265,7 +223,7 @@ var Resolver = (function () {
// PM does not exist :\
self.internal.startPM(resource).then(function (pmchannel) {
return resolve(pmchannel);
}).catch(function (e) {
})["catch"](function (e) {
return reject(e);
});
return;
@@ -273,8 +231,7 @@ var Resolver = (function () {
}
if (found) resolve(found);else reject(new Error("Didn't found anything"));
});
}
}]);
};
return Resolver;
})();

19
lib/Structures/Channel.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Equality = require("../Util/Equality.js");
@@ -19,19 +17,16 @@ var Channel = (function (_Equality) {
function Channel(data, client) {
_classCallCheck(this, Channel);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Channel).call(this));
_this.id = data.id;
_this.client = client;
return _this;
_Equality.call(this);
this.id = data.id;
this.client = client;
}
Channel.prototype["delete"] = function _delete() {
return this.client.deleteChannel.apply(this.client, reg(this, arguments));
};
_createClass(Channel, [{
key: "delete",
value: function _delete() {
return this.client.deleteChannel.apply(this.client, reg(this, arguments));
}
}, {
key: "isPrivate",
get: function get() {
return !!this.server;

23
lib/Structures/ChannelPermissions.js
View File

@@ -1,7 +1,5 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var Permissions = require("../Constants.js").Permissions;
@@ -13,9 +11,7 @@ var ChannelPermissions = (function () {
this.permissions = permissions;
}
_createClass(ChannelPermissions, [{
key: "serialise",
value: function serialise(explicit) {
ChannelPermissions.prototype.serialise = function serialise(explicit) {
var _this = this;
var hp = function hp(perm) {
@@ -47,16 +43,14 @@ var ChannelPermissions = (function () {
voiceMoveMembers: hp(Permissions.voiceMoveMembers),
voiceUseVAD: hp(Permissions.voiceUseVAD)
};
}
}, {
key: "serialize",
value: function serialize() {
};
ChannelPermissions.prototype.serialize = function serialize() {
// ;n;
return this.serialise();
}
}, {
key: "hasPermission",
value: function hasPermission(perm) {
};
ChannelPermissions.prototype.hasPermission = function hasPermission(perm) {
var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
if (perm instanceof String || typeof perm === "string") {
@@ -73,8 +67,7 @@ var ChannelPermissions = (function () {
}
}
return !!(this.permissions & perm);
}
}]);
};
return ChannelPermissions;
})();

9
lib/Structures/Invite.js
View File

@@ -1,7 +1,5 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var Server = require("./Server.js");
@@ -24,12 +22,9 @@ var Invite = (function () {
this.xkcd = data.xkcdpass;
}
_createClass(Invite, [{
key: "toString",
value: function toString() {
Invite.prototype.toString = function toString() {
return "https://discord.gg/" + this.code;
}
}]);
};
return Invite;
})();

78
lib/Structures/Message.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Cache = require("../Util/Cache.js");
@@ -17,26 +15,27 @@ var Message = (function (_Equality) {
_inherits(Message, _Equality);
function Message(data, channel, client) {
var _this = this;
_classCallCheck(this, Message);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Message).call(this));
_Equality.call(this);
this.channel = channel;
this.client = client;
this.nonce = data.nonce;
this.attachments = data.attachments;
this.tts = data.tts;
this.embeds = data.embeds;
this.timestamp = Date.parse(data.timestamp);
this.everyoneMentioned = data.mention_everyone;
this.id = data.id;
_this.channel = channel;
_this.client = client;
_this.nonce = data.nonce;
_this.attachments = data.attachments;
_this.tts = data.tts;
_this.embeds = data.embeds;
_this.timestamp = Date.parse(data.timestamp);
_this.everyoneMentioned = data.mention_everyone;
_this.id = data.id;
if (data.edited_timestamp) this.editedTimestamp = Date.parse(data.edited_timestamp);
if (data.edited_timestamp) _this.editedTimestamp = Date.parse(data.edited_timestamp);
if (data.author instanceof User) this.author = data.author;else this.author = client.internal.users.add(new User(data.author, client));
if (data.author instanceof User) _this.author = data.author;else _this.author = client.internal.users.add(new User(data.author, client));
_this.content = data.content;
_this.mentions = new Cache();
this.content = data.content;
this.mentions = new Cache();
data.mentions.forEach(function (mention) {
// this is .add and not .get because it allows the bot to cache
@@ -44,45 +43,38 @@ var Message = (function (_Equality) {
// not previously cached.
if (mention instanceof User) _this.mentions.push(mention);else _this.mentions.add(client.internal.users.add(new User(mention, client)));
});
return _this;
}
_createClass(Message, [{
key: "isMentioned",
value: function isMentioned(user) {
Message.prototype.isMentioned = function isMentioned(user) {
user = this.client.internal.resolver.resolveUser(user);
if (user) {
return this.mentions.has("id", user.id);
} else {
return false;
}
}
}, {
key: "toString",
value: function toString() {
};
Message.prototype.toString = function toString() {
return this.content;
}
}, {
key: "delete",
value: function _delete() {
};
Message.prototype["delete"] = function _delete() {
return this.client.deleteMessage.apply(this.client, reg(this, arguments));
}
}, {
key: "update",
value: function update() {
};
Message.prototype.update = function update() {
return this.client.updateMessage.apply(this.client, reg(this, arguments));
}
}, {
key: "reply",
value: function reply() {
};
Message.prototype.reply = function reply() {
return this.client.reply.apply(this.client, reg(this, arguments));
}
}, {
key: "replyTTS",
value: function replyTTS() {
};
Message.prototype.replyTTS = function replyTTS() {
return this.client.replyTTS.apply(this.client, reg(this, arguments));
}
}, {
};
_createClass(Message, [{
key: "sender",
get: function get() {
return this.author;

36
lib/Structures/PMChannel.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Channel = require("./Channel.js");
@@ -20,33 +18,29 @@ var PMChannel = (function (_Channel) {
function PMChannel(data, client) {
_classCallCheck(this, PMChannel);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(PMChannel).call(this, data, client));
_Channel.call(this, data, client);
_this.type = data.type || "text";
_this.lastMessageId = data.last_message_id;
_this.messages = new Cache("id", 1000);
_this.recipient = _this.client.internal.users.add(new User(data.recipient, _this.client));
return _this;
this.type = data.type || "text";
this.lastMessageId = data.last_message_id;
this.messages = new Cache("id", 1000);
this.recipient = this.client.internal.users.add(new User(data.recipient, this.client));
}
/* warning! may return null */
_createClass(PMChannel, [{
key: "toString",
value: function toString() {
PMChannel.prototype.toString = function toString() {
return this.recipient.toString();
}
}, {
key: "sendMessage",
value: function sendMessage() {
};
PMChannel.prototype.sendMessage = function sendMessage() {
return this.client.sendMessage.apply(this.client, reg(this, arguments));
}
}, {
key: "sendTTSMessage",
value: function sendTTSMessage() {
};
PMChannel.prototype.sendTTSMessage = function sendTTSMessage() {
return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
}
}, {
};
_createClass(PMChannel, [{
key: "lastMessage",
get: function get() {
return this.messages.get("id", this.lastMessageID);

17
lib/Structures/PermissionOverwrite.js
View File

@@ -18,9 +18,7 @@ var PermissionOverwrite = (function () {
// returns an array of allowed permissions
_createClass(PermissionOverwrite, [{
key: "setAllowed",
value: function setAllowed(allowedArray) {
PermissionOverwrite.prototype.setAllowed = function setAllowed(allowedArray) {
var _this = this;
allowedArray.forEach(function (permission) {
@@ -31,10 +29,9 @@ var PermissionOverwrite = (function () {
_this.allow |= 1 << permission;
}
});
}
}, {
key: "setDenied",
value: function setDenied(deniedArray) {
};
PermissionOverwrite.prototype.setDenied = function setDenied(deniedArray) {
var _this2 = this;
deniedArray.forEach(function (permission) {
@@ -45,8 +42,9 @@ var PermissionOverwrite = (function () {
_this2.deny |= 1 << permission;
}
});
}
}, {
};
_createClass(PermissionOverwrite, [{
key: "allowed",
get: function get() {
var allowed = [];
@@ -64,7 +62,6 @@ var PermissionOverwrite = (function () {
}
// returns an array of denied permissions
}, {
key: "denied",
get: function get() {

44
lib/Structures/Role.js
View File

@@ -1,7 +1,5 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var Permissions = require("../Constants.js").Permissions;
@@ -37,9 +35,7 @@ var Role = (function () {
this.client = client;
}
_createClass(Role, [{
key: "serialise",
value: function serialise(explicit) {
Role.prototype.serialise = function serialise(explicit) {
var _this = this;
var hp = function hp(perm) {
@@ -71,16 +67,14 @@ var Role = (function () {
voiceMoveMembers: hp(Permissions.voiceMoveMembers),
voiceUseVAD: hp(Permissions.voiceUseVAD)
};
}
}, {
key: "serialize",
value: function serialize() {
};
Role.prototype.serialize = function serialize() {
// ;n;
return this.serialise();
}
}, {
key: "hasPermission",
value: function hasPermission(perm) {
};
Role.prototype.hasPermission = function hasPermission(perm) {
var explicit = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1];
if (perm instanceof String || typeof perm === "string") {
@@ -101,10 +95,9 @@ var Role = (function () {
// !!(36953089 & (1 << 21)) = voice speak allowed
return !!(this.permissions & perm);
}
}, {
key: "setPermission",
value: function setPermission(permission, value) {
};
Role.prototype.setPermission = function setPermission(permission, value) {
if (permission instanceof String || typeof permission === "string") {
permission = Permissions[permission];
}
@@ -116,10 +109,9 @@ var Role = (function () {
this.permissions &= ~permission;
}
}
}
}, {
key: "setPermissions",
value: function setPermissions(obj) {
};
Role.prototype.setPermissions = function setPermissions(obj) {
var _this2 = this;
obj.forEach(function (value, permission) {
@@ -131,17 +123,15 @@ var Role = (function () {
_this2.setPermission(permission, value);
}
});
}
}, {
key: "colorAsHex",
value: function colorAsHex() {
};
Role.prototype.colorAsHex = function colorAsHex() {
var val = this.color.toString();
while (val.length < 6) {
val = "0" + val;
}
return "#" + val;
}
}]);
};
return Role;
})();

135
lib/Structures/Server.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Equality = require("../Util/Equality.js");
@@ -22,26 +20,28 @@ var Server = (function (_Equality) {
_inherits(Server, _Equality);
function Server(data, client) {
var _this = this;
_classCallCheck(this, Server);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Server).call(this));
_Equality.call(this);
var self = _this;
_this.client = client;
var self = this;
this.client = client;
_this.region = data.region;
_this.ownerID = data.owner_id;
_this.name = data.name;
_this.id = data.id;
_this.members = new Cache();
_this.channels = new Cache();
_this.roles = new Cache();
_this.icon = data.icon;
_this.afkTimeout = data.afkTimeout;
_this.afkChannelID = data.afk_channel_id;
_this.memberMap = {};
this.region = data.region;
this.ownerID = data.owner_id;
this.name = data.name;
this.id = data.id;
this.members = new Cache();
this.channels = new Cache();
this.roles = new Cache();
this.icon = data.icon;
this.afkTimeout = data.afkTimeout;
this.afkChannelID = data.afk_channel_id;
this.memberMap = {};
var self = _this;
var self = this;
data.roles.forEach(function (dataRole) {
_this.roles.add(new Role(dataRole, _this, client));
@@ -71,13 +71,19 @@ var Server = (function (_Equality) {
});
if (data.presences) {
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
for (var _iterator = data.presences, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
try {
for (var _iterator = data.presences[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var presence = _step.value;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var presence = _ref;
var user = client.internal.users.get("id", presence.user.id);
if (user) {
@@ -85,80 +91,53 @@ var Server = (function (_Equality) {
user.gameID = presence.game_id;
}
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
}
return _this;
}
_createClass(Server, [{
key: "rolesOfUser",
value: function rolesOfUser(user) {
Server.prototype.rolesOfUser = function rolesOfUser(user) {
user = this.client.internal.resolver.resolveUser(user);
if (user) {
return this.memberMap[user.id] ? this.memberMap[user.id].roles : [];
} else {
return null;
}
}
}, {
key: "rolesOf",
value: function rolesOf(user) {
return this.rolesOfUser(user);
}
}, {
key: "toString",
value: function toString() {
return this.name;
}
}, {
key: "equalsStrict",
value: function equalsStrict(obj) {
if (obj instanceof Server) {
var _iteratorNormalCompletion2 = true;
var _didIteratorError2 = false;
var _iteratorError2 = undefined;
};
try {
for (var _iterator2 = strictKeys[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var key = _step2.value;
Server.prototype.rolesOf = function rolesOf(user) {
return this.rolesOfUser(user);
};
Server.prototype.toString = function toString() {
return this.name;
};
Server.prototype.equalsStrict = function equalsStrict(obj) {
if (obj instanceof Server) {
for (var _iterator2 = strictKeys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var key = _ref2;
if (obj[key] !== this[key]) {
return false;
}
}
} catch (err) {
_didIteratorError2 = true;
_iteratorError2 = err;
} finally {
try {
if (!_iteratorNormalCompletion2 && _iterator2.return) {
_iterator2.return();
}
} finally {
if (_didIteratorError2) {
throw _iteratorError2;
}
}
}
} else {
return false;
}
return true;
}
}, {
};
_createClass(Server, [{
key: "iconURL",
get: function get() {
if (!this.icon) {

119
lib/Structures/ServerChannel.js
View File

@@ -1,11 +1,7 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Channel = require("./Channel.js");
@@ -18,24 +14,22 @@ var ServerChannel = (function (_Channel) {
_inherits(ServerChannel, _Channel);
function ServerChannel(data, client, server) {
var _this = this;
_classCallCheck(this, ServerChannel);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(ServerChannel).call(this, data, client));
_this.name = data.name;
_this.type = data.type;
_this.position = data.position;
_this.permissionOverwrites = new Cache();
_this.server = server;
_Channel.call(this, data, client);
this.name = data.name;
this.type = data.type;
this.position = data.position;
this.permissionOverwrites = new Cache();
this.server = server;
data.permission_overwrites.forEach(function (permission) {
_this.permissionOverwrites.add(new PermissionOverwrite(permission));
});
return _this;
}
_createClass(ServerChannel, [{
key: "permissionsOf",
value: function permissionsOf(user) {
ServerChannel.prototype.permissionsOf = function permissionsOf(user) {
user = this.client.internal.resolver.resolveUser(user);
if (user) {
if (this.server.owner.equals(user)) {
@@ -60,83 +54,62 @@ var ServerChannel = (function (_Channel) {
var permissions = 0;
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
for (var _iterator = userRoles, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
try {
for (var _iterator = userRoles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var serverRole = _step.value;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var serverRole = _ref;
permissions |= serverRole.permissions;
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
for (var _iterator2 = roleOverwrites.concat(memberOverwrites), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var _iteratorNormalCompletion2 = true;
var _didIteratorError2 = false;
var _iteratorError2 = undefined;
try {
for (var _iterator2 = roleOverwrites.concat(memberOverwrites)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var overwrite = _step2.value;
var overwrite = _ref2;
permissions = permissions & ~overwrite.deny;
permissions = permissions | overwrite.allow;
}
} catch (err) {
_didIteratorError2 = true;
_iteratorError2 = err;
} finally {
try {
if (!_iteratorNormalCompletion2 && _iterator2.return) {
_iterator2.return();
}
} finally {
if (_didIteratorError2) {
throw _iteratorError2;
}
}
}
return new ChannelPermissions(permissions);
} else {
return null;
}
}
}, {
key: "permsOf",
value: function permsOf(user) {
};
ServerChannel.prototype.permsOf = function permsOf(user) {
return this.permissionsOf(user);
}
}, {
key: "mention",
value: function mention() {
};
ServerChannel.prototype.mention = function mention() {
return "<#" + this.id + ">";
}
}, {
key: "toString",
value: function toString() {
};
ServerChannel.prototype.toString = function toString() {
return this.mention();
}
}, {
key: "setName",
value: function setName() {
};
ServerChannel.prototype.setName = function setName() {
return this.client.setChannelName.apply(this.client, reg(this, arguments));
}
}]);
};
return ServerChannel;
})(Channel);

48
lib/Structures/TextChannel.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var ServerChannel = require("./ServerChannel.js");
@@ -18,42 +16,36 @@ var TextChannel = (function (_ServerChannel) {
function TextChannel(data, client, server) {
_classCallCheck(this, TextChannel);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(TextChannel).call(this, data, client, server));
_ServerChannel.call(this, data, client, server);
_this.topic = data.topic;
_this.lastMessageID = data.last_message_id;
_this.messages = new Cache("id", client.options.maximumMessages);
return _this;
this.topic = data.topic;
this.lastMessageID = data.last_message_id;
this.messages = new Cache("id", client.options.maximumMessages);
}
/* warning! may return null */
_createClass(TextChannel, [{
key: "setTopic",
value: function setTopic() {
TextChannel.prototype.setTopic = function setTopic() {
return this.client.setTopic.apply(this.client, reg(this, arguments));
}
}, {
key: "setNameAndTopic",
value: function setNameAndTopic() {
};
TextChannel.prototype.setNameAndTopic = function setNameAndTopic() {
return this.client.setChannelNameAndTopic.apply(this.client, reg(this, arguments));
}
}, {
key: "update",
value: function update() {
};
TextChannel.prototype.update = function update() {
return this.client.updateChannel.apply(this.client, reg(this, arguments));
}
}, {
key: "sendMessage",
value: function sendMessage() {
};
TextChannel.prototype.sendMessage = function sendMessage() {
return this.client.sendMessage.apply(this.client, reg(this, arguments));
}
}, {
key: "sendTTSMessage",
value: function sendTTSMessage() {
};
TextChannel.prototype.sendTTSMessage = function sendTTSMessage() {
return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
}
}, {
};
_createClass(TextChannel, [{
key: "lastMessage",
get: function get() {
return this.messages.get("id", this.lastMessageID);

45
lib/Structures/User.js
View File

@@ -4,8 +4,6 @@ var _createClass = (function () { function defineProperties(target, props) { for
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Equality = require("../Util/Equality.js");
@@ -17,38 +15,33 @@ var User = (function (_Equality) {
function User(data, client) {
_classCallCheck(this, User);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(User).call(this));
_this.client = client;
_this.username = data.username;
_this.discriminator = data.discriminator;
_this.id = data.id;
_this.avatar = data.avatar;
_this.status = data.status || "offline";
_this.gameID = data.game_id || null;
_this.typing = {
_Equality.call(this);
this.client = client;
this.username = data.username;
this.discriminator = data.discriminator;
this.id = data.id;
this.avatar = data.avatar;
this.status = data.status || "offline";
this.gameID = data.game_id || null;
this.typing = {
since: null,
channel: null
};
return _this;
}
_createClass(User, [{
key: "mention",
value: function mention() {
User.prototype.mention = function mention() {
return "<@" + this.id + ">";
}
}, {
key: "toString",
value: function toString() {
};
User.prototype.toString = function toString() {
return this.mention();
}
}, {
key: "equalsStrict",
value: function equalsStrict(obj) {
};
User.prototype.equalsStrict = function equalsStrict(obj) {
if (obj instanceof User) return this.id === obj.id && this.username === obj.username && this.discriminator === obj.discriminator && this.avatar === obj.avatar && this.status === obj.status && this.gameID === obj.gameID;else return false;
}
}, {
};
_createClass(User, [{
key: "avatarURL",
get: function get() {
if (!this.avatar) {

4
lib/Structures/VoiceChannel.js
View File

@@ -2,8 +2,6 @@
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var ServerChannel = require("./ServerChannel.js");
@@ -14,7 +12,7 @@ var VoiceChannel = (function (_ServerChannel) {
function VoiceChannel(data, client, server) {
_classCallCheck(this, VoiceChannel);
return _possibleConstructorReturn(this, Object.getPrototypeOf(VoiceChannel).call(this, data, client, server));
_ServerChannel.call(this, data, client, server);
}
return VoiceChannel;

94
lib/Util/Cache.js
View File

@@ -1,11 +1,7 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var Cache = (function (_Array) {
@@ -14,15 +10,11 @@ var Cache = (function (_Array) {
function Cache(discrim, limit) {
_classCallCheck(this, Cache);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(Cache).call(this));
_this.discrim = discrim || "id";
return _this;
_Array.call(this);
this.discrim = discrim || "id";
}
_createClass(Cache, [{
key: "get",
value: function get(key, value) {
Cache.prototype.get = function get(key, value) {
var found = null;
this.forEach(function (val, index, array) {
if (val.hasOwnProperty(key) && val[key] == value) {
@@ -31,15 +23,13 @@ var Cache = (function (_Array) {
}
});
return found;
}
}, {
key: "has",
value: function has(key, value) {
};
Cache.prototype.has = function has(key, value) {
return !!this.get(key, value);
}
}, {
key: "getAll",
value: function getAll(key, value) {
};
Cache.prototype.getAll = function getAll(key, value) {
var found = new Cache(this.discrim);
this.forEach(function (val, index, array) {
if (val.hasOwnProperty(key) && val[key] == value) {
@@ -48,39 +38,29 @@ var Cache = (function (_Array) {
}
});
return found;
}
}, {
key: "add",
value: function add(data) {
var exit = false;
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
};
try {
for (var _iterator = this[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var item = _step.value;
Cache.prototype.add = function add(data) {
var exit = false;
for (var _iterator = this, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var item = _ref;
if (item[this.discrim] === data[this.discrim]) {
exit = item;
break;
}
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
if (exit) {
return exit;
} else {
@@ -90,10 +70,9 @@ var Cache = (function (_Array) {
this.push(data);
return data;
}
}
}, {
key: "update",
value: function update(old, data) {
};
Cache.prototype.update = function update(old, data) {
var item = this.get(this.discrim, old[this.discrim]);
if (item) {
var index = this.indexOf(item);
@@ -102,15 +81,13 @@ var Cache = (function (_Array) {
} else {
return false;
}
}
}, {
key: "random",
value: function random() {
};
Cache.prototype.random = function random() {
return this[Math.floor(Math.random() * this.length)];
}
}, {
key: "remove",
value: function remove(data) {
};
Cache.prototype.remove = function remove(data) {
var index = this.indexOf(data);
if (~index) {
this.splice(index, 1);
@@ -121,8 +98,7 @@ var Cache = (function (_Array) {
}
}
return false;
}
}]);
};
return Cache;
})(Array);

27
lib/Util/Equality.js
View File

@@ -1,9 +1,3 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
/*
The Equality Class is just used to show
that a Class has an ID that can be used to
@@ -15,27 +9,30 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
Instead, use objectThatExtendsEquality.equals()
*/
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var Equality = (function () {
function Equality() {
_classCallCheck(this, Equality);
}
_createClass(Equality, [{
key: "equals",
value: function equals(object) {
Equality.prototype.equals = function equals(object) {
if (object && object[this.eqDiscriminator] == this[this.eqDiscriminator]) {
return true;
}
return false;
}
}, {
key: "equalsStrict",
value: function equalsStrict(object) {
};
Equality.prototype.equalsStrict = function equalsStrict(object) {
// override per class type
return;
}
}, {
};
_createClass(Equality, [{
key: "eqDiscriminator",
get: function get() {
return "id";

62
lib/Voice/AudioEncoder.js
View File

@@ -1,7 +1,5 @@
"use strict";
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var cpoc = require("child_process");
@@ -24,27 +22,30 @@ var AudioEncoder = (function () {
this.choice = false;
}
_createClass(AudioEncoder, [{
key: "opusBuffer",
value: function opusBuffer(buffer) {
AudioEncoder.prototype.opusBuffer = function opusBuffer(buffer) {
return this.opus.encode(buffer, 1920);
}
}, {
key: "getCommand",
value: function getCommand(force) {
};
AudioEncoder.prototype.getCommand = function getCommand(force) {
if (this.choice && force) return choice;
var choices = ["avconv", "ffmpeg"];
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
for (var _iterator = choices, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
try {
for (var _iterator = choices[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var choice = _step.value;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var choice = _ref;
var p = cpoc.spawnSync(choice);
if (!p.error) {
@@ -52,26 +53,11 @@ var AudioEncoder = (function () {
return choice;
}
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
return "help";
}
}, {
key: "encodeStream",
value: function encodeStream(stream) {
};
AudioEncoder.prototype.encodeStream = function encodeStream(stream) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
var self = this;
@@ -104,10 +90,9 @@ var AudioEncoder = (function () {
reject("close");
});
});
}
}, {
key: "encodeFile",
value: function encodeFile(file) {
};
AudioEncoder.prototype.encodeFile = function encodeFile(file) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
var self = this;
@@ -136,8 +121,7 @@ var AudioEncoder = (function () {
reject("close");
});
});
}
}]);
};
return AudioEncoder;
})();

7
lib/Voice/StreamIntent.js
View File

@@ -1,11 +1,8 @@
"use strict"
"use strict";
// represents an intent of streaming music
;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var EventEmitter = require("events");
@@ -16,7 +13,7 @@ var StreamIntent = (function (_EventEmitter) {
function StreamIntent() {
_classCallCheck(this, StreamIntent);
return _possibleConstructorReturn(this, Object.getPrototypeOf(StreamIntent).call(this));
_EventEmitter.call(this);
}
return StreamIntent;

130
lib/Voice/VoiceConnection.js
View File

@@ -1,4 +1,4 @@
"use strict"
"use strict";
/*
Major credit to izy521 who is the creator of
https://github.com/izy521/discord.io,
@@ -7,14 +7,8 @@
been possible!
*/
;
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var WebSocket = require("ws");
@@ -32,32 +26,28 @@ var VoiceConnection = (function (_EventEmitter) {
function VoiceConnection(channel, client, session, token, server, endpoint) {
_classCallCheck(this, VoiceConnection);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(VoiceConnection).call(this));
_this.id = channel.id;
_this.voiceChannel = channel;
_this.client = client;
_this.session = session;
_this.token = token;
_this.server = server;
_this.endpoint = endpoint.replace(":80", "");
_this.vWS = null; // vWS means voice websocket
_this.ready = false;
_this.vWSData = {};
_this.encoder = new AudioEncoder();
_this.udp = null;
_this.playingIntent = null;
_this.playing = false;
_this.streamTime = 0;
_this.streamProc = null;
_this.KAI = null;
_this.init();
return _this;
_EventEmitter.call(this);
this.id = channel.id;
this.voiceChannel = channel;
this.client = client;
this.session = session;
this.token = token;
this.server = server;
this.endpoint = endpoint.replace(":80", "");
this.vWS = null; // vWS means voice websocket
this.ready = false;
this.vWSData = {};
this.encoder = new AudioEncoder();
this.udp = null;
this.playingIntent = null;
this.playing = false;
this.streamTime = 0;
this.streamProc = null;
this.KAI = null;
this.init();
}
_createClass(VoiceConnection, [{
key: "destroy",
value: function destroy() {
VoiceConnection.prototype.destroy = function destroy() {
this.stopPlaying();
if (this.KAI) clearInterval(this.KAI);
this.vWS.close();
@@ -71,20 +61,18 @@ var VoiceConnection = (function (_EventEmitter) {
self_deaf: false
}
});
}
}, {
key: "stopPlaying",
value: function stopPlaying() {
};
VoiceConnection.prototype.stopPlaying = function stopPlaying() {
this.playing = false;
this.playingIntent = null;
if (this.instream) {
this.instream.end();
this.instream.destroy();
}
}
}, {
key: "playStream",
value: function playStream(stream) {
};
VoiceConnection.prototype.playStream = function playStream(stream) {
var self = this;
@@ -154,10 +142,9 @@ var VoiceConnection = (function (_EventEmitter) {
send();
return retStream;
}
}, {
key: "setSpeaking",
value: function setSpeaking(value) {
};
VoiceConnection.prototype.setSpeaking = function setSpeaking(value) {
this.playing = value;
if (this.vWS.readyState === WebSocket.OPEN) this.vWS.send(JSON.stringify({
op: 5,
@@ -166,10 +153,9 @@ var VoiceConnection = (function (_EventEmitter) {
delay: 0
}
}));
}
}, {
key: "sendPacket",
value: function sendPacket(packet) {
};
VoiceConnection.prototype.sendPacket = function sendPacket(packet) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
@@ -181,10 +167,9 @@ var VoiceConnection = (function (_EventEmitter) {
callback(e);
return false;
}
}
}, {
key: "sendBuffer",
value: function sendBuffer(rawbuffer, sequence, timestamp, callback) {
};
VoiceConnection.prototype.sendBuffer = function sendBuffer(rawbuffer, sequence, timestamp, callback) {
var self = this;
self.playing = true;
try {
@@ -202,26 +187,24 @@ var VoiceConnection = (function (_EventEmitter) {
self.emit("error", e);
return false;
}
}
}, {
key: "test",
value: function test() {
};
VoiceConnection.prototype.test = function test() {
this.playFile("C:/users/amish/desktop/audio.mp3").then(function (stream) {
stream.on("time", function (time) {
console.log("Time", time);
});
});
}
}, {
key: "playFile",
value: function playFile(stream) {
var _this2 = this;
};
VoiceConnection.prototype.playFile = function playFile(stream) {
var _this = this;
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
_this2.encoder.encodeFile(stream).catch(error).then(function (data) {
_this.encoder.encodeFile(stream)["catch"](error).then(function (data) {
self.streamProc = data.proc;
var intent = self.playStream(data.stream);
resolve(intent);
@@ -234,17 +217,16 @@ var VoiceConnection = (function (_EventEmitter) {
callback(e);
}
});
}
}, {
key: "playRawStream",
value: function playRawStream(stream) {
var _this3 = this;
};
VoiceConnection.prototype.playRawStream = function playRawStream(stream) {
var _this2 = this;
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
_this3.encoder.encodeStream(stream).catch(error).then(function (data) {
_this2.encoder.encodeStream(stream)["catch"](error).then(function (data) {
self.streamProc = data.proc;
self.instream = data.instream;
var intent = self.playStream(data.stream);
@@ -258,16 +240,15 @@ var VoiceConnection = (function (_EventEmitter) {
callback(e);
}
});
}
}, {
key: "init",
value: function init() {
var _this4 = this;
};
VoiceConnection.prototype.init = function init() {
var _this3 = this;
var self = this;
dns.lookup(this.endpoint, function (err, address, family) {
self.endpoint = address;
var vWS = self.vWS = new WebSocket("wss://" + _this4.endpoint, null, { rejectUnauthorized: false });
var vWS = self.vWS = new WebSocket("wss://" + _this3.endpoint, null, { rejectUnauthorized: false });
var udpClient = self.udp = udp.createSocket("udp4");
var firstPacket = true;
@@ -344,8 +325,7 @@ var VoiceConnection = (function (_EventEmitter) {
}
});
});
}
}]);
};
return VoiceConnection;
})(EventEmitter);

2
package.json
View File

@@ -32,7 +32,7 @@
"babel-preset-es2015": "^6.1.18",
"babel-preset-es2015-loose": "^6.1.2",
"grunt": "~0.4.5",
"grunt-babel": "^5.0.1",
"grunt-babel": "<6.0.0",
"grunt-browserify": "^4.0.0",
"grunt-contrib-uglify": "^0.9.2",
"load-grunt-tasks": "^3.2.0"