From 244be5fca03d8fea6ad329df223cb8c4c2e90c8f Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 19:05:29 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix(=E5=9C=A8=E6=B8=B2=E6=9F=93=E6=9C=9F?=
 =?UTF-8?q?=E9=97=B4=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 668462b46150a0173db9fefc2700ed4f03c2b9c7)
---
 themes/heo/components/Footer.js               |  3 +-
 themes/heo/components/LatestPostsGroupMini.js | 11 ++---
 themes/heo/components/SocialButton.js         | 48 +++++++++++--------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/themes/heo/components/Footer.js b/themes/heo/components/Footer.js
index 2d189ee7b45..222554680d5 100644
--- a/themes/heo/components/Footer.js
+++ b/themes/heo/components/Footer.js
@@ -8,6 +8,7 @@ import SocialButton from './SocialButton'
  * @returns
  */
 const Footer = () => {
+  const BEI_AN = siteConfig('BEI_AN')
   return (
     <footer className='relative flex-shrink-0 bg-white dark:bg-[#1a191d] justify-center text-center m-auto w-full leading-6  text-gray-600 dark:text-gray-100 text-sm'>
       {/* 颜色过度区 */}
@@ -33,7 +34,7 @@ const Footer = () => {
         </div>
 
         <div id='footer-bottom-right'>
-          {siteConfig('BEI_AN') && (
+          {BEI_AN && (
             <>
               <i className='fas fa-shield-alt' />{' '}
               <a href='https://beian.miit.gov.cn/' className='mr-2'>
diff --git a/themes/heo/components/LatestPostsGroupMini.js b/themes/heo/components/LatestPostsGroupMini.js
index c8f0dcf4ef9..32094157bc9 100644
--- a/themes/heo/components/LatestPostsGroupMini.js
+++ b/themes/heo/components/LatestPostsGroupMini.js
@@ -15,12 +15,9 @@ export default function LatestPostsGroupMini({ latestPosts, siteInfo }) {
   // 获取当前路径
   const currentPath = useRouter().asPath
   const { locale } = useGlobal()
+  const SUB_PATH = siteConfig('SUB_PATH', '')
 
-  if (!latestPosts) {
-    return <></>
-  }
-
-  return (
+  return latestPosts ? (
     <>
       <div className=' mb-2 px-1 flex flex-nowrap justify-between'>
         <div>
@@ -30,7 +27,7 @@ export default function LatestPostsGroupMini({ latestPosts, siteInfo }) {
       </div>
       {latestPosts.map(post => {
         const selected =
-          currentPath === `${siteConfig('SUB_PATH', '')}/${post.slug}`
+          currentPath === `${SUB_PATH}/${post.slug}`
         const headerImage = post?.pageCoverThumbnail
           ? post.pageCoverThumbnail
           : siteInfo?.pageCover
@@ -63,5 +60,5 @@ export default function LatestPostsGroupMini({ latestPosts, siteInfo }) {
         )
       })}
     </>
-  )
+  ) : null
 }
diff --git a/themes/heo/components/SocialButton.js b/themes/heo/components/SocialButton.js
index 9d4c6b0f481..f746bc0b61b 100644
--- a/themes/heo/components/SocialButton.js
+++ b/themes/heo/components/SocialButton.js
@@ -6,73 +6,83 @@ import { siteConfig } from '@/lib/config'
  * @constructor
  */
 const SocialButton = () => {
+  const CONTACT_GITHUB = siteConfig('CONTACT_GITHUB')
+  const CONTACT_TWITTER = siteConfig('CONTACT_TWITTER')
+  const CONTACT_TELEGRAM = siteConfig('CONTACT_TELEGRAM')
+  const CONTACT_LINKEDIN = siteConfig('CONTACT_LINKEDIN')
+  const CONTACT_WEIBO = siteConfig('CONTACT_WEIBO')
+  const CONTACT_INSTAGRAM = siteConfig('CONTACT_INSTAGRAM')
+  const CONTACT_EMAIL = siteConfig('CONTACT_EMAIL')
+  const ENABLE_RSS = siteConfig('ENABLE_RSS')
+  const CONTACT_BILIBILI = siteConfig('CONTACT_BILIBILI')
+  const CONTACT_YOUTUBE = siteConfig('CONTACT_YOUTUBE')
   return (
     <div className='w-full justify-center flex-wrap flex'>
       <div className='space-x-12 text-3xl text-gray-600 dark:text-gray-300 '>
-        {siteConfig('CONTACT_GITHUB') && (
+        {CONTACT_GITHUB && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'github'}
-            href={siteConfig('CONTACT_GITHUB')}>
+            href={CONTACT_GITHUB}>
             <i className='transform hover:scale-125 duration-150 fab fa-github dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_TWITTER') && (
+        {CONTACT_TWITTER && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'twitter'}
-            href={siteConfig('CONTACT_TWITTER')}>
+            href={CONTACT_TWITTER}>
             <i className='transform hover:scale-125 duration-150 fab fa-twitter dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_TELEGRAM') && (
+        {CONTACT_TELEGRAM && (
           <a
             target='_blank'
             rel='noreferrer'
-            href={siteConfig('CONTACT_TELEGRAM')}
+            href={CONTACT_TELEGRAM}
             title={'telegram'}>
             <i className='transform hover:scale-125 duration-150 fab fa-telegram dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_LINKEDIN') && (
+        {CONTACT_LINKEDIN && (
           <a
             target='_blank'
             rel='noreferrer'
-            href={siteConfig('CONTACT_LINKEDIN')}
+            href={CONTACT_LINKEDIN}
             title={'linkIn'}>
             <i className='transform hover:scale-125 duration-150 fab fa-linkedin dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_WEIBO') && (
+        {CONTACT_WEIBO && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'weibo'}
-            href={siteConfig('CONTACT_WEIBO')}>
+            href={CONTACT_WEIBO}>
             <i className='transform hover:scale-125 duration-150 fab fa-weibo dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_INSTAGRAM') && (
+        {CONTACT_INSTAGRAM && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'instagram'}
-            href={siteConfig('CONTACT_INSTAGRAM')}>
+            href={CONTACT_INSTAGRAM}>
             <i className='transform hover:scale-125 duration-150 fab fa-instagram dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_EMAIL') && (
+        {CONTACT_EMAIL && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'email'}
-            href={`mailto:${siteConfig('CONTACT_EMAIL')}`}>
+            href={`mailto:${CONTACT_EMAIL}`}>
             <i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {JSON.parse(siteConfig('ENABLE_RSS')) && (
+        {JSON.parse(ENABLE_RSS) && (
           <a
             target='_blank'
             rel='noreferrer'
@@ -81,21 +91,21 @@ const SocialButton = () => {
             <i className='transform hover:scale-125 duration-150 fas fa-rss dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_BILIBILI') && (
+        {CONTACT_BILIBILI && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'bilibili'}
-            href={siteConfig('CONTACT_BILIBILI')}>
+            href={CONTACT_BILIBILI}>
             <i className='transform hover:scale-125 duration-150 fab fa-bilibili dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}
-        {siteConfig('CONTACT_YOUTUBE') && (
+        {CONTACT_YOUTUBE && (
           <a
             target='_blank'
             rel='noreferrer'
             title={'youtube'}
-            href={siteConfig('CONTACT_YOUTUBE')}>
+            href={CONTACT_YOUTUBE}>
             <i className='transform hover:scale-125 duration-150 fab fa-youtube dark:hover:text-indigo-400 hover:text-indigo-600' />
           </a>
         )}

From c2d17ffae45e7034546f85a4fb0d79e5cc431310 Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 19:21:29 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8acb42d44dae705fe1ffb7ef2cc5bc589c7ff463)
---
 components/SEO.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/components/SEO.js b/components/SEO.js
index b82087f3db7..b102ed1116e 100644
--- a/components/SEO.js
+++ b/components/SEO.js
@@ -12,9 +12,12 @@ import { useEffect } from 'react'
  */
 const SEO = props => {
   const { children, siteInfo, post, NOTION_CONFIG } = props
-  let url = siteConfig('PATH')?.length
-    ? `${siteConfig('LINK')}/${siteConfig('SUB_PATH', '')}`
-    : siteConfig('LINK')
+  const PATH = siteConfig('PATH')
+  const LINK = siteConfig('LINK')
+  const SUB_PATH = siteConfig('SUB_PATH', '')
+  let url = PATH?.length
+    ? `${LINK}/${SUB_PATH}`
+    : LINK
   let image
   const router = useRouter()
   const meta = getSEOMeta(props, router, useGlobal()?.locale)
@@ -40,7 +43,8 @@ const SEO = props => {
   }, [])
 
   // SEO关键词
-  let keywords = meta?.tags || siteConfig('KEYWORDS')
+  const KEYWORDS = siteConfig('KEYWORDS')
+  let keywords = meta?.tags || KEYWORDS
   if (post?.tags && post?.tags?.length > 0) {
     keywords = post?.tags?.join(',')
   }
@@ -48,11 +52,12 @@ const SEO = props => {
     url = `${url}/${meta.slug}`
     image = meta.image || '/bg_image.jpg'
   }
-  const title = meta?.title || siteConfig('TITLE')
+  const TITLE = siteConfig('TITLE')
+  const title = meta?.title || TITLE
   const description = meta?.description || `${siteInfo?.description}`
   const type = meta?.type || 'website'
   const lang = siteConfig('LANG').replace('-', '_') // Facebook OpenGraph 要 zh_CN 這樣的格式才抓得到語言
-  const category = meta?.category || siteConfig('KEYWORDS') // section 主要是像是 category 這樣的分類，Facebook 用這個來抓連結的分類
+  const category = meta?.category || KEYWORDS // section 主要是像是 category 這樣的分類，Facebook 用這個來抓連結的分類
   const favicon = siteConfig('BLOG_FAVICON')
   const BACKGROUND_DARK = siteConfig('BACKGROUND_DARK', '', NOTION_CONFIG)
 
@@ -94,6 +99,7 @@ const SEO = props => {
 
   const FACEBOOK_PAGE = siteConfig('FACEBOOK_PAGE', null, NOTION_CONFIG)
 
+  const AUTHOR = siteConfig('AUTHOR')
   return (
     <Head>
       <link rel='icon' href={favicon} />
@@ -154,7 +160,7 @@ const SEO = props => {
       {meta?.type === 'Post' && (
         <>
           <meta property='article:published_time' content={meta.publishDay} />
-          <meta property='article:author' content={siteConfig('AUTHOR')} />
+          <meta property='article:author' content={AUTHOR} />
           <meta property='article:section' content={category} />
           <meta property='article:publisher' content={FACEBOOK_PAGE} />
         </>
@@ -173,6 +179,7 @@ const getSEOMeta = (props, router, locale) => {
   const { post, siteInfo, tag, category, page } = props
   const keyword = router?.query?.s
 
+  const TITLE = siteConfig('TITLE')
   switch (router.route) {
     case '/':
       return {
@@ -235,7 +242,7 @@ const getSEOMeta = (props, router, locale) => {
     case '/search/[keyword]/page/[page]':
       return {
         title: `${keyword || ''}${keyword ? ' | ' : ''}${locale.NAV.SEARCH} | ${siteInfo?.title}`,
-        description: siteConfig('TITLE'),
+        description: TITLE,
         image: `${siteInfo?.pageCover}`,
         slug: 'search/' + (keyword || ''),
         type: 'website'

From f2c3d9242a9b9e2ca57fd3d30e503ace9f6982cb Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 19:35:56 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0e4e6b278626945a9041c3ba0aed35479fa9ac36)
---
 components/GoogleAdsense.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/GoogleAdsense.js b/components/GoogleAdsense.js
index 5f17f6ae288..f102847bf96 100644
--- a/components/GoogleAdsense.js
+++ b/components/GoogleAdsense.js
@@ -39,6 +39,7 @@ function requestAd(ads) {
 // 获取节点或其子节点中包含 adsbygoogle 类的节点
 function getNodesWithAdsByGoogleClass(node) {
   const adsNodes = []
+
   // 检查节点及其子节点是否包含 adsbygoogle 类
   function checkNodeForAds(node) {
     if (
@@ -53,6 +54,7 @@ function getNodesWithAdsByGoogleClass(node) {
       }
     }
   }
+
   checkNodeForAds(node)
   return adsNodes
 }
@@ -174,6 +176,9 @@ const AdSlot = ({ type = 'show' }) => {
  * @param {*} props
  */
 const AdEmbed = () => {
+  const ADSENSE_GOOGLE_ID = siteConfig('ADSENSE_GOOGLE_ID')
+  const ADSENSE_GOOGLE_TEST = siteConfig('ADSENSE_GOOGLE_TEST')
+  const ADSENSE_GOOGLE_SLOT_AUTO = siteConfig('ADSENSE_GOOGLE_SLOT_AUTO')
   useEffect(() => {
     setTimeout(() => {
       // 找到所有 class 为 notion-text 且内容为 '<ins/>' 的 div 元素
@@ -187,18 +192,12 @@ const AdEmbed = () => {
           const newInsElement = document.createElement('ins')
           newInsElement.className = 'adsbygoogle w-full py-1'
           newInsElement.style.display = 'block'
-          newInsElement.setAttribute(
-            'data-ad-client',
-            siteConfig('ADSENSE_GOOGLE_ID')
-          )
+          newInsElement.setAttribute('data-ad-client', ADSENSE_GOOGLE_ID)
           newInsElement.setAttribute(
             'data-adtest',
-            siteConfig('ADSENSE_GOOGLE_TEST') ? 'on' : 'off'
-          )
-          newInsElement.setAttribute(
-            'data-ad-slot',
-            siteConfig('ADSENSE_GOOGLE_SLOT_AUTO')
+            ADSENSE_GOOGLE_TEST ? 'on' : 'off'
           )
+          newInsElement.setAttribute('data-ad-slot', ADSENSE_GOOGLE_SLOT_AUTO)
           newInsElement.setAttribute('data-ad-format', 'auto')
           newInsElement.setAttribute('data-full-width-responsive', 'true')
 

From 7726363c69e2354450253c2648f9babb1edf050b Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 19:40:04 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f0f144d557535e5bd7caf975d693379cc129652b)
---
 components/NotionPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/NotionPage.js b/components/NotionPage.js
index 0ac8c1c0514..a3f1a085127 100644
--- a/components/NotionPage.js
+++ b/components/NotionPage.js
@@ -27,7 +27,7 @@ const NotionPage = ({ post, className }) => {
     })
 
   const zoomRef = useRef(zoom ? zoom.clone() : null)
-
+  const IMAGE_ZOOM_IN_WIDTH = siteConfig('IMAGE_ZOOM_IN_WIDTH', 1200)
   // 页面首次打开时执行的勾子
   useEffect(() => {
     // 检测当前的url并自动滚动到对应目标
@@ -64,7 +64,7 @@ const NotionPage = ({ post, className }) => {
               //   替换为更高清的图像
               mutation?.target?.setAttribute(
                 'src',
-                compressImage(src, siteConfig('IMAGE_ZOOM_IN_WIDTH', 1200))
+                compressImage(src, IMAGE_ZOOM_IN_WIDTH)
               )
             }, 800)
           }

From d500cff483bf279f8a21c0a1a47686083f22cc58 Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 19:46:09 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 03408d4d65a52a1388d9fc251c45a624ff056766)
---
 themes/example/index.js  | 3 ++-
 themes/fukasawa/index.js | 3 ++-
 themes/gitbook/index.js  | 3 ++-
 themes/heo/index.js      | 3 ++-
 themes/hexo/index.js     | 3 ++-
 themes/landing/index.js  | 3 ++-
 themes/matery/index.js   | 3 ++-
 themes/medium/index.js   | 3 ++-
 themes/movie/index.js    | 3 ++-
 themes/nav/index.js      | 3 ++-
 themes/next/index.js     | 3 ++-
 themes/nobelium/index.js | 3 ++-
 themes/photo/index.js    | 3 ++-
 themes/plog/index.js     | 3 ++-
 themes/simple/index.js   | 3 ++-
 15 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/themes/example/index.js b/themes/example/index.js
index d78e20a4561..412366e1add 100644
--- a/themes/example/index.js
+++ b/themes/example/index.js
@@ -156,6 +156,7 @@ const LayoutPostList = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -170,7 +171,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/fukasawa/index.js b/themes/fukasawa/index.js
index 0e2cf9d3623..d184f1f9141 100644
--- a/themes/fukasawa/index.js
+++ b/themes/fukasawa/index.js
@@ -137,6 +137,7 @@ const LayoutPostList = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -151,7 +152,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index b737e9f88c7..47598cf1358 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -316,6 +316,7 @@ const LayoutSlug = props => {
       ? `${post?.title} | ${siteInfo?.description}`
       : `${post?.title} | ${siteInfo?.title}`
 
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -332,7 +333,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/heo/index.js b/themes/heo/index.js
index b3c966ed332..93a7dabb314 100644
--- a/themes/heo/index.js
+++ b/themes/heo/index.js
@@ -267,6 +267,7 @@ const LayoutSlug = props => {
     siteConfig('COMMENT_WEBMENTION_ENABLE')
 
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -283,7 +284,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 49d20a31447..c32310c0347 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -263,6 +263,7 @@ const LayoutArchive = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -277,7 +278,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/landing/index.js b/themes/landing/index.js
index 9dbb3be6158..51e4f904abf 100644
--- a/themes/landing/index.js
+++ b/themes/landing/index.js
@@ -76,6 +76,7 @@ const LayoutSlug = props => {
 
   // 如果 是 /article/[slug] 的文章路径则进行重定向到另一个域名
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -90,7 +91,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/matery/index.js b/themes/matery/index.js
index cb844a5df66..25234e7c0d2 100644
--- a/themes/matery/index.js
+++ b/themes/matery/index.js
@@ -225,6 +225,7 @@ const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const { fullWidth } = useGlobal()
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -239,7 +240,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/medium/index.js b/themes/medium/index.js
index cbb766144dc..798f48793e4 100644
--- a/themes/medium/index.js
+++ b/themes/medium/index.js
@@ -185,6 +185,7 @@ const LayoutSlug = props => {
   )
 
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -201,7 +202,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/movie/index.js b/themes/movie/index.js
index 6e969b7d7f3..af775d0dbab 100644
--- a/themes/movie/index.js
+++ b/themes/movie/index.js
@@ -152,6 +152,7 @@ const LayoutPostList = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 用js 实现将页面中的多个视频聚合为一个分集的视频
     function combineVideo() {
@@ -299,7 +300,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
     return () => {
diff --git a/themes/nav/index.js b/themes/nav/index.js
index ed405186e97..691c369a885 100755
--- a/themes/nav/index.js
+++ b/themes/nav/index.js
@@ -255,6 +255,7 @@ const LayoutPostList = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -269,7 +270,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/next/index.js b/themes/next/index.js
index 8c70fb8ff81..bb68834c9e5 100644
--- a/themes/next/index.js
+++ b/themes/next/index.js
@@ -322,6 +322,7 @@ const LayoutSlug = props => {
   const { post, lock, validPassword } = props
 
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -336,7 +337,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/nobelium/index.js b/themes/nobelium/index.js
index c8324277afa..47f2f20514a 100644
--- a/themes/nobelium/index.js
+++ b/themes/nobelium/index.js
@@ -221,6 +221,7 @@ const LayoutArchive = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -235,7 +236,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/photo/index.js b/themes/photo/index.js
index b76eef756ce..9c5b2dfb251 100644
--- a/themes/photo/index.js
+++ b/themes/photo/index.js
@@ -152,6 +152,7 @@ const LayoutPostList = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 用js 实现将页面中的多个视频聚合为一个分集的视频
     function combineVideo() {
@@ -299,7 +300,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
     return () => {
diff --git a/themes/plog/index.js b/themes/plog/index.js
index 4de0ba0a288..88f4054b31b 100644
--- a/themes/plog/index.js
+++ b/themes/plog/index.js
@@ -176,6 +176,7 @@ const LayoutArchive = props => {
 const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -190,7 +191,7 @@ const LayoutSlug = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])
diff --git a/themes/simple/index.js b/themes/simple/index.js
index 020bbf4e215..a2b98e64b15 100644
--- a/themes/simple/index.js
+++ b/themes/simple/index.js
@@ -267,6 +267,7 @@ const LayoutSlug = props => {
 const Layout404 = props => {
   const { post } = props
   const router = useRouter()
+  const waiting404 = siteConfig('POST_WAITING_TIME_FOR_404') * 1000
   useEffect(() => {
     // 404
     if (!post) {
@@ -281,7 +282,7 @@ const Layout404 = props => {
             }
           }
         },
-        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+        waiting404
       )
     }
   }, [post])

From 17a8fd73327c9f796534d8133642f56be2d83cd7 Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Tue, 3 Dec 2024 20:16:41 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix(=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8React=20HOOK=E7=9A=84=E9=97=AE=E9=A2=98):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c22114a0332dda440e7b12a4cf726af86d5e1c7d)
---
 lib/config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/config.js b/lib/config.js
index 2d46b6fb476..bf03f95f0a2 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -38,6 +38,9 @@ export const siteConfig = (key, defaultVal = null, extendConfig = {}) => {
     case 'TAG_SORT_BY_COUNT':
     case 'THEME':
     case 'LINK':
+    case 'NPM_CDN_BASE':
+    case 'CDNJS_CDN_BASE':
+    case 'JSDELIVR_CDN_BASE':
       // LINK比较特殊，
       if (key === 'LINK') {
         if (!extendConfig || Object.keys(extendConfig).length === 0) {

From 8cb2244f377eab559914c7f2834144817356f8ec Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Wed, 4 Dec 2024 02:45:47 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat(=E6=94=AF=E6=8C=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=9D=97=E6=A0=BC=E5=BC=8F=E7=9A=84=E7=9B=AE=E5=BD=95=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 079515a157f3d0ba5cc1a92272fc16e74537f25f)

feat(支持同步块格式的目录识别): 修复额外的多余目录识别问题

(cherry picked from commit c2d8ed211c16413aec37fd2438d93a7525afc03d)

feat(支持同步块格式的目录识别): 去除多余的判断逻辑

(cherry picked from commit bacbe55bea13c4d3c6e79a11afcde4ba5139c67b)
---
 lib/notion/getPageTableOfContents.js | 34 +++++++++++++++++-----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/notion/getPageTableOfContents.js b/lib/notion/getPageTableOfContents.js
index a23be7cb30e..738c22031cf 100644
--- a/lib/notion/getPageTableOfContents.js
+++ b/lib/notion/getPageTableOfContents.js
@@ -12,7 +12,7 @@ const indentLevels = {
  * H1, H2, and H3 elements.
  */
 export const getPageTableOfContents = (page, recordMap) => {
-  const contents = (page.content ?? [])
+  const contents = page.content ?? []
   const toc = getBlockHeader(contents, recordMap)
   const indentLevelStack = [
     {
@@ -69,20 +69,28 @@ function getBlockHeader(contents, recordMap, toc) {
       continue
     }
     const { type } = block
-    if (type.indexOf('header') >= 0) {
-      const existed = toc.find(e => e.id === blockId)
-      if (!existed) {
-        toc.push({
-          id: blockId,
-          type,
-          text: getTextContent(block.properties?.title),
-          indentLevel: indentLevels[type]
-        })
-      }
-    }
-
     if (block.content?.length > 0) {
       getBlockHeader(block.content, recordMap, toc)
+    } else {
+      if (type.indexOf('header') >= 0) {
+        const existed = toc.find(e => e.id === blockId)
+        if (!existed) {
+          toc.push({
+            id: blockId,
+            type,
+            text: getTextContent(block.properties?.title),
+            indentLevel: indentLevels[type]
+          })
+        }
+      } else if (type === 'transclusion_reference') {
+        getBlockHeader(
+          [block.format.transclusion_reference_pointer.id],
+          recordMap,
+          toc
+        )
+      } else if (type === 'transclusion_container') {
+          getBlockHeader(block.content, recordMap, toc)
+      }
     }
   }
 

From 45a6ec1eb4effa6c2c1b7fcab63a2b30fd15c7f4 Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Fri, 20 Dec 2024 18:15:28 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat(=E6=9B=B4=E6=8D=A2short=5Fid?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F):=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E7=BC=A9=E7=9F=AD=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E6=BD=9C=E5=9C=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6d73a4388c1613dc0a719d68c8b4b3432fefd314)
---
 lib/notion/convertInnerUrl.js | 5 ++---
 lib/utils/pageId.js           | 5 +----
 themes/gitbook/index.js       | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/notion/convertInnerUrl.js b/lib/notion/convertInnerUrl.js
index 0a8cfbce4f8..b632e245790 100644
--- a/lib/notion/convertInnerUrl.js
+++ b/lib/notion/convertInnerUrl.js
@@ -27,8 +27,7 @@ export const convertInnerUrl = allPages => {
       const slug = getLastPartOfUrl(anchorTag.href)
       if (checkStrIsNotionId(slug)) {
         const slugPage = allPages?.find(page => {
-          const find = idToUuid(slug).indexOf(page.short_id) === 0
-          return find
+          return idToUuid(slug).indexOf(page.short_id) === 14
         })
         if (slugPage) {
           anchorTag.href = slugPage?.href
@@ -51,4 +50,4 @@ export const convertInnerUrl = allPages => {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/lib/utils/pageId.js b/lib/utils/pageId.js
index c963df28b62..6bd39885811 100644
--- a/lib/utils/pageId.js
+++ b/lib/utils/pageId.js
@@ -38,10 +38,7 @@ function getShortId(uuid) {
   if (!uuid || uuid.indexOf('-') < 0) {
     return uuid
   }
-  // 找到第一个 '-' 的位置
-  const index = uuid.indexOf('-')
-  // 截取从开始到第一个 '-' 之前的部分
-  return uuid.substring(0, index)
+  return uuid.substring(14)
 }
 
 module.exports = { extractLangPrefix, extractLangId, getShortId }
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index b737e9f88c7..003f2f5c562 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -78,7 +78,7 @@ function getNavPagesWithLatest(allNavPages, latestPosts, post) {
     }
     // 属于最新文章通常6篇 && (无阅读记录 || 最近更新时间大于上次阅读时间)
     if (
-      latestPosts.some(post => post?.id.indexOf(item?.short_id) === 0) &&
+      latestPosts.some(post => post?.id.indexOf(item?.short_id) === 14) &&
       (!postReadTime[item.short_id] ||
         postReadTime[item.short_id] < new Date(item.lastEditedDate).getTime())
     ) {

From 0c415984556603e2958430f7c23807764c7ff74d Mon Sep 17 00:00:00 2001
From: anime <street-anime-olive@duck.com>
Date: Fri, 20 Dec 2024 20:09:57 +0800
Subject: [PATCH 09/10] =?UTF-8?q?feat(=E6=94=AF=E6=8C=81=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=86=85=E7=AB=99=E5=86=85=E9=93=BE=E6=8E=A5=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E8=B7=B3=E8=BD=AC=E5=B9=B6=E4=BC=98=E5=8C=96=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d35fcfdfaaef78d14cdaa7d88f69884f09c84277)
---
 lib/notion/convertInnerUrl.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/notion/convertInnerUrl.js b/lib/notion/convertInnerUrl.js
index 0a8cfbce4f8..76317a1ab2b 100644
--- a/lib/notion/convertInnerUrl.js
+++ b/lib/notion/convertInnerUrl.js
@@ -1,5 +1,6 @@
 import { idToUuid } from 'notion-utils'
 import { checkStrIsNotionId, getLastPartOfUrl, isBrowser } from '../utils'
+import { loadLangFromLocalStorage } from '@/lib/lang'
 
 /**
  * 处理页面内连接跳转:
@@ -17,11 +18,13 @@ export const convertInnerUrl = allPages => {
   if (!allAnchorTags) {
     return
   }
-
-  const currentURL = window.location.origin + window.location.pathname
-  // url替换成slug
+  const { origin, pathname } = window.location;
+  const currentURL = origin + pathname
+  const currentPathLang = pathname.split('/').filter(Boolean)[0]
+  const lang = loadLangFromLocalStorage().split(/[-_]/)[0]
+  const langPrefix = lang === currentPathLang ? '/' + lang : ''
   for (const anchorTag of allAnchorTags) {
-    // 检查url
+    // url替换成slug
     if (anchorTag?.href) {
       // 如果url是一个Notion_id，尝试匹配成博客的文章内链
       const slug = getLastPartOfUrl(anchorTag.href)
@@ -31,14 +34,11 @@ export const convertInnerUrl = allPages => {
           return find
         })
         if (slugPage) {
-          anchorTag.href = slugPage?.href
+          anchorTag.href = langPrefix + slugPage?.href
         }
       }
     }
-  }
-
-  // 链接在当前页面打开
-  for (const anchorTag of allAnchorTags) {
+    // 链接在当前页面打开
     if (anchorTag?.target === '_blank') {
       const hrefWithoutQueryHash = anchorTag.href.split('?')[0].split('#')[0]
       const hrefWithRelativeHash =

From 70abe50a1f20874eec52c68a2230773fe375f256 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sat, 21 Dec 2024 21:28:35 +0800
Subject: [PATCH 10/10] =?UTF-8?q?4.7.12=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4c579c78c3b..374d005a02c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "4.7.11",
+  "version": "4.7.12",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {