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

src/client/Client.js

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

src/client/ClientManager.js

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

src/client/rest/RESTMethods.js

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

test/destroy.js

@@ -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());