From b74c1b70b6522a2dea03659b813f7a2cce80545d Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Sun, 18 Dec 2016 15:06:42 -0600 Subject: [PATCH] fix 992 (#994) --- src/client/Client.js | 3 --- src/client/ClientManager.js | 17 +++++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/client/Client.js b/src/client/Client.js index 6a06facd9..907f3e033 100644 --- a/src/client/Client.js +++ b/src/client/Client.js @@ -249,9 +249,6 @@ class Client extends EventEmitter { for (const i of this._intervals) clearInterval(i); this._timeouts.clear(); this._intervals.clear(); - this.token = null; - this.email = null; - this.password = null; return this.manager.destroy(); } diff --git a/src/client/ClientManager.js b/src/client/ClientManager.js index 6e5ea5159..01f664b0e 100644 --- a/src/client/ClientManager.js +++ b/src/client/ClientManager.js @@ -59,14 +59,15 @@ class ClientManager { } destroy() { - return new Promise(resolve => { - this.client.ws.destroy(); - if (!this.client.user.bot) { - resolve(this.client.rest.methods.logout()); - } else { - resolve(); - } - }); + this.client.ws.destroy(); + if (this.client.user.bot) { + this.client.token = null; + return Promise.resolve(); + } else { + return this.client.rest.methods.logout().then(() => { + this.client.token = null; + }); + } } }