From 8e60f83b6fa664ffd5f39e72f5e03ec4132e7024 Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Fri, 20 Dec 2024 20:46:48 +0100
Subject: [PATCH] fix crashing webhook sending

---
 src/routes/admin/reports/+server.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/routes/admin/reports/+server.ts b/src/routes/admin/reports/+server.ts
index 9f8e23f..735393d 100644
--- a/src/routes/admin/reports/+server.ts
+++ b/src/routes/admin/reports/+server.ts
@@ -50,12 +50,7 @@ export const POST = (async ({ request, cookies }) => {
 
 	let reports = await Report.findAll({
 		where: reportFindOptions,
-		include: [
-			{ model: User, as: 'reporter' },
-			{ model: User, as: 'reported' },
-			{ model: Admin, as: 'auditor' },
-			{ model: StrikeReason, as: 'strike_reason' }
-		],
+		include: [{ all: true }],
 		order: [['created_at', 'DESC']],
 		offset: data.from || 0,
 		limit: data.limit || 100
@@ -153,12 +148,10 @@ export const PATCH = (async ({ request, cookies }) => {
 
 	if (webhookTriggerUsers.length > 0 && data.status == 'reviewed' && env.REPORTED_WEBHOOK) {
 		for (const webhookTriggerUser of webhookTriggerUsers) {
-			try {
-				// no `await` to avoid blocking
-				webhookUserReported(env.REPORTED_WEBHOOK, webhookTriggerUser);
-			} catch (e) {
-				console.error(`failed to send reported webhook: ${e}`);
-			}
+			// no `await` to avoid blocking
+			webhookUserReported(env.REPORTED_WEBHOOK, webhookTriggerUser).catch((e) =>
+				console.error(`failed to send reported webhook: ${e}`)
+			);
 		}
 	}