Revert "Merge pull request 'Complete Housekeeping migration and /ase cutover' (#52) from codex/housekeeping-complete into main"

This reverts commit 488b6e57c4, reversing
changes made to b506b4499a.
This commit is contained in:
Simo committed 2026-08-30 21:31:34 +02:00
1 parent 488b6e57c4
commit b1ddda66ff
802 files changed
+61370 -76659

No files matched your search

@@ -0,0 +1,327 @@
"use client";
import { ArrowLeft, Loader2, Mail, Send, Shield, User } from "lucide-react";
import { useTranslations } from "next-intl";
import { useEffect, useRef, useState } from "react";
import {
closeHelpCenterTicket,
liftBanFromHelpTicket,
reopenHelpCenterTicket,
replyHelpCenterTicket,
} from "@/actions/admin-help-tickets";
import Link from "@/components/link";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Textarea } from "@/components/ui/textarea";
import { useServerAction } from "@/hooks/use-server-action";
interface ThreadMessage {
key: string;
userId: number;
username: string;
isStaff: boolean;
content: string;
createdAt: string;
}
interface HelpTicketInfo {
id: string;
title: string;
open: boolean;
createdAt: string;
updatedAt: string;
categoryName?: string | null;
creator: {
id: number;
username: string;
rank: number;
mail: string;
} | null;
}
export function AdminHelpTicketDetail({
ticket,
messages: initialMessages,
canEdit,
canLiftBan = false,
hasActiveBan = false,
listHref = "/admin/help-tickets",
hideRequesterContact = false,
}: {
ticket: HelpTicketInfo;
messages: ThreadMessage[];
canEdit: boolean;
/** Staff may lift requester bans (USERS_BAN). */
canLiftBan?: boolean;
hasActiveBan?: boolean;
listHref?: string;
/** Hide email/IP-style contact for mod-lite surfaces. */
hideRequesterContact?: boolean;
}) {
const t = useTranslations("pages.admin.helpTickets");
const [messages, setMessages] = useState(initialMessages);
const [reply, setReply] = useState("");
const { run, isPending } = useServerAction();
const messagesEndRef = useRef<HTMLDivElement>(null);
useEffect(() => {
setMessages(initialMessages);
}, [initialMessages]);
// biome-ignore lint/correctness/useExhaustiveDependencies: scroll when thread updates
useEffect(() => {
messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
}, [messages]);
function handleReply() {
if (!reply.trim() || isPending) return;
run(
() =>
replyHelpCenterTicket({
ticketId: ticket.id,
content: reply.trim(),
}),
{
successMessage: t("success.replied"),
onSuccess: () => setReply(""),
},
);
}
function handleClose() {
run(() => closeHelpCenterTicket({ ticketId: ticket.id }), {
successMessage: t("success.closed"),
});
}
function handleReopen() {
run(() => reopenHelpCenterTicket({ ticketId: ticket.id }), {
successMessage: t("success.reopened"),
});
}
function handleLiftBan() {
if (!ticket.creator || isPending) return;
run(() => liftBanFromHelpTicket({ ticketId: ticket.id }), {
successMessage: t("success.banLifted"),
});
}
return (
<div className="space-y-6">
<div className="flex items-start gap-4">
<Link href={listHref}>
<Button variant="ghost" size="icon" aria-label={t("backToList")}>
<ArrowLeft className="h-4 w-4" />
</Button>
</Link>
<div className="flex-1">
<div className="flex items-center gap-2 mb-1">
<span className="text-sm text-muted-foreground font-mono">
#{ticket.id}
</span>
<Badge variant={ticket.open ? "default" : "secondary"}>
{ticket.open ? t("statusOpen") : t("statusClosed")}
</Badge>
{ticket.categoryName ? (
<Badge variant="outline">{ticket.categoryName}</Badge>
) : null}
{hasActiveBan ? (
<Badge variant="destructive">{t("requesterBanned")}</Badge>
) : null}
</div>
<h1 className="text-2xl font-bold">{ticket.title}</h1>
</div>
</div>
<div className="grid gap-6 lg:grid-cols-[1fr_300px]">
<div className="space-y-4">
<Card className="overflow-hidden">
<CardHeader className="pb-2 border-b">
<CardTitle className="text-sm">{t("threadTitle")}</CardTitle>
</CardHeader>
<div className="max-h-[600px] overflow-y-auto p-4 space-y-4">
{messages.map((msg) => (
<div key={msg.key} className="flex gap-3">
<div className="shrink-0">
<div className="w-9 h-9 rounded-full bg-accent flex items-center justify-center text-xs font-bold">
{msg.isStaff ? (
<Shield className="h-4 w-4 text-primary" />
) : (
<User className="h-4 w-4" />
)}
</div>
</div>
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2 mb-1">
<span
className={`text-xs font-semibold ${msg.isStaff ? "text-primary" : ""}`}
>
{msg.username}
{msg.isStaff ? ` (${t("staffBadge")})` : ""}
</span>
<span className="text-[10px] text-muted-foreground">
{new Date(msg.createdAt).toLocaleString()}
</span>
</div>
<div
className={`rounded-lg px-4 py-2.5 text-sm leading-relaxed ${
msg.isStaff
? "bg-primary/10 border border-primary/20"
: "bg-muted"
}`}
>
<p className="whitespace-pre-wrap break-words">
{msg.content}
</p>
</div>
</div>
</div>
))}
<div ref={messagesEndRef} />
</div>
{canEdit && ticket.open && (
<div className="border-t p-4">
<div className="flex gap-2">
<Textarea
value={reply}
onChange={(e) => setReply(e.target.value)}
placeholder={t("replyPlaceholder")}
rows={3}
maxLength={5000}
className="resize-none"
onKeyDown={(e) => {
if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
handleReply();
}
}}
/>
<Button
onClick={handleReply}
disabled={isPending || !reply.trim()}
size="icon"
className="shrink-0 h-auto"
aria-label={t("replySubmit")}
>
{isPending ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<Send className="h-4 w-4" />
)}
</Button>
</div>
<p className="text-[10px] text-muted-foreground mt-1">
{t("replyHint")}
</p>
</div>
)}
{!ticket.open && (
<div className="border-t p-4 text-center text-sm text-muted-foreground">
{t("closedHint")}
</div>
)}
</Card>
</div>
<div className="space-y-4">
{(canEdit || (canLiftBan && hasActiveBan)) && (
<Card>
<CardHeader className="pb-2">
<CardTitle className="text-sm">{t("actionsTitle")}</CardTitle>
</CardHeader>
<CardContent className="space-y-2">
{canLiftBan && hasActiveBan && ticket.creator ? (
<Button
variant="destructive"
size="sm"
className="w-full"
disabled={isPending}
onClick={handleLiftBan}
>
{t("liftBanSubmit")}
</Button>
) : null}
{canEdit && ticket.open ? (
<Button
variant="outline"
size="sm"
className="w-full"
disabled={isPending}
onClick={handleClose}
>
{t("closeSubmit")}
</Button>
) : null}
{canEdit && !ticket.open ? (
<Button
variant="outline"
size="sm"
className="w-full"
disabled={isPending}
onClick={handleReopen}
>
{t("reopenSubmit")}
</Button>
) : null}
</CardContent>
</Card>
)}
{ticket.creator && (
<Card>
<CardHeader className="pb-2">
<CardTitle className="text-sm">{t("requesterTitle")}</CardTitle>
</CardHeader>
<CardContent className="space-y-2">
<Link
href={
hideRequesterContact
? `/u/${encodeURIComponent(ticket.creator.username)}`
: `/admin/users/show/${ticket.creator.id}`
}
className="flex items-center gap-2 text-sm font-medium hover:text-primary"
>
<User className="h-3.5 w-3.5" />
{ticket.creator.username}
<Badge variant="outline" className="text-[10px]">
{t("rankLabel", { rank: ticket.creator.rank })}
</Badge>
</Link>
{!hideRequesterContact && ticket.creator.mail ? (
<div className="flex items-center gap-2 text-xs text-muted-foreground">
<Mail className="h-3 w-3" />
{ticket.creator.mail}
</div>
) : null}
</CardContent>
</Card>
)}
<Card>
<CardHeader className="pb-2">
<CardTitle className="text-sm">{t("detailsTitle")}</CardTitle>
</CardHeader>
<CardContent className="space-y-2 text-xs text-muted-foreground">
<div className="flex justify-between gap-2">
<span>{t("colCreated")}</span>
<span>{new Date(ticket.createdAt).toLocaleString()}</span>
</div>
<div className="flex justify-between gap-2">
<span>{t("colUpdated")}</span>
<span>{new Date(ticket.updatedAt).toLocaleString()}</span>
</div>
<div className="flex justify-between gap-2">
<span>{t("messageCountLabel")}</span>
<span>{messages.length}</span>
</div>
</CardContent>
</Card>
</div>
</div>
</div>
);
}
+182
View File
@@ -0,0 +1,182 @@
import { and, asc, eq, gt, inArray, or } from "drizzle-orm";
import { notFound, redirect } from "next/navigation";
import { getTranslations } from "next-intl/server";
import { TicketQueueBanner } from "@/components/admin/ticket-queue-banner";
import { getMinStaffRank } from "@/lib/admin/min-staff-rank";
import { fetchTicketQueueOpenCounts } from "@/lib/admin/ticket-queue-counts";
import { positiveBigInt } from "@/lib/api";
import { unixNow } from "@/lib/bans";
import {
Ban,
db,
User,
WebsiteHelpCenterCategories,
WebsiteHelpCenterTicketReplies,
WebsiteHelpCenterTickets,
} from "@/lib/db";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { AdminHelpTicketDetail } from "./admin-help-ticket-detail";
export default async function AdminHelpTicketDetailPage({
params,
}: {
params: Promise<{ id: string }>;
}) {
const { session, permissions } = await getAdminContext();
if (!canAccess(permissions, PERMS.TICKETS_VIEW, session.user.rank)) {
redirect("/admin");
}
const t = await getTranslations("pages.admin.helpTickets");
const { id } = await params;
const ticketId = positiveBigInt(id);
if (!ticketId) notFound();
const [ticket] = await db
.select({
id: WebsiteHelpCenterTickets.id,
userId: WebsiteHelpCenterTickets.userId,
categoryId: WebsiteHelpCenterTickets.categoryId,
title: WebsiteHelpCenterTickets.title,
content: WebsiteHelpCenterTickets.content,
open: WebsiteHelpCenterTickets.open,
createdAt: WebsiteHelpCenterTickets.createdAt,
updatedAt: WebsiteHelpCenterTickets.updatedAt,
})
.from(WebsiteHelpCenterTickets)
.where(eq(WebsiteHelpCenterTickets.id, ticketId))
.limit(1);
if (!ticket) notFound();
const replies = await db
.select({
id: WebsiteHelpCenterTicketReplies.id,
userId: WebsiteHelpCenterTicketReplies.userId,
content: WebsiteHelpCenterTicketReplies.content,
createdAt: WebsiteHelpCenterTicketReplies.createdAt,
})
.from(WebsiteHelpCenterTicketReplies)
.where(eq(WebsiteHelpCenterTicketReplies.ticketId, ticket.id))
.orderBy(asc(WebsiteHelpCenterTicketReplies.id));
const authorIds = [
...new Set([
...(ticket.userId != null ? [ticket.userId] : []),
...replies.map((r) => r.userId),
]),
];
const now = unixNow();
const [users, categoryRows, activeBanRows] = await Promise.all([
authorIds.length > 0
? db
.select({
id: User.id,
username: User.username,
rank: User.rank,
mail: User.mail,
})
.from(User)
.where(inArray(User.id, authorIds))
: Promise.resolve([]),
ticket.categoryId != null
? db
.select({ name: WebsiteHelpCenterCategories.name })
.from(WebsiteHelpCenterCategories)
.where(eq(WebsiteHelpCenterCategories.id, ticket.categoryId))
.limit(1)
: Promise.resolve([]),
ticket.userId != null
? db
.select({ id: Ban.id })
.from(Ban)
.where(
and(
eq(Ban.userId, ticket.userId),
or(eq(Ban.banExpire, 0), gt(Ban.banExpire, now)),
),
)
.limit(1)
: Promise.resolve([]),
]);
const category = categoryRows[0] ?? null;
const activeBan = activeBanRows[0] ?? null;
const userById = new Map(users.map((u) => [u.id, u]));
const openerId = ticket.userId;
const minStaffRank = await getMinStaffRank();
const messages = [
{
key: "opening",
userId: openerId ?? 0,
username:
openerId != null
? (userById.get(openerId)?.username ?? `#${openerId}`)
: "—",
isStaff: false,
content: ticket.content,
createdAt: (ticket.createdAt ?? new Date()).toISOString(),
},
...replies.map((r) => {
const user = userById.get(r.userId);
const isStaff =
r.userId !== openerId && (user?.rank ?? 0) >= minStaffRank;
return {
key: String(r.id),
userId: r.userId,
username: user?.username ?? `#${r.userId}`,
isStaff,
content: r.content,
createdAt: (r.createdAt ?? new Date()).toISOString(),
};
}),
];
const creator = openerId != null ? userById.get(openerId) : undefined;
const canEdit = canAccess(permissions, PERMS.TICKETS_EDIT, session.user.rank);
const canLiftBan = canAccess(permissions, PERMS.USERS_BAN, session.user.rank);
const isBanAppeal =
/ban\s*appeal/i.test(ticket.title) ||
/ban\s*appeal/i.test(category?.name ?? "");
const queues = await fetchTicketQueueOpenCounts();
return (
<div className="space-y-6">
<TicketQueueBanner
hint={t("queueHint")}
otherHref="/admin/tickets"
otherLabel={t("queueOtherCta")}
countsLine={t("queueCounts", {
here: queues.helpOpen,
other: queues.cmsOpen,
})}
/>
<AdminHelpTicketDetail
ticket={{
id: String(ticket.id),
title: ticket.title,
open: ticket.open,
createdAt: (ticket.createdAt ?? new Date()).toISOString(),
updatedAt: (ticket.updatedAt ?? new Date()).toISOString(),
categoryName: category?.name ?? (isBanAppeal ? "Ban appeal" : null),
creator: creator
? {
id: creator.id,
username: creator.username,
rank: creator.rank,
mail: creator.mail ?? "",
}
: null,
}}
messages={messages}
canEdit={canEdit}
canLiftBan={canLiftBan}
hasActiveBan={!!activeBan}
/>
</div>
);
}
@@ -0,0 +1,91 @@
"use client";
import { useTranslations } from "next-intl";
import { DataTable } from "@/components/admin/data-table";
import Link from "@/components/link";
import { Badge } from "@/components/ui/badge";
import type { DataTableColumn, PaginatedResult } from "@/types/common";
export interface HelpTicketRow {
id: string;
title: string;
user: string;
userId: number | null;
replies: number;
open: boolean;
date: string;
updated: string;
}
export function HelpTicketsTable({
data,
basePath = "/admin/help-tickets",
}: {
data: PaginatedResult<HelpTicketRow>;
basePath?: string;
}) {
const t = useTranslations("pages.admin.helpTickets");
const columns: DataTableColumn<HelpTicketRow>[] = [
{
key: "title",
label: t("colTicket"),
sortable: true,
render: (_value, row) => (
<div className="min-w-0">
<div className="flex items-center gap-2">
<span className="text-xs text-muted-foreground font-mono">
#{row.id}
</span>
<Link
href={`${basePath}/${row.id}`}
className="font-medium truncate hover:underline"
>
{row.title}
</Link>
</div>
<div className="text-xs text-muted-foreground">
{t("meta", { user: row.user, count: row.replies })}
</div>
</div>
),
},
{
key: "open",
label: t("colStatus"),
sortable: true,
filterKey: "filter_status",
filterOptions: [
{ label: t("presetOpen"), value: "open" },
{ label: t("statusClosed"), value: "closed" },
],
render: (value) => {
const open = value === true || value === "true";
return (
<Badge
variant={open ? "default" : "secondary"}
className="text-[0.7rem]"
>
{open ? t("statusOpen") : t("statusClosed")}
</Badge>
);
},
},
{ key: "user", label: t("colUser"), sortable: true },
{ key: "date", label: t("colCreated"), sortable: true },
{ key: "updated", label: t("colUpdated"), sortable: true },
];
return (
<DataTable
data={data}
columns={columns}
searchPlaceholder={t("searchPlaceholder")}
presets={[
{ label: t("presetOpen"), params: { filter_status: "open" } },
{ label: t("statusClosed"), params: { filter_status: "closed" } },
{ label: t("presetAll"), params: { filter_status: "all" } },
]}
/>
);
}
+214
View File
@@ -0,0 +1,214 @@
import {
and,
asc,
count,
desc,
eq,
inArray,
like,
or,
type SQL,
} from "drizzle-orm";
import { redirect } from "next/navigation";
import { getTranslations } from "next-intl/server";
import { StatusCard } from "@/components/admin/dashboard";
import { TicketQueueBanner } from "@/components/admin/ticket-queue-banner";
import { fetchTicketQueueOpenCounts } from "@/lib/admin/ticket-queue-counts";
import { calcPagination, parseListParams } from "@/lib/admin-helpers";
import {
db,
User,
WebsiteHelpCenterTicketReplies,
WebsiteHelpCenterTickets,
} from "@/lib/db";
import { formatDate } from "@/lib/format-date";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { type HelpTicketRow, HelpTicketsTable } from "./help-tickets-table";
export default async function AdminHelpTicketsPage({
searchParams,
}: {
searchParams: Promise<Record<string, string>>;
}) {
const { session, permissions } = await getAdminContext();
if (!canAccess(permissions, PERMS.TICKETS_VIEW, session.user.rank)) {
redirect("/admin");
}
const t = await getTranslations("pages.admin.helpTickets");
const raw = await searchParams;
const parsed = parseListParams(new URLSearchParams(raw));
const statusFilter = raw.filter_status || "open";
const conditions: SQL[] = [];
if (statusFilter === "open") {
conditions.push(eq(WebsiteHelpCenterTickets.open, true));
} else if (statusFilter === "closed") {
conditions.push(eq(WebsiteHelpCenterTickets.open, false));
}
if (parsed.search.trim()) {
const q = parsed.search.trim();
const asId = /^\d+$/.test(q) ? BigInt(q) : null;
const matchingUsers = await db
.select({ id: User.id })
.from(User)
.where(like(User.username, `%${q}%`))
.limit(50)
.catch(() => []);
const searchFilter = or(
like(WebsiteHelpCenterTickets.title, `%${q}%`),
like(WebsiteHelpCenterTickets.content, `%${q}%`),
...(matchingUsers.length > 0
? [
inArray(
WebsiteHelpCenterTickets.userId,
matchingUsers.map((u) => u.id),
),
]
: []),
...(asId !== null ? [eq(WebsiteHelpCenterTickets.id, asId)] : []),
);
if (searchFilter) conditions.push(searchFilter);
}
const where = conditions.length > 0 ? and(...conditions) : undefined;
const orderCol =
parsed.sort === "title"
? WebsiteHelpCenterTickets.title
: parsed.sort === "open"
? WebsiteHelpCenterTickets.open
: parsed.sort === "user"
? WebsiteHelpCenterTickets.userId
: parsed.sort === "date"
? WebsiteHelpCenterTickets.createdAt
: parsed.sort === "id"
? WebsiteHelpCenterTickets.id
: WebsiteHelpCenterTickets.updatedAt;
const orderBy = parsed.order === "asc" ? asc(orderCol) : desc(orderCol);
const [totalRows, openRows, closedRows, queues] = await Promise.all([
db
.select({ total: count() })
.from(WebsiteHelpCenterTickets)
.where(where)
.catch(() => [{ total: 0 }]),
db
.select({ total: count() })
.from(WebsiteHelpCenterTickets)
.where(eq(WebsiteHelpCenterTickets.open, true))
.catch(() => [{ total: 0 }]),
db
.select({ total: count() })
.from(WebsiteHelpCenterTickets)
.where(eq(WebsiteHelpCenterTickets.open, false))
.catch(() => [{ total: 0 }]),
fetchTicketQueueOpenCounts(),
]);
const total = Number(totalRows[0]?.total ?? 0);
const openCount = Number(openRows[0]?.total ?? 0);
const closedCount = Number(closedRows[0]?.total ?? 0);
const pagination = calcPagination(total, parsed.page, parsed.perPage);
const tickets = await db
.select({
id: WebsiteHelpCenterTickets.id,
userId: WebsiteHelpCenterTickets.userId,
title: WebsiteHelpCenterTickets.title,
open: WebsiteHelpCenterTickets.open,
createdAt: WebsiteHelpCenterTickets.createdAt,
updatedAt: WebsiteHelpCenterTickets.updatedAt,
})
.from(WebsiteHelpCenterTickets)
.where(where)
.orderBy(orderBy)
.limit(pagination.perPage)
.offset(pagination.offset)
.catch(() => []);
const ticketIds = tickets.map((ticket) => ticket.id);
const userIds = [
...new Set(
tickets
.map((ticket) => ticket.userId)
.filter((id): id is number => id != null),
),
];
const [replyGroups, users] = await Promise.all([
ticketIds.length > 0
? db
.select({
ticketId: WebsiteHelpCenterTicketReplies.ticketId,
total: count(),
})
.from(WebsiteHelpCenterTicketReplies)
.where(inArray(WebsiteHelpCenterTicketReplies.ticketId, ticketIds))
.groupBy(WebsiteHelpCenterTicketReplies.ticketId)
.catch(() => [])
: Promise.resolve([]),
userIds.length > 0
? db
.select({ id: User.id, username: User.username })
.from(User)
.where(inArray(User.id, userIds))
.catch(() => [])
: Promise.resolve([]),
]);
const replyCountByTicket = new Map(
replyGroups.map((g) => [String(g.ticketId), Number(g.total)]),
);
const usernameById = new Map(users.map((u) => [u.id, u.username]));
const rows: HelpTicketRow[] = tickets.map((ticket) => ({
id: String(ticket.id),
title: ticket.title,
user:
ticket.userId != null
? (usernameById.get(ticket.userId) ?? `#${ticket.userId}`)
: "—",
userId: ticket.userId,
replies: replyCountByTicket.get(String(ticket.id)) ?? 0,
open: ticket.open,
date: formatDate(ticket.createdAt, "date"),
updated: formatDate(ticket.updatedAt, "date"),
}));
return (
<div className="space-y-6">
<TicketQueueBanner
hint={t("queueHint")}
otherHref="/admin/tickets"
otherLabel={t("queueOtherCta")}
countsLine={t("queueCounts", {
here: queues.helpOpen,
other: queues.cmsOpen,
})}
/>
<div className="grid grid-cols-[repeat(auto-fit,minmax(180px,1fr))] gap-3.5">
<StatusCard label={t("statusOpen")} value={openCount} icon="🎫" />
<StatusCard label={t("statusClosed")} value={closedCount} icon="✅" />
</div>
{total === 0 && !parsed.search && statusFilter === "open" ? (
<div className="admin-empty">{t("noTickets")}</div>
) : (
<HelpTicketsTable
data={{
rows,
total,
page: pagination.page,
perPage: pagination.perPage,
lastPage: pagination.lastPage,
}}
/>
)}
</div>
);
}