From 61f014e60ff60ab395caa3eb6be2000110918280 Mon Sep 17 00:00:00 2001
From: expoli <31023767+expoli@users.noreply.github.com>
Date: Sun, 29 Oct 2023 19:42:38 +0800
Subject: [PATCH 1/6] [fix] key not exist error

---
 themes/hexo/components/MenuGroupCard.js | 6 ++++++
 themes/hexo/components/MenuListSide.js  | 6 ++++++
 themes/hexo/components/MenuListTop.js   | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/themes/hexo/components/MenuGroupCard.js b/themes/hexo/components/MenuGroupCard.js
index 574a8e5b..5be22e2b 100644
--- a/themes/hexo/components/MenuGroupCard.js
+++ b/themes/hexo/components/MenuGroupCard.js
@@ -16,6 +16,12 @@ const MenuGroupCard = (props) => {
     { name: locale.COMMON.TAGS, to: '/tag', slot: tagSlot, show: CONFIG.MENU_TAG }
   ]
 
+  for (let i = 0; i < links.length; i++) {
+    if (links[i].id !== i) {
+      links[i].id = i
+    }
+  }
+
   return (
     <nav id='nav' className='leading-8 flex justify-center  dark:text-gray-200 w-full'>
         {links.map(link => {
diff --git a/themes/hexo/components/MenuListSide.js b/themes/hexo/components/MenuListSide.js
index 1a3b2f5b..789d07d2 100644
--- a/themes/hexo/components/MenuListSide.js
+++ b/themes/hexo/components/MenuListSide.js
@@ -18,6 +18,12 @@ export const MenuListSide = (props) => {
   if (customNav) {
     links = customNav.concat(links)
   }
+  
+  for (let i = 0; i < links.length; i++) {
+    if (links[i].id !== i) {
+      links[i].id = i
+    }
+  }
 
   // 如果 开启自定义菜单，则覆盖Page生成的菜单
   if (BLOG.CUSTOM_MENU) {
diff --git a/themes/hexo/components/MenuListTop.js b/themes/hexo/components/MenuListTop.js
index a2fd66ad..4f2da0d1 100644
--- a/themes/hexo/components/MenuListTop.js
+++ b/themes/hexo/components/MenuListTop.js
@@ -20,6 +20,12 @@ export const MenuListTop = (props) => {
     links = links.concat(customNav)
   }
 
+  for (let i = 0; i < links.length; i++) {
+    if (links[i].id !== i) {
+      links[i].id = i
+    }
+  }
+
   // 如果 开启自定义菜单，则覆盖Page生成的菜单
   if (BLOG.CUSTOM_MENU) {
     links = customMenu

From 49038d613318023a489920ee61ca58e0489d524e Mon Sep 17 00:00:00 2001
From: expoli <31023767+expoli@users.noreply.github.com>
Date: Sun, 29 Oct 2023 19:43:56 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[fix]=20=E6=96=87=E7=AB=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=B0=81=E9=9D=A2=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E5=B0=81=E9=9D=A2=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=81=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/hexo/components/BlogPostCard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/hexo/components/BlogPostCard.js b/themes/hexo/components/BlogPostCard.js
index dc1d9759..f1febbdd 100644
--- a/themes/hexo/components/BlogPostCard.js
+++ b/themes/hexo/components/BlogPostCard.js
@@ -9,7 +9,7 @@ import LazyImage from '@/components/LazyImage'
 const BlogPostCard = ({ index, post, showSummary, siteInfo }) => {
   const showPreview = CONFIG.POST_LIST_PREVIEW && post.blockMap
   if (post && !post.pageCoverThumbnail && CONFIG.POST_LIST_COVER_DEFAULT) {
-    post.pageCover = siteInfo?.pageCoverThumbnail
+    post.pageCoverThumbnail = siteInfo?.pageCover
   }
   const showPageCover = CONFIG.POST_LIST_COVER && post?.pageCoverThumbnail && !showPreview
   //   const delay = (index % 2) * 200

From bbce50b0532e5c887aa2136c79f27733c348a9cd Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Tue, 31 Oct 2023 15:27:12 +0800
Subject: [PATCH 3/6] =?UTF-8?q?HEO=E4=B8=BB=E9=A2=98=E8=8B=B1=E9=9B=84?=
 =?UTF-8?q?=E5=8C=BA=E9=BB=98=E8=AE=A4=E5=B0=81=E9=9D=A2=E5=9B=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/heo/components/Hero.js | 3 +--
 themes/heo/config.js          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index 14cad8b0..7f21c474 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -378,8 +378,7 @@ function TodayCard({ cRef }) {
             isCoverUp ? '' : ' pointer-events-none'
           } cursor-pointer today-card-cover absolute w-full h-full top-0`}
           style={{
-            background:
-              "url('https://bu.dusays.com/2023/03/12/640dcd3a1b146.png') no-repeat center /cover"
+            background: `url('${CONFIG.HERO_RECOMMEND_COVER}') no-repeat center /cover`
           }}
         ></div>
       </div>
diff --git a/themes/heo/config.js b/themes/heo/config.js
index f62be177..1d336dc2 100644
--- a/themes/heo/config.js
+++ b/themes/heo/config.js
@@ -25,6 +25,7 @@ const CONFIG = {
   // 英雄区右侧推荐文章标签, 例如 [推荐] , 最多六篇文章; 若留空白''，则推荐最近更新文章
   HERO_RECOMMEND_POST_TAG: '推荐',
   HERO_RECOMMEND_POST_SORT_BY_UPDATE_TIME: false, // 推荐文章排序，为`true`时将强制按最后修改时间倒序
+  HERO_RECOMMEND_COVER: 'https://cdn.pixabay.com/photo/2015/10/30/20/13/sunrise-1014712_1280.jpg', // 英雄区右侧图片
 
   // 右侧个人资料卡牌欢迎语，点击可自动切换
   INFOCARD_GREETINGS: [

From 2f5aa8c69b24e46290395b4c718e1e8037015d1d Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Tue, 31 Oct 2023 15:29:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?HEO=E4=B8=BB=E9=A2=98=E8=8B=B1=E9=9B=84?=
 =?UTF-8?q?=E5=8C=BA=E5=B0=81=E9=9D=A2=E9=BB=98=E8=AE=A4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96Notion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/heo/components/Hero.js | 6 +++---
 themes/heo/config.js          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index 7f21c474..a0ff3f73 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -253,7 +253,7 @@ function TopGroup(props) {
           )
         })}
       </div>
-      <TodayCard cRef={todayCardRef} />
+      <TodayCard cRef={todayCardRef} siteInfo={siteInfo}/>
     </div>
   )
 }
@@ -301,7 +301,7 @@ function getTopPosts({ latestPosts, allNavPages }) {
  * 英雄区右侧，今日卡牌
  * @returns
  */
-function TodayCard({ cRef }) {
+function TodayCard({ cRef, siteInfo }) {
   const router = useRouter()
   // 卡牌是否盖住下层
   const [isCoverUp, setIsCoverUp] = useState(true)
@@ -378,7 +378,7 @@ function TodayCard({ cRef }) {
             isCoverUp ? '' : ' pointer-events-none'
           } cursor-pointer today-card-cover absolute w-full h-full top-0`}
           style={{
-            background: `url('${CONFIG.HERO_RECOMMEND_COVER}') no-repeat center /cover`
+            background: `url('${siteInfo?.pageCover}') no-repeat center /cover`
           }}
         ></div>
       </div>
diff --git a/themes/heo/config.js b/themes/heo/config.js
index 1d336dc2..a979621c 100644
--- a/themes/heo/config.js
+++ b/themes/heo/config.js
@@ -25,7 +25,7 @@ const CONFIG = {
   // 英雄区右侧推荐文章标签, 例如 [推荐] , 最多六篇文章; 若留空白''，则推荐最近更新文章
   HERO_RECOMMEND_POST_TAG: '推荐',
   HERO_RECOMMEND_POST_SORT_BY_UPDATE_TIME: false, // 推荐文章排序，为`true`时将强制按最后修改时间倒序
-  HERO_RECOMMEND_COVER: 'https://cdn.pixabay.com/photo/2015/10/30/20/13/sunrise-1014712_1280.jpg', // 英雄区右侧图片
+  //   HERO_RECOMMEND_COVER: 'https://cdn.pixabay.com/photo/2015/10/30/20/13/sunrise-1014712_1280.jpg', // 英雄区右侧图片
 
   // 右侧个人资料卡牌欢迎语，点击可自动切换
   INFOCARD_GREETINGS: [

From 47cfa405ed5375a989a8e4c5b0366b0707a4ea84 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Wed, 1 Nov 2023 11:40:06 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8A=98=E5=8F=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=9D=97=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog.config.js         |  4 +++-
 components/PrismMac.js | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/blog.config.js b/blog.config.js
index 65683d0d..ae020dac 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -114,7 +114,9 @@ const BLOG = {
 
   CODE_MAC_BAR: process.env.NEXT_PUBLIC_CODE_MAC_BAR || true, // 代码左上角显示mac的红黄绿图标
   CODE_LINE_NUMBERS: process.env.NEXT_PUBLIC_CODE_LINE_NUMBERS || false, // 是否显示行号
-  CODE_COLLAPSE: process.env.NEXT_PUBLIC_CODE_COLLAPSE || true, // 是否折叠代码框
+  CODE_COLLAPSE: process.env.NEXT_PUBLIC_CODE_COLLAPSE || true, // 是否支持折叠代码框
+  CODE_COLLAPSE_EXPAND_DEFAULT: process.env.NEXT_PUBLIC_CODE_COLLAPSE_EXPAND_DEFAULT || true, // 折叠代码默认是展开状态
+
   // END********代码相关********
 
   // Mermaid 图表CDN
diff --git a/components/PrismMac.js b/components/PrismMac.js
index 0a69e55e..3e568e9f 100644
--- a/components/PrismMac.js
+++ b/components/PrismMac.js
@@ -105,13 +105,20 @@ const renderCollapseCode = () => {
     codeBlock.parentNode.insertBefore(collapseWrapper, codeBlock)
     panel.appendChild(codeBlock)
 
-    header.addEventListener('click', () => {
+    function collapseCode() {
       panel.classList.toggle('invisible')
       panel.classList.toggle('h-0')
       panel.classList.toggle('h-auto')
       header.querySelector('svg').classList.toggle('rotate-180')
       panelWrapper.classList.toggle('border-gray-300')
-    })
+    }
+
+    // 点击后折叠展开代码
+    header.addEventListener('click', collapseCode)
+    // 是否自动展开
+    if (JSON.parse(BLOG.CODE_COLLAPSE_EXPAND_DEFAULT)) {
+      header.click()
+    }
   }
 }
 

From e24b8cfe3ae6d38081e93cf03fd88ae6c3c94bf5 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Wed, 1 Nov 2023 14:28:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/notion/mapImage.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/notion/mapImage.js b/lib/notion/mapImage.js
index f25eda99..0406507f 100644
--- a/lib/notion/mapImage.js
+++ b/lib/notion/mapImage.js
@@ -67,13 +67,10 @@ const mapImgUrl = (img, block, type = 'block', from) => {
     ret = BLOG.NOTION_HOST + '/image/' + encodeURIComponent(ret) + '?table=' + type + '&id=' + block.id
   }
 
-  // UnSplash 随机图片接口优化
-  if (ret.includes('source.unsplash.com/random')) {
-    // 检查原始URL是否已经包含参数
-    const separator = ret.includes('?') ? '&' : '?'
-    // 拼接唯一识别参数，防止请求的图片被缓存
-    ret = `${ret}${separator}random=${block.id}`
-  }
+  // 随机图片接口优化 防止因url一致而随机结果相同
+  const separator = ret.includes('?') ? '&' : '?'
+  // 拼接唯一识别参数，防止请求的图片被缓存
+  ret = `${ret.trim()}${separator}t=${block.id}`
 
   // 文章封面
   if (from === 'pageCoverThumbnail') {