From 7b24127de5b346af6a6ae974922925c2cdb3e635 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Sat, 20 Feb 2016 19:08:48 -0800 Subject: [PATCH] ready fires after forceFetchUsers if option is true --- lib/Client/InternalClient.js | 7 +++++-- src/Client/InternalClient.js | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index 2fa0b7501..a35ffbd45 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -1383,14 +1383,17 @@ var InternalClient = (function () { }); self.state = _ConnectionState2["default"].READY; - client.emit("ready"); client.emit("debug", "ready packet took " + (Date.now() - startTime) + "ms to process"); client.emit("debug", "ready with " + self.servers.length + " servers, " + self.channels.length + " channels and " + self.users.length + " users cached."); self.readyTime = Date.now(); if (self.client.options.forceFetchUsers) { - self.forceFetchUsers(); + self.forceFetchUsers().then(function () { + client.emit("ready"); + }); + } else { + client.emit("ready"); } break; diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index a13fa6a90..17ed2aa72 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -1156,14 +1156,15 @@ export default class InternalClient { }); self.state = ConnectionState.READY; - client.emit("ready"); client.emit("debug", `ready packet took ${Date.now() - startTime}ms to process`); client.emit("debug", `ready with ${self.servers.length} servers, ${self.channels.length} channels and ${self.users.length} users cached.`); self.readyTime = Date.now(); if (self.client.options.forceFetchUsers) { - self.forceFetchUsers(); + self.forceFetchUsers().then(() => {client.emit("ready")}); + } else { + client.emit("ready"); } break;