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

rearange errors

Browse Source
This commit is contained in:
MathMan05 2025-11-19 09:04:47 -06:00
parent 8ee8c8c28c
commit ced0421ee9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/util/handlers/Webhook.ts
View File

@ -8,14 +8,6 @@ import { WebhookExecuteSchema } from "@spacebar/schemas";
export const executeWebhook = async (req: Request, res: Response) => { export const executeWebhook = async (req: Request, res: Response) => {
const body = req.body as WebhookExecuteSchema; const body = req.body as WebhookExecuteSchema;
if (body.username) {
ValidateName(body.username);
}
// ensure one of content, embeds, components, or file is present
if (!body.content && !body.embeds && !body.components && !body.file && !body.attachments) {
throw DiscordApiErrors.CANNOT_SEND_EMPTY_MESSAGE;
}
const { webhook_id, token } = req.params; const { webhook_id, token } = req.params;
const webhook = await Webhook.findOne({ const webhook = await Webhook.findOne({
@ -33,6 +25,15 @@ export const executeWebhook = async (req: Request, res: Response) => {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED; throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
} }
if (body.username) {
ValidateName(body.username);
}
// ensure one of content, embeds, components, or file is present
if (!body.content && !body.embeds && !body.components && !body.file && !body.attachments) {
throw DiscordApiErrors.CANNOT_SEND_EMPTY_MESSAGE;
}
const { wait } = req.query; const { wait } = req.query;
if (!wait) { if (!wait) {