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

feat(client): Support more request member fields (#9475)

Browse Source 
feat(client): support more request member fields

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Jiralite
2023-05-10 17:40:52 +01:00
committed by GitHub
parent 7b617bd22e
commit 1edd01a7a4
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/src/client.ts
View File

@@ -7,7 +7,6 @@ import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
import {
GatewayDispatchEvents,
GatewayOpcodes,
type APIGuildMember,
type GatewayAutoModerationActionExecutionDispatchData,
type GatewayAutoModerationRuleCreateDispatchData,
type GatewayAutoModerationRuleDeleteDispatchData,
@@ -169,6 +168,13 @@ export interface ClientOptions {
rest: REST;
}
export interface RequestGuildMembersResult {
members: GatewayGuildMembersChunkDispatchData['members'];
nonce: NonNullable<GatewayGuildMembersChunkDispatchData['nonce']>;
notFound: NonNullable<GatewayGuildMembersChunkDispatchData['not_found']>;
presences: NonNullable<GatewayGuildMembersChunkDispatchData['presences']>;
}
export class Client extends AsyncEventEmitter<ManagerShardEventsMap> {
public readonly rest: REST;
@@ -199,8 +205,10 @@ export class Client extends AsyncEventEmitter<ManagerShardEventsMap> {
const shardId = calculateShardId(options.guild_id, await this.gateway.getShardCount());
const nonce = options.nonce ?? DiscordSnowflake.generate().toString();
const promise = new Promise<APIGuildMember[]>((resolve, reject) => {
const guildMembers: APIGuildMember[] = [];
const promise = new Promise<RequestGuildMembersResult>((resolve, reject) => {
const members: RequestGuildMembersResult['members'] = [];
const notFound: RequestGuildMembersResult['notFound'] = [];
const presences: RequestGuildMembersResult['presences'] = [];
const timer = setTimeout(() => {
reject(new Error('Request timed out'));
@@ -211,11 +219,13 @@ export class Client extends AsyncEventEmitter<ManagerShardEventsMap> {
if (data.nonce !== nonce) return;
guildMembers.push(...data.members);
members.push(...data.members);
if ('presences' in data) presences.push(...data.presences);
if ('not_found' in data) notFound.push(...data.not_found);
if (data.chunk_index >= data.chunk_count - 1) {
this.off(GatewayDispatchEvents.GuildMembersChunk, handler);
resolve(guildMembers);
resolve({ members, nonce, notFound, presences });
}
};