From 71b710450271854b979505395311a40410b70f47 Mon Sep 17 00:00:00 2001
From: regalijan <r@regalijan.com>
Date: Thu, 19 Oct 2023 16:49:17 -0400
Subject: [PATCH] Don't use metadata for submission data

---
 functions/api/appeals/submit.ts | 14 +++++++-------
 functions/api/reports/submit.ts | 20 +++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/functions/api/appeals/submit.ts b/functions/api/appeals/submit.ts
index 7877451..6008ba4 100644
--- a/functions/api/appeals/submit.ts
+++ b/functions/api/appeals/submit.ts
@@ -69,19 +69,19 @@ export async function onRequestPost(context: RequestContext) {
   await context.env.DATA.put(
     `appeal_${appealId}`,
     JSON.stringify({
+      createdAt: Date.now(),
       learned,
-      user: currentUser,
+      user: {
+        discriminator: currentUser.discriminator,
+        email: currentUser.email,
+        id: currentUser.id,
+        username: currentUser.username,
+      },
       whyBanned,
       whyUnban,
     }),
     {
       expirationTtl: 94608000,
-      metadata: {
-        created_at: Date.now(),
-        id: currentUser.id,
-        open: true,
-        tag: `${currentUser.id}#${currentUser.discriminator}`,
-      },
     }
   );
 
diff --git a/functions/api/reports/submit.ts b/functions/api/reports/submit.ts
index 76b65fb..f004470 100644
--- a/functions/api/reports/submit.ts
+++ b/functions/api/reports/submit.ts
@@ -144,6 +144,8 @@ export async function onRequestPost(context: RequestContext) {
     fileExt
   );
 
+  const { current_user: currentUser } = context.data;
+
   await context.env.DATA.put(
     `reportprocessing_${reportId}`,
     context.data.current_user.id,
@@ -155,19 +157,15 @@ export async function onRequestPost(context: RequestContext) {
       attachment: `${fileKey}.${
         ["mkv", "mov", "wmv"].includes(fileExt.toLowerCase()) ? "mp4" : fileExt
       }`,
-      reporter: context.data.current_user,
+      reporter: {
+        discriminator: currentUser.discriminator,
+        email: currentUser.email,
+        id: currentUser.id,
+        username: currentUser.username,
+      },
       target_ids: metaIDs,
       target_usernames: metaNames,
-    }),
-    {
-      metadata: {
-        i: context.data.current_user.id,
-        r: metaIDs.toString(),
-        p: true,
-        s: `${context.data.current_user.username}#${context.data.current_user.discriminator}`,
-        u: metaNames.toString(),
-      },
-    }
+    })
   );
 
   return new Response(JSON.stringify({ id: reportId, upload_url: uploadUrl }), {