From 0be3c31b51d11a9c3f3b56d72d4fa2d4f7aafff4 Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Wed, 27 Nov 2024 22:28:11 +0100
Subject: [PATCH] include reporter and reported in report api get

---
 src/routes/api/report/+server.ts | 34 ++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/routes/api/report/+server.ts b/src/routes/api/report/+server.ts
index f233acf..6331302 100644
--- a/src/routes/api/report/+server.ts
+++ b/src/routes/api/report/+server.ts
@@ -13,9 +13,25 @@ export const GET = async ({ url }) => {
 	if (user === null) return new Response(null, { status: 400 });
 
 	const reports = {
-		from_self: await Report.findAll({ where: { reporter_id: user.id } }).then((reports) =>
+		from_self: await Report.findAll({
+			where: { reporter_id: user.id },
+			include: [
+				{ model: User, as: 'reporter' },
+				{ model: User, as: 'reported' }
+			]
+		}).then((reports) =>
 			reports.map((report) => {
 				return {
+					reporter: {
+						username: report.reporter.username,
+						uuid: report.reporter.uuid
+					},
+					reported: report.reported
+						? {
+								username: report.reported.username,
+								uuid: report.reported.uuid
+							}
+						: null,
 					subject: report.subject,
 					draft: report.draft,
 					status: report.status,
@@ -23,9 +39,23 @@ export const GET = async ({ url }) => {
 				};
 			})
 		),
-		to_self: await Report.findAll({ where: { reported_id: user.id } }).then((reports) =>
+		to_self: await Report.findAll({
+			where: { reported_id: user.id },
+			include: [
+				{ model: User, as: 'reporter' },
+				{ model: User, as: 'reported' }
+			]
+		}).then((reports) =>
 			reports.map((report) => {
 				return {
+					reporter: {
+						username: report.reporter.username,
+						uuid: report.reporter.uuid
+					},
+					reported: {
+						username: report.reported.username,
+						uuid: report.reported.uuid
+					},
 					subject: report.subject,
 					draft: report.draft,
 					status: report.status,