fix(viewer): context viewer

piterator-org · Oct 29, 2023 · 9fbdf33 · 9fbdf33
1 parent d80e743
commit 9fbdf33
Show file tree

Hide file tree

Showing 20 changed files with 338 additions and 552 deletions.
diff --git a/packages/viewer/src/app/[id]/[page]/page.tsx b/packages/viewer/src/app/[id]/[page]/page.tsx
@@ -7,7 +7,6 @@ import { selectReply } from "@/lib/reply";
 import { selectPost } from "@/lib/post";
 import { checkExists } from "@/lib/utils";
 import savedInLegacyList from "../saved-in-legacy.json";
-// import serializeReply from "@/lib/serialize-reply";
 
 const REPLIES_PER_PAGE = parseInt(process.env.REPLIES_PER_PAGE ?? "10", 10);
 

diff --git a/packages/viewer/src/app/[id]/context/[user]/route.ts b/packages/viewer/src/app/[id]/context/[user]/route.ts
@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { selectReply } from "@/lib/reply";
 import prisma from "@/lib/prisma";
-// import serializeReply from "@/lib/serialize-reply";
 
 export async function GET(
   request: NextRequest,

diff --git a/packages/viewer/src/app/[id]/replies/route.ts b/packages/viewer/src/app/[id]/replies/route.ts
@@ -1,6 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
 import prisma from "@/lib/prisma";
-// import serializeReply from "@/lib/serialize-reply";
 
 import { selectReply } from "@/lib/reply";
 

diff --git a/packages/viewer/src/app/[id]/statistics/[user]/route.ts b/packages/viewer/src/app/[id]/statistics/[user]/route.ts
@@ -0,0 +1,16 @@
+import { NextRequest, NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: { id: string; user: string } },
+) {
+  const postId = parseInt(params.id, 10);
+  const authorId = parseInt(params.user, 10);
+
+  const numReplies = await prisma.replySnapshot.count({
+    where: { authorId, reply: { postId } },
+  });
+
+  return NextResponse.json({ numReplies });
+}
diff --git a/packages/viewer/src/app/r/[rid]/page.tsx b/packages/viewer/src/app/r/[rid]/page.tsx
@@ -10,8 +10,6 @@ import stringifyTime from "@/lib/time";
 import getReplyRaw from "./get-reply-raw";
 import savedInLegacyList from "../saved-in-legacy.json";
 
-// import serializeReply from "@/lib/serialize-reply";
-
 export const metadata = { title: "金玉良言 - 洛谷帖子保存站" };
 
 const REPLIES_PER_PAGE = parseInt(process.env.REPLIES_PER_PAGE ?? "10", 10);
@@ -61,9 +59,8 @@ export default async function Page({ params }: { params: { rid: string } }) {
           <div className="rounded-4 shadow-bssb">
             <div className="px-md-4x px-4 pt-md-3x pt-2x pb-md-4x pb-4 position-relative">
               <Content
-                // discussionAuthor={reply.post.snapshots[0].authorId}
+                discussionAuthor={reply.post.snapshots[0].author.id}
                 content={reply.snapshots[0].content}
-                // usersMetioned={reply.usersMetioned}
               />
               <span
                 className="text-end text-body-tertiary d-block d-md-none"

diff --git a/packages/viewer/src/app/user/[uid]/discussions/UserDiscussions.tsx b/packages/viewer/src/app/user/[uid]/discussions/UserDiscussions.tsx
@@ -3,7 +3,6 @@
 import useSWRInfinite from "swr/infinite";
 import InfiniteScroll from "react-infinite-scroll-component";
 import type { PostWithLatestContent } from "@/lib/post";
-// import type { UserMetioned } from "@/lib/serialize-reply";
 import Content from "@/components/replies/Content";
 import fetcher from "@/lib/fetcher";
 import Spinner from "@/components/Spinner";
@@ -63,7 +62,7 @@ export default function UserDiscussions({ uid }: { uid: string }) {
               }
             >
               <Content
-                // discussionAuthor={discussion.snapshots[0].author.id}
+                discussionAuthor={discussion.snapshots[0].author.id}
                 content={discussion.snapshots[0].content}
                 // usersMetioned={discussion.usersMetioned}
               />

diff --git a/packages/viewer/src/app/user/[uid]/discussions/data/route.ts b/packages/viewer/src/app/user/[uid]/discussions/data/route.ts
@@ -1,7 +1,6 @@
 import { NextResponse, type NextRequest } from "next/server";
 import prisma from "@/lib/prisma";
 import { getPost } from "@/lib/post";
-// import serializeReply from "@/lib/serialize-reply";
 import { NUM_PER_PAGE } from "../../constants";
 
 export async function GET(

diff --git a/packages/viewer/src/app/user/[uid]/info/route.ts b/packages/viewer/src/app/user/[uid]/info/route.ts
@@ -0,0 +1,17 @@
+import { NextResponse, type NextRequest } from "next/server";
+import prisma from "@/lib/prisma";
+import { selectUser } from "@/lib/user";
+import { notFound } from "next/navigation";
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: { uid: string } },
+) {
+  const uid = parseInt(params.uid, 10);
+  const user =
+    (await prisma.user.findUnique({
+      where: { id: uid },
+      select: selectUser.withLatest,
+    })) ?? notFound();
+  return NextResponse.json(user);
+}
diff --git a/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx b/packages/viewer/src/app/user/[uid]/participated/UserParticipated.tsx
@@ -4,7 +4,6 @@ import Link from "next/link";
 import useSWRInfinite from "swr/infinite";
 import InfiniteScroll from "react-infinite-scroll-component";
 import type { PostWithLatestContent } from "@/lib/post";
-// import type { UserMetioned } from "@/lib/serialize-reply";
 import UserAvatar from "@/components/UserAvatar";
 import UserInfo from "@/components/UserInfo";
 import Content from "@/components/replies/Content";
@@ -115,7 +114,7 @@ export default function UserParticipated({
                         </span>
                       </summary>
                       <Content
-                        // discussionAuthor={discussion.snapshots[0].author.id}
+                        discussionAuthor={discussion.snapshots[0].author.id}
                         content={discussion.snapshots[0].content}
                         // usersMetioned={discussion.usersMetioned}
                       />
@@ -181,9 +180,9 @@ export default function UserParticipated({
                               </div>
                               <div className="px-4 py-2 position-relative">
                                 <Content
-                                  // discussionAuthor={
-                                  //   discussion.snapshots[0].author.id
-                                  // }
+                                  discussionAuthor={
+                                    discussion.snapshots[0].author.id
+                                  }
                                   content={reply.snapshots[0].content}
                                   // usersMetioned={reply.usersMetioned}
                                 />

diff --git a/packages/viewer/src/app/user/[uid]/participated/data/route.ts b/packages/viewer/src/app/user/[uid]/participated/data/route.ts
@@ -1,7 +1,6 @@
 import { NextResponse, type NextRequest } from "next/server";
 import prisma from "@/lib/prisma";
 import { getPost } from "@/lib/post";
-// import serializeReply from "@/lib/serialize-reply";
 import { getReply } from "@/lib/reply";
 import { NUM_PER_PAGE } from "../../constants";
 

diff --git a/packages/viewer/src/app/user/[uid]/replies/UserReplies.tsx b/packages/viewer/src/app/user/[uid]/replies/UserReplies.tsx
@@ -3,8 +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 { UserMetioned } from "@/lib/serialize-reply";
 import fetcher from "@/lib/fetcher";
 import Reply from "@/components/replies/Reply";
 import Spinner from "@/components/Spinner";

diff --git a/packages/viewer/src/app/user/[uid]/replies/data/route.ts b/packages/viewer/src/app/user/[uid]/replies/data/route.ts
@@ -1,7 +1,6 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { getReply, selectReply } from "@/lib/reply";
 import prisma from "@/lib/prisma";
-// import serializeReply from "@/lib/serialize-reply";
 import { NUM_PER_PAGE } from "../../constants";
 
 export async function GET(

diff --git a/packages/viewer/src/components/markdown.css b/packages/viewer/src/components/markdown.css
@@ -236,3 +236,12 @@
   margin-left: auto;
   margin-right: auto;
 } */
+
+.markdown .lfm-user-mention {
+  text-decoration: none;
+}
+
+.markdown .lfm-user-mention:focus {
+  background-color: var(--bs-primary);
+  color: white;
+}