Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-15 02:53: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; var self = this;
return new Promise(function (resolve, reject) { var prom = new Promise(function (resolve, reject) {
content = content instanceof Array ? content.join("\n") : content; content = content instanceof Array ? content.join("\n") : content;
request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).send({ if (self.options.queue) {
content: content, if (!self.queue[message.channel.id]) {
mentions: [] self.queue[message.channel.id] = [];
}).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;
} }
}); 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", key: "setUsername",
@@ -551,7 +566,7 @@ var Client = (function () {
var self = this; var self = this;
return new Promise(function (resolve, reject) { var prom = new Promise(function (resolve, reject) {
var fstream; var fstream;
@@ -565,7 +580,7 @@ var Client = (function () {
self.resolveDestination(destination).then(send)["catch"](error); self.resolveDestination(destination).then(send)["catch"](error);
function send(destination) { function send(destination) {
if (~self.options.queue.indexOf("send")) { if (self.options.queue) {
//queue send file too //queue send file too
if (!self.queue[destination]) { if (!self.queue[destination]) {
self.queue[destination] = []; self.queue[destination] = [];
@@ -587,15 +602,19 @@ var Client = (function () {
} }
function good(msg) { function good(msg) {
prom.message = msg;
callback(null, msg); callback(null, msg);
resolve(msg); resolve(msg);
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
}, { }, {
key: "sendMessage", key: "sendMessage",
@@ -617,7 +636,7 @@ var Client = (function () {
} }
function send(destination) { function send(destination) {
if (~self.options.queue.indexOf("send")) { if (self.options.queue) {
//we're QUEUEING messages, so sending them sequentially based on servers. //we're QUEUEING messages, so sending them sequentially based on servers.
if (!self.queue[destination]) { if (!self.queue[destination]) {
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", key: "checkQueue",
value: function checkQueue(channelID) { value: function checkQueue(channelID) {
@@ -1453,7 +1491,7 @@ var Client = (function () {
self.queue[channelID].shift(); self.queue[channelID].shift();
doNext(); doNext();
})["catch"](function (err) { })["catch"](function (err) {
msgToSend["catch"](err); msgToSend.error(err);
self.queue[channelID].shift(); self.queue[channelID].shift();
doNext(); doNext();
}); });
@@ -1465,7 +1503,19 @@ var Client = (function () {
self.queue[channelID].shift(); self.queue[channelID].shift();
doNext(); doNext();
})["catch"](function (err) { })["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(); self.queue[channelID].shift();
doNext(); doNext();
}); });

97
src/Client.js
View File

@@ -406,31 +406,42 @@ class Client {
var self = this; var self = this;
return new Promise(function (resolve, reject) { var prom = new Promise(function (resolve, reject) {
content = (content instanceof Array ? content.join("\n") : content); content = (content instanceof Array ? content.join("\n") : content);
request if(self.options.queue){
.patch(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`) if (!self.queue[message.channel.id]) {
.set("authorization", self.token) self.queue[message.channel.id] = [];
.send({ }
self.queue[message.channel.id].push({
action: "updateMessage",
message: message,
content: content, content: content,
mentions: [] then: good,
}) error: bad
.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;
}
}); });
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;
} }
setUsername(newName, callback = function (err) { }) { setUsername(newName, callback = function (err) { }) {
@@ -563,7 +574,7 @@ class Client {
var self = this; var self = this;
return new Promise(function (resolve, reject) { var prom = new Promise(function (resolve, reject) {
var fstream; var fstream;
@@ -577,7 +588,7 @@ class Client {
self.resolveDestination(destination).then(send).catch(error); self.resolveDestination(destination).then(send).catch(error);
function send(destination) { function send(destination) {
if(~self.options.queue.indexOf("send")){ if(self.options.queue){
//queue send file too //queue send file too
if (!self.queue[destination]) { if (!self.queue[destination]) {
self.queue[destination] = []; self.queue[destination] = [];
@@ -599,17 +610,21 @@ class Client {
} }
function good(msg) { function good(msg) {
prom.message = msg;
callback(null, msg); callback(null, msg);
resolve(msg); resolve(msg);
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
sendMessage(destination, message, callback = function (err, msg) { }, premessage = "") { sendMessage(destination, message, callback = function (err, msg) { }, premessage = "") {
@@ -628,7 +643,7 @@ class Client {
} }
function send(destination) { function send(destination) {
if (~self.options.queue.indexOf("send")) { if (self.options.queue) {
//we're QUEUEING messages, so sending them sequentially based on servers. //we're QUEUEING messages, so sending them sequentially based on servers.
if (!self.queue[destination]) { if (!self.queue[destination]) {
self.queue[destination] = []; self.queue[destination] = [];
@@ -1189,6 +1204,28 @@ class Client {
} }
_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;
}
});
});
}
checkQueue(channelID) { checkQueue(channelID) {
var self = this; var self = this;
@@ -1214,7 +1251,7 @@ class Client {
doNext(); doNext();
}) })
.catch(function (err) { .catch(function (err) {
msgToSend.catch(err); msgToSend.error(err);
self.queue[channelID].shift(); self.queue[channelID].shift();
doNext(); doNext();
}); });
@@ -1228,11 +1265,25 @@ class Client {
doNext(); doNext();
}) })
.catch(function(err){ .catch(function(err){
fileToSend.catch(err); fileToSend.error(err);
self.queue[channelID].shift(); self.queue[channelID].shift();
doNext(); doNext();
}); });
break; 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;
default: default:
done(); done();
break; break;

26
test/bot.1.js
View File

@@ -1,37 +1,37 @@
var Discord = require("../"); var Discord = require("../");
var mybot = new Discord.Client({ var mybot = new Discord.Client({
queue : ["send"] queue: ["send"]
}); });
var fs = require("fs"); var fs = require("fs");
var server, channel, message, sentMessage = false; var server, channel, message, sentMessage = false;
mybot.on("message", function(message){ mybot.on("message", function (message) {
if( mybot.user.equals(message.sender) ){ if (mybot.user.equals(message.sender)) {
return; return;
} }
if( message.content !== "$$$" ){ if (message.content !== "$$$") {
return; return;
} }
var action1 = mybot.sendMessage(message.channel, "this is message " + 1); var action1 = mybot.sendMessage(message.channel, "this is message " + 1);
var action1 = mybot.sendFile(message.channel, fs.createReadStream("./test/image.png"));
var action2 = mybot.sendMessage(message.channel, "this is message " + 2).then(log); var action2 = mybot.sendMessage(message.channel, "this is message " + 2).then(log);
var action1 = mybot.sendFile(message.channel, fs.createReadStream("./test/image.png"));
var action2 = mybot.sendMessage(message.channel, "this is message " + 3).then(log);
var action1 = mybot.sendFile(message.channel, fs.createReadStream("./test/image.png"));
var action2 = mybot.sendMessage(message.channel, "this is message " + 4).then(log);
var action1 = mybot.sendFile(message.channel, fs.createReadStream("./test/image.png"));
var action2 = mybot.sendMessage(message.channel, "this is message " + 5).then(log);
function log(){ function log() {
console.log("w", action1.message);
mybot.updateMessage(action1.message, "blurg");
mybot.sendMessage(message.channel, "This is message 3 million minus the million so basically just 3");
} }
}); });
function error(err){ function dump(msg) {
console.log(msg);
}
function error(err) {
console.log(err); console.log(err);
} }