show newest reports and feedback first
All checks were successful
deploy / build-and-deploy (push) Successful in 18s
All checks were successful
deploy / build-and-deploy (push) Successful in 18s
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core';
|
||||
import { user } from './user.ts';
|
||||
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';
|
||||
|
||||
type Database = MySql2Database<{ feedback: typeof feedback }>;
|
||||
@@ -88,7 +88,8 @@ export async function getFeedbacks(db: Database, _values: GetFeedbacksReq) {
|
||||
username: user.username
|
||||
})
|
||||
.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) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { alias, int, mysqlTable, text, timestamp, varchar } from 'drizzle-orm/mysql-core';
|
||||
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 { generateRandomString } from '@util/random.ts';
|
||||
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.includeDrafts == false ? isNotNull(report.createdAt) : undefined
|
||||
)
|
||||
);
|
||||
)
|
||||
.orderBy(desc(report.id));
|
||||
}
|
||||
|
||||
export async function getReportById(db: Database, values: GetReportById) {
|
||||
|
||||
Reference in New Issue
Block a user