Merge pull request tangly1024#2163 from tangly1024/feat/frame-work

frame-work lib/db
yeslsl · Mar 10, 2024 · f8a7f49 · f8a7f49
2 parents de1b8fa + 1fb9ba4
commit f8a7f49
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/lib/db/getSiteData.js b/lib/db/getSiteData.js
@@ -12,6 +12,7 @@ import { getConfigMapFromConfigPage } from '@/lib/notion/getNotionConfig'
 
 export { getAllTags } from '../notion/getAllTags'
 export { getPostBlocks } from '../notion/getPostBlocks'
+export { getPost } from '../notion/getNotionPost'
 
 /**
  * 获取博客数据; 基于Notion实现

diff --git a/lib/notion/getNotion.js → lib/notion/getNotionPost.js b/lib/notion/getNotion.js → lib/notion/getNotionPost.js
@@ -9,7 +9,7 @@ import { defaultMapImageUrl } from 'react-notion-x'
  * @param {*} pageId
  * @returns
  */
-export async function getNotion(pageId) {
+export async function getPost(pageId) {
   const blockMap = await getPostBlocks(pageId, 'slug')
   if (!blockMap) {
     return null

diff --git a/pages/[prefix]/[slug]/[...suffix].js b/pages/[prefix]/[slug]/[...suffix].js
@@ -1,7 +1,6 @@
 import BLOG from '@/blog.config'
-import { getGlobalData, getPostBlocks } from '@/lib/db/getSiteData'
+import { getGlobalData, getPostBlocks, getPost } from '@/lib/db/getSiteData'
 import { idToUuid } from 'notion-utils'
-import { getNotion } from '@/lib/notion/getNotion'
 import Slug, { getRecommendPost } from '..'
 import { uploadDataToAlgolia } from '@/lib/plugins/algolia'
 import { checkContainHttp } from '@/lib/utils'
@@ -61,7 +60,7 @@ export async function getStaticProps({ params: { prefix, slug, suffix } }) {
   if (!props?.post) {
     const pageId = fullSlug.slice(-1)[0]
     if (pageId.length >= 32) {
-      const post = await getNotion(pageId)
+      const post = await getPost(pageId)
       props.post = post
     }
   }

diff --git a/pages/[prefix]/[slug]/index.js b/pages/[prefix]/[slug]/index.js
@@ -1,7 +1,6 @@
 import BLOG from '@/blog.config'
-import { getGlobalData, getPostBlocks } from '@/lib/db/getSiteData'
+import { getGlobalData, getPostBlocks, getPost } from '@/lib/db/getSiteData'
 import { idToUuid } from 'notion-utils'
-import { getNotion } from '@/lib/notion/getNotion'
 import Slug, { getRecommendPost } from '..'
 import { uploadDataToAlgolia } from '@/lib/plugins/algolia'
 import { checkContainHttp } from '@/lib/utils'
@@ -52,7 +51,7 @@ export async function getStaticProps({ params: { prefix, slug } }) {
   if (!props?.post) {
     const pageId = slug.slice(-1)[0]
     if (pageId.length >= 32) {
-      const post = await getNotion(pageId)
+      const post = await getPost(pageId)
       props.post = post
     }
   }

diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
@@ -1,9 +1,8 @@
 import BLOG from '@/blog.config'
-import { getGlobalData, getPostBlocks } from '@/lib/db/getSiteData'
+import { getGlobalData, getPostBlocks, getPost } from '@/lib/db/getSiteData'
 import { useEffect, useState } from 'react'
 import { idToUuid } from 'notion-utils'
 import { useRouter } from 'next/router'
-import { getNotion } from '@/lib/notion/getNotion'
 import { getPageTableOfContents } from '@/lib/notion/getPageTableOfContents'
 import { getLayoutByTheme } from '@/themes/theme'
 import md5 from 'js-md5'
@@ -92,7 +91,7 @@ export async function getStaticProps({ params: { prefix } }) {
   if (!props?.post) {
     const pageId = prefix
     if (pageId.length >= 32) {
-      const post = await getNotion(pageId)
+      const post = await getPost(pageId)
       props.post = post
     }
   }