RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1360 from CyberL1/fix/application-command-code-fucks

Browse Source 
fix: add BulkApplicationCommandCreateSchema
This commit is contained in:
Cyber 2025-10-22 18:03:19 +02:00 committed by GitHub
commit e54972694b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/openapi.json
View File

Binary file not shown.

BIN
assets/schemas.json
View File

Binary file not shown.

2
src/api/routes/applications/#application_id/commands/#command_id/index.ts
View File

@ -95,7 +95,7 @@ router.patch(
version: Snowflake.generate(),
};
await ApplicationCommand.update({ name: body.name }, commandForDb);
await ApplicationCommand.update({ name: body.name.trim() }, commandForDb);
res.send(commandForDb);
},
);

10
src/api/routes/applications/#application_id/commands/index.ts
View File

@ -83,10 +83,10 @@ router.post(
version: Snowflake.generate(),
};
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, name: body.name } });
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, name: body.name.trim() } });
if (commandExists) {
await ApplicationCommand.update({ application_id: req.params.application_id, name: body.name }, commandForDb);
await ApplicationCommand.update({ application_id: req.params.application_id, name: body.name.trim() }, commandForDb);
} else {
commandForDb.id = Snowflake.generate(); // Have to be done that way so the id doesn't change
await ApplicationCommand.save(commandForDb);
@ -99,7 +99,7 @@ router.post(
router.put(
"/",
route({
// requestBody: "ApplicationCommandCreateSchema", // How to make this array?
requestBody: "BulkApplicationCommandCreateSchema",
}),
async (req: Request, res: Response) => {
const applicationExists = await Application.exists({ where: { id: req.params.application_id } });
@ -154,10 +154,10 @@ router.put(
version: Snowflake.generate(),
};
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, name: command.name } });
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, name: command.name.trim() } });
if (commandExists) {
await ApplicationCommand.update({ application_id: req.params.application_id, name: command.name }, commandForDb);
await ApplicationCommand.update({ application_id: req.params.application_id, name: command.name.trim() }, commandForDb);
} else {
commandForDb.id = Snowflake.generate(); // Have to be done that way so the id doesn't change
await ApplicationCommand.save(commandForDb);

7
src/api/routes/applications/#application_id/guilds/#guild_id/commands/#command_id/index.ts
View File

@ -113,7 +113,7 @@ router.patch(
};
const commandExists = await ApplicationCommand.exists({
where: { application_id: req.params.application_id, guild_id: req.params.guild_id, id: req.params.command_id, name: body.name },
where: { application_id: req.params.application_id, guild_id: req.params.guild_id, id: req.params.command_id, name: body.name.trim() },
});
if (!commandExists) {
@ -121,7 +121,10 @@ router.patch(
return;
}
await ApplicationCommand.update({ application_id: req.params.application_id, guild_id: req.params.guild_id, id: req.params.command_id, name: body.name }, commandForDb);
await ApplicationCommand.update(
{ application_id: req.params.application_id, guild_id: req.params.guild_id, id: req.params.command_id, name: body.name.trim() },
commandForDb,
);
res.send(commandForDb);
},
);

6
src/api/routes/applications/#application_id/guilds/#guild_id/commands/index.ts
View File

@ -107,10 +107,10 @@ router.post(
version: Snowflake.generate(),
};
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, guild_id: req.params.guild_id, name: body.name } });
const commandExists = await ApplicationCommand.exists({ where: { application_id: req.params.application_id, guild_id: req.params.guild_id, name: body.name.trim() } });
if (commandExists) {
await ApplicationCommand.update({ application_id: req.params.application_id, guild_id: req.params.guild_id, name: body.name }, commandForDb);
await ApplicationCommand.update({ application_id: req.params.application_id, guild_id: req.params.guild_id, name: body.name.trim() }, commandForDb);
} else {
commandForDb.id = Snowflake.generate(); // Have to be done that way so the id doesn't change
await ApplicationCommand.save(commandForDb);
@ -123,7 +123,7 @@ router.post(
router.put(
"/",
route({
// requestBody: "ApplicationCommandCreateSchema", // How to make this array?
requestBody: "BulkApplicationCommandCreateSchema",
}),
async (req: Request, res: Response) => {
const applicationExists = await Application.exists({ where: { id: req.params.application_id } });

2
src/api/routes/interactions/index.ts
View File

@ -91,7 +91,7 @@ router.post("/", route({}), async (req: Request, res: Response) => {
}
if (body.type === InteractionType.MessageComponent || body.data.type === InteractionType.ModalSubmit) {
interactionData.message = await Message.findOneOrFail({ where: { id: body.message_id } });
interactionData.message = await Message.findOneOrFail({ where: { id: body.message_id }, relations: ["author"] });
}
emitEvent({

2
src/schemas/api/bots/ApplicationCommandCreateSchema.ts
View File

@ -17,3 +17,5 @@ export interface ApplicationCommandCreateSchema {
contexts?: InteractionContextType[];
handler?: ApplicationCommandHandlerType;
}
export type BulkApplicationCommandCreateSchema = ApplicationCommandCreateSchema[];