From eb550a7c3623d022b2c991f1778827dcb4bc3a67 Mon Sep 17 00:00:00 2001 From: regalijan Date: Thu, 19 Oct 2023 16:50:41 -0400 Subject: [PATCH] Move appeal bans entirely to D1 --- functions/api/appeals/[id]/ban.ts | 12 +++++++----- functions/api/appeals/submit.ts | 8 +++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/functions/api/appeals/[id]/ban.ts b/functions/api/appeals/[id]/ban.ts index b501f8d..2ff9310 100644 --- a/functions/api/appeals/[id]/ban.ts +++ b/functions/api/appeals/[id]/ban.ts @@ -9,10 +9,12 @@ export async function onRequestPost(context: RequestContext) { status: 400, }); - await context.env.DATA.put( - `appealban_${context.data.targetId}`, - JSON.stringify({ moderator: currentUser.id }), - ); + await context.env.D1.prepare( + "INSERT INTO appeal_bans (created_at, created_by, user) VALUES (?, ?, ?);", + ) + .bind(Date.now(), context.data.current_user.id, context.data.targetId) + .run(); + await fetch(context.env.APPEALS_WEBHOOK, { body: JSON.stringify({ embeds: [ @@ -23,7 +25,7 @@ export async function onRequestPost(context: RequestContext) { fields: [ { name: "Moderator", - value: `${currentUser.username}#${currentUser.discriminator} (${currentUser.id})`, + value: `${currentUser.username} (${currentUser.id})`, }, ], }, diff --git a/functions/api/appeals/submit.ts b/functions/api/appeals/submit.ts index 491bf2f..8b3d389 100644 --- a/functions/api/appeals/submit.ts +++ b/functions/api/appeals/submit.ts @@ -52,7 +52,13 @@ export async function onRequestPost(context: RequestContext) { status: 403, }); - if (await context.env.DATA.get(`appealban_${currentUser.id}`)) { + if ( + ( + await context.env.D1.prepare("SELECT * FROM appeal_bans WHERE user = ?;") + .bind(currentUser.id) + .run() + ).results.length + ) { await context.env.DATA.put(`blockedappeal_${currentUser.id}`, "1", { metadata: { email: currentUser.email }, });