Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 12:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented queuing

Browse Source
This commit is contained in:
hydrabolt
2015-08-29 19:47:11 +01:00
parent b45d60eee8
commit bb53b65cf5
3 changed files with 106 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Client.js
View File

@@ -19,7 +19,7 @@ var WebSocket = require("ws");
var fs = require("fs"); var fs = require("fs");
var defaultOptions = { var defaultOptions = {
queue: false queue: []
}; };
var Client = (function () { var Client = (function () {
@@ -35,7 +35,7 @@ var Client = (function () {
further efforts will be made to connect. further efforts will be made to connect.
*/ */
this.options = options; this.options = options;
this.options.queue = this.options.queue || false; this.options.queue = this.options.queue || [];
this.token = token; this.token = token;
this.state = 0; this.state = 0;
this.websocket = null; this.websocket = null;
@@ -605,14 +605,14 @@ var Client = (function () {
} }
function send(destination) { function send(destination) {
if (~self.options.queue.indexOf("sendMessage")) {
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.messageQueue[destination]) { if (!self.messageQueue[destination]) {
self.messageQueue[destination] = []; self.messageQueue[destination] = [];
} }
self.messageQueue[destination].push({ self.messageQueue[destination].push({
action: "sendMessage",
content: message, content: message,
mentions: mentions, mentions: mentions,
then: [resolve, callback], then: [resolve, callback],
@@ -1405,18 +1405,26 @@ var Client = (function () {
done(); done();
return; return;
} }
var msgToSend = self.messageQueue[channelID][0]; var queuedEvent = self.messageQueue[channelID][0];
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) { switch (queuedEvent.action) {
msgToSend.then[0](msg); case "sendMessage":
msgToSend.then[1](null, msg); var msgToSend = queuedEvent;
self.messageQueue[channelID].shift(); self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) {
doNext(); msgToSend.then[0](msg);
})["catch"](function (err) { msgToSend.then[1](null, msg);
msgToSend["catch"][0](err); self.messageQueue[channelID].shift();
msgToSend["catch"][1](err); doNext();
self.messageQueue[channelID].shift(); })["catch"](function (err) {
doNext(); msgToSend["catch"][0](err);
}); msgToSend["catch"][1](err);
self.messageQueue[channelID].shift();
doNext();
});
break;
default:
done();
break;
}
}; };
var done = function done() { var done = function done() {

120
src/Client.js
View File

@@ -13,7 +13,7 @@ var WebSocket = require("ws");
var fs = require("fs"); var fs = require("fs");
var defaultOptions = { var defaultOptions = {
queue: false queue: []
} }
class Client { class Client {
@@ -25,7 +25,7 @@ class Client {
further efforts will be made to connect. further efforts will be made to connect.
*/ */
this.options = options; this.options = options;
this.options.queue = this.options.queue || false; this.options.queue = this.options.queue || [];
this.token = token; this.token = token;
this.state = 0; this.state = 0;
this.websocket = null; this.websocket = null;
@@ -623,33 +623,33 @@ class Client {
} }
function send(destination) { function send(destination) {
if (~self.options.queue.indexOf("sendMessage")) {
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.messageQueue[destination]){ if (!self.messageQueue[destination]) {
self.messageQueue[destination] = []; self.messageQueue[destination] = [];
} }
self.messageQueue[destination].push({ self.messageQueue[destination].push({
content : message, action: "sendMessage",
mentions : mentions, content: message,
then : [resolve, callback], mentions: mentions,
error : [reject, callback] then: [resolve, callback],
error: [reject, callback]
}); });
self.checkQueue(destination); self.checkQueue(destination);
}else{ } else {
self._sendMessage(destination, message, mentions).then(mgood).catch(mbad); self._sendMessage(destination, message, mentions).then(mgood).catch(mbad);
} }
} }
function mgood(msg){ function mgood(msg) {
callback(null, msg); callback(null, msg);
resolve(msg); resolve(msg);
} }
function mbad(error){ function mbad(error) {
callback(error); callback(error);
reject(error); reject(error);
} }
@@ -1112,76 +1112,84 @@ class Client {
}); });
} }
_sendMessage(destination, content, mentions){ _sendMessage(destination, content, mentions) {
var self = this; var self = this;
return new Promise(function(resolve, reject){ return new Promise(function (resolve, reject) {
request request
.post(`${Endpoints.CHANNELS}/${destination}/messages`) .post(`${Endpoints.CHANNELS}/${destination}/messages`)
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
content: content, content: content,
mentions: mentions mentions: mentions
}) })
.end(function (err, res) { .end(function (err, res) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
var data = res.body; var data = res.body;
var mentions = []; var mentions = [];
data.mentions = data.mentions || []; //for some reason this was not defined at some point? data.mentions = data.mentions || []; //for some reason this was not defined at some point?
for (var mention of data.mentions) { for (var mention of data.mentions) {
mentions.push(self.addUser(mention)); mentions.push(self.addUser(mention));
}
var channel = self.getChannel("id", data.channel_id);
if (channel) {
var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
resolve(msg);
}
} }
}); var channel = self.getChannel("id", data.channel_id);
if (channel) {
var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
resolve(msg);
}
}
});
}); });
} }
checkQueue(channelID){ checkQueue(channelID) {
var self = this; var self = this;
if(!this.checkingQueue[channelID]){ if (!this.checkingQueue[channelID]) {
//if we aren't already checking this queue. //if we aren't already checking this queue.
this.checkingQueue[channelID] = true; this.checkingQueue[channelID] = true;
doNext(); doNext();
function doNext(){ function doNext() {
if(self.messageQueue[channelID].length === 0){ if (self.messageQueue[channelID].length === 0) {
done(); done();
return; return;
} }
var msgToSend = self.messageQueue[channelID][0]; var queuedEvent = self.messageQueue[channelID][0];
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions) switch (queuedEvent.action) {
.then(function(msg){ case "sendMessage":
msgToSend.then[0](msg); var msgToSend = queuedEvent;
msgToSend.then[1](null, msg); self._sendMessage(channelID, msgToSend.content, msgToSend.mentions)
self.messageQueue[channelID].shift(); .then(function (msg) {
doNext(); msgToSend.then[0](msg);
}) msgToSend.then[1](null, msg);
.catch(function(err){ self.messageQueue[channelID].shift();
msgToSend.catch[0](err); doNext();
msgToSend.catch[1](err); })
self.messageQueue[channelID].shift(); .catch(function (err) {
doNext(); msgToSend.catch[0](err);
}); msgToSend.catch[1](err);
self.messageQueue[channelID].shift();
doNext();
});
break;
default:
done();
break;
}
} }
function done(){ function done() {
self.checkingQueue[channelID] = false; self.checkingQueue[channelID] = false;
return; return;
} }

13
test/bot.1.js
View File

@@ -1,6 +1,6 @@
var Discord = require("../"); var Discord = require("../");
var mybot = new Discord.Client({ var mybot = new Discord.Client({
queue : true queue : ["sendMessage"]
}); });
var server, channel, message, sentMessage = false; var server, channel, message, sentMessage = false;
@@ -8,14 +8,9 @@ var server, channel, message, sentMessage = false;
mybot.on("message", function(message){ mybot.on("message", function(message){
if(message.content === "$$$"){ if(message.content === "$$$"){
mybot.sendMessage(message.channel, "this is part 1"); for(var x=1;x<=10;x++){
mybot.sendMessage(message.channel, "this is part 2"); mybot.sendMessage(message.channel, "this is message " + x);
mybot.sendMessage(message.channel, "this is part 3"); }
mybot.sendMessage(message.channel, "this is part 4");
mybot.sendMessage(message.channel, "this is part 5");
mybot.sendMessage(message.channel, "this is part 6");
mybot.sendMessage(message.channel, "this is part 7");
mybot.sendMessage(message.channel, "this is part 8");
} }
}); });