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

update fetch member to work in a more consistent way (#1696)

Browse Source 
* Update Guild.js

* Update Guild.js
This commit is contained in:
Gus Caplan
2017-07-20 19:11:12 -05:00
committed by Crawl
parent edfd50d003
commit 8cf95dc9b3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/structures/Guild.js
View File

@@ -499,14 +499,15 @@ class Guild {
/** /**
* Fetches all the members in the guild, even if they are offline. If the guild has less than 250 members, * Fetches all the members in the guild, even if they are offline. If the guild has less than 250 members,
* this should not be necessary. * this should not be necessary.
* @param {string} [query=''] Limit fetch to members with similar usernames * @param {Object} [options] Options for the fetch operation
* @param {number} [limit=0] Maximum number of members to request * @param {string} [options.query=''] Limit fetch to members with similar usernames
* @param {number} [options.limit=0] Maximum number of members to request
* @returns {Promise<Collection<Snowflake, GuildMember>>} * @returns {Promise<Collection<Snowflake, GuildMember>>}
*/ */
fetchMembers(query = '', limit = 0) { fetchMembers({ query = '', limit = 0 }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.memberCount === this.members.size) { if (this.memberCount === this.members.size) {
resolve(new Collection()); resolve((query || limit) ? new Collection() : this.members);
return; return;
} }
this.client.ws.send({ this.client.ws.send({
@@ -520,17 +521,19 @@ class Guild {
const fetchedMembers = new Collection(); const fetchedMembers = new Collection();
const handler = (members, guild) => { const handler = (members, guild) => {
if (guild.id !== this.id) return; if (guild.id !== this.id) return;
for (const member of members.values()) fetchedMembers.set(member.user.id, member); for (const member of members.values()) {
if (query || limit) fetchedMembers.set(member.user.id, member);
}
if (this.memberCount === this.members.size || ((query || limit) && members.size < 1000)) { if (this.memberCount === this.members.size || ((query || limit) && members.size < 1000)) {
this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
resolve(fetchedMembers); resolve((query || limit) ? fetchedMembers : this.members);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.client.on(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
this.client.setTimeout(() => { this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
reject(new Error('Members didn\'t arrive in time.')); reject(new Error('Members didn\'t arrive in time.'));
}, 120 * 1000); }, 120e3);
}); });
} }