From c93ed88daf173d91a605fbd18ae931d7441a69e5 Mon Sep 17 00:00:00 2001 From: meew0 Date: Fri, 29 Jan 2016 22:46:42 +0100 Subject: [PATCH] Rebuild for voice moving --- lib/Client/InternalClient.js | 101 ++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index bf6db93d7..4e0762ff8 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -697,34 +697,35 @@ var InternalClient = (function () { // def moveMember InternalClient.prototype.moveMember = function moveMember(user, server, channel) { + var _this19 = this; + user = this.resolver.resolveUser(user); server = this.resolver.resolveServer(server); - channel = this.resolver.resolveChannel(channel); - - console.log(channel.type); - // Make sure `channel` is a voice channel - if (channel.type !== "voice") { - throw new Error("Can't moveMember into a non-voice channel"); - } else { - return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { channel_id: channel.id }).then(function (res) { - user.voiceChannel = channel; - return res; - }); - } + return this.resolver.resolveChannel(channel).then(function (channel) { + // Make sure `channel` is a voice channel + if (channel.type !== "voice") { + throw new Error("Can't moveMember into a non-voice channel"); + } else { + return _this19.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { channel_id: channel.id }).then(function (res) { + user.voiceChannel = channel; + return res; + }); + } + }); }; // def createRole InternalClient.prototype.createRole = function createRole(server, data) { - var _this19 = this; + var _this20 = this; server = this.resolver.resolveServer(server); return this.apiRequest("post", _Constants.Endpoints.SERVER_ROLES(server.id), true).then(function (res) { - var role = server.roles.add(new _StructuresRole2["default"](res, server, _this19.client)); + var role = server.roles.add(new _StructuresRole2["default"](res, server, _this20.client)); if (data) { - return _this19.updateRole(role, data); + return _this20.updateRole(role, data); } return role; }); @@ -733,7 +734,7 @@ var InternalClient = (function () { // def updateRole InternalClient.prototype.updateRole = function updateRole(role, data) { - var _this20 = this; + var _this21 = this; var server = this.resolver.resolveServer(role.server); @@ -769,7 +770,7 @@ var InternalClient = (function () { } return this.apiRequest("patch", _Constants.Endpoints.SERVER_ROLES(server.id) + "/" + role.id, true, newData).then(function (res) { - return server.roles.update(role, new _StructuresRole2["default"](res, server, _this20.client)); + return server.roles.update(role, new _StructuresRole2["default"](res, server, _this21.client)); }); }; @@ -914,7 +915,7 @@ var InternalClient = (function () { // def createInvite InternalClient.prototype.createInvite = function createInvite(chanServ, options) { - var _this21 = this; + var _this22 = this; if (chanServ instanceof _StructuresChannel2["default"]) { // do something @@ -947,7 +948,7 @@ var InternalClient = (function () { } return this.apiRequest("post", epoint, true, options).then(function (res) { - return new _StructuresInvite2["default"](res, _this21.channels.get("id", res.channel.id), _this21.client); + return new _StructuresInvite2["default"](res, _this22.channels.get("id", res.channel.id), _this22.client); }); }; @@ -964,7 +965,7 @@ var InternalClient = (function () { //def getInvite InternalClient.prototype.getInvite = function getInvite(invite) { - var _this22 = this; + var _this23 = this; invite = this.resolver.resolveInviteID(invite); if (!invite) { @@ -972,11 +973,11 @@ var InternalClient = (function () { } return this.apiRequest("get", _Constants.Endpoints.INVITE(invite), true).then(function (res) { - if (!_this22.channels.has("id", res.channel.id)) { - return new _StructuresInvite2["default"](res, null, _this22.client); + if (!_this23.channels.has("id", res.channel.id)) { + return new _StructuresInvite2["default"](res, null, _this23.client); } - return _this22.apiRequest("post", _Constants.Endpoints.CHANNEL_INVITES(res.channel.id), true, { validate: invite }).then(function (res2) { - return new _StructuresInvite2["default"](res2, _this22.channels.get("id", res.channel.id), _this22.client); + return _this23.apiRequest("post", _Constants.Endpoints.CHANNEL_INVITES(res.channel.id), true, { validate: invite }).then(function (res2) { + return new _StructuresInvite2["default"](res2, _this23.channels.get("id", res.channel.id), _this23.client); }); }); }; @@ -984,22 +985,22 @@ var InternalClient = (function () { //def getInvites InternalClient.prototype.getInvites = function getInvites(channel) { - var _this23 = this; + var _this24 = this; if (!(channel instanceof _StructuresChannel2["default"])) { var server = this.resolver.resolveServer(channel); if (server) { return this.apiRequest("get", _Constants.Endpoints.SERVER_INVITES(server.id), true).then(function (res) { return res.map(function (data) { - return new _StructuresInvite2["default"](data, _this23.channels.get("id", data.channel.id), _this23.client); + return new _StructuresInvite2["default"](data, _this24.channels.get("id", data.channel.id), _this24.client); }); }); } } return this.resolver.resolveChannel(channel).then(function (channel) { - return _this23.apiRequest("get", _Constants.Endpoints.CHANNEL_INVITES(channel.id), true).then(function (res) { + return _this24.apiRequest("get", _Constants.Endpoints.CHANNEL_INVITES(channel.id), true).then(function (res) { return res.map(function (data) { - return new _StructuresInvite2["default"](data, _this23.channels.get("id", data.channel.id), _this23.client); + return new _StructuresInvite2["default"](data, _this24.channels.get("id", data.channel.id), _this24.client); }); }); }); @@ -1008,7 +1009,7 @@ var InternalClient = (function () { //def overwritePermissions InternalClient.prototype.overwritePermissions = function overwritePermissions(channel, role, updated) { - var _this24 = this; + var _this25 = this; return this.resolver.resolveChannel(channel).then(function (channel) { var user; @@ -1049,7 +1050,7 @@ var InternalClient = (function () { } } - return _this24.apiRequest("put", _Constants.Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id, true, data); + return _this25.apiRequest("put", _Constants.Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id, true, data); }); }; @@ -1085,49 +1086,49 @@ var InternalClient = (function () { //def sendTyping InternalClient.prototype.sendTyping = function sendTyping(channel) { - var _this25 = this; + var _this26 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - return _this25.apiRequest("post", _Constants.Endpoints.CHANNEL(channel.id) + "/typing", true); + return _this26.apiRequest("post", _Constants.Endpoints.CHANNEL(channel.id) + "/typing", true); }); }; //def startTyping InternalClient.prototype.startTyping = function startTyping(channel) { - var _this26 = this; + var _this27 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - if (_this26.intervals.typing[channel.id]) { + if (_this27.intervals.typing[channel.id]) { // typing interval already exists, leave it alone throw new Error("Already typing in that channel"); } - _this26.intervals.typing[channel.id] = setInterval(function () { - return _this26.sendTyping(channel)["catch"](function (error) { - return _this26.emit("error", error); + _this27.intervals.typing[channel.id] = setInterval(function () { + return _this27.sendTyping(channel)["catch"](function (error) { + return _this27.emit("error", error); }); }, 4000); - return _this26.sendTyping(channel); + return _this27.sendTyping(channel); }); }; //def stopTyping InternalClient.prototype.stopTyping = function stopTyping(channel) { - var _this27 = this; + var _this28 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - if (!_this27.intervals.typing[channel.id]) { + if (!_this28.intervals.typing[channel.id]) { // typing interval doesn"t exist throw new Error("Not typing in that channel"); } - clearInterval(_this27.intervals.typing[channel.id]); - _this27.intervals.typing[channel.id] = false; + clearInterval(_this28.intervals.typing[channel.id]); + _this28.intervals.typing[channel.id] = false; }); }; @@ -1158,12 +1159,12 @@ var InternalClient = (function () { //def setChannelTopic InternalClient.prototype.setChannelTopic = function setChannelTopic(chann) { - var _this28 = this; + var _this29 = this; var topic = arguments.length <= 1 || arguments[1] === undefined ? "" : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this28.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this29.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: channel.name, position: channel.position, topic: topic @@ -1176,12 +1177,12 @@ var InternalClient = (function () { //def setChannelName InternalClient.prototype.setChannelName = function setChannelName(chann) { - var _this29 = this; + var _this30 = this; var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this29.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this30.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: name, position: channel.position, topic: channel.topic @@ -1194,13 +1195,13 @@ var InternalClient = (function () { //def setChannelNameAndTopic InternalClient.prototype.setChannelNameAndTopic = function setChannelNameAndTopic(chann) { - var _this30 = this; + var _this31 = this; var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1]; var topic = arguments.length <= 2 || arguments[2] === undefined ? "" : arguments[2]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this30.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this31.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: name, position: channel.position, topic: topic @@ -1214,12 +1215,12 @@ var InternalClient = (function () { //def setTopic InternalClient.prototype.setChannelPosition = function setChannelPosition(chann) { - var _this31 = this; + var _this32 = this; var position = arguments.length <= 1 || arguments[1] === undefined ? 0 : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this31.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this32.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: channel.name, position: position, topic: channel.topic