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,