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

fix(GuildMemberManager): fetchMany fixes (#6314)

Browse Source
This commit is contained in:
Noel
2021-08-06 15:07:14 +02:00
committed by GitHub
parent 3725dcafc0
commit 52817fc414
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/managers/GuildMemberManager.js
View File

@@ -381,7 +381,7 @@ class GuildMemberManager extends CachedManager {
force = false, force = false,
} = {}) { } = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.guild.memberCount === this.cache.size && !query && !limit && !presences && !user_ids && !force) { if (!query && !limit && !presences && !user_ids && !force) {
resolve(this.cache); resolve(this.cache);
return; return;
} }
@@ -406,18 +406,13 @@ class GuildMemberManager extends CachedManager {
if (chunk.nonce !== nonce) return; if (chunk.nonce !== nonce) return;
i++; i++;
for (const member of members.values()) { for (const member of members.values()) {
if (option) fetchedMembers.set(member.id, member); if (option || force) fetchedMembers.set(member.id, member);
} }
if ( if ((option && members.size < 1000) || (limit && fetchedMembers.size >= limit) || i === chunk.count) {
this.guild.memberCount <= this.cache.size ||
(option && members.size < 1000) ||
(limit && fetchedMembers.size >= limit) ||
i === chunk.count
) {
clearTimeout(timeout); clearTimeout(timeout);
this.client.removeListener(Events.GUILD_MEMBERS_CHUNK, handler); this.client.removeListener(Events.GUILD_MEMBERS_CHUNK, handler);
this.client.decrementMaxListeners(); this.client.decrementMaxListeners();
let fetched = option ? fetchedMembers : this.cache; let fetched = option || force ? fetchedMembers : this.cache;
if (user_ids && !Array.isArray(user_ids) && fetched.size) fetched = fetched.first(); if (user_ids && !Array.isArray(user_ids) && fetched.size) fetched = fetched.first();
resolve(fetched); resolve(fetched);
} }