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

Merge pull request #1362 from spacebarchat/revert-1361-fix/application-command-index

Browse Source 
Revert "fix: no sense it doing it twice when it could be done in one query"
This commit is contained in:
Cyber 2025-10-22 18:41:32 +02:00 committed by GitHub
commit f6fa2d0d07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/routes/guilds/#guild_id/application-command-index.ts
View File

@ -19,6 +19,7 @@
import { route } from "@spacebar/api"; import { route } from "@spacebar/api";
import { Request, Response, Router } from "express"; import { Request, Response, Router } from "express";
import { Application, ApplicationCommand, Member, Snowflake } from "@spacebar/util"; import { Application, ApplicationCommand, Member, Snowflake } from "@spacebar/util";
import { IsNull } from "typeorm";
const router = Router({ mergeParams: true }); const router = Router({ mergeParams: true });
@ -30,7 +31,6 @@ router.get("/", route({}), async (req: Request, res: Response) => {
applications.push(await Application.findOneOrFail({ where: { id: member.id } })); applications.push(await Application.findOneOrFail({ where: { id: member.id } }));
} }
const applicationCommands: ApplicationCommand[] = [];
const applicationsSendable = []; const applicationsSendable = [];
for (const application of applications) { for (const application of applications) {
@ -42,13 +42,19 @@ router.get("/", route({}), async (req: Request, res: Response) => {
id: application.id, id: application.id,
name: application.name, name: application.name,
}); });
}
applicationCommands.push(await ApplicationCommand.findOneOrFail({ where: { application_id: application.id } })); 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 } }));
} }
const applicationCommandsSendable = []; const applicationCommandsSendable = [];
for (const command of applicationCommands) { for (const command of [...globalApplicationCommands, ...guildApplicationCommands]) {
applicationCommandsSendable.push({ applicationCommandsSendable.push({
application_id: command.application_id, application_id: command.application_id,
description: command.description, description: command.description,