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

Fixed catchup implementation

Browse Source
This commit is contained in:
hydrabolt
2015-10-29 18:19:12 +00:00
parent a2ed9bf228
commit 944ad23b22
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Client.js
View File

@@ -2169,8 +2169,10 @@ var Client = (function (_EventEmitter) {
if (self.options.catchup) { if (self.options.catchup) {
// mention_count, last_message_id, id // mention_count, last_message_id, id
rstate.forEach(function (catchup, index) { rstate.forEach(function (catchup, index) {
if (self.options.catchupAll) { if (self.options.catchup === "all") {
self.getChannelLogs(catchup.id, 100000, { after: catchup.last_message_id }).then(function (results) { self.getChannelLogs(catchup.id, 100000, {
after: catchup.last_message_id
}).then(function (results) {
for (var _iterator19 = results, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : _iterator19[Symbol.iterator]();;) { for (var _iterator19 = results, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : _iterator19[Symbol.iterator]();;) {
var _ref19; var _ref19;
@@ -2186,12 +2188,12 @@ var Client = (function (_EventEmitter) {
var m = _ref19; var m = _ref19;
if (self.options.catchupIsolate) self.emit("catchupMessage", m);else self.emit("message", m); self.emit("message", m, true);
} }
self.ack(results[0]); self.ack(results[0]);
}); });
} else { } else if (self.options.catchup) {
self.getChannelLogs(catchup.id, 2500).then(function (results) { self.getChannelLogs(catchup.id, 2500).then(function (results) {
for (var _iterator20 = results, _isArray20 = Array.isArray(_iterator20), _i20 = 0, _iterator20 = _isArray20 ? _iterator20 : _iterator20[Symbol.iterator]();;) { for (var _iterator20 = results, _isArray20 = Array.isArray(_iterator20), _i20 = 0, _iterator20 = _isArray20 ? _iterator20 : _iterator20[Symbol.iterator]();;) {
@@ -2209,7 +2211,7 @@ var Client = (function (_EventEmitter) {
var m = _ref20; var m = _ref20;
if (m.id == catchup.last_message_id) break; if (m.id == catchup.last_message_id) break;
if (self.options.catchupIsolate) self.emit("catchupMessage", m);else self.emit("message", m); self.emit("message", m, true);
} }
self.ack(results[0]); self.ack(results[0]);

20
src/Client.js
View File

@@ -2114,29 +2114,27 @@ class Client extends EventEmitter {
if (self.options.catchup) { if (self.options.catchup) {
// mention_count, last_message_id, id // mention_count, last_message_id, id
rstate.forEach(function (catchup, index) { rstate.forEach(function (catchup, index) {
if(self.options.catchupAll){ if(self.options.catchup === "all"){
self.getChannelLogs(catchup.id, 100000, {after:catchup.last_message_id}).then((results) => { self.getChannelLogs(catchup.id, 100000,
{
after:catchup.last_message_id
}
).then((results) => {
for (var m of results) { for (var m of results) {
if(self.options.catchupIsolate) self.emit("message", m, true);
self.emit("catchupMessage", m);
else
self.emit("message", m);
} }
self.ack(results[0]); self.ack(results[0]);
}); });
}else{ }else if(self.options.catchup){
self.getChannelLogs(catchup.id, 2500).then((results) => { self.getChannelLogs(catchup.id, 2500).then((results) => {
for (var m of results) { for (var m of results) {
if(m.id == catchup.last_message_id) if(m.id == catchup.last_message_id)
break; break;
if(self.options.catchupIsolate) self.emit("message", m, true);
self.emit("catchupMessage", m);
else
self.emit("message", m);
} }
self.ack(results[0]); self.ack(results[0]);

2
test/bot.1.js
View File

@@ -2,7 +2,7 @@ var Discord = require("../");
var Member = require("../lib/Member.js"); var Member = require("../lib/Member.js");
var mybot = new Discord.Client({ var mybot = new Discord.Client({
compress : true, compress : true,
catchup : true catchup : "isolate"
}); });
var fs = require("fs"); var fs = require("fs");
var request = require("request").defaults({ encoding: null }); var request = require("request").defaults({ encoding: null });