dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-09 05:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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,7 +1405,10 @@ var Client = (function () {
done(); done();
return; return;
} }
var msgToSend = self.messageQueue[channelID][0]; var queuedEvent = self.messageQueue[channelID][0];
switch (queuedEvent.action) {
case "sendMessage":
var msgToSend = queuedEvent;
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) { self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) {
msgToSend.then[0](msg); msgToSend.then[0](msg);
msgToSend.then[1](null, msg); msgToSend.then[1](null, msg);
@ -1417,6 +1420,11 @@ var Client = (function () {
self.messageQueue[channelID].shift(); self.messageQueue[channelID].shift();
doNext(); doNext();
}); });
break;
default:
done();
break;
}
}; };
var done = function done() { var done = function done() {

18
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,14 +623,14 @@ 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({
action: "sendMessage",
content: message, content: message,
mentions: mentions, mentions: mentions,
then: [resolve, callback], then: [resolve, callback],
@ -1165,7 +1165,10 @@ class Client {
done(); done();
return; return;
} }
var msgToSend = self.messageQueue[channelID][0]; var queuedEvent = self.messageQueue[channelID][0];
switch (queuedEvent.action) {
case "sendMessage":
var msgToSend = queuedEvent;
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions) self._sendMessage(channelID, msgToSend.content, msgToSend.mentions)
.then(function (msg) { .then(function (msg) {
msgToSend.then[0](msg); msgToSend.then[0](msg);
@ -1179,6 +1182,11 @@ class Client {
self.messageQueue[channelID].shift(); self.messageQueue[channelID].shift();
doNext(); doNext();
}); });
break;
default:
done();
break;
}
} }
function done() { function done() {

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");
} }
}); });