refactor(db): migrate app pages and APIs from Prisma facade to Drizzle (4)

Co-authored-by: Cursor <[email protected]>
This commit is contained in:
SimoandCursor committed 2026-08-01 14:15:36 +02:00
1 parent 580972c0a0
commit 9aa4f331bf
40 files changed
+1259 -927

No files matched your search

+15 -14
View File
@@ -1,9 +1,10 @@
import { asc, eq, gte } from "drizzle-orm";
import { notFound, redirect } from "next/navigation"; import { notFound, redirect } from "next/navigation";
import { getTranslations } from "next-intl/server"; import { getTranslations } from "next-intl/server";
import { TicketQueueBanner } from "@/components/admin/ticket-queue-banner"; import { TicketQueueBanner } from "@/components/admin/ticket-queue-banner";
import { getMinStaffRank } from "@/lib/admin/min-staff-rank"; import { getMinStaffRank } from "@/lib/admin/min-staff-rank";
import { db, User, WebsiteTicket } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { AdminTicketDetail } from "./admin-ticket-detail"; import { AdminTicketDetail } from "./admin-ticket-detail";
export default async function AdminTicketDetailPage({ export default async function AdminTicketDetailPage({
@@ -21,11 +22,11 @@ export default async function AdminTicketDetailPage({
const ticketId = Number(id); const ticketId = Number(id);
if (Number.isNaN(ticketId)) notFound(); if (Number.isNaN(ticketId)) notFound();
const ticket = await prisma.websiteTicket.findUnique({ const ticket = await db.query.WebsiteTicket.findFirst({
where: { id: ticketId }, where: eq(WebsiteTicket.id, ticketId),
include: { with: {
creator: { creator: {
select: { columns: {
id: true, id: true,
username: true, username: true,
look: true, look: true,
@@ -35,12 +36,12 @@ export default async function AdminTicketDetailPage({
accountCreated: true, accountCreated: true,
}, },
}, },
assignee: { select: { id: true, username: true } }, assignee: { columns: { id: true, username: true } },
messages: { messages: {
orderBy: { createdAt: "asc" }, orderBy: (m, { asc: a }) => [a(m.createdAt)],
include: { with: {
user: { user: {
select: { id: true, username: true, look: true, rank: true }, columns: { id: true, username: true, look: true, rank: true },
}, },
}, },
}, },
@@ -51,11 +52,11 @@ export default async function AdminTicketDetailPage({
// Staff assignees: min_staff_rank and above // Staff assignees: min_staff_rank and above
const minStaffRank = await getMinStaffRank(); const minStaffRank = await getMinStaffRank();
const staffMembers = await prisma.user.findMany({ const staffMembers = await db
where: { rank: { gte: minStaffRank } }, .select({ id: User.id, username: User.username })
select: { id: true, username: true }, .from(User)
orderBy: { username: "asc" }, .where(gte(User.rank, minStaffRank))
}); .orderBy(asc(User.username));
const canEdit = canAccess(permissions, PERMS.TICKETS_EDIT, session.user.rank); const canEdit = canAccess(permissions, PERMS.TICKETS_EDIT, session.user.rank);
File diff suppressed because it is too large. Load diff
+6 -4
View File
@@ -1,6 +1,7 @@
import { asc } from "drizzle-orm";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { db, WebsiteTicketTemplate } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { TicketTemplatesManager } from "./templates-manager"; import { TicketTemplatesManager } from "./templates-manager";
export default async function TicketTemplatesPage() { export default async function TicketTemplatesPage() {
@@ -9,9 +10,10 @@ export default async function TicketTemplatesPage() {
redirect("/admin/tickets"); redirect("/admin/tickets");
} }
const templates = await prisma.websiteTicketTemplate.findMany({ const templates = await db
orderBy: { sortOrder: "asc" }, .select()
}); .from(WebsiteTicketTemplate)
.orderBy(asc(WebsiteTicketTemplate.sortOrder));
return ( return (
<div className="space-y-6"> <div className="space-y-6">
File diff suppressed because it is too large. Load diff
+37 -32
View File
@@ -1,20 +1,21 @@
import { and, asc, count, like, or, type SQL } from "drizzle-orm";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { getTranslations } from "next-intl/server"; import { getTranslations } from "next-intl/server";
import { EmulatorSettingsForm } from "@/components/admin/emulator-settings-form"; import { EmulatorSettingsForm } from "@/components/admin/emulator-settings-form";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { calcPagination } from "@/lib/admin-helpers"; import { calcPagination } from "@/lib/admin-helpers";
import { prisma } from "@/lib/prisma"; import { db, EmulatorSettings } from "@/lib/db";
const TRANSLATION_KEY_PATTERNS = [ const TRANSLATION_KEY_PATTERNS = [
"commands.description.%", "commands.description.",
"commands.keys.%", "commands.keys.",
"commands.cmd_%", "commands.cmd_",
"wordfilter.%", "wordfilter.",
"pet.%message%", "pet.",
"matchmaking.%message%", "matchmaking.",
"message.%", "message.",
"notification.%", "notification.",
] as const; ] as const;
export default async function EmulatorTranslationsPage({ export default async function EmulatorTranslationsPage({
@@ -29,35 +30,39 @@ export default async function EmulatorTranslationsPage({
const perPage = Math.min(Math.max(parseInt(sp.perPage || "50", 10), 10), 200); const perPage = Math.min(Math.max(parseInt(sp.perPage || "50", 10), 10), 200);
const page = Math.max(parseInt(sp.page || "1", 10), 1); const page = Math.max(parseInt(sp.page || "1", 10), 1);
const patternFilters: any[] = TRANSLATION_KEY_PATTERNS.map((p) => ({ const patternFilters = or(
key: { contains: p.replace(/%/g, "") }, ...TRANSLATION_KEY_PATTERNS.map((p) => like(EmulatorSettings.key, `${p}%`)),
})); )!;
const baseFilter: any = { OR: patternFilters }; const conditions: SQL[] = [patternFilters];
if (group) conditions.push(like(EmulatorSettings.key, `${group}.%`));
const conditions: any[] = [baseFilter];
if (group) conditions.push({ key: { startsWith: `${group}.` } });
if (search) { if (search) {
conditions.push({ conditions.push(
OR: [{ key: { contains: search } }, { value: { contains: search } }], or(
}); like(EmulatorSettings.key, `%${search}%`),
like(EmulatorSettings.value, `%${search}%`),
)!,
);
} }
const where: any = { AND: conditions }; const where = and(...conditions);
const [settings, total, allKeys] = await Promise.all([ const [settings, totalRows, allKeys] = await Promise.all([
prisma.emulatorSettings.findMany({ db
where, .select()
orderBy: { key: "asc" }, .from(EmulatorSettings)
skip: (page - 1) * perPage, .where(where)
take: perPage, .orderBy(asc(EmulatorSettings.key))
}), .limit(perPage)
prisma.emulatorSettings.count({ where }), .offset((page - 1) * perPage),
prisma.emulatorSettings.findMany({ db.select({ total: count() }).from(EmulatorSettings).where(where),
where: baseFilter, db
select: { key: true }, .select({ key: EmulatorSettings.key })
}), .from(EmulatorSettings)
.where(patternFilters),
]); ]);
const total = Number(totalRows[0]?.total ?? 0);
const groupCounts = new Map<string, number>(); const groupCounts = new Map<string, number>();
for (const { key } of allKeys) { for (const { key } of allKeys) {
const g = key.includes(".") ? key.split(".")[0] : "general"; const g = key.includes(".") ? key.split(".")[0] : "general";
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
+6 -5
View File
@@ -1,7 +1,8 @@
import { sql } from "drizzle-orm";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { db } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { Prisma, prisma } from "@/lib/prisma";
import { getWatchedUserIds } from "@/lib/services/watch"; import { getWatchedUserIds } from "@/lib/services/watch";
import { UserAccountInfo } from "../../_components/user-account-info"; import { UserAccountInfo } from "../../_components/user-account-info";
import { UserHero } from "../../_components/user-hero"; import { UserHero } from "../../_components/user-hero";
@@ -28,10 +29,10 @@ export default async function UserEditPage({
const watched = await getWatchedUserIds(session.user.id); const watched = await getWatchedUserIds(session.user.id);
// Fetch rank list from permissions table for the rank dropdown // Fetch rank list from permissions table for the rank dropdown
const rawRanks: { id: number; rank_name: string }[] = await prisma.$queryRaw( const [rawRanks] = (await db.execute(
Prisma.sql`SELECT id, rank_name FROM permissions ORDER BY id ASC`, sql`SELECT id, rank_name FROM permissions ORDER BY id ASC`,
); )) as unknown as [{ id: number; rank_name: string }[], unknown];
const ranks = rawRanks.map((r) => ({ const ranks = (rawRanks ?? []).map((r) => ({
id: Number(r.id), id: Number(r.id),
name: String(r.rank_name || `Rank ${r.id}`), name: String(r.rank_name || `Rank ${r.id}`),
})); }));
+15 -14
View File
@@ -1,6 +1,7 @@
import { desc } from "drizzle-orm";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { db, WebsiteShopVouchers } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { type VoucherRow, VouchersClient } from "./vouchers-client"; import { type VoucherRow, VouchersClient } from "./vouchers-client";
export default async function AdminVouchers() { export default async function AdminVouchers() {
@@ -14,19 +15,19 @@ export default async function AdminVouchers() {
let rows: VoucherRow[] = []; let rows: VoucherRow[] = [];
try { try {
const vouchers = await prisma.websiteShopVouchers.findMany({ const vouchers = await db
select: { .select({
id: true, id: WebsiteShopVouchers.id,
code: true, code: WebsiteShopVouchers.code,
amount: true, amount: WebsiteShopVouchers.amount,
maxUses: true, maxUses: WebsiteShopVouchers.maxUses,
useCount: true, useCount: WebsiteShopVouchers.useCount,
expiresAt: true, expiresAt: WebsiteShopVouchers.expiresAt,
createdAt: true, createdAt: WebsiteShopVouchers.createdAt,
}, })
orderBy: { id: "desc" }, .from(WebsiteShopVouchers)
take: 200, .orderBy(desc(WebsiteShopVouchers.id))
}); .limit(200);
rows = vouchers.map((v) => { rows = vouchers.map((v) => {
const expired = v.expiresAt ? v.expiresAt.getTime() <= now : false; const expired = v.expiresAt ? v.expiresAt.getTime() <= now : false;
const usedUp = v.maxUses > 0 && v.useCount >= v.maxUses; const usedUp = v.maxUses > 0 && v.useCount >= v.maxUses;
+7 -6
View File
@@ -1,9 +1,10 @@
import { asc } from "drizzle-orm";
import { Filter } from "lucide-react"; import { Filter } from "lucide-react";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { getTranslations } from "next-intl/server"; import { getTranslations } from "next-intl/server";
import { AdminPageShell } from "@/components/admin/admin-page-shell"; import { AdminPageShell } from "@/components/admin/admin-page-shell";
import { db, WebsiteWordfilter } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { WordFilterClient } from "./wordfilter-client"; import { WordFilterClient } from "./wordfilter-client";
export default async function AdminWordFilter() { export default async function AdminWordFilter() {
@@ -21,11 +22,11 @@ export default async function AdminWordFilter() {
let words: { id: string; word: string }[] = []; let words: { id: string; word: string }[] = [];
try { try {
const rows = await prisma.websiteWordfilter.findMany({ const rows = await db
select: { id: true, word: true }, .select({ id: WebsiteWordfilter.id, word: WebsiteWordfilter.word })
orderBy: { word: "asc" }, .from(WebsiteWordfilter)
take: 500, .orderBy(asc(WebsiteWordfilter.word))
}); .limit(500);
words = rows.map((w) => ({ id: String(w.id), word: w.word })); words = rows.map((w) => ({ id: String(w.id), word: w.word }));
} catch { } catch {
words = []; words = [];
+7 -6
View File
@@ -1,3 +1,4 @@
import { asc } from "drizzle-orm";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { getTranslations } from "next-intl/server"; import { getTranslations } from "next-intl/server";
import { import {
@@ -8,8 +9,8 @@ import {
} from "@/actions/admin-writeable-boxes"; } from "@/actions/admin-writeable-boxes";
import { StatusCard } from "@/components/admin/dashboard"; import { StatusCard } from "@/components/admin/dashboard";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { db, WebsiteWriteableBoxes } from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions"; import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
export const metadata = { title: "Writeable boxes" }; export const metadata = { title: "Writeable boxes" };
@@ -20,11 +21,11 @@ export default async function AdminWriteableBoxes() {
} }
const t = await getTranslations("pages.admin.writeableBoxes"); const t = await getTranslations("pages.admin.writeableBoxes");
const boxes = await prisma.websiteWriteableBoxes const boxes = await db
.findMany({ .select()
orderBy: [{ position: "asc" }, { id: "asc" }], .from(WebsiteWriteableBoxes)
take: 500, .orderBy(asc(WebsiteWriteableBoxes.position), asc(WebsiteWriteableBoxes.id))
}) .limit(500)
.catch(() => []); .catch(() => []);
const activeCount = boxes.filter((b) => b.isActive).length; const activeCount = boxes.filter((b) => b.isActive).length;
+12 -9
View File
@@ -1,7 +1,8 @@
import { sql } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError } from "@/lib/api-response"; import { apiError } from "@/lib/api-response";
import { db } from "@/lib/db";
import { PERMS } from "@/lib/permission-slugs"; import { PERMS } from "@/lib/permission-slugs";
import { prisma } from "@/lib/prisma";
const VALID_REPORTS = new Set(["registrations", "online-by-hour", "economy"]); const VALID_REPORTS = new Set(["registrations", "online-by-hour", "economy"]);
@@ -19,13 +20,13 @@ function csvRow(values: unknown[]): string {
} }
async function streamRegistrations(): Promise<ReadableStream<Uint8Array>> { async function streamRegistrations(): Promise<ReadableStream<Uint8Array>> {
const rows = await prisma.$queryRaw<{ day: string; cnt: bigint }[]>` const [rows] = (await db.execute(sql`
SELECT FROM_UNIXTIME(account_created, '%Y-%m-%d') AS day, COUNT(*) AS cnt SELECT FROM_UNIXTIME(account_created, '%Y-%m-%d') AS day, COUNT(*) AS cnt
FROM users FROM users
WHERE account_created > UNIX_TIMESTAMP(NOW() - INTERVAL 90 DAY) WHERE account_created > UNIX_TIMESTAMP(NOW() - INTERVAL 90 DAY)
GROUP BY day GROUP BY day
ORDER BY day ASC ORDER BY day ASC
`; `)) as unknown as [{ day: string; cnt: bigint }[], unknown];
const encoder = new TextEncoder(); const encoder = new TextEncoder();
return new ReadableStream({ return new ReadableStream({
start(controller) { start(controller) {
@@ -39,13 +40,13 @@ async function streamRegistrations(): Promise<ReadableStream<Uint8Array>> {
} }
async function streamOnlineByHour(): Promise<ReadableStream<Uint8Array>> { async function streamOnlineByHour(): Promise<ReadableStream<Uint8Array>> {
const rows = await prisma.$queryRaw<{ hour: number; cnt: bigint }[]>` const [rows] = (await db.execute(sql`
SELECT HOUR(FROM_UNIXTIME(last_online)) AS hour, COUNT(*) AS cnt SELECT HOUR(FROM_UNIXTIME(last_online)) AS hour, COUNT(*) AS cnt
FROM users FROM users
WHERE last_online > UNIX_TIMESTAMP(NOW() - INTERVAL 30 DAY) WHERE last_online > UNIX_TIMESTAMP(NOW() - INTERVAL 30 DAY)
GROUP BY hour GROUP BY hour
ORDER BY hour ASC ORDER BY hour ASC
`; `)) as unknown as [{ hour: number; cnt: bigint }[], unknown];
const encoder = new TextEncoder(); const encoder = new TextEncoder();
return new ReadableStream({ return new ReadableStream({
start(controller) { start(controller) {
@@ -61,11 +62,13 @@ async function streamOnlineByHour(): Promise<ReadableStream<Uint8Array>> {
} }
async function streamEconomy(): Promise<ReadableStream<Uint8Array>> { async function streamEconomy(): Promise<ReadableStream<Uint8Array>> {
const [totals] = await prisma.$queryRaw< const [rows] = (await db.execute(sql`
{ total_credits: bigint; total_pixels: bigint }[]
>`
SELECT SUM(credits) AS total_credits, SUM(pixels) AS total_pixels FROM users SELECT SUM(credits) AS total_credits, SUM(pixels) AS total_pixels FROM users
`; `)) as unknown as [
{ total_credits: bigint; total_pixels: bigint }[],
unknown,
];
const totals = rows[0];
const encoder = new TextEncoder(); const encoder = new TextEncoder();
return new ReadableStream({ return new ReadableStream({
start(controller) { start(controller) {
File diff suppressed because it is too large. Load diff
+22 -21
View File
@@ -1,7 +1,8 @@
import { asc, eq, like, or } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiOk } from "@/lib/api-response"; import { apiOk } from "@/lib/api-response";
import { db, ItemsBase } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
/** /**
* Search items_base for Quick Add / catalog tooling. * Search items_base for Quick Add / catalog tooling.
@@ -27,26 +28,26 @@ export const GET = withAdmin(
} }
const idExact = Number.parseInt(q, 10); const idExact = Number.parseInt(q, 10);
const rows = await prisma.itemsBase.findMany({ const conditions = [
where: { like(ItemsBase.itemName, `%${q}%`),
OR: [ like(ItemsBase.publicName, `%${q}%`),
{ itemName: { contains: q } }, ];
{ publicName: { contains: q } }, if (Number.isFinite(idExact) && String(idExact) === q) {
...(Number.isFinite(idExact) && String(idExact) === q conditions.push(eq(ItemsBase.id, idExact));
? [{ id: idExact }] }
: []),
], const rows = await db
}, .select({
select: { id: ItemsBase.id,
id: true, itemName: ItemsBase.itemName,
itemName: true, publicName: ItemsBase.publicName,
publicName: true, type: ItemsBase.type,
type: true, spriteId: ItemsBase.spriteId,
spriteId: true, })
}, .from(ItemsBase)
take: limit, .where(or(...conditions))
orderBy: { id: "asc" }, .orderBy(asc(ItemsBase.id))
}); .limit(limit);
return apiOk({ return apiOk({
results: rows.map((r) => ({ results: rows.map((r) => ({
@@ -1,6 +1,7 @@
import { inArray } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { db, ItemsBase } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { logAudit } from "@/lib/services/audit"; import { logAudit } from "@/lib/services/audit";
import { import {
cloneSingleFurni, cloneSingleFurni,
@@ -51,11 +52,10 @@ export const POST = withAdmin(
const classnames = entries.map((e) => e.classname); const classnames = entries.map((e) => e.classname);
if (classnames.length === 0) continue; if (classnames.length === 0) continue;
const placeholders = classnames.map(() => "?").join(","); const rows = await db
const rows = await prisma.$queryRawUnsafe<Array<{ item_name: string }>>( .select({ item_name: ItemsBase.itemName })
`SELECT item_name FROM items_base WHERE item_name IN (${placeholders})`, .from(ItemsBase)
...classnames, .where(inArray(ItemsBase.itemName, classnames));
);
const have = new Set(rows.map((r) => r.item_name)); const have = new Set(rows.map((r) => r.item_name));
for (const entry of entries) { for (const entry of entries) {
@@ -1,9 +1,10 @@
import { existsSync, promises as fs } from "node:fs"; import { existsSync, promises as fs } from "node:fs";
import path from "node:path"; import path from "node:path";
import { eq } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError } from "@/lib/api-response"; import { apiError } from "@/lib/api-response";
import { db, ItemsBase } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { getFurniAssetDirs } from "@/lib/services/furni-asset-dirs"; import { getFurniAssetDirs } from "@/lib/services/furni-asset-dirs";
import { import {
appendFurniEntriesBatch, appendFurniEntriesBatch,
@@ -120,15 +121,16 @@ export const POST = withAdmin(
// Try spriteId as fallback revision // Try spriteId as fallback revision
const revsToTry: number[] = []; const revsToTry: number[] = [];
if (rev > 0) revsToTry.push(rev); if (rev > 0) revsToTry.push(rev);
const dbItem = await prisma.itemsBase.findFirst({ const [dbItem] = await db
where: { itemName: item.classname }, .select({
select: { id: ItemsBase.id,
id: true, spriteId: ItemsBase.spriteId,
spriteId: true, publicName: ItemsBase.publicName,
publicName: true, type: ItemsBase.type,
type: true, })
}, .from(ItemsBase)
}); .where(eq(ItemsBase.itemName, item.classname))
.limit(1);
if (dbItem?.spriteId && !revsToTry.includes(dbItem.spriteId)) { if (dbItem?.spriteId && !revsToTry.includes(dbItem.spriteId)) {
revsToTry.push(dbItem.spriteId); revsToTry.push(dbItem.spriteId);
} }
@@ -1,10 +1,11 @@
import { existsSync, promises as fs } from "node:fs"; import { existsSync, promises as fs } from "node:fs";
import path from "node:path"; import path from "node:path";
import { eq, sql } from "drizzle-orm";
import type { NextRequest } from "next/server"; import type { NextRequest } from "next/server";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError, apiOk } from "@/lib/api-response"; import { apiError, apiOk } from "@/lib/api-response";
import { db, ItemsBase } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { logAudit } from "@/lib/services/audit"; import { logAudit } from "@/lib/services/audit";
import { getFurniAssetDirs } from "@/lib/services/furni-asset-dirs"; import { getFurniAssetDirs } from "@/lib/services/furni-asset-dirs";
import { import {
@@ -47,16 +48,17 @@ export const GET = withAdmin(
const { json } = parseNitroBundle(buffer); const { json } = parseNitroBundle(buffer);
// Fetch interaction flags from DB // Fetch interaction flags from DB
const items = await prisma.$queryRaw< const [items] = (await db.execute(sql`
SELECT allow_sit, allow_lay, allow_walk
FROM items_base WHERE item_name = ${rawClassname} LIMIT 1
`)) as unknown as [
Array<{ Array<{
allow_sit: string; allow_sit: string;
allow_lay: string; allow_lay: string;
allow_walk: string; allow_walk: string;
}> }>,
>` unknown,
SELECT allow_sit, allow_lay, allow_walk ];
FROM items_base WHERE item_name = ${rawClassname} LIMIT 1
`;
const dbRow = items[0]; const dbRow = items[0];
const flags = { const flags = {
@@ -153,14 +155,14 @@ export const PUT = withAdmin(
// 5. Update items_base (best-effort) // 5. Update items_base (best-effort)
try { try {
await prisma.$executeRaw` await db.execute(sql`
UPDATE items_base UPDATE items_base
SET width = ${dims.x}, length = ${dims.y}, stack_height = ${dims.z}, SET width = ${dims.x}, length = ${dims.y}, stack_height = ${dims.z},
allow_sit = ${cansiton ? "1" : "0"}, allow_sit = ${cansiton ? "1" : "0"},
allow_lay = ${canlayon ? "1" : "0"}, allow_lay = ${canlayon ? "1" : "0"},
allow_walk = ${canstandon ? "1" : "0"} allow_walk = ${canstandon ? "1" : "0"}
WHERE item_name = ${rawClassname} WHERE item_name = ${rawClassname}
`; `);
} catch (err) { } catch (err) {
console.warn( console.warn(
"[nitro-editor] items_base update failed:", "[nitro-editor] items_base update failed:",
@@ -180,10 +182,11 @@ export const PUT = withAdmin(
// 7. Audit log // 7. Audit log
try { try {
const dbItem = await prisma.itemsBase.findFirst({ const [dbItem] = await db
where: { itemName: rawClassname }, .select({ id: ItemsBase.id })
select: { id: true }, .from(ItemsBase)
}); .where(eq(ItemsBase.itemName, rawClassname))
.limit(1);
await logAudit({ await logAudit({
userId: ctx.session.user.id, userId: ctx.session.user.id,
action: "furni_edit_nitro", action: "furni_edit_nitro",
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
@@ -1,9 +1,10 @@
import { and, eq } from "drizzle-orm";
import { revalidateTag } from "next/cache"; import { revalidateTag } from "next/cache";
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError } from "@/lib/api-response"; import { apiError } from "@/lib/api-response";
import { AclModelRole, db } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
export const POST = withAdmin( export const POST = withAdmin(
{ permission: PERMS.PERMISSIONS_MANAGE }, { permission: PERMS.PERMISSIONS_MANAGE },
@@ -20,16 +21,32 @@ export const POST = withAdmin(
return apiError("Valid userId and roleId required", 400); return apiError("Valid userId and roleId required", 400);
} }
if (body.action === "remove") { if (body.action === "remove") {
await prisma.aclModelRole.deleteMany({ await db
where: { modelType: "User", modelId: userId, roleId }, .delete(AclModelRole)
}); .where(
and(
eq(AclModelRole.modelType, "User"),
eq(AclModelRole.modelId, userId),
eq(AclModelRole.roleId, roleId),
),
);
} else { } else {
const existing = await prisma.aclModelRole.findFirst({ const [existing] = await db
where: { modelType: "User", modelId: userId, roleId }, .select({ modelId: AclModelRole.modelId })
}); .from(AclModelRole)
.where(
and(
eq(AclModelRole.modelType, "User"),
eq(AclModelRole.modelId, userId),
eq(AclModelRole.roleId, roleId),
),
)
.limit(1);
if (!existing) if (!existing)
await prisma.aclModelRole.create({ await db.insert(AclModelRole).values({
data: { modelType: "User", modelId: userId, roleId }, modelType: "User",
modelId: userId,
roleId,
}); });
} }
revalidateTag("permissions", { expire: 0 }); revalidateTag("permissions", { expire: 0 });
+24 -13
View File
@@ -1,9 +1,11 @@
import { and, eq } from "drizzle-orm";
import type { ResultSetHeader } from "mysql2";
import { revalidateTag } from "next/cache"; import { revalidateTag } from "next/cache";
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError } from "@/lib/api-response"; import { apiError } from "@/lib/api-response";
import { AclModelPermission, AclModelRole, AclRole, db } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
export const POST = withAdmin( export const POST = withAdmin(
{ permission: PERMS.PERMISSIONS_MANAGE }, { permission: PERMS.PERMISSIONS_MANAGE },
@@ -15,7 +17,10 @@ export const POST = withAdmin(
const title = String(body.title ?? "").trim(); const title = String(body.title ?? "").trim();
if (!/^[a-z0-9._-]{2,64}$/.test(slug) || !title) if (!/^[a-z0-9._-]{2,64}$/.test(slug) || !title)
return apiError("Valid slug and title required", 400); return apiError("Valid slug and title required", 400);
const role = await prisma.aclRole.create({ data: { slug, title } }); const [result] = (await db
.insert(AclRole)
.values({ slug, title })) as unknown as [ResultSetHeader];
const role = { id: Number(result.insertId), slug, title };
revalidateTag("permissions", { expire: 0 }); revalidateTag("permissions", { expire: 0 });
return NextResponse.json({ role }); return NextResponse.json({ role });
}, },
@@ -27,20 +32,26 @@ export const DELETE = withAdmin(
const id = Number(request.nextUrl.searchParams.get("id")); const id = Number(request.nextUrl.searchParams.get("id"));
if (!Number.isInteger(id) || id <= 0) if (!Number.isInteger(id) || id <= 0)
return apiError("Valid ID required", 400); return apiError("Valid ID required", 400);
const role = await prisma.aclRole.findUnique({ const [role] = await db
where: { id }, .select({ slug: AclRole.slug })
select: { slug: true }, .from(AclRole)
}); .where(eq(AclRole.id, id))
.limit(1);
if (!role) return apiError("Role not found", 404); if (!role) return apiError("Role not found", 404);
if (role.slug.startsWith("rank_")) if (role.slug.startsWith("rank_"))
return apiError("Rank roles must be managed through emulator ranks", 409); return apiError("Rank roles must be managed through emulator ranks", 409);
await prisma.$transaction([ await db.transaction(async (tx) => {
prisma.aclModelPermission.deleteMany({ await tx
where: { modelType: "Role", modelId: id }, .delete(AclModelPermission)
}), .where(
prisma.aclModelRole.deleteMany({ where: { roleId: id } }), and(
prisma.aclRole.delete({ where: { id } }), eq(AclModelPermission.modelType, "Role"),
]); eq(AclModelPermission.modelId, id),
),
);
await tx.delete(AclModelRole).where(eq(AclModelRole.roleId, id));
await tx.delete(AclRole).where(eq(AclRole.id, id));
});
revalidateTag("permissions", { expire: 0 }); revalidateTag("permissions", { expire: 0 });
return NextResponse.json({ success: true }); return NextResponse.json({ success: true });
}, },
@@ -1,7 +1,8 @@
import { sql } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError, apiOk } from "@/lib/api-response"; import { apiError, apiOk } from "@/lib/api-response";
import { db } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
interface BlacklistWord { interface BlacklistWord {
id: number; id: number;
@@ -9,9 +10,9 @@ interface BlacklistWord {
} }
export const GET = withAdmin({ permission: PERMS.PREFIXES_VIEW }, async () => { export const GET = withAdmin({ permission: PERMS.PREFIXES_VIEW }, async () => {
const words = await prisma.$queryRaw<BlacklistWord[]>` const [words] = (await db.execute(
SELECT id, word FROM custom_prefix_blacklist ORDER BY word ASC sql`SELECT id, word FROM custom_prefix_blacklist ORDER BY word ASC`,
`; )) as unknown as [BlacklistWord[], unknown];
return apiOk({ return apiOk({
words: words.map((w) => ({ ...w, created_at: "" })), words: words.map((w) => ({ ...w, created_at: "" })),
@@ -26,7 +27,9 @@ export const POST = withAdmin(
if (!word) return apiError("Word is required"); if (!word) return apiError("Word is required");
await prisma.$executeRaw`INSERT INTO custom_prefix_blacklist (word) VALUES (${word})`; await db.execute(
sql`INSERT INTO custom_prefix_blacklist (word) VALUES (${word})`,
);
return apiOk(); return apiOk();
}, },
@@ -41,7 +44,7 @@ export const DELETE = withAdmin(
if (!Number.isInteger(id) || id <= 0) if (!Number.isInteger(id) || id <= 0)
return apiError("Missing or invalid word id"); return apiError("Missing or invalid word id");
await prisma.$executeRaw`DELETE FROM custom_prefix_blacklist WHERE id = ${id}`; await db.execute(sql`DELETE FROM custom_prefix_blacklist WHERE id = ${id}`);
return apiOk({ deleted: id }); return apiOk({ deleted: id });
}, },
+21 -21
View File
@@ -1,7 +1,8 @@
import { sql } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError, apiOk } from "@/lib/api-response"; import { apiError, apiOk } from "@/lib/api-response";
import { db } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { Prisma, prisma } from "@/lib/prisma";
interface UserPrefix { interface UserPrefix {
id: number; id: number;
@@ -24,23 +25,24 @@ export const GET = withAdmin(
const offset = (page - 1) * limit; const offset = (page - 1) * limit;
const whereFragment = q const whereFragment = q
? Prisma.sql`WHERE up.text LIKE ${`%${q}%`} OR u.username LIKE ${`%${q}%`}` ? sql`WHERE up.text LIKE ${`%${q}%`} OR u.username LIKE ${`%${q}%`}`
: Prisma.empty; : sql``;
const prefixes = await prisma.$queryRaw<UserPrefix[]>( const [prefixes] =
Prisma.sql`SELECT up.id, up.user_id, up.text, up.color, up.icon, up.effect, up.active, u.username (await db.execute(sql`SELECT up.id, up.user_id, up.text, up.color, up.icon, up.effect, up.active, u.username
FROM custom_prefixes up FROM custom_prefixes up
LEFT JOIN users u ON u.id = up.user_id LEFT JOIN users u ON u.id = up.user_id
${whereFragment} ${whereFragment}
ORDER BY up.id DESC ORDER BY up.id DESC
LIMIT ${limit} OFFSET ${offset}`, LIMIT ${limit} OFFSET ${offset}`)) as unknown as [
); UserPrefix[],
unknown,
];
const countResult = await prisma.$queryRaw<[{ total: bigint }]>( const [countResult] =
Prisma.sql`SELECT COUNT(*) as total FROM custom_prefixes up (await db.execute(sql`SELECT COUNT(*) as total FROM custom_prefixes up
LEFT JOIN users u ON u.id = up.user_id LEFT JOIN users u ON u.id = up.user_id
${whereFragment}`, ${whereFragment}`)) as unknown as [[{ total: bigint }], unknown];
);
const total = Number(countResult[0]?.total || 0); const total = Number(countResult[0]?.total || 0);
@@ -69,9 +71,9 @@ export const POST = withAdmin(
return apiError("Missing required fields: username, text, color"); return apiError("Missing required fields: username, text, color");
} }
const users = await prisma.$queryRaw<{ id: number }[]>( const [users] = (await db.execute(
Prisma.sql`SELECT id FROM users WHERE username = ${username} LIMIT 1`, sql`SELECT id FROM users WHERE username = ${username} LIMIT 1`,
); )) as unknown as [{ id: number }[], unknown];
if (!users || users.length === 0) { if (!users || users.length === 0) {
return apiError("User not found"); return apiError("User not found");
@@ -79,8 +81,8 @@ export const POST = withAdmin(
const userId = users[0].id; const userId = users[0].id;
await prisma.$executeRaw( await db.execute(
Prisma.sql`INSERT INTO custom_prefixes (user_id, text, color, icon, effect, active) sql`INSERT INTO custom_prefixes (user_id, text, color, icon, effect, active)
VALUES (${userId}, ${text}, ${color}, ${icon || ""}, ${effect || ""}, ${active ? 1 : 0})`, VALUES (${userId}, ${text}, ${color}, ${icon || ""}, ${effect || ""}, ${active ? 1 : 0})`,
); );
@@ -96,8 +98,8 @@ export const PUT = withAdmin(
if (!id) return apiError("Missing prefix id"); if (!id) return apiError("Missing prefix id");
await prisma.$executeRaw( await db.execute(
Prisma.sql`UPDATE custom_prefixes sql`UPDATE custom_prefixes
SET text = ${text}, color = ${color}, icon = ${icon || ""}, effect = ${effect || ""}, active = ${active ? 1 : 0} SET text = ${text}, color = ${color}, icon = ${icon || ""}, effect = ${effect || ""}, active = ${active ? 1 : 0}
WHERE id = ${id}`, WHERE id = ${id}`,
); );
@@ -114,9 +116,7 @@ export const DELETE = withAdmin(
if (!id) return apiError("Missing prefix id"); if (!id) return apiError("Missing prefix id");
await prisma.$executeRaw( await db.execute(sql`DELETE FROM custom_prefixes WHERE id = ${id}`);
Prisma.sql`DELETE FROM custom_prefixes WHERE id = ${id}`,
);
return apiOk({ deleted: id }); return apiOk({ deleted: id });
}, },
+7 -6
View File
@@ -1,7 +1,8 @@
import { sql } from "drizzle-orm";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { apiError, apiOk } from "@/lib/api-response"; import { apiError, apiOk } from "@/lib/api-response";
import { db } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
interface PrefixSetting { interface PrefixSetting {
key: string; key: string;
@@ -31,9 +32,9 @@ const DEFAULT_SETTINGS: Record<string, string> = {
}; };
export const GET = withAdmin({ permission: PERMS.PREFIXES_VIEW }, async () => { export const GET = withAdmin({ permission: PERMS.PREFIXES_VIEW }, async () => {
const settings = await prisma.$queryRaw<PrefixSetting[]>` const [settings] = (await db.execute(
SELECT \`key\`, \`value\` FROM custom_prefix_settings sql`SELECT \`key\`, \`value\` FROM custom_prefix_settings`,
`; )) as unknown as [PrefixSetting[], unknown];
const result: Record<string, string> = { ...DEFAULT_SETTINGS }; const result: Record<string, string> = { ...DEFAULT_SETTINGS };
for (const s of settings) { for (const s of settings) {
@@ -58,11 +59,11 @@ export const PUT = withAdmin(
return apiError(`Invalid setting key: ${key}`); return apiError(`Invalid setting key: ${key}`);
} }
const strValue = String(value); const strValue = String(value);
await prisma.$executeRaw` await db.execute(sql`
INSERT INTO custom_prefix_settings (\`key\`, \`value\`) INSERT INTO custom_prefix_settings (\`key\`, \`value\`)
VALUES (${key}, ${strValue}) VALUES (${key}, ${strValue})
ON DUPLICATE KEY UPDATE \`value\` = ${strValue} ON DUPLICATE KEY UPDATE \`value\` = ${strValue}
`; `);
} }
return apiOk(); return apiOk();
+16 -9
View File
@@ -1,7 +1,8 @@
import { eq, sql } from "drizzle-orm";
import { NextResponse } from "next/server"; import { NextResponse } from "next/server";
import { withAdmin } from "@/lib/api-handler"; import { withAdmin } from "@/lib/api-handler";
import { db, User } from "@/lib/db";
import { PERMS } from "@/lib/permissions"; import { PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { rcon } from "@/lib/services/rcon"; import { rcon } from "@/lib/services/rcon";
import { logStaffActivity } from "@/lib/services/staff-activity"; import { logStaffActivity } from "@/lib/services/staff-activity";
@@ -31,9 +32,14 @@ export const POST = withAdmin(
); );
} }
const rankExists = await prisma.$queryRaw<{ id: number }[]>` const [rankExists] = (await db
SELECT id FROM permission_ranks WHERE id = ${rank} LIMIT 1 .execute(
`.catch(() => [] as { id: number }[]); sql`SELECT id FROM permission_ranks WHERE id = ${rank} LIMIT 1`,
)
.catch(() => [[]] as unknown as [unknown[], unknown])) as unknown as [
{ id: number }[],
unknown,
];
if (rankExists.length === 0) { if (rankExists.length === 0) {
return NextResponse.json( return NextResponse.json(
{ success: false, message: "Rank does not exist" }, { success: false, message: "Rank does not exist" },
@@ -41,10 +47,11 @@ export const POST = withAdmin(
); );
} }
const target = await prisma.user.findUnique({ const [target] = await db
where: { id: userId }, .select({ rank: User.rank })
select: { rank: true }, .from(User)
}); .where(eq(User.id, userId))
.limit(1);
if (!target) { if (!target) {
return NextResponse.json( return NextResponse.json(
{ success: false, message: "User not found" }, { success: false, message: "User not found" },
@@ -74,7 +81,7 @@ export const POST = withAdmin(
} }
} }
await prisma.user.update({ where: { id: userId }, data: { rank } }); await db.update(User).set({ rank }).where(eq(User.id, userId));
await rcon.setRank(userId, rank); await rcon.setRank(userId, rank);
await logStaffActivity({ await logStaffActivity({
staffId, staffId,
+13 -14
View File
@@ -6,9 +6,10 @@
// chars (matches the VARCHAR(255) column). Fails soft — never returns a 500 for // chars (matches the VARCHAR(255) column). Fails soft — never returns a 500 for
// DB issues, just a generic error envelope. // DB issues, just a generic error envelope.
import { eq } from "drizzle-orm";
import { apiError, apiJson } from "@/lib/api"; import { apiError, apiJson } from "@/lib/api";
import { bearerUserId } from "@/lib/api-auth"; import { bearerUserId } from "@/lib/api-auth";
import { prisma } from "@/lib/prisma"; import { db, WebsiteArticleComments, WebsiteArticles } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -31,24 +32,22 @@ export async function POST(
} }
try { try {
const article = await prisma.websiteArticles.findUnique({ const [article] = await db
where: { slug }, .select({ id: WebsiteArticles.id })
select: { id: true }, .from(WebsiteArticles)
}); .where(eq(WebsiteArticles.slug, slug))
.limit(1);
if (!article) { if (!article) {
return apiError("Article not found", 404); return apiError("Article not found", 404);
} }
const now = new Date(); const now = new Date();
await prisma.websiteArticleComments.create({ await db.insert(WebsiteArticleComments).values({
data: { articleId: article.id,
articleId: article.id, userId: uid,
userId: uid, comment,
comment, createdAt: now,
createdAt: now, updatedAt: now,
updatedAt: now,
},
select: { id: true },
}); });
return apiJson({ ok: true }); return apiJson({ ok: true });
+16 -14
View File
@@ -1,5 +1,6 @@
import { eq } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db, WebsiteArticles } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -14,19 +15,20 @@ export async function GET(
const { slug } = await params; const { slug } = await params;
try { try {
const article = await prisma.websiteArticles.findUnique({ const [article] = await db
where: { slug }, .select({
select: { id: WebsiteArticles.id,
id: true, title: WebsiteArticles.title,
title: true, slug: WebsiteArticles.slug,
slug: true, shortStory: WebsiteArticles.shortStory,
shortStory: true, fullStory: WebsiteArticles.fullStory,
fullStory: true, image: WebsiteArticles.image,
image: true, createdAt: WebsiteArticles.createdAt,
createdAt: true, updatedAt: WebsiteArticles.updatedAt,
updatedAt: true, })
}, .from(WebsiteArticles)
}); .where(eq(WebsiteArticles.slug, slug))
.limit(1);
if (!article) { if (!article) {
return apiJson({ error: "Article not found" }, { status: 404 }); return apiJson({ error: "Article not found" }, { status: 404 });
+20 -18
View File
@@ -1,34 +1,36 @@
import { count, desc } from "drizzle-orm";
import { apiJson, pagination } from "@/lib/api"; import { apiJson, pagination } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db, WebsiteArticles } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
/** /**
* GET /api/articles — paginated list of website_articles, newest first. * GET /api/articles — paginated list of website_articles, newest first.
* Mirrors the /news page query (prisma.websiteArticles). Returns list cards * Mirrors the /news page query. Returns list cards (shortStory only, never
* (shortStory only, never fullStory) plus pagination metadata. * fullStory) plus pagination metadata.
*/ */
export async function GET(req: Request) { export async function GET(req: Request) {
const sp = new URL(req.url).searchParams; const sp = new URL(req.url).searchParams;
const { page, perPage, skip, take } = pagination(sp); const { page, perPage, skip, take } = pagination(sp);
try { try {
const [total, articles] = await Promise.all([ const [totalRows, articles] = await Promise.all([
prisma.websiteArticles.count(), db.select({ total: count() }).from(WebsiteArticles),
prisma.websiteArticles.findMany({ db
select: { .select({
id: true, id: WebsiteArticles.id,
title: true, title: WebsiteArticles.title,
slug: true, slug: WebsiteArticles.slug,
shortStory: true, shortStory: WebsiteArticles.shortStory,
image: true, image: WebsiteArticles.image,
createdAt: true, createdAt: WebsiteArticles.createdAt,
}, })
orderBy: { createdAt: "desc" }, .from(WebsiteArticles)
skip, .orderBy(desc(WebsiteArticles.createdAt))
take, .limit(take)
}), .offset(skip),
]); ]);
const total = totalRows[0]?.total ?? 0;
return apiJson({ return apiJson({
data: articles, data: articles,
File diff suppressed because it is too large. Load diff
+20 -16
View File
@@ -2,8 +2,9 @@
// (guilds_members). AtomCMS JSON API parity. Returns { error } (404) when the // (guilds_members). AtomCMS JSON API parity. Returns { error } (404) when the
// id is unknown. The owner is the user_id column (accessor userId), surfaced // id is unknown. The owner is the user_id column (accessor userId), surfaced
// here as ownerId. // here as ownerId.
import { count, eq } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db, Guilds, GuildsMembers } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -19,18 +20,19 @@ export async function GET(
const guildId = Number(id); const guildId = Number(id);
try { try {
const guild = await prisma.guilds.findUnique({ const [guild] = await db
where: { id: guildId }, .select({
select: { id: Guilds.id,
id: true, name: Guilds.name,
name: true, description: Guilds.description,
description: true, userId: Guilds.userId,
userId: true, roomId: Guilds.roomId,
roomId: true, badge: Guilds.badge,
badge: true, dateCreated: Guilds.dateCreated,
dateCreated: true, })
}, .from(Guilds)
}); .where(eq(Guilds.id, guildId))
.limit(1);
if (!guild) { if (!guild) {
return apiJson({ error: "Guild not found" }, { status: 404 }); return apiJson({ error: "Guild not found" }, { status: 404 });
@@ -39,9 +41,11 @@ export async function GET(
// Member count is a separate guarded query (no relation is modelled). // Member count is a separate guarded query (no relation is modelled).
let memberCount = 0; let memberCount = 0;
try { try {
memberCount = await prisma.guildsMembers.count({ const [row] = await db
where: { guildId: guild.id }, .select({ total: count() })
}); .from(GuildsMembers)
.where(eq(GuildsMembers.guildId, guild.id));
memberCount = row?.total ?? 0;
} catch { } catch {
memberCount = 0; memberCount = 0;
} }
+16 -14
View File
@@ -2,8 +2,9 @@
// paginated list ordered newest first (by id), exposing the basic public // paginated list ordered newest first (by id), exposing the basic public
// fields. The owner is stored as the user_id column (accessor userId), surfaced // fields. The owner is stored as the user_id column (accessor userId), surfaced
// here as ownerId for API clarity. // here as ownerId for API clarity.
import { count, desc } from "drizzle-orm";
import { apiJson, pagination } from "@/lib/api"; import { apiJson, pagination } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db, Guilds } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -12,20 +13,21 @@ export async function GET(req: Request) {
const { page, perPage, skip, take } = pagination(sp); const { page, perPage, skip, take } = pagination(sp);
try { try {
const [total, rows] = await Promise.all([ const [totalRows, rows] = await Promise.all([
prisma.guilds.count(), db.select({ total: count() }).from(Guilds),
prisma.guilds.findMany({ db
orderBy: { id: "desc" }, .select({
skip, id: Guilds.id,
take, name: Guilds.name,
select: { description: Guilds.description,
id: true, userId: Guilds.userId,
name: true, })
description: true, .from(Guilds)
userId: true, .orderBy(desc(Guilds.id))
}, .limit(take)
}), .offset(skip),
]); ]);
const total = totalRows[0]?.total ?? 0;
// Rename userId → ownerId for the public payload. // Rename userId → ownerId for the public payload.
const data = rows.map(({ userId, ...rest }) => ({ const data = rows.map(({ userId, ...rest }) => ({
+4 -2
View File
@@ -1,6 +1,7 @@
import { sql } from "drizzle-orm";
import { env } from "@/env"; import { env } from "@/env";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db } from "@/lib/db";
import { redis } from "@/lib/redis"; import { redis } from "@/lib/redis";
import { rcon } from "@/lib/services/rcon"; import { rcon } from "@/lib/services/rcon";
@@ -13,7 +14,8 @@ export const dynamic = "force-dynamic";
* only care about reachability. * only care about reachability.
*/ */
export async function GET() { export async function GET() {
const database = await prisma.$queryRaw`SELECT 1` const database = await db
.execute(sql`SELECT 1`)
.then(() => true) .then(() => true)
.catch(() => false); .catch(() => false);
+17 -16
View File
@@ -1,7 +1,8 @@
import { count, desc, eq } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { FALLBACK_HOTEL_NAME } from "@/lib/brand"; import { FALLBACK_HOTEL_NAME } from "@/lib/brand";
import { db, User, WebsiteArticles } from "@/lib/db";
import { resolveHotelName } from "@/lib/hotel-name"; import { resolveHotelName } from "@/lib/hotel-name";
import { prisma } from "@/lib/prisma";
import { apiCacheKey, redisCache } from "@/lib/redis-cache"; import { apiCacheKey, redisCache } from "@/lib/redis-cache";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -14,23 +15,23 @@ export const dynamic = "force-dynamic";
export async function GET(_req: Request) { export async function GET(_req: Request) {
try { try {
const data = await redisCache(apiCacheKey("home"), 15, async () => { const data = await redisCache(apiCacheKey("home"), 15, async () => {
const [articles, online, hotelName] = await Promise.all([ const [articles, onlineRows, hotelName] = await Promise.all([
prisma.websiteArticles.findMany({ db
select: { .select({
id: true, id: WebsiteArticles.id,
title: true, title: WebsiteArticles.title,
slug: true, slug: WebsiteArticles.slug,
shortStory: true, shortStory: WebsiteArticles.shortStory,
image: true, image: WebsiteArticles.image,
createdAt: true, createdAt: WebsiteArticles.createdAt,
}, })
orderBy: { createdAt: "desc" }, .from(WebsiteArticles)
take: 4, .orderBy(desc(WebsiteArticles.createdAt))
}), .limit(4),
prisma.user.count({ where: { online: "1" } }), db.select({ total: count() }).from(User).where(eq(User.online, "1")),
resolveHotelName(), resolveHotelName(),
]); ]);
return { articles, online, hotelName }; return { articles, online: onlineRows[0]?.total ?? 0, hotelName };
}); });
return apiJson(data); return apiJson(data);
} catch { } catch {
+30 -17
View File
@@ -1,8 +1,9 @@
import { desc, eq, inArray } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { prisma } from "@/lib/prisma"; import { db, User, UsersCurrency } from "@/lib/db";
// Public REST API — leaderboard. Mirrors src/app/leaderboard/page.tsx. // Public REST API — leaderboard. Mirrors src/app/leaderboard/page.tsx.
// AtomCMS-faithful currency type ids (see prisma/schema.prisma UsersCurrency): // AtomCMS-faithful currency type ids (see UsersCurrency):
// Credits = -1 (lives on users.credits), Duckets = 0, Diamonds = 5. // Credits = -1 (lives on users.credits), Duckets = 0, Diamonds = 5.
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -16,11 +17,15 @@ const CURRENCY_TYPE: Record<Exclude<LeaderboardType, "credits">, number> = {
type Row = { rank: number; username: string; look: string; value: number }; type Row = { rank: number; username: string; look: string; value: number };
async function loadCreditsRows(): Promise<Row[]> { async function loadCreditsRows(): Promise<Row[]> {
const users = await prisma.user.findMany({ const users = await db
orderBy: { credits: "desc" }, .select({
take: 20, username: User.username,
select: { username: true, look: true, credits: true }, look: User.look,
}); credits: User.credits,
})
.from(User)
.orderBy(desc(User.credits))
.limit(20);
return users.map((u, i) => ({ return users.map((u, i) => ({
rank: i + 1, rank: i + 1,
username: u.username, username: u.username,
@@ -30,18 +35,26 @@ async function loadCreditsRows(): Promise<Row[]> {
} }
async function loadCurrencyRows(type: number): Promise<Row[]> { async function loadCurrencyRows(type: number): Promise<Row[]> {
const top = await prisma.usersCurrency.findMany({ const top = await db
where: { type }, .select({
orderBy: { amount: "desc" }, userId: UsersCurrency.userId,
take: 20, amount: UsersCurrency.amount,
select: { userId: true, amount: true }, })
}); .from(UsersCurrency)
.where(eq(UsersCurrency.type, type))
.orderBy(desc(UsersCurrency.amount))
.limit(20);
if (top.length === 0) return []; if (top.length === 0) return [];
const users = await prisma.user.findMany({ const users = await db
where: { id: { in: top.map((t) => t.userId) } }, .select({ id: User.id, username: User.username, look: User.look })
select: { id: true, username: true, look: true }, .from(User)
}); .where(
inArray(
User.id,
top.map((t) => t.userId),
),
);
const byId = new Map(users.map((u) => [u.id, u])); const byId = new Map(users.map((u) => [u.id, u]));
return top return top
+20 -18
View File
@@ -1,13 +1,14 @@
// Public REST API — the currently signed-in user. // Public REST API — the currently signed-in user.
// //
// Reads the NextAuth session, then re-queries prisma.user by the session id to // Reads the NextAuth session, then re-queries users by the session id to
// return a safe field set (never password / auth_ticket / 2FA secrets / pincode // return a safe field set (never password / auth_ticket / 2FA secrets / pincode
// / mail). Returns { user: null } only when unauthenticated or missing. // / mail). Returns { user: null } only when unauthenticated or missing.
import { eq } from "drizzle-orm";
import { apiJson, apiUnavailable } from "@/lib/api"; import { apiJson, apiUnavailable } from "@/lib/api";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { sessionUserId } from "@/lib/auth/session-user"; import { sessionUserId } from "@/lib/auth/session-user";
import { prisma } from "@/lib/prisma"; import { db, User } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -19,22 +20,23 @@ export async function GET(_req: Request) {
} }
try { try {
const user = await prisma.user.findUnique({ const [user] = await db
where: { id }, .select({
select: { id: User.id,
id: true, username: User.username,
username: true, look: User.look,
look: true, motto: User.motto,
motto: true, rank: User.rank,
rank: true, credits: User.credits,
credits: true, pixels: User.pixels,
pixels: true, points: User.points,
points: true, gender: User.gender,
gender: true, online: User.online,
online: true, accountCreated: User.accountCreated,
accountCreated: true, })
}, .from(User)
}); .where(eq(User.id, id))
.limit(1);
if (!user) { if (!user) {
return apiJson({ user: null }); return apiJson({ user: null });
+29 -10
View File
@@ -8,11 +8,13 @@
// to the user via personal_access_tokens.tokenable_id (a BigInt). NOTE: the live // to the user via personal_access_tokens.tokenable_id (a BigInt). NOTE: the live
// table has no expires_at column, so it is never read or written here. // table has no expires_at column, so it is never read or written here.
import { and, desc, eq } from "drizzle-orm";
import type { ResultSetHeader } from "mysql2";
import { apiError, apiJson, apiUnavailable, positiveBigInt } from "@/lib/api"; import { apiError, apiJson, apiUnavailable, positiveBigInt } from "@/lib/api";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { personalTokenScope } from "@/lib/auth/personal-token-scope"; import { personalTokenScope } from "@/lib/auth/personal-token-scope";
import { sessionUserId } from "@/lib/auth/session-user"; import { sessionUserId } from "@/lib/auth/session-user";
import { prisma } from "@/lib/prisma"; import { db, PersonalAccessTokens } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@@ -26,11 +28,21 @@ export async function GET(_req: Request) {
if (!id) return apiError("Unauthorized", 401); if (!id) return apiError("Unauthorized", 401);
try { try {
const tokens = await prisma.personalAccessTokens.findMany({ const scope = personalTokenScope(id);
where: personalTokenScope(id), const tokens = await db
select: { id: true, name: true, lastUsedAt: true }, .select({
orderBy: { id: "desc" }, id: PersonalAccessTokens.id,
}); name: PersonalAccessTokens.name,
lastUsedAt: PersonalAccessTokens.lastUsedAt,
})
.from(PersonalAccessTokens)
.where(
and(
eq(PersonalAccessTokens.tokenableId, scope.tokenableId),
eq(PersonalAccessTokens.tokenableType, scope.tokenableType),
),
)
.orderBy(desc(PersonalAccessTokens.id));
// Never expose the token hash. // Never expose the token hash.
return apiJson({ data: tokens }); return apiJson({ data: tokens });
} catch { } catch {
@@ -50,10 +62,17 @@ export async function DELETE(req: Request) {
try { try {
// Scope the delete to the owner so users cannot revoke others' tokens. // Scope the delete to the owner so users cannot revoke others' tokens.
const result = await prisma.personalAccessTokens.deleteMany({ const scope = personalTokenScope(id);
where: { id: parsedTokenId, ...personalTokenScope(id) }, const [result] = (await db
}); .delete(PersonalAccessTokens)
if (result.count === 0) { .where(
and(
eq(PersonalAccessTokens.id, parsedTokenId),
eq(PersonalAccessTokens.tokenableId, scope.tokenableId),
eq(PersonalAccessTokens.tokenableType, scope.tokenableType),
),
)) as unknown as [ResultSetHeader];
if (!result.affectedRows) {
return apiError("Token not found", 404); return apiError("Token not found", 404);
} }
return apiJson({ ok: true }); return apiJson({ ok: true });
+10 -5
View File
@@ -3,18 +3,23 @@
// `online` is the emulator's string flag "1" / "0" (see User model). Returns // `online` is the emulator's string flag "1" / "0" (see User model). Returns
// { count: 0 } (never 500) on DB failure. // { count: 0 } (never 500) on DB failure.
import { count, eq } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { cached } from "@/lib/cache"; import { cached } from "@/lib/cache";
import { prisma } from "@/lib/prisma"; import { db, User } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
export async function GET(_req: Request) { export async function GET(_req: Request) {
try { try {
const count = await cached("online_count", 10_000, () => const result = await cached("online_count", 10_000, async () => {
prisma.user.count({ where: { online: "1" } }), const [row] = await db
); .select({ total: count() })
return apiJson({ count }); .from(User)
.where(eq(User.online, "1"));
return row?.total ?? 0;
});
return apiJson({ count: result });
} catch { } catch {
return apiJson({ count: 0 }); return apiJson({ count: 0 });
} }
+9 -9
View File
@@ -1,23 +1,23 @@
// Public REST API — list of currently-online users (username + look only). // Public REST API — list of currently-online users (username + look only).
// //
// `online` is stored by the emulator as the string "1" / "0" (see User model in // `online` is stored by the emulator as the string "1" / "0" (see User model).
// prisma/schema.prisma). Capped at 100 rows. Returns empty data (never 500) on // Capped at 100 rows. Returns empty data (never 500) on DB failure.
// DB failure.
import { eq } from "drizzle-orm";
import { apiJson } from "@/lib/api"; import { apiJson } from "@/lib/api";
import { cached } from "@/lib/cache"; import { cached } from "@/lib/cache";
import { prisma } from "@/lib/prisma"; import { db, User } from "@/lib/db";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
export async function GET(_req: Request) { export async function GET(_req: Request) {
try { try {
const users = await cached("online_users", 10_000, async () => const users = await cached("online_users", 10_000, async () =>
prisma.user.findMany({ db
where: { online: "1" }, .select({ username: User.username, look: User.look })
select: { username: true, look: true }, .from(User)
take: 100, .where(eq(User.online, "1"))
}), .limit(100),
); );
return apiJson({ users }); return apiJson({ users });
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -2,9 +2,9 @@ import { NextResponse } from "next/server";
import { env } from "@/env"; import { env } from "@/env";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { sessionUserId } from "@/lib/auth/session-user"; import { sessionUserId } from "@/lib/auth/session-user";
import { db, WebsitePaypalTransactions } from "@/lib/db";
import { resolveHotelName } from "@/lib/hotel-name"; import { resolveHotelName } from "@/lib/hotel-name";
import { logger } from "@/lib/logger"; import { logger } from "@/lib/logger";
import { prisma } from "@/lib/prisma";
import { import {
createOrder, createOrder,
creditsPerUnit, creditsPerUnit,
@@ -87,7 +87,7 @@ export async function POST(req: Request): Promise<Response> {
await recordCreatedTopup( await recordCreatedTopup(
{ userId, orderId: order.id, amount, currency: PAYPAL_CURRENCY, credits }, { userId, orderId: order.id, amount, currency: PAYPAL_CURRENCY, credits },
(data) => prisma.websitePaypalTransactions.create({ data }), (data) => db.insert(WebsitePaypalTransactions).values(data),
); );
return NextResponse.json({ return NextResponse.json({