Promisified Guild#fetchAllMembers

lib/gateway/Shard.js

@@ -144,6 +144,15 @@ class Shard extends EventEmitter {
         this.connecting = false;
         this.ready = false;
         this.preReady = false;
+        if(this.requestMembersPromise !== undefined) {
+            for(const guildID in this.requestMembersPromise) {
+                if(!this.requestMembersPromise.hasOwnProperty(guildID))
+                    continue;
+                clearTimeout(this.requestMembersPromise[guildID].timeout);
+                this.requestMembersPromise[guildID].res();
+            }
+        }
+        this.requestMembersPromise = {};
         this.getAllUsersCount = {};
         this.getAllUsersQueue = [];
         this.getAllUsersLength = 1;
@@ -1134,6 +1143,11 @@ class Shard extends EventEmitter {
                 if(this.getAllUsersCount.hasOwnProperty(guild.id)) {
                     if(this.getAllUsersCount[guild.id] <= 1) {
                         delete this.getAllUsersCount[guild.id];
+                        if(this.requestMembersPromise.hasOwnProperty(guild.id)) {
+                            clearTimeout(this.requestMembersPromise[guild.id].timeout);
+                            this.requestMembersPromise[guild.id].res();
+                            delete this.requestMembersPromise[guild.id];
+                        }
                         this.checkReady();
                     } else {
                         --this.getAllUsersCount[guild.id];
@@ -1495,6 +1509,14 @@ class Shard extends EventEmitter {
             this.getAllUsersLength = 1 + guildID.length + 3;
         } else if(this.ready) {
             this.requestGuildMembers([guildID]);
+
+            return new Promise(res => this.requestMembersPromise[guildID] = {
+                res,
+                timeout: setTimeout(() => {
+                    delete this.requestMembersPromise[guildID];
+                    res();
+                }, this.client.options.requestTimeout)
+            });
         } else {
             this.getAllUsersQueue.push(guildID);
             this.getAllUsersLength += guildID.length + 3;

lib/structures/Guild.js

@@ -149,9 +149,10 @@ class Guild extends Base {
 
     /**
     * Request all guild members from Discord
+    * @returns {Promise} Resolves once all guild members are fetched
     */
     fetchAllMembers() {
-        this.shard.getGuildMembers(this.id, Math.ceil(this.memberCount / 1000)); // TODO Promise with chunk timeout
+        return this.shard.getGuildMembers(this.id, Math.ceil(this.memberCount / 1000));
     }
 
     get iconURL() {