CraftAttack/website
4
0
Fork 0
Code Issues 3 Pull Requests Actions Wiki Activity

include reporter and reported in report api get
All checks were successful
delpoy / build-and-deploy (push) Successful in 52s
Details

Browse Source
This commit is contained in:
bytedream 2024-11-27 22:28:11 +01:00
parent b15b74c9b2
commit 0be3c31b51
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/routes/api/report/+server.ts
View File

@ -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,