diff --git a/lib/Client.js b/lib/Client.js index 091424b16..7f9f5c523 100644 --- a/lib/Client.js +++ b/lib/Client.js @@ -1613,87 +1613,6 @@ var Client = (function () { }); }); } - }, { - key: "checkQueue", - value: function checkQueue(channelID) { - var _this = this; - - var self = this; - - if (!this.checkingQueue[channelID]) { - (function () { - var doNext = function doNext() { - if (self.queue[channelID].length === 0) { - done(); - return; - } - var queuedEvent = self.queue[channelID][0]; - switch (queuedEvent.action) { - case "sendMessage": - var msgToSend = queuedEvent; - self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions).then(function (msg) { - msgToSend.then(msg); - self.queue[channelID].shift(); - doNext(); - })["catch"](function (err) { - msgToSend.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "sendFile": - var fileToSend = queuedEvent; - self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName).then(function (msg) { - fileToSend.then(msg); - self.queue[channelID].shift(); - doNext(); - })["catch"](function (err) { - fileToSend.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "updateMessage": - var msgToUpd = queuedEvent; - self._updateMessage(msgToUpd.message, msgToUpd.content).then(function (msg) { - msgToUpd.then(msg); - self.queue[channelID].shift(); - doNext(); - })["catch"](function (err) { - msgToUpd.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "deleteMessage": - var msgToDel = queuedEvent; - self._deleteMessage(msgToDel.message).then(function (msg) { - msgToDel.then(msg); - self.queue[channelID].shift(); - doNext(); - })["catch"](function (err) { - msgToDel.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - default: - done(); - break; - } - }; - - var done = function done() { - self.checkingQueue[channelID] = false; - return; - }; - - //if we aren't already checking this queue. - _this.checkingQueue[channelID] = true; - doNext(); - })(); - } - } }, { key: "getGateway", value: function getGateway() { diff --git a/src/Client.js b/src/Client.js index aa396fb4e..4f6dbfe84 100644 --- a/src/Client.js +++ b/src/Client.js @@ -1355,91 +1355,6 @@ class Client { }); } - checkQueue(channelID) { - - var self = this; - - if (!this.checkingQueue[channelID]) { - //if we aren't already checking this queue. - this.checkingQueue[channelID] = true; - doNext(); - - function doNext() { - if (self.queue[channelID].length === 0) { - done(); - return; - } - var queuedEvent = self.queue[channelID][0]; - switch (queuedEvent.action) { - case "sendMessage": - var msgToSend = queuedEvent; - self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions) - .then(function (msg) { - msgToSend.then(msg); - self.queue[channelID].shift(); - doNext(); - }) - .catch(function (err) { - msgToSend.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "sendFile": - var fileToSend = queuedEvent; - self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName) - .then(function (msg) { - fileToSend.then(msg); - self.queue[channelID].shift(); - doNext(); - }) - .catch(function (err) { - fileToSend.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "updateMessage": - var msgToUpd = queuedEvent; - self._updateMessage(msgToUpd.message, msgToUpd.content) - .then(function (msg) { - msgToUpd.then(msg); - self.queue[channelID].shift(); - doNext(); - }) - .catch(function (err) { - msgToUpd.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - case "deleteMessage": - var msgToDel = queuedEvent; - self._deleteMessage(msgToDel.message) - .then(function (msg) { - msgToDel.then(msg); - self.queue[channelID].shift(); - doNext(); - }) - .catch(function (err) { - msgToDel.error(err); - self.queue[channelID].shift(); - doNext(); - }); - break; - default: - done(); - break; - } - } - - function done() { - self.checkingQueue[channelID] = false; - return; - } - } - } - getGateway() { var self = this; return new Promise(function (resolve, reject) {