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

fix report username filter
All checks were successful
deploy / build-and-deploy (push) Successful in 22s
Details

Browse Source
This commit is contained in:
Ruben Otto
2025-10-19 13:46:52 +02:00
parent 964ccfacbf
commit a37ecffd85
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/db/schema/report.ts
View File

@@ -94,23 +94,6 @@ export async function getReports(db: Database, values: GetReportsReq) {
const reporter = alias(user, 'reporter');
const reported = alias(user, 'reported');
let reporterIdSubquery;
if (values.reporter != null) {
reporterIdSubquery = db
.select({ id: reporter.id })
.from(reporter)
.where(eq(reporter.username, values.reporter))
.as('reporter_id_subquery');
}
let reportedIdSubquery;
if (values.reported != null) {
reportedIdSubquery = db
.select({ id: reported.id })
.from(reported)
.where(eq(reported.username, values.reported))
.as('reported_id_subquery');
}
return db
.select({
id: report.id,
@@ -145,8 +128,8 @@ export async function getReports(db: Database, values: GetReportsReq) {
.leftJoin(strikeReason, eq(strike.strikeReasonId, strikeReason.id))
.where(
and(
values.reporter != null ? eq(report.reporterId, reporterIdSubquery!.id) : undefined,
values.reported != null ? eq(report.reportedId, reportedIdSubquery!.id) : undefined,
values.reporter != null ? eq(reporter.username, values.reporter) : undefined,
values.reported != null ? eq(reported.username, values.reported) : undefined,
values.includeDrafts == false ? isNotNull(report.createdAt) : undefined
)
);