2

src/components/Comment.astro

@@ -2,25 +2,24 @@
 
 <script>
   document.addEventListener('astro:page-load', () => {
-    function loadTwikoo() {
-      const commentsContainer = document.getElementById('tcomment');
-      if (commentsContainer) {
+    (()=>{
+        const commentsContainer = document.getElementById('tcomment');
+        if (commentsContainer) {
         const script = document.createElement('script');
         script.src = 'https://cdn.jsdelivr.net/npm/twikoo@1.6.44/dist/twikoo.min.js';
         script.async = true;
         script.onload = () => {
-          const initScript = document.createElement('script');
-          initScript.innerHTML = `
-            twikoo.init({
-                envId: 'https://twikoo.hk.nvme0n1p.dev/',
-                el: '#tcomment',
-            });
-        `;
-          document.body.appendChild(initScript);
+            const initScript = document.createElement('script');
+            initScript.innerHTML = `
+                twikoo.init({
+                    envId: 'https://twikoo.hk.nvme0n1p.dev/',
+                    el: '#tcomment',
+                });
+            `;
+            document.body.appendChild(initScript);
         };
         document.body.appendChild(script);
-      }
-    }
-    loadTwikoo();
+      } 
+    })();
   });
 </script>

src/components/notion/Bookmark.astro

@@ -10,7 +10,6 @@ export interface Props {
 }
 
 const { block } = Astro.props
-console.log(block)
 const target = block.Bookmark || block.LinkPreview || block.Embed
 const urlString = target?.Url
 

src/lib/data-utils.ts

@@ -51,8 +51,9 @@ export type NotionBlock = {
 export type NotionBlockMap = Record<string, NotionBlock>
 
 export type RemotePostPayload = {
-  post: NotionPost
+  post: CollectionEntry<'blog'>
   blockMap: NotionBlockMap
+  rootId: string
 }
 
 export interface LinkEntry {
@@ -255,10 +256,20 @@ export async function fetchRemotePostContent(
   try {
     const res = await fetch(`https://notion-api.nvme0n1p.dev/v2/posts/${encodeURI(slug)}`)
     if (!res.ok) throw new Error(`Failed to fetch post content: ${res.status}`)
-    const data = (await res.json()) as Partial<RemotePostPayload>
+    const data = (await res.json()) as Partial<{
+      post: NotionPost
+      blockMap: NotionBlockMap
+    }>
     if (!data.post || !data.blockMap) return null
-    data.post = normalizePost(data.post)
-    return data as RemotePostPayload
+
+    const rootId = data.post.id
+    const post = normalizePost(data.post)
+
+    return {
+      post,
+      blockMap: data.blockMap,
+      rootId,
+    }
   } catch (error) {
     console.error(`fetchRemotePostContent error for slug "${slug}":`, error)
     return null
@@ -897,12 +908,20 @@ export function renderRemoteBlockMap(
 ): RenderedRemoteContent {
   const headingBlocks: Block[] = []
   const root = blockMap[rootId]?.value
-  const contentOrder = Array.isArray(root?.content)
-    ? root?.content
-    : Object.keys(blockMap)
+  const fallbackRoot =
+    root ||
+    Object.values(blockMap)
+      .map((b) => b.value)
+      .find(
+        (value) =>
+          Array.isArray(value?.content) &&
+          (value.type === 'page' || value.type === 'collection_view_page'),
+      )
+  const contentOrder = Array.isArray(fallbackRoot?.content)
+    ? fallbackRoot.content
+    : []
 
   const blocks = buildBlocks(contentOrder, blockMap, headingBlocks)
-
   const headings: TOCHeading[] = headingBlocks.map((block) => {
     const heading = block.Heading1 || block.Heading2 || block.Heading3
     return {
@@ -933,19 +952,18 @@ export async function getTOCSections(postId: string): Promise<TOCSection[]> {
   const post = await getPostById(postId)
   if (!post) return []
 
-  const parentId = isSubpost(postId) ? getParentId(postId) : postId
-  const parentPost = isSubpost(postId) ? await getPostById(parentId) : post
+  const parentPost = post
 
   if (!parentPost) return []
 
   const sections: TOCSection[] = []
 
-  const { headings: parentHeadings } = await render(parentPost)
-  if (parentHeadings.length > 0) {
+  const { headings } = await render(parentPost)
+  if (headings.length > 0) {
     sections.push({
       type: 'parent',
       title: 'Overview',
-      headings: parentHeadings.map((heading) => ({
+      headings: headings.map((heading) => ({
         slug: heading.slug,
         text: heading.text,
         depth: heading.depth,
@@ -953,23 +971,5 @@ export async function getTOCSections(postId: string): Promise<TOCSection[]> {
     })
   }
 
-  const subposts = await getSubpostsForParent(parentId)
-  for (const subpost of subposts) {
-    const { headings: subpostHeadings } = await render(subpost)
-    if (subpostHeadings.length > 0) {
-      sections.push({
-        type: 'subpost',
-        title: subpost.data.title,
-        headings: subpostHeadings.map((heading, index) => ({
-          slug: heading.slug,
-          text: heading.text,
-          depth: heading.depth,
-          isSubpostTitle: index === 0,
-        })),
-        subpostId: subpost.id,
-      })
-    }
-  }
-
   return sections
 }

src/pages/404.astro

@@ -16,7 +16,7 @@ import { cn } from '@/lib/utils'
   >
     <div class="max-w-md">
       <h1 class="mb-4 text-3xl font-medium">404: Page not found</h1>
-      <p class="prose">Oops! The page you're looking for doesn't exist.</p>
+      <p class="prose">啊哦，你好像来到了没有知识的荒原～</p>
     </div>
     <Link
       href="/"

src/pages/500.astro

@@ -0,0 +1,29 @@
+---
+import Breadcrumbs from '@/components/Breadcrumbs.astro'
+import Link from '@/components/Link.astro'
+import PageHead from '@/components/PageHead.astro'
+import { buttonVariants } from '@/components/ui/button'
+import Layout from '@/layouts/Layout.astro'
+import { cn } from '@/lib/utils'
+---
+
+<Layout class="max-w-3xl">
+  <PageHead slot="head" title="500" />
+  <Breadcrumbs items={[{ label: 'Error', icon: 'lucide:server-off' }]} />
+
+  <section class="flex flex-col items-center justify-center gap-y-4 text-center">
+    <div class="max-w-md">
+      <h1 class="mb-4 text-3xl font-medium">500: Something went wrong</h1>
+      <p class="prose">
+        服务器爆炸了！如果你能联系到博主的话提醒他一声吧！
+      </p>
+    </div>
+    <Link
+      href="/"
+      class={cn(buttonVariants({ variant: 'outline' }), 'flex gap-x-1.5 group')}
+    >
+      <span class="transition-transform group-hover:-translate-x-1">&larr;</span>
+      Go to home page
+    </Link>
+  </section>
+</Layout>

src/pages/blog/[...id].astro

@@ -42,41 +42,55 @@ export async function getStaticPaths() {
 const currentPostId = Astro.params.id
 
 let Content: any = null
-let headings
-let remoteContent = null
+let headings: any[] = []
+let remoteContent: any = null
+let post: any = null
+let authors: any[] = []
+let isCurrentSubpost = false
+let navigation: any = null
+let parentPost: any = null
+let hasChildPosts = false
+let subpostCount = 0
+let tocSections: TOCSection[] = []
+let heroImage: any = null
 
+try {
+  const remote = await fetchRemotePostContent(currentPostId)
+  if (!remote) {
+    // return Astro.response(null, {status: 404})
+    return Astro.rewrite('/404')
+  }
 
-const remote = await fetchRemotePostContent(currentPostId)
-if(!remote) {
-  // return Astro.response(null, {status: 404})
-  return Astro.rewrite("/404")
+  remoteContent = renderRemoteBlockMap(remote.blockMap, remote.rootId)
+  headings = remoteContent?.headings ?? []
+  post = remote.post
+  authors = await parseAuthors(post?.authors ?? [])
+
+  isCurrentSubpost = isSubpost(currentPostId)
+  navigation = await getAdjacentPosts(currentPostId)
+  parentPost = isCurrentSubpost ? await getParentPost(currentPostId) : null
+
+  hasChildPosts = await hasSubposts(currentPostId)
+  subpostCount = !isCurrentSubpost
+    ? await getSubpostCount(currentPostId)
+    : 0
+
+  tocSections = remoteContent
+    ? remoteContent.headings.length > 0
+      ? [
+          {
+            type: 'parent',
+            title: 'Overview',
+            headings: remoteContent.headings,
+          },
+        ]
+      : []
+    : await getTOCSections(currentPostId)
+  heroImage = post?.data?.banner
+} catch (error) {
+  console.error('blog page render failed:', error)
+  return Astro.rewrite('/500')
 }
-remoteContent = remote ? renderRemoteBlockMap(remote.blockMap, remote.post.id) : null
-headings = remoteContent?.headings ?? []
-const post = remote?.post
-const authors = await parseAuthors(post?.authors ?? [])
-
-const isCurrentSubpost = isSubpost(currentPostId)
-const navigation = await getAdjacentPosts(currentPostId)
-const parentPost = isCurrentSubpost ? await getParentPost(currentPostId) : null
-
-const hasChildPosts = await hasSubposts(currentPostId)
-const subpostCount = !isCurrentSubpost
-  ? await getSubpostCount(currentPostId)
-  : 0
-
-const tocSections: TOCSection[] = remoteContent
-  ? remoteContent.headings.length > 0
-    ? [
-        {
-          type: 'parent',
-          title: 'Overview',
-          headings: remoteContent.headings,
-        },
-      ]
-    : []
-  : await getTOCSections(currentPostId)
-const heroImage = post?.data?.banner
 export const prerender = false;
 ---
 

src/pages/blog/index.astro

@@ -35,7 +35,6 @@ const page = await fetch(`https://notion-api.nvme0n1p.dev/v2/posts/?page=${nowPa
     lastPage: totalPages,
   };
 });
-console.log(page);
 // fetch page
 if(page.lastPage < page.currentPage) {
   console.log("redirect to 404")