From e25c33d34cf690dba96b4db1625f96685fb3054b Mon Sep 17 00:00:00 2001 From: CyberL1 Date: Wed, 22 Oct 2025 18:31:55 +0200 Subject: [PATCH] fix: no sense it doing it twice when it could be done in one query --- .../guilds/#guild_id/application-command-index.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 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..2162c1f4 100644 --- a/src/api/routes/guilds/#guild_id/application-command-index.ts +++ b/src/api/routes/guilds/#guild_id/application-command-index.ts @@ -19,7 +19,6 @@ import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; import { Application, ApplicationCommand, Member, Snowflake } from "@spacebar/util"; -import { IsNull } from "typeorm"; const router = Router({ mergeParams: true }); @@ -31,6 +30,7 @@ router.get("/", route({}), async (req: Request, res: Response) => { applications.push(await Application.findOneOrFail({ where: { id: member.id } })); } + const applicationCommands: ApplicationCommand[] = []; const applicationsSendable = []; for (const application of applications) { @@ -42,19 +42,13 @@ router.get("/", route({}), async (req: Request, res: Response) => { id: application.id, name: application.name, }); - } - 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 } })); + applicationCommands.push(await ApplicationCommand.findOneOrFail({ where: { application_id: application.id } })); } const applicationCommandsSendable = []; - for (const command of [...globalApplicationCommands, ...guildApplicationCommands]) { + for (const command of applicationCommands) { applicationCommandsSendable.push({ application_id: command.application_id, description: command.description,