diff --git a/assets/openapi.json b/assets/openapi.json index 50d4fca1..2af0a2c7 100644 Binary files a/assets/openapi.json and b/assets/openapi.json differ diff --git a/assets/schemas.json b/assets/schemas.json index a3db68f8..05a63902 100644 Binary files a/assets/schemas.json and b/assets/schemas.json differ diff --git a/hashes.json b/hashes.json index aa59cb91..52864e4b 100644 --- a/hashes.json +++ b/hashes.json @@ -1,3 +1,3 @@ { - "npmDepsHash": "sha256-kdS1SwcBu6Dor92iO1ickLgz0T5UL16nyA49xXGajf4=" -} \ No newline at end of file + "npmDepsHash": "sha256-kdS1SwcBu6Dor92iO1ickLgz0T5UL16nyA49xXGajf4=" +} diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts index d294f4d3..c84bf893 100644 --- a/src/gateway/opcodes/RequestGuildMembers.ts +++ b/src/gateway/opcodes/RequestGuildMembers.ts @@ -47,7 +47,10 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) { if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100)) limit = 100; - const permissions = await getPermission(this.user_id, guild_id); + const permissions = await getPermission( + this.user_id, + Array.isArray(guild_id) ? guild_id[0] : guild_id, + ); permissions.hasThrow("VIEW_CHANNEL"); const whereQuery: FindManyOptions["where"] = {}; @@ -62,7 +65,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) { const memberFind: FindManyOptions = { where: { ...whereQuery, - guild_id, + guild_id: Array.isArray(guild_id) ? guild_id[0] : guild_id, }, relations: ["user", "roles"], }; @@ -70,7 +73,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) { const members = await Member.find(memberFind); const baseData = { - guild_id, + guild_id: Array.isArray(guild_id) ? guild_id[0] : guild_id, nonce, }; diff --git a/src/util/schemas/RequestGuildMembersSchema.ts b/src/util/schemas/RequestGuildMembersSchema.ts index 01ba4f2e..6909ba85 100644 --- a/src/util/schemas/RequestGuildMembersSchema.ts +++ b/src/util/schemas/RequestGuildMembersSchema.ts @@ -17,7 +17,7 @@ */ export interface RequestGuildMembersSchema { - guild_id: string; + guild_id: string | [string]; query?: string; limit?: number; presences?: boolean; @@ -26,7 +26,7 @@ export interface RequestGuildMembersSchema { } export const RequestGuildMembersSchema = { - guild_id: String, + guild_id: [] as string | string[], $query: String, $limit: Number, $presences: Boolean,