Merge branch 'dev'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -53,6 +53,15 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: dependencies
+    attributes:
+      label: 依賴插件 | Package dependencies Information
+      description: 在 Hexo 根目錄下執行`npm ls --depth 0` | Run `npm ls --depth 0` in Hexo root directory
+      render: Text
+    validations:
+      required: true
+
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -12,11 +12,7 @@ contact_links:
     url: https://t.me/bu2fly
     about: 'Official Telegram Group'
 
-  - name: QQ 1群
+  - name: QQ 群
     url: https://jq.qq.com/?_wv=1027&k=KU9105XR
-    about: '群號 1070540070，不要兩個Q群都添加'
-
-  - name: QQ 2群
-    url: https://jq.qq.com/?_wv=1027&k=r1nK0DQz
-    about: '群號 978221020，不要兩個Q群都添加'
+    about: '群號 1070540070'
 

README_CN.md

@@ -82,7 +82,7 @@ theme: butterfly
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
 - [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
-- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 各種站長驗證
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）

layout/includes/head.pug

@@ -40,7 +40,7 @@ if (theme.pwa && theme.pwa.enable)
 
 //- main css
 link(rel='stylesheet', href=url_for(theme.asset.main_css))
-link(rel='stylesheet', href=url_for(theme.asset.fontawesome) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.asset.fontawesome))
 
 if (theme.snackbar && theme.snackbar.enable)
   link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")

layout/includes/head/config.pug

@@ -78,9 +78,11 @@
   }
 
   let highlight = 'undefined';
-  if ((config.highlight && config.highlight.enable) || (config.prismjs && config.prismjs.enable)) {
+  let syntaxHighlighter = config.syntax_highlighter;
+  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable);
+  if (highlightEnable) {
     highlight = JSON.stringify({
-      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
+      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
       highlightCopy: theme.highlight_copy,
       highlightLang: theme.highlight_lang,
       highlightHeightLimit: theme.highlight_height_limit

layout/includes/third-party/newest-comments/artalk.pug

@@ -40,7 +40,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom && ($dom.innerHTML= result))
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
@@ -90,7 +90,7 @@ script.
       } catch (e) {
         console.log(e)
         const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
       }
     }
 

layout/includes/third-party/newest-comments/disqus-comment.pug

@@ -58,7 +58,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

layout/includes/third-party/newest-comments/github-issues.pug

@@ -84,7 +84,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

layout/includes/third-party/newest-comments/remark42.pug

@@ -38,7 +38,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

layout/includes/third-party/newest-comments/twikoo-comment.pug

@@ -69,7 +69,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

layout/includes/third-party/newest-comments/valine.pug

@@ -46,7 +46,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

layout/includes/third-party/newest-comments/waline.pug

@@ -38,7 +38,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

plugins.yml

@@ -5,7 +5,7 @@ algolia_search:
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.57.0
+  version: 4.60.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -37,7 +37,7 @@ disqusjs_css:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.22
+  version: 1.6.25
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
@@ -73,7 +73,7 @@ katex_copytex:
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 10.5.0
+  version: 10.6.1
 canvas_ribbon:
   name: butterfly-extsrc
   file: dist/canvas-ribbon.min.js
@@ -105,33 +105,33 @@ clickShowText:
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
-  version: 17.8.4
+  version: 17.8.5
 instantpage:
   name: instant.page
   file: instantpage.js
   version: 5.2.0
 typed:
   name: typed.js
   file: dist/typed.umd.js
-  version: 2.0.16
+  version: 2.1.0
 pangu:
   name: pangu
   file: dist/browser/pangu.min.js
   version: 4.0.7
 fancybox_css:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.css
-  version: 5.0.24
+  version: 5.0.28
   other_name: fancyapps-ui
 fancybox:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  version: 5.0.24
+  version: 5.0.28
   other_name: fancyapps-ui
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js
-  version: 1.0.8
+  version: 1.1.0
 snackbar_css:
   name: node-snackbar
   file: dist/snackbar.min.css
@@ -145,11 +145,19 @@ fontawesome:
   file: css/all.min.css
   other_name: font-awesome
   version: 6.4.2
+flickr_justified_gallery_js:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.min.js
+  version: 2.1.2
+flickr_justified_gallery_css:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.css
+  version: 2.1.2
 egjs_infinitegrid:
   name: '@egjs/infinitegrid'
   other_name: egjs-infinitegrid
   file: dist/infinitegrid.min.js
-  version: 4.10.1
+  version: 4.11.0
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -180,11 +188,11 @@ prismjs_autoloader:
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.6.3
+  version: 2.6.4
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.6.3
+  version: 2.6.4
 pace_js:
   name: pace-js
   other_name: pace
@@ -208,4 +216,4 @@ docsearch_css:
 abcjs_basic_js:
   name: abcjs
   file: dist/abcjs-basic-min.js
-  version: 6.2.2
+  version: 6.2.3