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

simplify client destruction

Browse source
This commit is contained in:
Amish Shah 2016-10-26 19:52:41 +01:00
parent 5e2ee2398e
commit 00fe45f6b3
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/Client.js
View file

@ -234,16 +234,14 @@ class Client extends EventEmitter {
* @returns {Promise}
*/
destroy() {
return new Promise((resolve, reject) => {
for (const t of this._timeouts) clearTimeout(t);
for (const i of this._intervals) clearInterval(i);
this._timeouts = [];
this._intervals = [];
this.token = null;
this.email = null;
this.password = null;
this.manager.destroy().then(resolve).catch(reject);
});
for (const t of this._timeouts) clearTimeout(t);
for (const i of this._intervals) clearInterval(i);
this._timeouts = [];
this._intervals = [];
this.token = null;
this.email = null;
this.password = null;
return this.manager.destroy();
}
/**

2
src/client/ClientManager.js
View file

@ -59,10 +59,10 @@ class ClientManager {
destroy() {
return new Promise((resolve) => {
this.client.ws.destroy();
if (!this.client.user.bot) {
this.client.rest.methods.logout().then(resolve);
} else {
this.client.ws.destroy();
resolve();
}
});