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

Merge branch 'indev' of https://github.com/hydrabolt/discord.js into indev

Browse Source
This commit is contained in:
Amish Shah
2016-10-26 19:18:19 +01:00
parent 996c9b45e2 7d04863b66
commit 4e37e47e64
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/Client.js
View File

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

13
src/client/ClientManager.js
View File

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

2
src/client/rest/RESTMethods.js
View File

@@ -36,7 +36,7 @@ class RESTMethods {
} }
logout() { logout() {
return this.rest.makeRequest('post', Constants.Endpoints.logout, true, {}); return this.rest.makeRequest('post', Constants.Endpoints.logout, true);
} }
getGateway() { getGateway() {

12
test/destroy.js
View File

@@ -1,12 +0,0 @@
'use strict';
const Discord = require('../');
const client = new Discord.Client({ fetch_all_members: false, api_request_method: 'sequential' });
const { email, password, token } = require('./auth.json');
let p = client.login(token);
p = p.then(() => client.destroy());
p = p.then(() => client.login(token));
p = p.then(() => client.destroy());