From a01f48b02b3af5f21a81b6429123ada0ae2595fe Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Wed, 22 Oct 2025 11:46:09 -0500 Subject: [PATCH 1/2] I think this fixes bugs --- .../guilds/#guild_id/application-command-index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/api/routes/guilds/#guild_id/application-command-index.ts b/src/api/routes/guilds/#guild_id/application-command-index.ts index 006264ad..54db496c 100644 --- a/src/api/routes/guilds/#guild_id/application-command-index.ts +++ b/src/api/routes/guilds/#guild_id/application-command-index.ts @@ -28,7 +28,8 @@ router.get("/", route({}), async (req: Request, res: Response) => { const applications: Application[] = []; for (const member of members) { - applications.push(await Application.findOneOrFail({ where: { id: member.id } })); + const app = await Application.findOne({ where: { id: member.id } }); + if (app) applications.push(app); } const applicationsSendable = []; @@ -44,17 +45,17 @@ router.get("/", route({}), async (req: Request, res: Response) => { }); } - const globalApplicationCommands: ApplicationCommand[] = []; - const guildApplicationCommands: ApplicationCommand[] = []; + const globalApplicationCommands: ApplicationCommand[][] = []; + const guildApplicationCommands: ApplicationCommand[][] = []; for (const application of applications) { - globalApplicationCommands.push(await ApplicationCommand.findOneOrFail({ where: { application_id: application.id, guild_id: IsNull() } })); - guildApplicationCommands.push(await ApplicationCommand.findOneOrFail({ where: { application_id: application.id, guild_id: req.params.guild_id } })); + globalApplicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: IsNull() } })); + guildApplicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: req.params.guild_id } })); } const applicationCommandsSendable = []; - for (const command of [...globalApplicationCommands, ...guildApplicationCommands]) { + for (const command of [...globalApplicationCommands, ...guildApplicationCommands].flat()) { applicationCommandsSendable.push({ application_id: command.application_id, description: command.description, From fa295314df22ee7dfbeb5084e2d7b4b0a5d0fed0 Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Wed, 22 Oct 2025 12:00:05 -0500 Subject: [PATCH 2/2] reduce a little --- .../routes/guilds/#guild_id/application-command-index.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/api/routes/guilds/#guild_id/application-command-index.ts b/src/api/routes/guilds/#guild_id/application-command-index.ts index 54db496c..6c5a5ffe 100644 --- a/src/api/routes/guilds/#guild_id/application-command-index.ts +++ b/src/api/routes/guilds/#guild_id/application-command-index.ts @@ -45,17 +45,16 @@ router.get("/", route({}), async (req: Request, res: Response) => { }); } - const globalApplicationCommands: ApplicationCommand[][] = []; - const guildApplicationCommands: ApplicationCommand[][] = []; + const applicationCommands: ApplicationCommand[][] = []; for (const application of applications) { - globalApplicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: IsNull() } })); - guildApplicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: req.params.guild_id } })); + applicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: IsNull() } })); + applicationCommands.push(await ApplicationCommand.find({ where: { application_id: application.id, guild_id: req.params.guild_id } })); } const applicationCommandsSendable = []; - for (const command of [...globalApplicationCommands, ...guildApplicationCommands].flat()) { + for (const command of applicationCommands.flat()) { applicationCommandsSendable.push({ application_id: command.application_id, description: command.description,