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

Added queue update message

Browse Source
This commit is contained in:
hydrabolt
2015-08-30 21:29:27 +01:00
parent 7b1e7d2efa
commit 2fdc5a3ff6
3 changed files with 162 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/Client.js
View File

@@ -368,26 +368,41 @@ var Client = (function () {
var self = this;
return new Promise(function (resolve, reject) {
var prom = new Promise(function (resolve, reject) {
content = content instanceof Array ? content.join("\n") : content;
request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).send({
content: content,
mentions: []
}).end(function (err, res) {
if (err) {
callback(err);
reject(err);
} else {
var msg = new Message(res.body, message.channel, message.mentions, message.sender);
callback(null, msg);
resolve(msg);
message.channel.messages[message.channel.messages.indexOf(message)] = msg;
if (self.options.queue) {
if (!self.queue[message.channel.id]) {
self.queue[message.channel.id] = [];
}
});
self.queue[message.channel.id].push({
action: "updateMessage",
message: message,
content: content,
then: good,
error: bad
});
self.checkQueue(message.channel.id);
} else {
self._updateMessage(message, content).then(good)["catch"](bad);
}
function good(msg) {
prom.message = msg;
callback(null, msg);
resolve(msg);
}
function bad(error) {
prom.error = error;
callback(error);
reject(error);
}
});
return prom;
}
}, {
key: "setUsername",
@@ -551,7 +566,7 @@ var Client = (function () {
var self = this;
return new Promise(function (resolve, reject) {
var prom = new Promise(function (resolve, reject) {
var fstream;
@@ -565,7 +580,7 @@ var Client = (function () {
self.resolveDestination(destination).then(send)["catch"](error);
function send(destination) {
if (~self.options.queue.indexOf("send")) {
if (self.options.queue) {
//queue send file too
if (!self.queue[destination]) {
self.queue[destination] = [];
@@ -587,15 +602,19 @@ var Client = (function () {
}
function good(msg) {
prom.message = msg;
callback(null, msg);
resolve(msg);
}
function bad(err) {
prom.error = err;
callback(err);
reject(err);
}
});
return prom;
}
}, {
key: "sendMessage",
@@ -617,7 +636,7 @@ var Client = (function () {
}
function send(destination) {
if (~self.options.queue.indexOf("send")) {
if (self.options.queue) {
//we're QUEUEING messages, so sending them sequentially based on servers.
if (!self.queue[destination]) {
self.queue[destination] = [];
@@ -1430,6 +1449,25 @@ var Client = (function () {
});
});
}
}, {
key: "_updateMessage",
value: function _updateMessage(message, content) {
var self = this;
return new Promise(function (resolve, reject) {
request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).send({
content: content,
mentions: []
}).end(function (err, res) {
if (err) {
reject(err);
} else {
var msg = new Message(res.body, message.channel, message.mentions, message.sender);
resolve(msg);
message.channel.messages[message.channel.messages.indexOf(message)] = msg;
}
});
});
}
}, {
key: "checkQueue",
value: function checkQueue(channelID) {
@@ -1453,7 +1491,7 @@ var Client = (function () {
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToSend["catch"](err);
msgToSend.error(err);
self.queue[channelID].shift();
doNext();
});
@@ -1465,7 +1503,19 @@ var Client = (function () {
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
fileToSend["catch"](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();
});