diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts index 7392cc6f3..47c065fe6 100644 --- a/src/handlers/guild.ts +++ b/src/handlers/guild.ts @@ -417,11 +417,27 @@ export async function pruneMembers(guildID: string, options: PruneOptions) { ); } +/** + * ⚠️ BEGINNER DEVS!! YOU SHOULD ALMOST NEVER NEED THIS AND YOU CAN GET FROM cache.members.get() + * + * ADVANCED: + * Highly recommended to use this function to fetch members instead of getMember from REST. + * REST: 50/s global(across all shards) rate limit with ALL requests this included + * GW(this function): 120/m(PER shard) rate limit. Meaning if you have 8 shards your limit is now 960/m. +*/ export function fetchMembers(guild: Guild, options?: FetchMembersOptions) { - if (!(identifyPayload.intents & Intents.GUILD_MEMBERS)) { + // You can request 1 member without the intent + if ( + (!options?.limit || options.limit > 1) && + !(identifyPayload.intents & Intents.GUILD_MEMBERS) + ) { throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS); } + if (options?.userIDs?.length) { + options.limit = options.userIDs.length; + } + return new Promise((resolve) => { requestAllMembers(guild, resolve, options); }) as Promise>; diff --git a/src/module/shard.ts b/src/module/shard.ts index ae95742fb..b23be8913 100644 --- a/src/module/shard.ts +++ b/src/module/shard.ts @@ -327,7 +327,8 @@ export function requestGuildMembers( op: GatewayOpcode.RequestGuildMembers, d: { guild_id: guildID, - query: options?.query || "", + // If a query is provided use it, OR if a limit is NOT provided use "" + query: options?.query || (options?.limit ? undefined : ""), limit: options?.limit || 0, presences: options?.presences || false, user_ids: options?.userIDs,