diff --git a/src/routes/postBranding.ts b/src/routes/postBranding.ts index d9ccbbd..b07fc24 100644 --- a/src/routes/postBranding.ts +++ b/src/routes/postBranding.ts @@ -74,7 +74,7 @@ export async function postBranding(req: Request, res: Response) { endpoint: "dearrow-postBranding", }); if (matchedRule !== null) { - sendNewUserWebhook(config.discordRejectedNewUserWebhookURL, hashedUserID, videoID, userAgent, req, videoDuration, title, matchedRule); + sendNewUserWebhook(config.discordRejectedNewUserWebhookURL, hashedUserID, videoID, userAgent, req, videoDuration, title, `Caught by rule: ${matchedRule}`); Logger.warn(`Dearrow submission rejected by request validator: ${hashedUserID} ${videoID} ${videoDuration} ${userAgent} ${req.headers["user-agent"]} ${title.title} ${thumbnail.timestamp}`); res.status(200).send("OK"); return; @@ -121,7 +121,7 @@ export async function postBranding(req: Request, res: Response) { const existingIsLocked = !!existingUUID && (await db.prepare("get", `SELECT "locked" from "titleVotes" where "UUID" = ?`, [existingUUID]))?.locked; if (existingUUID != undefined && isBanned) return; // ignore votes on existing details from banned users if (downvote && existingIsLocked && !isVip) { - sendWebhooks(videoID, existingUUID, voteType, wasWarned, shouldLock).catch((e) => Logger.error(e)); + if (!isBanned) sendWebhooks(videoID, existingUUID, voteType, wasWarned, shouldLock).catch((e) => Logger.error(e)); errorCode = 403; return; } @@ -150,7 +150,7 @@ export async function postBranding(req: Request, res: Response) { await db.prepare("run", `UPDATE "titleVotes" as tv SET "locked" = 0 FROM "titles" t WHERE tv."UUID" = t."UUID" AND tv."UUID" != ? AND t."videoID" = ?`, [UUID, videoID]); } - sendWebhooks(videoID, UUID, voteType, wasWarned, shouldLock).catch((e) => Logger.error(e)); + if (!isBanned) sendWebhooks(videoID, UUID, voteType, wasWarned, shouldLock).catch((e) => Logger.error(e)); } })(), (async () => { if (thumbnail) { @@ -211,7 +211,7 @@ export async function postBranding(req: Request, res: Response) { } } -function sendNewUserWebhook(webhookUrl: string, hashedUserID: HashedUserID, videoID: VideoID, userAgent: any, req: Request, videoDuration: number, title: TitleSubmission, ruleName: string | undefined) { +function sendNewUserWebhook(webhookUrl: string, hashedUserID: HashedUserID, videoID: VideoID, userAgent: any, req: Request, videoDuration: number, title: TitleSubmission, footerText: string | undefined) { if (!webhookUrl) return; axios.post(webhookUrl, { @@ -227,8 +227,8 @@ function sendNewUserWebhook(webhookUrl: string, hashedUserID: HashedUserID, vide "thumbnail": { "url": getMaxResThumbnail(videoID), }, - "footer": { - "text": ruleName === undefined ? `Caught by permission check` : `Caught by rule '${ruleName}'`, + "footer": footerText === undefined ? null : { + "text": footerText, }, }], })