Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: allow array in op 8

Browse Source
This commit is contained in:
Cyber 2024-08-17 11:22:37 +02:00
parent c5d58d5ff8
commit af36ea0bb5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gateway/opcodes/RequestGuildMembers.ts
View File

@ -47,7 +47,10 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100)) if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100))
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"); permissions.hasThrow("VIEW_CHANNEL");
const whereQuery: FindManyOptions["where"] = {}; const whereQuery: FindManyOptions["where"] = {};
@ -62,7 +65,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
const memberFind: FindManyOptions = { const memberFind: FindManyOptions = {
where: { where: {
...whereQuery, ...whereQuery,
guild_id, guild_id: Array.isArray(guild_id) ? guild_id[0] : guild_id,
}, },
relations: ["user", "roles"], relations: ["user", "roles"],
}; };
@ -70,7 +73,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
const members = await Member.find(memberFind); const members = await Member.find(memberFind);
const baseData = { const baseData = {
guild_id, guild_id: Array.isArray(guild_id) ? guild_id[0] : guild_id,
nonce, nonce,
}; };

4
src/util/schemas/RequestGuildMembersSchema.ts
View File

@ -17,7 +17,7 @@
*/ */
export interface RequestGuildMembersSchema { export interface RequestGuildMembersSchema {
guild_id: string; guild_id: string | string[];
query?: string; query?: string;
limit?: number; limit?: number;
presences?: boolean; presences?: boolean;
@ -26,7 +26,7 @@ export interface RequestGuildMembersSchema {
} }
export const RequestGuildMembersSchema = { export const RequestGuildMembersSchema = {
guild_id: String, guild_id: [] as string | string[],
$query: String, $query: String,
$limit: Number, $limit: Number,
$presences: Boolean, $presences: Boolean,