diff --git a/packages/viewer/src/app/[id]/context/[user]/route.ts b/packages/viewer/src/app/[id]/context/[user]/route.ts
index afed980..be508c9 100644
--- a/packages/viewer/src/app/[id]/context/[user]/route.ts
+++ b/packages/viewer/src/app/[id]/context/[user]/route.ts
@@ -1,12 +1,13 @@
import { NextRequest, NextResponse } from "next/server";
+import { selectReply } from "@/lib/reply";
import prisma from "@/lib/prisma";
-import serializeReply from "@/lib/serialize-reply";
+// import serializeReply from "@/lib/serialize-reply";
export async function GET(
request: NextRequest,
- { params }: { params: { id: string; user: string } },
+ { params }: { params: { id: string; user: string } }
) {
- const discussionId = parseInt(params.id, 10);
+ const postId = parseInt(params.id, 10);
const authorId = parseInt(params.user, 10);
/* eslint-disable @typescript-eslint/no-non-null-assertion */
const replyId = parseInt(request.nextUrl.searchParams.get("reply")!, 10);
@@ -15,54 +16,36 @@ export async function GET(
const reply = await (offset <= 0
? prisma.reply.findFirst({
select: {
- id: true,
- author: true,
- time: true,
- content: true,
- discussionId: true,
- takedown: {
- select: {
- submitter: {
- select: {
- id: true,
- username: true,
- },
- },
- reason: true,
- },
+ ...selectReply.withBasic,
+ ...selectReply.withTakedown,
+ ...selectReply.withLatestContent,
+ },
+ where: {
+ postId,
+ snapshots: {
+ some: { authorId },
},
+ id: { lt: replyId },
},
- where: { discussionId, authorId, id: { lt: replyId } },
orderBy: { id: "desc" },
skip: -offset,
})
: prisma.reply.findFirst({
select: {
- id: true,
- author: true,
- time: true,
- content: true,
- discussionId: true,
- takedown: {
- select: {
- submitter: {
- select: {
- id: true,
- username: true,
- },
- },
- reason: true,
- },
+ ...selectReply.withBasic,
+ ...selectReply.withTakedown,
+ ...selectReply.withLatestContent,
+ },
+ where: {
+ postId,
+ snapshots: {
+ some: { authorId },
},
+ id: { gt: replyId },
},
- where: { discussionId, authorId, id: { gt: replyId } },
orderBy: { id: "asc" },
skip: offset - 1,
}));
- if (reply)
- return NextResponse.json({
- ...reply,
- ...(await serializeReply(discussionId, reply)),
- });
+ if (reply) return NextResponse.json({ reply });
return NextResponse.json({});
}
diff --git a/packages/viewer/src/app/[id]/layout.tsx b/packages/viewer/src/app/[id]/layout.tsx
index 21e2610..5013c79 100644
--- a/packages/viewer/src/app/[id]/layout.tsx
+++ b/packages/viewer/src/app/[id]/layout.tsx
@@ -1,13 +1,13 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import prisma from "@/lib/prisma";
-import { getDiscussionUrl, getForumName, getForumUrl } from "@/lib/luogu";
+import { getPostUrl, getForumUrl } from "@/lib/luogu";
import stringifyTime from "@/lib/time";
import UserInfo from "@/components/UserInfo";
import "@/components/markdown.css";
import UpdateButton from "@/components/UpdateButton";
-import serializeReply from "@/lib/serialize-reply";
import Reply from "@/components/replies/Reply";
+import { selectPost } from "@/lib/post";
export async function generateMetadata({
params,
@@ -16,16 +16,14 @@ export async function generateMetadata({
}): Promise
{
const id = parseInt(params.id, 10);
if (Number.isNaN(id)) notFound();
- const snapshot = await prisma.snapshot.findFirst({
- select: { title: true, discussion: { select: { takedown: true } } },
+ const snapshot = await prisma.postSnapshot.findFirst({
+ select: { title: true, post: { select: { takedown: true } } },
orderBy: { time: "desc" },
- where: { discussionId: id },
+ where: { postId: id },
});
return {
title: `${
- snapshot && !snapshot.discussion.takedown
- ? `「${snapshot.title}」`
- : "404"
+ snapshot && !snapshot.post.takedown ? `「${snapshot.title}」` : "404"
} - 洛谷帖子保存站`,
};
}
@@ -42,23 +40,12 @@ export default async function Page({
snapshots: [{ title, forum, author, content, until: updatedAt }],
_count: { replies },
takedown,
- } = (await prisma.discussion.findUnique({
+ } = (await prisma.post.findUnique({
where: { id },
select: {
- time: true,
- replyCount: true,
- snapshots: {
- select: {
- until: true,
- title: true,
- forum: true,
- author: true,
- content: true,
- },
- orderBy: { time: "desc" },
- take: 1,
- },
- takedown: { select: { reason: true, submitter: true } },
+ ...selectPost.withBasic,
+ ...selectPost.withLatestContent,
+ ...selectPost.withTakedown,
_count: { select: { replies: true } },
},
})) ?? notFound();
@@ -87,7 +74,7 @@ export default async function Page({
target="_blank"
rel="noopener noreferrer"
>
- {getForumName(forum)}
+ {forum.name}
@@ -118,7 +105,7 @@ export default async function Page({
{children}
diff --git a/packages/viewer/src/app/[id]/replies/route.ts b/packages/viewer/src/app/[id]/replies/route.ts
index 37672bf..8202a6b 100644
--- a/packages/viewer/src/app/[id]/replies/route.ts
+++ b/packages/viewer/src/app/[id]/replies/route.ts
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import prisma from "@/lib/prisma";
-import serializeReply from "@/lib/serialize-reply";
+// import serializeReply from "@/lib/serialize-reply";
import { selectReply } from "@/lib/reply";
@@ -24,12 +24,7 @@ export async function GET(
take: parseInt(limit ?? "10", 10),
});
return NextResponse.json({
- data: await Promise.all(
- replies.map(async (reply) => ({
- ...reply,
- ...(await serializeReply(id, reply)),
- })),
- ),
+ replies,
nextCursor: replies.length ? replies[replies.length - 1].id : null,
});
}
diff --git a/packages/viewer/src/app/r/[rid]/page.tsx b/packages/viewer/src/app/r/[rid]/page.tsx
index e473c86..06c91ef 100644
--- a/packages/viewer/src/app/r/[rid]/page.tsx
+++ b/packages/viewer/src/app/r/[rid]/page.tsx
@@ -1,3 +1,5 @@
+// eslint-disable
+// Not impl yet
import { notFound } from "next/navigation";
import Link from "next/link";
import prisma from "@/lib/prisma";
@@ -13,6 +15,8 @@ export const metadata = { title: "金玉良言 - 洛谷帖子保存站" };
const REPLIES_PER_PAGE = parseInt(process.env.REPLIES_PER_PAGE ?? "10", 10);
export default async function Page({ params }: { params: { rid: string } }) {
+ return <>抱歉，本功能暂未完成 TAT;
+
const id = parseInt(params.rid, 10);
if (Number.isNaN(id)) notFound();
const replyRaw = await getReplyRaw(id);
diff --git a/packages/viewer/src/app/user/[uid]/page.tsx b/packages/viewer/src/app/user/[uid]/page.tsx
index 99467db..b5ba744 100644
--- a/packages/viewer/src/app/user/[uid]/page.tsx
+++ b/packages/viewer/src/app/user/[uid]/page.tsx
@@ -1,11 +1,13 @@
import { notFound } from "next/navigation";
import prisma from "@/lib/prisma";
import UserParticipated from "./participated/UserParticipated";
+import { selectUser } from "@/lib/user";
export default async function Page({ params }: { params: { uid: string } }) {
const user =
(await prisma.user.findUnique({
where: { id: parseInt(params.uid, 10) },
+ select: selectUser.withLatest,
})) ?? notFound();
return ;
}
diff --git a/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx b/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx
index 391521c..43c4eae 100644
--- a/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx
+++ b/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx
@@ -3,7 +3,6 @@
import Link from "next/link";
import useSWRInfinite from "swr/infinite";
import InfiniteScroll from "react-infinite-scroll-component";
-import type { User } from "@prisma/client";
import type { PostWithLatestContent } from "@/lib/post";
import type { UserMetioned } from "@/lib/serialize-reply";
import UserAvatar from "@/components/UserAvatar";
@@ -12,6 +11,7 @@ import Content from "@/components/replies/Content";
import fetcher from "@/lib/fetcher";
import Spinner from "@/components/Spinner";
import { NUM_MAX_REPLIES_SHOWED_DEFAULT } from "../constants";
+import { LatestUser } from "@/lib/user";
interface PageData {
data: (PostWithLatestContent & {
@@ -36,7 +36,7 @@ export default function UserParticipated({
user,
}: {
uid: string;
- user: User;
+ user: LatestUser;
}) {
const { data, size, setSize, isValidating } = useSWRInfinite(
(pageIndex: number, previousPageData: PageData) =>
@@ -137,7 +137,7 @@ export default function UserParticipated({
) : undefined}
@@ -235,7 +235,7 @@ export default function UserParticipated({
discussion.snapshots[0].author.id
}
content={reply.content}
- usersMetioned={reply.usersMetioned}
+ // usersMetioned={reply.usersMetioned}
/>
{href === undefined ? (
- {user.username}
+ {snapshot.name}
) : (
- {user.username}
+ {snapshot.name}
)}
- {user.checkmark && (
+ {snapshot.ccfLevel >= 3 && (
)}
- {user.badge && (
+ {snapshot.badge && (
- {user.badge}
+ {snapshot.badge}
)}
diff --git a/packages/viewer/src/components/replies/Content.tsx b/packages/viewer/src/components/replies/Content.tsx
index 43edd6c..d236ee9 100644
--- a/packages/viewer/src/components/replies/Content.tsx
+++ b/packages/viewer/src/components/replies/Content.tsx
@@ -1,94 +1,96 @@
+// eslint-disable
+// Not impl: Context
"use client";
-import "katex/dist/katex.css";
+import "katex/dist/katex.min.css";
import "highlight.js/styles/tokyo-night-dark.css";
import { useEffect, useRef } from "react";
-import renderMathInElement from "katex/contrib/auto-render";
-import { computePosition, shift } from "@floating-ui/dom";
-import type { UserMetioned } from "@/lib/serialize-reply";
-import UserInfo from "@/components/UserInfo";
-import UserAvatar from "@/components/UserAvatar";
+// import { computePosition, shift } from "@floating-ui/dom";
+// import type { UserMetioned } from "@/lib/serialize-reply";
+// import UserInfo from "@/components/UserInfo";
+// import UserAvatar from "@/components/UserAvatar";
+import Markdown from "react-markdown";
+import rehypeKatex from "rehype-katex";
+import remarkMath from "remark-math";
export default function Content({
+ // Markdown
content,
discussionAuthor,
- usersMetioned,
+ // usersMetioned,
userIdState,
}: {
content: string;
discussionAuthor: number;
- usersMetioned: UserMetioned[];
+ // usersMetioned: UserMetioned[];
// eslint-disable-next-line react/require-default-props
userIdState?: [number | null, (userId: number | null) => void];
}) {
const contentRef = useRef(null);
- const userRefs = useRef>({});
+ // const userRefs = useRef>({});
- useEffect(() => {
- renderMathInElement(contentRef.current!, {
- delimiters: [
- { left: "$$", right: "$$", display: true },
- { left: "$", right: "$", display: false },
- ],
- });
+ // useEffect(() => {
+ // contentRef.current?.querySelectorAll("a[data-uid]").forEach((element) => {
+ // const uid = parseInt(element.getAttribute("data-uid")!, 10);
+ // const tooltip = userRefs.current[uid]!;
+ // if (!tooltip) return;
- contentRef.current?.querySelectorAll("a[data-uid]").forEach((element) => {
- const uid = parseInt(element.getAttribute("data-uid")!, 10);
- const tooltip = userRefs.current[uid]!;
- if (!tooltip) return;
+ // function update() {
+ // // eslint-disable-next-line @typescript-eslint/no-floating-promises
+ // computePosition(element as HTMLElement, tooltip, {
+ // placement: "top",
+ // middleware: [shift()],
+ // }).then(({ x, y }) =>
+ // Object.assign(tooltip.style, { left: `${x}px`, top: `${y}px` }),
+ // );
+ // }
+ // function showTooltip() {
+ // update();
+ // tooltip.style.display = "block";
+ // }
+ // function hideTooltip() {
+ // tooltip.style.display = "none";
+ // }
- function update() {
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
- computePosition(element as HTMLElement, tooltip, {
- placement: "top",
- middleware: [shift()],
- }).then(({ x, y }) =>
- Object.assign(tooltip.style, { left: `${x}px`, top: `${y}px` }),
- );
- }
- function showTooltip() {
- update();
- tooltip.style.display = "block";
- }
- function hideTooltip() {
- tooltip.style.display = "none";
- }
-
- (
- [
- ["mouseenter", showTooltip],
- ["mouseleave", hideTooltip],
- ["focus", showTooltip],
- ["blur", hideTooltip],
- ...(userIdState
- ? [
- [
- "click",
- (event: Event) => {
- event.preventDefault();
- hideTooltip();
- if (userIdState[0] !== uid) userIdState[1](uid);
- else userIdState[1](null);
- },
- ],
- ]
- : []),
- ] as [string, () => void][]
- ).forEach(([event, listener]) =>
- element.addEventListener(event, listener),
- );
- });
- });
+ // (
+ // [
+ // ["mouseenter", showTooltip],
+ // ["mouseleave", hideTooltip],
+ // ["focus", showTooltip],
+ // ["blur", hideTooltip],
+ // ...(userIdState
+ // ? [
+ // [
+ // "click",
+ // (event: Event) => {
+ // event.preventDefault();
+ // hideTooltip();
+ // if (userIdState[0] !== uid) userIdState[1](uid);
+ // else userIdState[1](null);
+ // },
+ // ],
+ // ]
+ // : []),
+ // ] as [string, () => void][]
+ // ).forEach(([event, listener]) =>
+ // element.addEventListener(event, listener),
+ // );
+ // });
+ // });
return (
<>
- {usersMetioned.map((user) => (
+
+ {/* {usersMetioned.map((user) => (
{
userRefs.current[user.id] = el;
@@ -134,7 +136,7 @@ export default function Content({