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

some fixes

Browse Source
This commit is contained in:
MathMan05 2025-11-19 08:39:30 -06:00
parent c583c14dd7
commit 45be302302
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import { WebhookExecuteSchema } from "@spacebar/schemas";
export const executeWebhook = async (req: Request, res: Response) => { export const executeWebhook = async (req: Request, res: Response) => {
const { wait } = req.query; const { wait } = req.query;
if (!wait) { if (!wait) {
res.status(204).send(); res.status(204).send();
} }
@ -18,7 +19,11 @@ export const executeWebhook = async (req: Request, res: Response) => {
// ensure one of content, embeds, components, or file is present // ensure one of content, embeds, components, or file is present
if (!body.content && !body.embeds && !body.components && !body.file && !body.attachments) { if (!body.content && !body.embeds && !body.components && !body.file && !body.attachments) {
throw DiscordApiErrors.CANNOT_SEND_EMPTY_MESSAGE; if (wait) {
throw DiscordApiErrors.CANNOT_SEND_EMPTY_MESSAGE;
} else {
return;
}
} }
// block username from containing certain words // block username from containing certain words
@ -46,17 +51,30 @@ export const executeWebhook = async (req: Request, res: Response) => {
}, },
relations: ["channel", "guild", "application"], relations: ["channel", "guild", "application"],
}); });
console.log("in here?", wait);
if (!webhook) { if (!webhook) {
throw DiscordApiErrors.UNKNOWN_WEBHOOK; if (wait) {
throw DiscordApiErrors.UNKNOWN_WEBHOOK;
} else {
return;
}
} }
if (!webhook.channel.isWritable()) { if (!webhook.channel.isWritable()) {
throw new HTTPError(`Cannot send messages to channel of type ${webhook.channel.type}`, 400); if (wait) {
throw new HTTPError(`Cannot send messages to channel of type ${webhook.channel.type}`, 400);
} else {
return;
}
} }
if (webhook.token !== token) { if (webhook.token !== token) {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED; if (wait) {
throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED;
} else {
return;
}
} }
// TODO: creating messages by users checks if the user can bypass rate limits, we cant do that on webhooks, but maybe we could check the application if there is one? // TODO: creating messages by users checks if the user can bypass rate limits, we cant do that on webhooks, but maybe we could check the application if there is one?
@ -70,12 +88,16 @@ export const executeWebhook = async (req: Request, res: Response) => {
}); });
if (count >= limits.absoluteRate.sendMessage.limit) if (count >= limits.absoluteRate.sendMessage.limit)
throw FieldErrors({ if (wait) {
channel_id: { throw FieldErrors({
code: "TOO_MANY_MESSAGES", channel_id: {
message: req.t("common:toomany.MESSAGE"), code: "TOO_MANY_MESSAGES",
}, message: req.t("common:toomany.MESSAGE"),
}); },
});
} else {
return;
}
} }
const files = (req.files as Express.Multer.File[]) ?? []; const files = (req.files as Express.Multer.File[]) ?? [];