Merge pull request #1177 from CyberL1/fix/op-8

fix: allow array in op 8
This commit is contained in:
Madeline 2024-08-17 22:54:04 +10:00 committed by GitHub
commit bb31df036a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3054 additions and 69924 deletions

View File

@ -16619,6 +16619,86 @@
] ]
} }
}, },
"/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/{burst}/{user_id}": {
"delete": {
"security": [
{
"bearer": []
}
],
"responses": {
"204": {
"description": "No description available"
},
"400": {
"description": "",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/APIErrorResponse"
}
}
}
},
"403": {
"description": "No description available"
},
"404": {
"description": "No description available"
}
},
"parameters": [
{
"name": "channel_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "channel_id"
},
{
"name": "message_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "message_id"
},
{
"name": "emoji",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "emoji"
},
{
"name": "burst",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "burst"
},
{
"name": "user_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "user_id"
}
],
"tags": [
"channels"
]
}
},
"/channels/{channel_id}/messages/{message_id}/": { "/channels/{channel_id}/messages/{message_id}/": {
"patch": { "patch": {
"x-right-required": "SEND_MESSAGES", "x-right-required": "SEND_MESSAGES",

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
{ {
"npmDepsHash": "sha256-kdS1SwcBu6Dor92iO1ickLgz0T5UL16nyA49xXGajf4=" "npmDepsHash": "sha256-kdS1SwcBu6Dor92iO1ickLgz0T5UL16nyA49xXGajf4="
} }

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,
}; };

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,