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

show newest reports and feedback first
All checks were successful
deploy / build-and-deploy (push) Successful in 18s
Details

Browse Source
This commit is contained in:
Ruben Otto
2025-12-27 19:11:05 +01:00
parent c89b18112d
commit 3e99749cda
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/db/schema/feedback.ts
View File

@@ -1,7 +1,7 @@
import { int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core'; import { int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core';
import { user } from './user.ts'; import { user } from './user.ts';
import type { MySql2Database } from 'drizzle-orm/mysql2'; import type { MySql2Database } from 'drizzle-orm/mysql2';
import { eq, inArray } from 'drizzle-orm'; import { desc, eq, inArray } from 'drizzle-orm';
import { generateRandomString } from '@util/random.ts'; import { generateRandomString } from '@util/random.ts';
type Database = MySql2Database<{ feedback: typeof feedback }>; type Database = MySql2Database<{ feedback: typeof feedback }>;
@@ -88,7 +88,8 @@ export async function getFeedbacks(db: Database, _values: GetFeedbacksReq) {
username: user.username username: user.username
}) })
.from(feedback) .from(feedback)
.leftJoin(user, eq(feedback.userId, user.id)); .leftJoin(user, eq(feedback.userId, user.id))
.orderBy(desc(feedback.id));
} }
export async function getFeedbackByUrlHash(db: Database, values: GetFeedbackByUrlHash) { export async function getFeedbackByUrlHash(db: Database, values: GetFeedbackByUrlHash) {

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

@@ -1,6 +1,6 @@
import { alias, int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core'; import { alias, int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core';
import type { MySql2Database } from 'drizzle-orm/mysql2'; import type { MySql2Database } from 'drizzle-orm/mysql2';
import { and, eq, isNotNull } from 'drizzle-orm'; import { and, desc, eq, isNotNull } from 'drizzle-orm';
import { reportStatus } from './reportStatus.ts'; import { reportStatus } from './reportStatus.ts';
import { generateRandomString } from '@util/random.ts'; import { generateRandomString } from '@util/random.ts';
import { BASE_PATH } from 'astro:env/server'; import { BASE_PATH } from 'astro:env/server';
@@ -135,7 +135,8 @@ export async function getReports(db: Database, values: GetReportsReq) {
values.reported != null ? eq(reported.username, values.reported) : undefined, values.reported != null ? eq(reported.username, values.reported) : undefined,
values.includeDrafts == false ? isNotNull(report.createdAt) : undefined values.includeDrafts == false ? isNotNull(report.createdAt) : undefined
) )
); )
.orderBy(desc(report.id));
} }
export async function getReportById(db: Database, values: GetReportById) { export async function getReportById(db: Database, values: GetReportById) {