Merge branch 'dev'

fix: 修復當設置搜索文件為xml時，搜索 < 和 > 沒有結果的 bug closed #1369
fix: 修復 CDN 的 custom_format 沒配置，preconnect 報錯的 bug closed #1371

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://buy.stripe.com/3cs6rP6YA91sbbG5kk','https://jsd.012700.xyz/gh/jerryc127/CDN/Photo/wechat.jpg'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.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.md

@@ -1,7 +1,5 @@
 <div align="right">
-  Language:
-  🇺🇸
-  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
+<a title="Chinese" href="/README_CN.md">中文</a>
 </div>
 
 # hexo-theme-butterfly
@@ -14,9 +12,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
+📢 Demo: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
 
-Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) || [Chinese](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
@@ -62,26 +60,26 @@ npm i hexo-theme-butterfly
 
 - [x] Card UI Design
 - [X] Support sub-menu
-- [x] Two Column designs
+- [x] Two-column layout
 - [x] Responsive Web Design
 - [x] Dark Mode
 - [x] Pjax
 - [x] Read Mode
 - [x] Conversion between Traditional and Simplified Chinese
 - [X] TOC catalog is available for both computers and mobile phones
-- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
+- [X] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean/mac/mac light), also support customization
 - [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
 - [X] Disable copy/Add a Copyright Notice to the Copied Text
-- [X] Search (Algolia SearchZ/Local Search)
+- [X] Search (Algolia Search/Local Search)
 - [x] Mathjax and Katex
 - [x] Built-in 404 page
 - [x] WordCount
 - [x] Related articles
 - [x] Displays outdated notice for a post
-- [x] Share (AddThis/Sharejs/Addtoany)
+- [x] Share (Sharejs/Addtoany)
 - [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk)
 - [x] Multiple Comment System Support
-- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp/messenger)
+- [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)
 - [x] Web analytics
 - [x] Google AdSense
 - [x] Webmaster Verification

README_CN.md

@@ -1,7 +1,5 @@
 <div align="right">
-  語言:
-  中文
-  <a title="English" href="/README.md">英文</a>
+  <a title="English" href="/README.md">English</a>
 </div>
 
 # hexo-theme-butterfly
@@ -14,9 +12,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
+📢 預覽: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
 
-文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) || [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
@@ -72,19 +70,19 @@ theme: butterfly
 - [X] 內置多種代碼配色（darker/pale night/light/ocean/mac/mac light），可自定義代碼配色
 - [X] 代碼塊顯示代碼語言/關閉或展開代碼塊/代碼複製/代碼自動換行
 - [X] 可關閉文字複製/可開啟內容複製增加版權信息）
-- [X] 兩種搜索（Algolia搜索和本地搜索）
+- [X] 兩種搜索（ Algolia 搜索和本地搜索）
 - [x] Mathjax 和 Katex
 - [x] 內置404頁面
 - [x] 顯示字數統計
 - [x] 顯示相關文章
 - [x] 過期文章提醒
-- [x] 多種分享系統（AddThis/Sharejs/Addtoany）
+- [x] 多種分享系統（Sharejs/Addtoany）
 - [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp/messenger）
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
 - [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
-- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 各種站長驗證
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）

_config.yml

@@ -1,7 +1,13 @@
-# Main menu navigation (導航目錄)
-# see https://butterfly.js.org/posts/4aa8abbe/#導航菜單
+# Navigation bar settings (導航欄設置)
+# see https://butterfly.js.org/posts/4aa8abbe/##導航欄設置-Navigation-bar-settings
 # --------------------------------------
 
+nav:
+  logo: # image
+  display_title: true
+  fixed: false # fixed navigation bar
+
+# Menu 目錄
 menu:
   # Home: / || fas fa-home
   # Archives: /archives/ || fas fa-archive
@@ -13,11 +19,6 @@ menu:
   # Link: /link/ || fas fa-link
   # About: /about/ || fas fa-heart
 
-nav:
-  logo: # image
-  display_title: true
-  fixed: false # fixed navigation bar
-
 # Code Blocks (代碼相關)
 # --------------------------------------
 
@@ -28,54 +29,12 @@ highlight_shrink: false # true: shrink the code blocks / false: expand the code
 highlight_height_limit: false # unit: px
 code_word_wrap: false
 
-# copy settings
-# copyright: Add the copyright information after copied content (複製的內容後面加上版權信息)
-copy:
-  enable: true
-  copyright:
-    enable: false
-    limit_count: 50
-
-# social settings (社交圖標設置)
+# Social Settings (社交圖標設置)
 # formal:
-#   icon: link || the description
+#   icon: link || the description || color
 social:
-  # fab fa-github: https://github.com/xxxxx || Github
-  # fas fa-envelope: mailto:xxxxxx@gmail.com || Email
-
-# search (搜索)
-# see https://butterfly.js.org/posts/ceeb73f/#搜索系統
-# --------------------------------------
-
-# Algolia search
-algolia_search:
-  enable: false
-  hits:
-    per_page: 6
-
-# Local search
-local_search:
-  enable: false
-  preload: false
-  CDN:
-
-# Math (數學)
-# --------------------------------------
-# About the per_page
-# if you set it to true, it will load mathjax/katex script in each page (true 表示每一頁都加載js)
-# if you set it to false, it will load mathjax/katex script according to your setting (add the 'mathjax: true' in page's front-matter)
-# (false 需要時加載，須在使用的 Markdown Front-matter 加上 mathjax: true)
-
-# MathJax
-mathjax:
-  enable: false
-  per_page: false
-
-# KaTeX
-katex:
-  enable: false
-  per_page: false
-  hide_scrollbar: true
+  # fab fa-github: https://github.com/xxxxx || Github || '#24292e'
+  # fas fa-envelope: mailto:xxxxxx@gmail.com || Email || '#4a7dbe'
 
 # Image (圖片設置)
 # --------------------------------------
@@ -155,14 +114,6 @@ post_meta:
     tags: true # true or false 文章頁是否顯示標籤
     label: true # true or false 顯示描述性文字
 
-# wordcount (字數統計)
-# see https://butterfly.js.org/posts/ceeb73f/#字數統計
-wordcount:
-  enable: false
-  post_wordcount: true
-  min2read: true
-  total_wordcount: true
-
 # Display the article introduction on homepage
 # 1: description
 # 2: both (if the description exists, it will show description, or show the auto_excerpt)
@@ -174,11 +125,21 @@ index_post_content:
 
 # anchor
 anchor:
-  button:
+  # when you scroll, the URL will update according to header id.
+  auto_update: false
+  # Click the headline to scroll and update the anchor
+  click_to_scroll: false
+
+# figcaption (圖片描述文字)
+photofigcaption: false
+
+# copy settings
+# copyright: Add the copyright information after copied content (複製的內容後面加上版權信息)
+copy:
+  enable: true
+  copyright:
     enable: false
-    always_show: false
-    icon: # the unicode value of Font Awesome icon, such as '\3423'
-  auto_update: false # when you scroll in post, the URL will update according to header id.
+    limit_count: 50
 
 # Post
 # --------------------------------------
@@ -202,6 +163,7 @@ post_copyright:
 # Sponsor/reward
 reward:
   enable: false
+  text:
   QR_code:
     # - img: /img/wechat.jpg
     #   link:
@@ -224,9 +186,6 @@ related_post:
   limit: 6 # Number of posts displayed
   date_type: created # or created or updated 文章日期顯示創建日或者更新日
 
-# figcaption (圖片描述文字)
-photofigcaption: false
-
 # post_pagination (分頁)
 # value: 1 || 2 || false
 # 1: The 'next post' will link to old post
@@ -243,14 +202,189 @@ noticeOutdate:
   message_prev: It has been
   message_next: days since the last update, the content of the article may be outdated.
 
-# Share System (分享功能)
+# Footer Settings
+# --------------------------------------
+footer:
+  owner:
+    enable: true
+    since: 2020
+  custom_text:
+  copyright: true # Copyright of theme and framework
+
+# aside (側邊欄)
 # --------------------------------------
 
-# AddThis
-# https://www.addthis.com/
-addThis:
+aside:
+  enable: true
+  hide: false
+  button: true
+  mobile: true # display on mobile
+  position: right # left or right
+  display:
+    archive: true
+    tag: true
+    category: true
+  card_author:
+    enable: true
+    description:
+    button:
+      enable: true
+      icon: fab fa-github
+      text: Follow Me
+      link: https://github.com/xxxxxx
+  card_announcement:
+    enable: true
+    content: This is my Blog
+  card_recent_post:
+    enable: true
+    limit: 5 # if set 0 will show all
+    sort: date # date or updated
+    sort_order: # Don't modify the setting unless you know how it works
+  card_categories:
+    enable: true
+    limit: 8 # if set 0 will show all
+    expand: none # none/true/false
+    sort_order: # Don't modify the setting unless you know how it works
+  card_tags:
+    enable: true
+    limit: 40 # if set 0 will show all
+    color: false
+    orderby: random # Order of tags, random/name/length
+    order: 1 # Sort of order. 1, asc for ascending; -1, desc for descending
+    sort_order: # Don't modify the setting unless you know how it works
+  card_archives:
+    enable: true
+    type: monthly # yearly or monthly
+    format: MMMM YYYY # eg: YYYY年MM月
+    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
+    limit: 8 # if set 0 will show all
+    sort_order: # Don't modify the setting unless you know how it works
+  card_webinfo:
+    enable: true
+    post_count: true
+    last_push_date: true
+    sort_order: # Don't modify the setting unless you know how it works
+  card_post_series:
+    enable: true
+    series_title: false # The title shows the series name
+    orderBy: 'date' # Order by title or date
+    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
+
+# busuanzi count for PV / UV in site
+# 訪問人數
+busuanzi:
+  site_uv: true
+  site_pv: true
+  page_pv: true
+
+# Time difference between publish date and now (網頁運行時間)
+# Formal: Month/Day/Year Time or Year/Month/Day Time
+runtimeshow:
   enable: false
-  pubid:
+  publish_date:
+
+# Aside widget - Newest Comments
+newest_comments:
+  enable: false
+  sort_order: # Don't modify the setting unless you know how it works
+  limit: 6
+  storage: 10 # unit: mins, save data to localStorage
+  avatar: true
+
+# Bottom right button (右下角按鈕)
+# --------------------------------------
+
+# Conversion between Traditional and Simplified Chinese (簡繁轉換)
+translate:
+  enable: false
+  # The text of a button
+  default: 繁
+  # the language of website (1 - Traditional Chinese/ 2 - Simplified Chinese）
+  defaultEncoding: 2
+  # Time delay
+  translateDelay: 0
+  # The text of the button when the language is Simplified Chinese
+  msgToTraditionalChinese: '繁'
+  # The text of the button when the language is Traditional Chinese
+  msgToSimplifiedChinese: '簡'
+
+# Read Mode (閲讀模式)
+readmode: true
+
+# dark mode
+darkmode:
+  enable: true
+  # Toggle Button to switch dark/light mode
+  button: true
+  # Switch dark/light mode automatically (自動切換 dark mode和 light mode)
+  # autoChangeMode: 1  Following System Settings, if the system doesn't support dark mode, it will switch dark mode between 6 pm to 6 am
+  # autoChangeMode: 2  Switch dark mode between 6 pm to 6 am
+  # autoChangeMode: false
+  autoChangeMode: false
+  # Set the light mode time. The value is between 0 and 24. If not set, the default value is 6 and 18
+  start: # 8
+  end: # 22
+
+# show scroll percent in scroll-to-top button
+rightside_scroll_percent: false
+
+# Don't modify the following settings unless you know how they work (非必要請不要修改 )
+# Choose: readmode,translate,darkmode,hideAside,toc,chat,comment
+# Don't repeat 不要重複
+rightside_item_order:
+  enable: false
+  hide: # readmode,translate,darkmode,hideAside
+  show: # toc,chat,comment
+
+# Math (數學)
+# --------------------------------------
+# About the per_page
+# if you set it to true, it will load mathjax/katex script in each page (true 表示每一頁都加載js)
+# if you set it to false, it will load mathjax/katex script according to your setting (add the 'mathjax: true' in page's front-matter)
+# (false 需要時加載，須在使用的 Markdown Front-matter 加上 mathjax: true)
+
+# MathJax
+mathjax:
+  enable: false
+  per_page: false
+
+# KaTeX
+katex:
+  enable: false
+  per_page: false
+  hide_scrollbar: true
+
+# search (搜索)
+# see https://butterfly.js.org/posts/ceeb73f/#搜索系統
+# --------------------------------------
+
+# Algolia search
+algolia_search:
+  enable: false
+  hits:
+    per_page: 6
+
+# Local search
+local_search:
+  enable: false
+  # Preload the search data when the page loads.
+  preload: false
+  # Show top n results per article, show all results by setting to -1
+  top_n_per_article: 1
+  # Unescape html strings to the readable one.
+  unescape: false
+  CDN:
+
+# Docsearch
+docsearch:
+  enable: false
+  appId:
+  apiKey:
+  indexName:
+  option:
+
+# Share System (分享)
+# --------------------------------------
 
 # Share.js
 # https://github.com/overtrue/share.js
@@ -407,12 +541,6 @@ daovoice:
   enable: false
   app_id:
 
-# gitter
-# https://gitter.im/
-gitter:
-  enable: false
-  room:
-
 # crisp
 # https://crisp.chat/en/
 crisp:
@@ -426,15 +554,6 @@ messenger:
   pageID:
   lang: zh_TW # Language en_US/zh_CN/zh_TW and so on
 
-# Footer Settings
-# --------------------------------------
-footer:
-  owner:
-    enable: true
-    since: 2020
-  custom_text:
-  copyright: true # Copyright of theme and framework
-
 # Analysis
 # --------------------------------------
 
@@ -517,6 +636,9 @@ index_top_img_height:
 category_ui: # 留空或 index
 tag_ui: # 留空或 index
 
+# Stretches the lines so that each line has equal width（文字向兩側對齊，對最後一行無效）
+text_align_justify: false
+
 # Website Background (設置網站背景)
 # can set it to color or image (可設置圖片 或者 顔色)
 # The formal of image: url(http://xxxxxx.com/xxx.jpg)
@@ -525,12 +647,25 @@ background:
 # Footer Background
 footer_bg: false
 
+# Add mask to header or footer (为 header 或 footer 添加黑色半透遮罩)
+mask:
+  header: true
+  footer: true
+
 # the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
-rightside-bottom:
+rightside_bottom:
 
 # Enter transitions (開啓網頁進入效果)
 enter_transitions: true
 
+# Typewriter Effect (打字效果)
+# https://github.com/disjukr/activate-power-mode
+activate_power_mode:
+  enable: false
+  colorful: true # open particle animation (冒光特效)
+  shake: true #  open shake (抖動特效)
+  mobile: false
+
 # Background effects (背景特效)
 # --------------------------------------
 
@@ -559,14 +694,6 @@ canvas_nest:
   count: 99 # the number of lines, default: 99.
   mobile: false
 
-# Typewriter Effect (打字效果)
-# https://github.com/disjukr/activate-power-mode
-activate_power_mode:
-  enable: false
-  colorful: true # open particle animation (冒光特效)
-  shake: true #  open shake (抖動特效)
-  mobile: false
-
 # Mouse click effects: fireworks (鼠標點擊效果: 煙火特效)
 fireworks:
   enable: false
@@ -579,7 +706,7 @@ click_heart:
   mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
-ClickShowText:
+clickShowText:
   enable: false
   text:
     # - I
@@ -648,120 +775,13 @@ preloader:
   # pace theme (see https://codebyzach.github.io/pace/)
   pace_css_url:
 
-# aside (側邊欄)
-# --------------------------------------
-
-aside:
-  enable: true
-  hide: false
-  button: true
-  mobile: true # display on mobile
-  position: right # left or right
-  display:
-    archive: true
-    tag: true
-    category: true
-  card_author:
-    enable: true
-    description:
-    button:
-      enable: true
-      icon: fab fa-github
-      text: Follow Me
-      link: https://github.com/xxxxxx
-  card_announcement:
-    enable: true
-    content: This is my Blog
-  card_recent_post:
-    enable: true
-    limit: 5 # if set 0 will show all
-    sort: date # date or updated
-    sort_order: # Don't modify the setting unless you know how it works
-  card_categories:
-    enable: true
-    limit: 8 # if set 0 will show all
-    expand: none # none/true/false
-    sort_order: # Don't modify the setting unless you know how it works
-  card_tags:
-    enable: true
-    limit: 40 # if set 0 will show all
-    color: false
-    sort_order: # Don't modify the setting unless you know how it works
-  card_archives:
-    enable: true
-    type: monthly # yearly or monthly
-    format: MMMM YYYY # eg: YYYY年MM月
-    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
-    limit: 8 # if set 0 will show all
-    sort_order: # Don't modify the setting unless you know how it works
-  card_webinfo:
-    enable: true
-    post_count: true
-    last_push_date: true
-    sort_order: # Don't modify the setting unless you know how it works
-
-# busuanzi count for PV / UV in site
-# 訪問人數
-busuanzi:
-  site_uv: true
-  site_pv: true
-  page_pv: true
-
-# Time difference between publish date and now (網頁運行時間)
-# Formal: Month/Day/Year Time or Year/Month/Day Time
-runtimeshow:
+# wordcount (字數統計)
+# see https://butterfly.js.org/posts/ceeb73f/#字數統計
+wordcount:
   enable: false
-  publish_date:
-
-# Aside widget - Newest Comments
-newest_comments:
-  enable: false
-  sort_order: # Don't modify the setting unless you know how it works
-  limit: 6
-  storage: 10 # unit: mins, save data to localStorage
-  avatar: true
-
-# Bottom right button (右下角按鈕)
-# --------------------------------------
-
-# Conversion between Traditional and Simplified Chinese (簡繁轉換)
-translate:
-  enable: false
-  # The text of a button
-  default: 繁
-  # the language of website (1 - Traditional Chinese/ 2 - Simplified Chinese）
-  defaultEncoding: 2
-  # Time delay
-  translateDelay: 0
-  # The text of the button when the language is Simplified Chinese
-  msgToTraditionalChinese: '繁'
-  # The text of the button when the language is Traditional Chinese
-  msgToSimplifiedChinese: '簡'
-
-# Read Mode (閲讀模式)
-readmode: true
-
-# dark mode
-darkmode:
-  enable: true
-  # Toggle Button to switch dark/light mode
-  button: true
-  # Switch dark/light mode automatically (自動切換 dark mode和 light mode)
-  # autoChangeMode: 1  Following System Settings, if the system doesn't support dark mode, it will switch dark mode between 6 pm to 6 am
-  # autoChangeMode: 2  Switch dark mode between 6 pm to 6 am
-  # autoChangeMode: false
-  autoChangeMode: false
-
-# show scroll percent in scroll-to-top button
-rightside_scroll_percent: false
-
-# Don't modify the following settings unless you know how they work (非必要請不要修改 )
-# Choose: readmode,translate,darkmode,hideAside,toc,chat,comment
-# Don't repeat 不要重複
-rightside_item_order:
-  enable: false
-  hide: # readmode,translate,darkmode,hideAside
-  show: # toc,chat,comment
+  post_wordcount: true
+  min2read: true
+  total_wordcount: true
 
 # Lightbox (圖片大圖查看模式)
 # --------------------------------------
@@ -772,12 +792,25 @@ rightside_item_order:
 medium_zoom: false
 
 # fancybox
-# http://fancyapps.com/fancybox/3/
+# https://fancyapps.com/fancybox/
 fancybox: true
 
 # Tag Plugins settings (標籤外掛)
 # --------------------------------------
 
+# series (系列文章)
+series:
+  enable: true
+  orderBy: 'title' # Order by title or date
+  order: 1 # Sort of order. 1, asc for ascending; -1, desc for descending
+  number: true
+
+# abcjs (樂譜渲染)
+# See https://github.com/paulrosen/abcjs
+abcjs:
+  enable: false
+  per_page: true
+
 # mermaid
 # see https://github.com/mermaid-js/mermaid
 mermaid:
@@ -896,63 +929,66 @@ CDN:
   # when set it to local, you need to install hexo-butterfly-extjs
   third_party_provider: jsdelivr
 
-  # Add version number to CDN, true or false
-  version: false
+  # Add version number to url, true or false
+  version: true
 
   # Custom format
   # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
   custom_format:
 
   option:
-    # main_css:
-    # main:
-    # utils:
-    # translate:
-    # local_search:
-    # algolia_js:
-    # algolia_search_v4:
-    # instantsearch_v4:
-    # pjax:
-    # gitalk:
-    # gitalk_css:
-    # blueimp_md5:
-    # valine:
-    # disqusjs:
-    # disqusjs_css:
-    # twikoo:
-    # waline_js:
-    # waline_css:
-    # sharejs:
-    # sharejs_css:
-    # mathjax:
-    # katex:
-    # katex_copytex:
-    # mermaid:
-    # canvas_ribbon:
-    # canvas_fluttering_ribbon:
-    # canvas_nest:
-    # lazyload:
-    # instantpage:
-    # typed:
-    # pangu:
-    # fancybox_css_v4:
-    # fancybox_v4:
-    # medium_zoom:
-    # snackbar_css:
-    # snackbar:
+    # abcjs_basic_js:
     # activate_power_mode:
-    # fireworks:
-    # click_heart:
-    # ClickShowText:
-    # fontawesomeV6:
-    # flickr_justified_gallery_js:
-    # flickr_justified_gallery_css:
+    # algolia_js:
+    # algolia_search:
     # aplayer_css:
     # aplayer_js:
+    # artalk_css:
+    # artalk_js:
+    # blueimp_md5:
+    # busuanzi:
+    # canvas_fluttering_ribbon:
+    # canvas_nest:
+    # canvas_ribbon:
+    # click_heart:
+    # clickShowText:
+    # disqusjs:
+    # disqusjs_css:
+    # docsearch_css:
+    # docsearch_js:
+    # egjs_infinitegrid:
+    # fancybox:
+    # fancybox_css:
+    # fireworks:
+    # fontawesome:
+    # gitalk:
+    # gitalk_css:
+    # giscus:
+    # instantpage:
+    # instantsearch:
+    # katex:
+    # katex_copytex:
+    # lazyload:
+    # local_search:
+    # main:
+    # main_css:
+    # mathjax:
+    # medium_zoom:
+    # mermaid:
     # meting_js:
+    # pangu:
+    # prismjs_autoloader:
     # prismjs_js:
     # prismjs_lineNumber_js:
-    # prismjs_autoloader:
-    # artalk_js:
-    # artalk_css:
-    # busuanzi:
+    # pjax:
+    # sharejs:
+    # sharejs_css:
+    # snackbar:
+    # snackbar_css:
+    # translate:
+    # twikoo:
+    # typed:
+    # utils:
+    # valine:
+    # waline_css:
+    # waline_js:

languages/default.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
-  error: Copy error
-  noSupport: The browser does not support
+  success: Copy Successful
+  error: Copy Error
+  noSupport: Browser Not Supported
 
 page:
   articles: Articles
@@ -15,16 +15,15 @@ page:
 
 card_post_count: comments
 
-sticky: Sticky
-no_title: No title
+no_title: Untitled
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
-  min2read: Reading time
-  min2read_unit: min
-  page_pv: Post View
+  wordcount: Word Count
+  min2read: Reading Time
+  min2read_unit: mins
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
@@ -45,10 +44,11 @@ search:
   local_search:
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
+    hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
-  next: Next Post
+  prev: Previous
+  next: Next
 
 comment: Comment
 
@@ -65,32 +65,33 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Run time
+      name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
     loading_text: loading...
-    error: Unable to get the data, please make sure the settings are correct.
-    zero: No Comment
+    error: Unable to retrieve comments, please check the configuration
+    zero: No comments
     image: image
     link: link
     code: code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Series
 
 date_suffix:
-  just: Just
+  just: Just now
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Donate
+donate: Sponsor
 share: Share
 
 rightside:
@@ -101,7 +102,7 @@ rightside:
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between single-column and double-column
+  aside: Toggle between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
@@ -111,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: Dark Mode Activated Manually
-  night_to_day: Light Mode Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
+  cht_to_chs: You have switched to Simplified Chinese
+  day_to_night: You have switched to Dark Mode
+  night_to_day: You have switched to Light Mode
 
 loading: Loading...
 load_more: Load More
 
-error404: Page not found
+error404: Page Not Found

languages/en.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
-  error: Copy error
-  noSupport: The browser does not support
+  success: Copy Successful
+  error: Copy Error
+  noSupport: Browser Not Supported
 
 page:
   articles: Articles
@@ -15,16 +15,15 @@ page:
 
 card_post_count: comments
 
-sticky: Sticky
-no_title: No title
+no_title: Untitled
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
-  min2read: Reading time
-  min2read_unit: min
-  page_pv: Post View
+  wordcount: Word Count
+  min2read: Reading Time
+  min2read_unit: mins
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
@@ -45,10 +44,11 @@ search:
   local_search:
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
+    hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
-  next: Next Post
+  prev: Previous
+  next: Next
 
 comment: Comment
 
@@ -65,43 +65,44 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Run time
+      name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
     loading_text: loading...
-    error: Unable to get the data, please make sure the settings are correct.
-    zero: No Comment
+    error: Unable to retrieve comments, please check the configuration
+    zero: No comments
     image: image
     link: link
     code: code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Series
 
 date_suffix:
-  just: Just
+  just: Just now
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Donate
+donate: Sponsor
 share: Share
 
 rightside:
   readmode_title: Read Mode
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Switch Between Light And Dark Mode
+  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  night_mode_title: Toggle Between Light And Dark Mode
   back_to_top: Back To Top
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between single-column and double-column
+  aside: Toggle between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
@@ -111,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: Dark Mode Activated Manually
-  night_to_day: Light Mode Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
+  cht_to_chs: You have switched to Simplified Chinese
+  day_to_night: You have switched to Dark Mode
+  night_to_day: You have switched to Light Mode
 
 loading: Loading...
 load_more: Load More
 
-error404: Page not found
+error404: Page Not Found

languages/zh-CN.yml

@@ -15,7 +15,6 @@ page:
 
 card_post_count: 条评论
 
-sticky: 置顶
 no_title: 无题
 
 post:
@@ -46,6 +45,7 @@ search:
   local_search:
     input_placeholder: 搜索文章
     hits_empty: '找不到您查询的内容：${query}'
+    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -83,6 +83,7 @@ aside:
     link: 链接
     code: 代码
   card_toc: 目录
+  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -91,7 +92,7 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 打赏
+donate: 赞助
 share: 分享
 
 rightside:
@@ -112,8 +113,8 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  chs_to_cht: 你已切换为繁体
-  cht_to_chs: 你已切换为简体
+  chs_to_cht: 你已切换为繁体中文
+  cht_to_chs: 你已切换为简体中文
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
 

languages/zh-TW.yml

@@ -15,8 +15,7 @@ page:
 
 card_post_count: 條評論
 
-sticky: 置頂
-no_title: 無題
+no_title: 無標題
 
 post:
   created: 發表於
@@ -46,7 +45,8 @@ search:
   local_search:
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
-
+    hits_stats: '共找到 ${hits} 篇文章'
+    
 pagination:
   prev: 上一篇
   next: 下一篇
@@ -83,6 +83,7 @@ aside:
     link: 連結
     code: 程式碼
   card_toc: 目錄
+  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -91,14 +92,14 @@ date_suffix:
   day: 天前
   month: 個月前
 
-donate: 打賞
+donate: 贊助
 share: 分享
 
 rightside:
   readmode_title: 閱讀模式
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
-  back_to_top: 回到頂部
+  back_to_top: 返回頂部
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
@@ -109,11 +110,11 @@ copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體
-  cht_to_chs: 你已切換為簡體
+  chs_to_cht: 你已切換為繁體中文
+  cht_to_chs: 你已切換為簡體中文
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 

layout/archive.pug

@@ -3,7 +3,6 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    - const archiveLength = findArchiveLength(fragment_cache)
-    .article-sort-title= _p('page.articles') + ' - ' + archiveLength
+    .article-sort-title= `${_p('page.articles')} - ${getArchiveLength()}`
     +articleSort(page.posts)
     include includes/pagination.pug

layout/includes/additional-js.pug

@@ -8,7 +8,7 @@ div
   if theme.medium_zoom
     script(src=url_for(theme.asset.medium_zoom))
   else if theme.fancybox
-    script(src=url_for(theme.asset.fancybox_v4))
+    script(src=url_for(theme.asset.fancybox))
 
   if theme.instantpage
     script(src=url_for(theme.asset.instantpage), type='module')
@@ -22,14 +22,6 @@ div
   if theme.pangu.enable
     != partial("includes/third-party/pangu.pug", {}, { cache: true })
 
-  //- search
-  if theme.algolia_search.enable
-    script(src=url_for(theme.asset.algolia_search_v4))
-    script(src=url_for(theme.asset.instantsearch_v4))
-    script(src=url_for(theme.asset.algolia_js))
-  else if theme.local_search.enable
-    script(src=url_for(theme.asset.local_search))
-
   .js-pjax
     if needLoadCountJs
       != partial("includes/third-party/card-post-count/index", {}, { cache: true })
@@ -39,6 +31,8 @@ div
 
     include ./third-party/math/index.pug
 
+    include ./third-party/abcjs/index.pug
+
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
@@ -67,3 +61,5 @@ div
 
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
     script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
+
+  !=partial('includes/third-party/search/index', {}, {cache: true})

layout/includes/head.pug

@@ -15,7 +15,7 @@
 
 meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
-meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0")
+meta(name="viewport" content="width=device-width, initial-scale=1.0,viewport-fit=cover")
 title= tabTitle
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
@@ -40,13 +40,13 @@ 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.fontawesomeV6) 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'")
 
 if theme.fancybox
-  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css_v4) media="print" onload="this.media='all'")
+  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css) media="print" onload="this.media='all'")
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})
@@ -55,15 +55,14 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font &&　theme.blog_title_font.font_link
+if theme.blog_title_font && theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
-include ./head/noscript.pug
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/config.pug

@@ -21,9 +21,12 @@
     localSearch = JSON.stringify({
       path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
       preload: theme.local_search.preload,
+      top_n_per_article: theme.local_search.top_n_per_article,
+      unescape: theme.local_search.unescape,
       languages: {
         // search languages
         hits_empty: _p("search.local_search.hits_empty"),
+        hits_stats: _p("search.local_search.hits_stats"),
       }
     })
   }
@@ -75,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
@@ -85,7 +90,7 @@
   }
 
 script.
-  const GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = {
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -102,7 +107,7 @@ script.
       post: !{theme.post_meta.post.date_format === 'relative'}
     },
     runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
-    date_suffix: {
+    dateSuffix: {
       just: '!{_p("date_suffix.just")}',
       min: '!{_p("date_suffix.min")}',
       hour: '!{_p("date_suffix.hour")}',
@@ -112,11 +117,9 @@ script.
     copyright: !{copyright},
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
-    source: {
-      justifiedGallery: {
-        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
-        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
-      }
+    infinitegrid: {
+      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
+      buttonText: '!{_p("load_more")}'
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
@@ -124,5 +127,6 @@ script.
     percent: {
       toc: !{theme.toc.scroll_percent},
       rightside: !{theme.rightside_scroll_percent},
-    }
+    },
+    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

layout/includes/head/noscript.pug

@@ -1,14 +0,0 @@
-noscript. 
-  <style type="text/css">
-    #nav {
-      opacity: 1
-    }
-    .justified-gallery img {
-      opacity: 1
-    }
-
-    #recent-posts time,
-    #post-meta time {
-      display: inline !important
-    }
-  </style>

layout/includes/head/preconnect.pug

@@ -1,4 +1,20 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
+-
+  const { internal_provider, third_party_provider, custom_format } = theme.CDN
+  const providers = {
+    'jsdelivr': '//cdn.jsdelivr.net',
+    'cdnjs': '//cdnjs.cloudflare.com',
+    'unpkg': '//unpkg.com',
+    'custom': custom_format && custom_format.match(/^((https?:)?(\/\/[^/]+)|([^/]+))(\/|$)/)[1]
+  }
+-
+
+if internal_provider === third_party_provider && internal_provider !== 'local'
+  link(rel="preconnect" href=providers[internal_provider])
+else 
+  if internal_provider !== 'local'
+    link(rel="preconnect" href=providers[internal_provider])
+  if third_party_provider !== 'local'
+  link(rel="preconnect" href=providers[third_party_provider])
 
 if theme.google_analytics
   link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')

layout/includes/header/index.pug

@@ -44,7 +44,7 @@ header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
             span#subtitle
         if(theme.social)
           #site_social_icons
-            !=fragment_cache('social', function(){return partial('includes/header/social')})
+            !=partial('includes/header/social', {}, {cache: true})
       #scroll-down
         i.fas.fa-angle-down.scroll-down-effects
     else

layout/includes/header/nav.pug

@@ -7,7 +7,7 @@ nav#nav
         span.site-name=config.title
     
   #menus
-    if (theme.algolia_search.enable || theme.local_search.enable)
+    if (theme.algolia_search.enable || theme.local_search.enable || theme.docsearch.enable)
       #search-button
         a.site-page.social-icon.search(href="javascript:void(0);")
           i.fas.fa-search.fa-fw

layout/includes/header/post-info.pug

@@ -102,14 +102,12 @@
         case whichCount
           when 'Disqus'
             +countBlock
-              span.disqus-comment-count
-                a(href=full_url_for(page.path) + '#disqus_thread')
-                  i.fa-solid.fa-spinner.fa-spin
+              a.disqus-comment-count(href=full_url_for(page.path) + '#post-comment')
+                i.fa-solid.fa-spinner.fa-spin
           when 'Disqusjs'
             +countBlock
-              a(href=full_url_for(page.path) + '#disqusjs')
-                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
-                  i.fa-solid.fa-spinner.fa-spin
+              a.disqusjs-comment-count(href=full_url_for(page.path) + '#post-comment')
+                i.fa-solid.fa-spinner.fa-spin
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
@@ -142,5 +140,5 @@
           when 'Artalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.artalk-count
+                span#ArtalkCount
                   i.fa-solid.fa-spinner.fa-spin

layout/includes/header/social.pug

@@ -1,4 +1,4 @@
 each url, icon in theme.social
   a.social-icon(href=url_for(trim(url.split('||')[0])) target="_blank" 
   title=url.split('||')[1] === undefined ? '' : trim(url.split('||')[1]))
-    i(class=icon)
+    i(class=icon style=url.split('||')[2] === undefined ? '' : `color: ${trim(url.split('||')[2]).replace(/[\'\"]/g, '')};`)

layout/includes/layout.pug

@@ -44,5 +44,4 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
       include ./404.pug
 
     include ./rightside.pug
-    !=partial('includes/third-party/search/index', {}, {cache: true})
     include ./additional-js.pug

layout/includes/loading/fullpage-loading.pug

@@ -9,20 +9,25 @@
     .loading-word= _p('loading')
 
 script.
-  const preloader = {
-    endLoading: () => {
-      document.body.style.overflow = 'auto';
-      document.getElementById('loading-box').classList.add("loaded")
-    },
-    initLoading: () => {
-      document.body.style.overflow = '';
-      document.getElementById('loading-box').classList.remove("loaded")
-
+  (()=>{
+    const $loadingBox = document.getElementById('loading-box')
+    const $body = document.body
+    const preloader = {
+      endLoading: () => {
+        $body.style.overflow = ''
+        $loadingBox.classList.add('loaded')
+      },
+      initLoading: () => {
+        $body.style.overflow = 'hidden'
+        $loadingBox.classList.remove('loaded')
+      }
     }
-  }
-  window.addEventListener('load',()=> { preloader.endLoading() })
 
-  if (!{theme.pjax && theme.pjax.enable}) {
-    document.addEventListener('pjax:send', () => { preloader.initLoading() })
-    document.addEventListener('pjax:complete', () => { preloader.endLoading() })
-  }
+    preloader.initLoading()
+    window.addEventListener('load',() => { preloader.endLoading() })
+
+    if (!{theme.pjax && theme.pjax.enable}) {
+      document.addEventListener('pjax:send', () => { preloader.initLoading() })
+      document.addEventListener('pjax:complete', () => { preloader.endLoading() })
+    }
+  })()

layout/includes/loading/pace.pug

@@ -1,2 +1,11 @@
+script.
+  window.paceOptions = {
+    restartOnPushState: false
+  }
+
+  document.addEventListener('pjax:send', () => {
+    Pace.restart()
+  })
+
 link(rel="stylesheet", href=url_for(theme.preloader.pace_css_url || theme.asset.pace_default_css))
 script(src=url_for(theme.asset.pace_js))

layout/includes/mixins/post-ui.pug

@@ -19,13 +19,11 @@ mixin postUI(posts)
             else
               div.post-bg(style=`background: ${post_cover}`)
       .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)= title
-        .article-meta-wrap
+        a.article-title(href=url_for(link) title=title)
           if (is_home() && (article.top || article.sticky > 0))
-            span.article-meta
-              i.fas.fa-thumbtack.sticky
-              span.sticky= _p('sticky')
-              span.article-meta-separator |
+            i.fas.fa-thumbtack.sticky
+          = title
+        .article-meta-wrap
           if (theme.post_meta.page.date_type)
             span.post-meta-date
               if (theme.post_meta.page.date_type === 'both')
@@ -47,16 +45,16 @@ mixin postUI(posts)
           if (theme.post_meta.page.categories && article.categories.data.length > 0)
             span.article-meta
               span.article-meta-separator |
-              i.fas.fa-inbox
               each item, index in article.categories.data
+                i.fas.fa-inbox
                 a(href=url_for(item.path)).article-meta__categories #[=item.name]
                 if (index < article.categories.data.length - 1)
                   i.fas.fa-angle-right.article-meta-link
           if (theme.post_meta.page.tags && article.tags.data.length > 0)
             span.article-meta.tags
               span.article-meta-separator |
-              i.fas.fa-tag
               each item, index in article.tags.data
+                i.fas.fa-tag
                 a(href=url_for(item.path)).article-meta__tags #[=item.name]
                 if (index < article.tags.data.length - 1)
                   span.article-meta-link #[='•']
@@ -70,17 +68,13 @@ mixin postUI(posts)
                 block
               span.article-meta-label= ' ' + _p('card_post_count')
           
-          if theme.comments.card_post_count
+          if theme.comments.card_post_count && theme.comments.use
             case theme.comments.use[0]
               when 'Disqus'
-                +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqus_thread')
-                    i.fa-solid.fa-spinner.fa-spin
               when 'Disqusjs'
                 +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqusjs')
-                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
-                      i.fa-solid.fa-spinner.fa-spin
+                  a.disqus-count(href=full_url_for(link) + '#post-comment')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
@@ -89,7 +83,7 @@ mixin postUI(posts)
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
-                    span.waline-comment-count(id=url_for(link))
+                    span.waline-comment-count(data-path=url_for(link))
                       i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex

layout/includes/page/flink.pug

@@ -1,7 +1,10 @@
 #article-container
   .flink
-    - let pageContent = page.content
-    if page.flink_url
+    - let { content, random, flink_url } = page
+    - let pageContent = content
+
+    if flink_url || random
+      - const linkData = flink_url ? false : site.data.link || false
       script.
         (()=>{
           const replaceSymbol = (str) => {
@@ -9,35 +12,45 @@
           }
 
           let result = ""
-          fetch("!{url_for(page.flink_url)}")
-            .then(response => response.json())
-            .then(str => {
-              for(let i = 0; i < str.length; i++){
-                const replaceClassName = replaceSymbol(str[i].class_name)
-                const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
-                const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
-                
-                let listResult = ""
-                const lists = str[i].link_list
-                for(let j = 0; j < lists.length; j++){
-                  listResult += `
-                    <div class="flink-list-item">
-                      <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
-                        <div class="flink-item-icon">
-                          <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
-                        </div>
-                        <div class="flink-item-name">${lists[j].name}</div> 
-                        <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
-                      </a>
-                    </div>`
-                }
+          const add = (str) => {
+            for(let i = 0; i < str.length; i++){
+              const replaceClassName = replaceSymbol(str[i].class_name)
+              const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
+              const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
 
-                result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+              let listResult = ""
+              const lists = str[i].link_list
+              if (!{random === true}) {
+                lists.sort(() => Math.random() - 0.5)
+              }
+              for(let j = 0; j < lists.length; j++){
+                listResult += `
+                  <div class="flink-list-item">
+                    <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
+                      <div class="flink-item-icon">
+                        <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
+                      </div>
+                      <div class="flink-item-name">${lists[j].name}</div> 
+                      <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
+                    </a>
+                  </div>`
               }
 
-              document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-              window.lazyLoadInstance && window.lazyLoadInstance.update()
-            })
+              result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+            }
+
+            document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+          }
+
+          const linkData = !{JSON.stringify(linkData)}
+          if (!{Boolean(flink_url)}) {
+            fetch("!{url_for(flink_url)}")
+              .then(response => response.json())
+              .then(add)
+          } else if (linkData) {
+            add(linkData)
+          }
         })()
 
     else
@@ -67,4 +80,3 @@
 
         - pageContent = result + pageContent
     != pageContent
-

layout/includes/page/tags.pug

@@ -1,2 +1,2 @@
 .tag-cloud-list.is-center
-  !=cloudTags({source: site.tags, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})
+  !=cloudTags({source: site.tags, orderby: page.orderby || 'random', order: page.order || 1, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})

layout/includes/post/post-copyright.pug

@@ -5,13 +5,19 @@ if theme.post_copyright.enable && page.copyright !== false
   - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
-      span.post-copyright-meta= _p('post.copyright.author') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-user.fa-fw
+        = _p('post.copyright.author') + ": "
       span.post-copyright-info
         a(href=authorHref)=author
     .post-copyright__type
-      span.post-copyright-meta= _p('post.copyright.link') + ": "
+      span.post-copyright-meta
+        i.fas.fa-square-arrow-up-right.fa-fw
+        = _p('post.copyright.link') + ": "
       span.post-copyright-info
         a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
-      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-exclamation.fa-fw
+        = _p('post.copyright.copyright_notice') + ": "
       span.post-copyright-info!= info

layout/includes/post/reward.pug

@@ -1,7 +1,7 @@
 .post-reward
   .reward-button
     i.fas.fa-qrcode
-    = ' ' + _p('donate')
+    = theme.reward.text || _p('donate')
   .reward-main
     ul.reward-all
       each item in theme.reward.QR_code

layout/includes/rightside.pug

@@ -23,7 +23,7 @@ mixin rightsideItem(array)
             i.fas.fa-list-ul
       when 'chat'
         if chat_btn
-          button#chat_btn(type="button" title=_p("rightside.chat"))
+          button#chat-btn(type="button" title=_p("rightside.chat"))
             i.fas.fa-sms
       when 'comment'
         if commentsJsLoad
@@ -42,15 +42,15 @@ mixin rightsideItem(array)
   #rightside-config-show
     if enable
       if hide
-        button#rightside_config(type="button" title=_p("rightside.setting"))
+        button#rightside-config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
     else
       if is_post()
         if (readmode || translate.enable || (darkmode.enable && darkmode.button))
-          button#rightside_config(type="button" title=_p("rightside.setting"))
+          button#rightside-config(type="button" title=_p("rightside.setting"))
             i.fas.fa-cog.fa-spin
       else if translate.enable || (darkmode.enable && darkmode.button)
-        button#rightside_config(type="button" title=_p("rightside.setting"))
+        button#rightside-config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
 
     if showArray

layout/includes/sidebar.pug

@@ -14,5 +14,5 @@
         .headline= _p('aside.categories') 
         .length-num= site.categories.length
 
-    hr
+    hr.custom-hr
     !=partial('includes/header/menu_item', {}, {cache: true})

layout/includes/third-party/abcjs/abcjs.pug

@@ -0,0 +1,15 @@
+script.
+  (() => {
+    const abcjsInit = () => {
+      const abcjsFn = () => {
+        document.querySelectorAll(".abc-music-sheet").forEach(ele => {
+          ABCJS.renderAbc(ele, ele.innerHTML, {responsive: 'resize'})
+        })
+      }
+      
+      typeof ABCJS === 'object' ? abcjsFn()
+        : getScript('!{url_for(theme.asset.abcjs_basic_js)}').then(abcjsFn)
+    }
+
+    window.pjax ? abcjsInit() : window.addEventListener('load', abcjsInit)
+  })()

layout/includes/third-party/abcjs/index.pug

@@ -0,0 +1,6 @@
+if theme.abcjs && theme.abcjs.enable
+  if theme.abcjs.per_page
+    if is_post() || is_page()
+      include ./abcjs.pug
+  else if page.abcjs
+    include ./abcjs.pug

layout/includes/third-party/card-post-count/artalk.pug

@@ -2,19 +2,30 @@
 
 script.
   (() => {
-    const getArtalkCount = () => {
-      const runWidget = () => {
-        Artalk.LoadCountWidget({
-          server: '!{server}',
-          site: '!{site}',
-          countEl: '.artalk-count'
+    const getArtalkCount = async() => {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
+
+        const headerList = {
+          method: 'GET',
+        }
+
+        const searchParams = new URLSearchParams({
+          'site_name': '!{site}',
+          'page_keys': keyArray
         })
+
+        const res = await fetch(`!{server}/api/v2/stats/page_comment?${searchParams}`, headerList)
+        const result = await res.json()
+
+        keyArray.forEach((key, index) => {
+          eleGroup[index].textContent = result.data[key] || 0
+        })
+      } catch (err) {
+        console.error(err)
       }
-
-      if (typeof Artalk === 'function') runWidget()
-      else getScript('!{theme.asset.artalk_js}').then(runWidget)
     }
 
-
     window.pjax ? getArtalkCount() : window.addEventListener('load', getArtalkCount)
   })()

layout/includes/third-party/card-post-count/disqus.pug

@@ -1,16 +1,25 @@
+- const { shortname, apikey } = theme.disqus
 script.
   (() => {
-    const getCount = () => {
-      if (window.DISQUSWIDGETS === undefined) {
-        var d = document, s = d.createElement('script');
-        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-        s.id = 'dsq-count-scr';
-        (d.head || d.body).appendChild(s);
-      } else {
-        DISQUSWIDGETS.getCount({reset: true});
+    const getCount = async () => {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .disqus-count')
+        const cleanedLinks = Array.from(eleGroup).map(i => `thread:link=${i.href.replace(/#post-comment$/, '')}`);
+
+        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&${cleanedLinks.join('&')}`,{
+          method: 'GET'
+        })
+        const result = await res.json()
+
+        eleGroup.forEach(i => {
+          const cleanedLink = i.href.replace(/#post-comment$/, '')
+          const urlData = result.response.find(data => data.link === cleanedLink) || { posts: 0 }
+          i.textContent = urlData.posts
+        })
+      } catch (err) {
+        console.error(err)
       }
     }
 
     window.pjax ? getCount() : window.addEventListener('load', getCount)
-
   })()

layout/includes/third-party/card-post-count/fb.pug

@@ -1,4 +1,4 @@
-- const fbSDKVer = 'v15.0'
+- const fbSDKVer = 'v16.0'
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.

layout/includes/third-party/card-post-count/twikoo.pug

@@ -18,7 +18,7 @@ script.
           includeReply: false
         }).then(function (res) {
           document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
-            item.innerText = res[index].count
+            item.textContent = res[index].count
           })
         }).catch(function (err) {
           console.log(err)

layout/includes/third-party/card-post-count/waline.pug

@@ -1,17 +1,20 @@
+- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
 script.
   (() => {
-    function loadWaline () {
-      function initWaline () {
-        let initData = {
-          el: null,
-          serverURL: '!{theme.waline.serverURL}',
-          comment: true
-        }
-        const waline = Waline.init(initData)
-      }
+    async function loadWaline () {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .waline-comment-count')
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-path'))
 
-      if (typeof Waline === 'object') initWaline() 
-      else getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+        const res = await fetch(`!{serverURL}/api/comment?type=count&url=${keyArray}`, { method: 'GET' })
+        const result = await res.json()
+        
+        result.data.forEach((count, index) => {
+          eleGroup[index].textContent = count
+        })
+      } catch (err) {
+        console.error(err)
+      }
     }
 
     window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)

layout/includes/third-party/chat/chatra.pug

@@ -1,33 +1,50 @@
 //- https://chatra.io/help/api/
 script.
-  (function(d, w, c) {
-      w.ChatraID = '#{theme.chatra.id}';
-      var s = d.createElement('script');
-      w[c] = w[c] || function() {
-          (w[c].q = w[c].q || []).push(arguments);
-      };
-      s.async = true;
-      s.src = 'https://call.chatra.io/chatra.js';
-      if (d.head) d.head.appendChild(s);
-  })(document, window, 'Chatra');
+  (() => {
+    const isChatBtn = !{theme.chat_btn}
+    const isChatHideShow = !{theme.chat_hide_show}
 
-  if (!{theme.chat_btn}) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        Chatra('openChat')
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
+    if (isChatBtn) {
+      const close = () => {
+        Chatra('minimizeWidget')
         Chatra('hide')
       }
-      function chatBtnShow () {
+
+      const open = () => {
+        Chatra('openChat', true)
         Chatra('show')
       }
+
+      window.ChatraSetup = {
+        startHidden: true
+      }
+    
+      window.chatBtnFn = () => {
+        const isShow = document.getElementById('chatra').classList.contains('chatra--expanded')
+        isShow ? close() : open()
+      }
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          Chatra('hide')
+        },
+        show: () => {
+          Chatra('show')
+        }
+      }
     }
-  }
+
+    (function(d, w, c) {
+      w.ChatraID = '#{theme.chatra.id}'
+      var s = d.createElement('script')
+      w[c] = w[c] || function() {
+          (w[c].q = w[c].q || []).push(arguments)
+      }
+      s.async = true
+      s.src = 'https://call.chatra.io/chatra.js'
+      if (d.head) d.head.appendChild(s)
+    })(document, window, 'Chatra')
+
+  })()
 
 

layout/includes/third-party/chat/crisp.pug

@@ -1,36 +1,45 @@
 script.
-  window.$crisp = [];
-  window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
-  (function () {
-    d = document;
-    s = d.createElement("script");
-    s.src = "https://client.crisp.chat/l.js";
-    s.async = 1;
-    d.getElementsByTagName("head")[0].appendChild(s);
-  })();
-  $crisp.push(["safe", true])
+  (() => {
+    window.$crisp = [];
+    window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
+    (function () {
+      d = document;
+      s = d.createElement("script");
+      s.src = "https://client.crisp.chat/l.js";
+      s.async = 1;
+      d.getElementsByTagName("head")[0].appendChild(s);
+    })();
+    $crisp.push(["safe", true])
 
-  if (!{theme.chat_btn}) {
-    $crisp.push(["do", "chat:hide"])
-    $crisp.push(["on", "chat:closed", function() {
-      $crisp.push(["do", "chat:hide"])
-    }])
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
+    const isChatBtn = !{theme.chat_btn}
+    const isChatHideShow = !{theme.chat_hide_show}
+
+    if (isChatBtn) {
+      const open = () => {
         $crisp.push(["do", "chat:show"])
         $crisp.push(["do", "chat:open"])
+      }
 
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
+      const close = () => {
         $crisp.push(["do", "chat:hide"])
       }
-      function chatBtnShow () {
-        $crisp.push(["do", "chat:show"])
+
+      close()
+      $crisp.push(["on", "chat:closed", function() {
+        close()
+      }])
+
+      window.chatBtnFn = () => {
+        $crisp.is("chat:visible") ? close() : open()
+      }
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          $crisp.push(["do", "chat:hide"])
+        },
+        show: () => {
+          $crisp.push(["do", "chat:show"])
+        }
       }
     }
-  }
+  })()

layout/includes/third-party/chat/daovoice.pug

@@ -1,40 +1,40 @@
 //- https://guide.daocloud.io/daovoice/javascript-api-5869833.html
 script.
-  (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/!{theme.daovoice.app_id}.js","daovoice")
+  (() => {
+    (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/!{theme.daovoice.app_id}.js","daovoice")
 
-script.
-  var isChatBtn = !{theme.chat_btn}
-  daovoice('init', {
-    app_id: '!{theme.daovoice.app_id}',},{
-    launcher: { 
-       disableLauncherIcon: isChatBtn // 悬浮 ICON 是否显示
-    },
-  });
-  daovoice('update');
+    const isChatBtn = !{theme.chat_btn}
+    const isChatHideShow = !{theme.chat_hide_show}
 
-  if (isChatBtn) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        daovoice('show')
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        daovoice('update', {},{
-          launcher: { 
-          disableLauncherIcon: true // 悬浮 ICON 是否显示
-          },
-        });
+    daovoice('init', {
+      app_id: '!{theme.daovoice.app_id}',},{
+      launcher: { 
+        disableLauncherIcon: isChatBtn
+      },
+    });
+    daovoice('update');
+
+    if (isChatBtn) {
+      window.chatBtnFn = () => {
+        const isShow = document.getElementById('daodream-messenger').classList.contains('daodream-messenger-active')
+        isShow ? daovoice('hide') : daovoice('show')
       }
-      function chatBtnShow () {
-        daovoice('update', {},{
-          launcher: { 
-          disableLauncherIcon: false // 悬浮 ICON 是否显示
-          },
-        });
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          daovoice('update', {},{
+            launcher: {
+              disableLauncherIcon: true
+            }
+          })
+        },
+        show: () => {
+          daovoice('update', {}, {
+            launcher: {
+              disableLauncherIcon: false
+            }
+          })
+        }
       }
     }
-  }
+  })()

layout/includes/third-party/chat/gitter.pug

@@ -1,43 +0,0 @@
-if theme.chat_btn
-  script.
-    ((window.gitter = {}).chat = {}).options = {
-      disableDefaultChat: true,
-    };
-    document.addEventListener('gitter-sidecar-ready', (e) => {
-      const GitterChat = e.detail.Chat
-      let chat
-
-      function initGitter () {
-        chat = new GitterChat({
-          room: '#{theme.gitter.room}',
-          activationElement: '#chat_btn'
-        });
-      }
-
-      initGitter()
-
-      if (!{theme.pjax.enable}) {
-        document.addEventListener('pjax:complete', () => {
-          chat.destroy()
-          initGitter()
-        })
-      }
-
-    })
-else
-  script.
-    ((window.gitter = {}).chat = {}).options = {
-      room: '#{theme.gitter.room}',
-    };
-
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'none'
-      }
-
-      function chatBtnShow () {
-        document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'block'
-      }
-    }
-
-script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)

layout/includes/third-party/chat/index.pug

@@ -4,8 +4,6 @@ else if theme.tidio && theme.tidio.enable
   include ./tidio.pug
 else if theme.daovoice && theme.daovoice.enable
   include ./daovoice.pug
-else if theme.gitter && theme.gitter.enable
-  include ./gitter.pug
 else if theme.crisp && theme.crisp.enable
   include ./crisp.pug
 else if theme.messenger && theme.messenger.enable

layout/includes/third-party/chat/messenger.pug

@@ -4,39 +4,41 @@
 #fb-customer-chat.fb-customerchat(page_id=pageID attribution='biz_inbox')
 
 script.
-  document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
+  (() => {
+    document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
-  window.fbAsyncInit = function() {
-    FB.init({
-      xfbml: true,
-      version: 'v15.0'
-    });
-  };
-
-  (function(d, s, id) {
-    var js, fjs = d.getElementsByTagName(s)[0];
-    if (d.getElementById(id)) return;
-    js = d.createElement(s); js.id = id;
-    js.src = 'https://connect.facebook.net/!{lang}/sdk/xfbml.customerchat.js';
-    fjs.parentNode.insertBefore(js, fjs);
-  }(document, 'script', 'facebook-jssdk'));
-
-  if (!{theme.chat_btn}) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        FB.CustomerChat.show();
+    window.fbAsyncInit = function() {
+      FB.init({
+        xfbml: true,
+        version: 'v16.0'
       });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        FB.CustomerChat.hide()
-      }
-      function chatBtnShow () {
-        FB.CustomerChat.show(false)
-      }
-    }
-  }
+    };
+
+    (function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = 'https://connect.facebook.net/!{lang}/sdk/xfbml.customerchat.js';
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+
+    const isChatBtn = !{theme.chat_btn}
+    const isChatHideShow = !{theme.chat_hide_show}
+
+    if (isChatBtn) {
+      window.chatBtnFn = () => {
+        const isShow = document.querySelector('.fb_customer_chat_bounce_in_v2')
+        isShow ? FB.CustomerChat.hide() : FB.CustomerChat.show()
+      }
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          FB.CustomerChat.hide()
+        },
+        show: () => {
+          FB.CustomerChat.show(false)
+        }
+      }
+    }
+  })()
 

layout/includes/third-party/chat/tidio.pug

@@ -1,41 +1,45 @@
 script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async)
+script.
+  (() => {
+    const isChatBtn = !{theme.chat_btn}
+    const isChatHideShow = !{theme.chat_hide_show}
 
-if theme.chat_btn
-  script.
-    function onTidioChatApiReady() {
-      window.tidioChatApi.hide();
-      window.tidioChatApi.on("close", function() {
-        window.tidioChatApi.hide();
-      });
-    }
-    if (window.tidioChatApi) {
-      window.tidioChatApi.on("ready", onTidioChatApiReady);
-    } else {
-      document.addEventListener("tidioChat-ready", onTidioChatApiReady);
-    }
+    if (isChatBtn) {
+      let isShow = false
+      const close = () => {
+        window.tidioChatApi.hide()
+        isShow = false
+      }
+      
+      const open = () => {
+        window.tidioChatApi.open()
+        window.tidioChatApi.show()
+        isShow = true
+      }
 
-    var chatBtnFn = () => {
-      document.getElementById("chat_btn").addEventListener("click", function(){
-        window.tidioChatApi.show();
-        window.tidioChatApi.open();
-      });
-    }
-    chatBtnFn()
-
-else if theme.chat_hide_show
-  script.
-    function chatBtnHide () {
+      const onTidioChatApiReady = () => {
+        window.tidioChatApi.hide()
+        window.tidioChatApi.on("close", close)
+      }
       if (window.tidioChatApi) {
-        //- window.tidioChatApi.hide();
-        document.getElementById('tidio-chat').style.display= 'none'
+        window.tidioChatApi.on("ready", onTidioChatApiReady)
+      } else {
+        document.addEventListener("tidioChat-ready", onTidioChatApiReady)
+      }
+
+      window.chatBtnFn = () => {
+        if (!window.tidioChatApi) return
+        isShow ? close() : open()
+      }
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          window.tidioChatApi && window.tidioChatApi.hide()
+        },
+        show: () => {
+          window.tidioChatApi && window.tidioChatApi.show()
+        }
       }
     }
-
-    function chatBtnShow () {
-      if (window.tidioChatApi) {
-        //- window.tidioChatApi.show();
-        document.getElementById('tidio-chat').style.display= 'block'
-      } 
-    }
-
+  })()
 

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

@@ -1,38 +1,55 @@
 - const { server, site, option } = theme.artalk
+- const { use, lazyload } = theme.comments
 
 script.
-  function loadArtalk () {
-    function initArtalk () {
-      window.artalkItem = new Artalk(Object.assign({
+  (() => {
+    let artalkItem = null
+    const initArtalk = () => {
+      artalkItem = Artalk.init(Object.assign({
         el: '#artalk-wrap',
         server: '!{server}',
         site: '!{site}',
         pageKey: location.pathname,
         darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
-        countEl: '.artalk-count'
       },!{JSON.stringify(option)}))
+
+      if (GLOBAL_CONFIG.lightbox === 'null') return
+      artalkItem.on('list-loaded', () => {
+        artalkItem.ctx.get('list').getCommentNodes().forEach(comment => {
+          const $content = comment.getRender().$content
+          btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
+        })
+      })
+
+      const destroyArtalk = () => {
+        artalkItem.destroy()
+      }
+
+      btf.addGlobalFn('pjax', destroyArtalk, 'destroyArtalk')
     }
 
-    if (typeof window.artalkItem === 'object') setTimeout(()=>{initArtalk()},200)
-    else {
-      getCSS('!{theme.asset.artalk_css}')
-      typeof Artalk !== 'function' ? getScript('!{theme.asset.artalk_js}').then(initArtalk)
-                                  : setTimeout(()=>{initArtalk()},200)
+    const loadArtalk = async () => {
+      if (typeof Artalk === 'object') initArtalk()
+      else {
+        await getCSS('!{theme.asset.artalk_css}')
+        await getScript('!{theme.asset.artalk_js}')
+        initArtalk()
+      }
     }
-  }
 
-  document.getElementById('darkmode').addEventListener('click',()=> {
-    if (typeof window.artalkItem !== 'object') return
-    let isDark = document.documentElement.getAttribute('data-theme') === 'dark'
-    window.artalkItem.setDarkMode(!isDark)
-  })
-
-  
-  if ('!{theme.comments.use[0]}' === 'Artalk' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
-    else loadArtalk()
-  } else {
-    function loadOtherComment () {
-      loadArtalk()
+    const artalkChangeMode = theme => {
+      const artalkWrap = document.getElementById('artalk-wrap')
+      if (!(artalkWrap && artalkWrap.children.length)) return
+      const isDark = theme === 'dark'
+      artalkItem.setDarkMode(isDark)
     }
-  }
+
+    btf.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
+
+    if ('!{use[0]}' === 'Artalk' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+      else loadArtalk()
+    } else {
+      window.loadOtherComment = loadArtalk
+    }
+  })()

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

@@ -1,51 +1,59 @@
-- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
+- const disqusPageTitle = page.title.replace(/'/ig,"\\'")
+- const { shortname, apikey } = theme.disqus
+- const { use, lazyload, count } = theme.comments
 
 script.
-  function loadDisqus () {
-    var disqus_config = function () {
+  (() => {
+    const disqus_config = function () {
       this.page.url = '!{ page.permalink }'
       this.page.identifier = '!{ url_for(page.path) }'
       this.page.title = '!{ disqusPageTitle }'
-    };
+    }
 
-    window.disqusReset = () => {
-      DISQUS.reset({
+    const disqusReset = () => {
+      window.DISQUS && window.DISQUS.reset({
         reload: true,
         config: disqus_config
       })
     }
 
-    if (window.DISQUS) disqusReset()
-    else {
-      (function() { 
-        var d = document, s = d.createElement('script');
-        s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
-        s.setAttribute('data-timestamp', +new Date());
-        (d.head || d.body).appendChild(s);
-      })();
+    btf.addGlobalFn('themeChange', disqusReset, 'disqus')
+
+    const loadDisqus = () =>{
+      if (window.DISQUS) disqusReset()
+      else {
+        const script = document.createElement('script')
+        script.src = 'https://!{shortname}.disqus.com/embed.js'
+        script.setAttribute('data-timestamp', +new Date())
+        document.head.appendChild(script)
+      }
     }
 
-    document.getElementById('darkmode').addEventListener('click', () => {
-      setTimeout(() => window.disqusReset(), 200)
-    })
-  }
+    const getCount = async() => {
+      try {
+        const eleGroup = document.querySelector('#post-meta .disqus-comment-count')
+        if (!eleGroup) return
+        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
 
-  if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
-    else loadDisqus()
-  } else {
-    function loadOtherComment () {
-      loadDisqus()
+        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&thread:link=${cleanedLinks}`,{
+          method: 'GET'
+        })
+        const result = await res.json()
+
+        const count = result.response.length ? result.response[0].posts : 0
+        eleGroup.textContent = count
+      } catch (err) {
+        console.error(err)
+      }
     }
-  }
 
-if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqus'
-  script.
-    if (window.DISQUSWIDGETS === undefined) {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
+    if ('!{use[0]}' === 'Disqus' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
+      else {
+        loadDisqus()
+        !{ count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
+      }
     } else {
-      DISQUSWIDGETS.getCount({reset: true});
+      window.loadOtherComment = loadDisqus
     }
+  })()

layout/includes/third-party/comments/disqusjs.pug

@@ -1,18 +1,19 @@
 - let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  function loadDisqusjs () {
-    function initDisqusjs () {
+  (() => {
+    const initDisqusjs = () => {
       window.disqusjs = null
       disqusjs = new DisqusJS(Object.assign({
-        shortname: '!{theme.disqusjs.shortname}',
+        shortname: '!{dqShortname}',
         identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
-        apikey: '!{theme.disqusjs.apikey}',
-      },!{JSON.stringify(theme.disqusjs.option)}))
+        apikey: '!{dqApikey}',
+      },!{JSON.stringify(dqOption)}))
 
-      disqusjs.render(document.getElementById('disqusjs'))
+      disqusjs.render(document.getElementById('disqusjs-wrap'))
     }
 
     const themeChange = () => {
@@ -22,36 +23,42 @@ script.
       initDisqusjs()
     }
 
+    btf.addGlobalFn('themeChange', themeChange, 'disqusjs')
 
-    document.getElementById('darkmode').addEventListener('click', themeChange)
-
-    if (window.disqusJsLoad) initDisqusjs()
-    else {
-      getCSS('!{url_for(theme.asset.disqusjs_css)}')
-      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
-      window.disqusJsLoad = true
+    const loadDisqusjs = async() => {
+      if (window.disqusJsLoad) initDisqusjs()
+      else {
+        await getCSS('!{url_for(theme.asset.disqusjs_css)}')
+        await getScript('!{url_for(theme.asset.disqusjs)}')
+        initDisqusjs()
+        window.disqusJsLoad = true
+      }
     }
-  }
 
-  if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
-    else loadDisqusjs()
-  }
-  else {
-    function loadOtherComment () {
-      loadDisqusjs()
+    const getCount = async() => {
+      try {
+        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
+        if (!eleGroup) return
+        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+
+        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{dqShortname}&api_key=!{dqApikey}&thread:link=${cleanedLinks}`,{
+          method: 'GET'
+        })
+        const result = await res.json()
+        const count = result.response.length ? result.response[0].posts : 0
+        eleGroup.textContent = count
+      } catch (err) {
+        console.error(err)
+      }
     }
-  }
 
-
-if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
-  script.
-    if (window.DISQUSWIDGETS === undefined) {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
+    if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs-wrap'), loadDisqusjs)
+      else {
+        loadDisqusjs()
+        !{ theme.comments.count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
+      }
     } else {
-      DISQUSWIDGETS.getCount({reset: true});
+      window.loadOtherComment = loadDisqusjs
     }
-
+  })()

layout/includes/third-party/comments/facebook_comments.pug

@@ -1,36 +1,46 @@
-- const fbSDKVer = 'v15.0'
+- const fbSDKVer = 'v16.0'
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.
-  function loadFBComment () {
-    document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
+  (()=>{
+    const loadFBComment = () => {
+      document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
-    const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-    const $fbComment = document.getElementsByClassName('fb-comments')[0]
-    $fbComment.setAttribute('data-colorscheme',themeNow)
-    $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
+      const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+      $fbComment.setAttribute('data-colorscheme',themeNow)
+      $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
 
-    if (typeof FB === 'object') {
-      FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
-      FB.XFBML.parse(document.getElementById('post-comment'))
+      if (typeof FB === 'object') {
+        FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
+        FB.XFBML.parse(document.getElementById('post-comment'))
+      }
+      else {
+        let ele = document.createElement('script')
+        ele.setAttribute('src','!{fbSDK}')
+        ele.setAttribute('async', 'true')
+        ele.setAttribute('defer', 'true')
+        ele.setAttribute('crossorigin', 'anonymous')
+        ele.setAttribute('id', 'facebook-jssdk')
+        document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
+      }
     }
-    else {
-      let ele = document.createElement('script')
-      ele.setAttribute('src','!{fbSDK}')
-      ele.setAttribute('async', 'true')
-      ele.setAttribute('defer', 'true')
-      ele.setAttribute('crossorigin', 'anonymous')
-      ele.setAttribute('id', 'facebook-jssdk')
-      document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
-    }   
-  }
 
-  if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
-    else loadFBComment()
-  } else {
-    function loadOtherComment () {
-      loadFBComment()
+    const fbModeChange = theme => {
+      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+      if ($fbComment && typeof FB === 'object') {
+        $fbComment.setAttribute('data-colorscheme',theme)
+        FB.XFBML.parse(document.getElementById('post-comment'))
+      }
     }
-  }
+
+    btf.addGlobalFn('themeChange', fbModeChange, 'facebook_comments')
+
+    if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
+      if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
+      else loadFBComment()
+    } else {
+      window.loadOtherComment = loadFBComment
+    }
+  })()
 

layout/includes/third-party/comments/giscus.pug

@@ -1,49 +1,54 @@
-- const { repo, repo_id, category_id, option } = theme.giscus
-- const themes = theme.giscus.theme
+- const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
+- const giscusUrl = theme.asset.giscus || 'https://giscus.app/client.js'
+- const giscusOriginUrl = new URL(giscusUrl).origin
+- const { use, lazyload } = theme.comments
+
 script.
-  function loadGiscus () {
-    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-
-    const config = Object.assign({
-      src: 'https://giscus.app/client.js',
-      'data-repo': '!{repo}',
-      'data-repo-id': '!{repo_id}',
-      'data-category-id': '!{category_id}',
-      'data-mapping': 'pathname',
-      'data-theme': nowTheme,
-      'data-reactions-enabled': '1',
-      crossorigin: 'anonymous',
-      async: true
-    },!{JSON.stringify(option)})
-
-    let ele = document.createElement('script')
-    for (let key in config) {
-      ele.setAttribute(key, config[key])
-    }
-    document.getElementById('giscus-wrap').insertAdjacentElement('afterbegin',ele)
-  }
-
-  function changeGiscusTheme () {
-    const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-
-    function sendMessage(message) {
-      const iframe = document.querySelector('iframe.giscus-frame');
-      if (!iframe) return;
-      iframe.contentWindow.postMessage({ giscus: message }, 'https://giscus.app');
+  (()=>{
+    const getGiscusTheme = theme => {
+      return theme === 'dark' ? '!{themes.dark}' : '!{themes.light}'
     }
 
-    sendMessage({
-      setConfig: {
-        theme: theme
+    const loadGiscus = () => {
+      const config = Object.assign({
+        src: '!{giscusUrl}',
+        'data-repo': '!{repo}',
+        'data-repo-id': '!{repo_id}',
+        'data-category-id': '!{category_id}',
+        'data-mapping': 'pathname',
+        'data-theme': getGiscusTheme(document.documentElement.getAttribute('data-theme')),
+        'data-reactions-enabled': '1',
+        crossorigin: 'anonymous',
+        async: true
+      },!{JSON.stringify(option)})
+
+      const ele = document.createElement('script')
+      for (let key in config) {
+        ele.setAttribute(key, config[key])
       }
-    });
-  }
-
-  if ('!{theme.comments.use[0]}' === 'Giscus' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
-    else loadGiscus()
-  } else {
-    function loadOtherComment () {
-      loadGiscus()
+      document.getElementById('giscus-wrap').appendChild(ele)
     }
-  }
+
+    const changeGiscusTheme = theme => {
+      const sendMessage = message => {
+        const iframe = document.querySelector('iframe.giscus-frame')
+        if (!iframe) return
+        iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
+      }
+
+      sendMessage({
+        setConfig: {
+          theme: getGiscusTheme(theme)
+        }
+      });
+    }
+
+    btf.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
+
+    if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
+      else loadGiscus()
+    } else {
+      window.loadOtherComment= loadGiscus
+    }
+  })()

layout/includes/third-party/comments/gitalk.pug

@@ -1,41 +1,44 @@
+- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
+
 script.
-  function loadGitalk () {
-    function initGitalk () {
-      var gitalk = new Gitalk(Object.assign({
-        clientID: '!{theme.gitalk.client_id}',
-        clientSecret: '!{theme.gitalk.client_secret}',
-        repo: '!{theme.gitalk.repo}',
-        owner: '!{theme.gitalk.owner}',
-        admin: ['!{theme.gitalk.admin}'],
+  (() => {
+    const initGitalk = () => {
+      const gitalk = new Gitalk(Object.assign({
+        clientID: '!{client_id}',
+        clientSecret: '!{client_secret}',
+        repo: '!{repo}',
+        owner: '!{owner}',
+        admin: ['!{admin}'],
         id: '!{md5(page.path)}',
         updateCountCallback: commentCount
-      },!{JSON.stringify(theme.gitalk.option)}))
+      },!{JSON.stringify(option)}))
 
       gitalk.render('gitalk-container')
     }
 
-    if (typeof Gitalk === 'function') initGitalk()
-    else {
-      getCSS('!{url_for(theme.asset.gitalk_css)}')
-      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
+    const loadGitalk = async() => {
+      if (typeof Gitalk === 'function') initGitalk()
+      else {
+        await getCSS('!{url_for(theme.asset.gitalk_css)}')
+        await getScript('!{url_for(theme.asset.gitalk)}')
+        initGitalk()
+      }
     }
-  }
-  
-  function commentCount(n){
-    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-    if (isCommentCount) {
-      isCommentCount.innerHTML= n
+    
+    const commentCount = n => {
+      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+      if (isCommentCount) {
+        isCommentCount.textContent= n
+      }
     }
-  }
 
-  if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
-    else loadGitalk()
-  } else {
-    function loadOtherComment () {
-      loadGitalk()
+    if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
+      else loadGitalk()
+    } else {
+      window.loadOtherComment = loadGitalk
     }
-  }
+  })()
 
 
 

layout/includes/third-party/comments/index.pug

@@ -1,5 +1,5 @@
 - let defaultComment = theme.comments.use[0]
-hr
+hr.custom-hr
 #post-comment
   .comment-head
     .comment-headline
@@ -7,9 +7,9 @@ hr
       span= ' ' + _p('comment')
     
     if theme.comments.use.length > 1
-      #comment-switch
+      .comment-switch
         span.first-comment=defaultComment
-        span.switch-btn
+        span#switch-btn
         span.second-comment=theme.comments.use[1]
 
 
@@ -22,7 +22,7 @@ hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqusjs
+            #disqusjs-wrap
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'

layout/includes/third-party/comments/livere.pug

@@ -1,26 +1,25 @@
-script.
-  function loadLivere () {
-    if (typeof LivereTower === 'object') {
-      window.LivereTower.init()
-    }
-    else {
-      (function(d, s) {
-          var j, e = d.getElementsByTagName(s)[0];
-          if (typeof LivereTower === 'function') { return; }
-          j = d.createElement(s);
-          j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-          j.async = true;
-          e.parentNode.insertBefore(j, e);
-      })(document, 'script');
-    }
-  }
+- const { use, lazyload } = theme.comments
 
-  if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
-    else loadLivere()
-  }
-  else {
-    function loadOtherComment () {
-      loadLivere()
+script.
+  (()=>{
+    const loadLivere = () => {
+      if (typeof LivereTower === 'object') window.LivereTower.init()
+      else {
+        (function(d, s) {
+            var j, e = d.getElementsByTagName(s)[0];
+            if (typeof LivereTower === 'function') { return; }
+            j = d.createElement(s);
+            j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+            j.async = true;
+            e.parentNode.insertBefore(j, e);
+        })(document, 'script');
+      }
     }
-  }
+
+    if ('!{use[0]}' === 'Livere' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
+      else loadLivere()
+    } else {
+      window.loadOtherComment = loadLivere
+    }
+  })()

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

@@ -51,11 +51,12 @@ script.
     }
   }
 
-  document.getElementById('darkmode').addEventListener('click',()=>{
+  function remarkChangeMode (theme) {
     if (!window.REMARK42) return
-    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
     window.REMARK42.changeTheme(theme)
-  })
+  }
+
+  btf.addGlobalFn('themeChange', remarkChangeMode, 'remark42')
 
   if ('!{theme.comments.use[0]}' === 'Remark42' || !!{theme.comments.lazyload}) {
     if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('remark42'), loadRemark42)

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

@@ -2,18 +2,7 @@
 - const { use, lazyload, count } = theme.comments
 
 script.
-  (()=>{
-    const init = () => {
-      twikoo.init(Object.assign({
-        el: '#twikoo-wrap',
-        envId: '!{envId}',
-        region: '!{region}',
-        onCommentLoaded: function () {
-          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
-        }
-      }, !{JSON.stringify(option)}))
-    }
-
+  (() => {
     const getCount = () => {
       const countELement = document.getElementById('twikoo-count')
       if(!countELement) return
@@ -22,32 +11,35 @@ script.
         region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
-      }).then(function (res) {
-        countELement.innerText = res[0].count
-      }).catch(function (err) {
-        console.error(err);
-      });
+      }).then(res => {
+        countELement.textContent = res[0].count
+      }).catch(err => {
+        console.error(err)
+      })
     }
 
-    const runFn = () => {
-      init()
+    const init = () => {
+      twikoo.init(Object.assign({
+        el: '#twikoo-wrap',
+        envId: '!{envId}',
+        region: '!{region}',
+        onCommentLoaded: () => {
+          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
+        }
+      }, !{JSON.stringify(option)}))
+
       !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
     }
 
     const loadTwikoo = () => {
-      if (typeof twikoo === 'object') {
-        setTimeout(runFn,0)
-        return
-      } 
-      getScript('!{url_for(theme.asset.twikoo)}').then(runFn)
+      if (typeof twikoo === 'object') setTimeout(init,0)
+      else getScript('!{url_for(theme.asset.twikoo)}').then(init)
     }
 
     if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {
       if (!{lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
       else loadTwikoo()
     } else {
-      window.loadOtherComment = () => {
-        loadTwikoo()
-      }
+      window.loadOtherComment = loadTwikoo
     }
   })()

layout/includes/third-party/comments/utterances.pug

@@ -1,34 +1,39 @@
+- const { use, lazyload } = theme.comments
+- const { repo, issue_term, light_theme, dark_theme } = theme.utterances
+
 script.
-  function loadUtterances () {
-    let ele = document.createElement('script')
-    ele.setAttribute('id', 'utterances_comment')
-    ele.setAttribute('src', 'https://utteranc.es/client.js')
-    ele.setAttribute('repo', '!{theme.utterances.repo}')
-    ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
-    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-    ele.setAttribute('theme', nowTheme)
-    ele.setAttribute('crossorigin', 'anonymous')
-    ele.setAttribute('async', 'true')
-    document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
-  }
-
-  function utterancesTheme () {
-    const iframe = document.querySelector('.utterances-frame')
-    if (iframe) {
-      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-      const message = {
-        type: 'set-theme',
-        theme: theme
-      };
-      iframe.contentWindow.postMessage(message, 'https://utteranc.es');
+  (() => {
+    const loadUtterances = () => {
+      let ele = document.createElement('script')
+      ele.id = 'utterances_comment'
+      ele.src = 'https://utteranc.es/client.js'
+      ele.setAttribute('repo', '!{repo}')
+      ele.setAttribute('issue-term', '!{issue_term}')
+      const nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{dark_theme}' : '#{light_theme}'
+      ele.setAttribute('theme', nowTheme)
+      ele.crossOrigin = 'anonymous'
+      ele.async = true
+      document.getElementById('utterances-wrap').appendChild(ele)
     }
-  }
 
-  if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
-    else loadUtterances()
-  } else {
-    function loadOtherComment () {
-      loadUtterances()
+    const utterancesTheme = theme => {
+      const iframe = document.querySelector('.utterances-frame')
+      if (iframe) {
+        const theme = theme === 'dark' ? '#{dark_theme}' : '#{light_theme}'
+        const message = {
+          type: 'set-theme',
+          theme: theme
+        };
+        iframe.contentWindow.postMessage(message, 'https://utteranc.es');
+      }
     }
-  }
+
+    btf.addGlobalFn('themeChange', utterancesTheme, 'utterances')
+
+    if ('!{use[0]}' === 'Utterances' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+      else loadUtterances()
+    } else {
+      window.loadOtherComment = loadUtterances
+    }
+  })()

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

@@ -1,33 +1,38 @@
+- const { use, lazyload } = theme.comments
+- const { appId, appKey, avatar, serverURLs, visitor, option } = theme.valine
+
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
 
 script.
-  function loadValine () {
-    function initValine () {
+  (() => {
+    const initValine = () => {
       const valine = new Valine(Object.assign({
         el: '#vcomment',
-        appId: '#{theme.valine.appId}',
-        appKey: '#{theme.valine.appKey}',
-        avatar: '#{theme.valine.avatar}',
-        serverURLs: '#{theme.valine.serverURLs}',
+        appId: '#{appId}',
+        appKey: '#{appKey}',
+        avatar: '#{avatar}',
+        serverURLs: '#{serverURLs}',
         emojiMaps: !{emojiMaps},
         path: window.location.pathname,
-        visitor: #{theme.valine.visitor}
-      }, !{JSON.stringify(theme.valine.option)}))
+        visitor: #{visitor}
+      }, !{JSON.stringify(option)}))
     }
 
-    if (typeof Valine === 'function') initValine() 
-    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
-  }
-
-  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
-    else setTimeout(loadValine, 0)
-  } else {
-    function loadOtherComment () {
-      loadValine()
+    const loadValine = async () => {
+      if (typeof Valine === 'function') initValine()
+      else {
+        await getScript('!{url_for(theme.asset.valine)}')
+        initValine()
+      }
     }
-  }
-  
+
+    if ('!{use[0]}' === 'Valine' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
+      else setTimeout(loadValine, 0)
+    } else {
+      window.loadOtherComment = loadValine
+    }
+  })()
 

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

@@ -2,9 +2,11 @@
 - const { lazyload, count, use } = theme.comments
 
 script.
-  function loadWaline () {
-    function initWaline () {
-      const waline = Waline.init(Object.assign({
+  (() => {
+    let initFn = window.walineFn || null
+
+    const initWaline = (Fn) => {
+      const waline = Fn(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
         pageview: !{lazyload ? false : pageview},
@@ -12,23 +14,30 @@ script.
         path: window.location.pathname,
         comment: !{lazyload ? false : count},
       }, !{JSON.stringify(option)}))
+
+      const destroyWaline = () => {
+        waline.destroy()
+      }
+
+      btf.addGlobalFn('pjax', destroyWaline, 'destroyWaline')
     }
 
-    if (typeof Waline === 'object') initWaline()
-    else {
-      getCSS('!{url_for(theme.asset.waline_css)}').then(() => {
-        getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
-      })
+    const loadWaline = async () => {
+      if (initFn) initWaline(initFn)
+      else {
+        await getCSS('!{url_for(theme.asset.waline_css)}')
+        const { init } = await import('!{url_for(theme.asset.waline_js)}')
+        initFn = init || Waline.init
+        initWaline(initFn)
+        window.walineFn = initFn
+      }
     }
-  }
 
-  if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
-    if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
-    else setTimeout(loadWaline, 0)
-  } else {
-    function loadOtherComment () {
-      loadWaline()
+    if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+      else setTimeout(loadWaline, 0)
+    } else {
+      window.loadOtherComment = loadWaline
     }
-  }
-  
+  })()
 

layout/includes/third-party/effect.pug

@@ -24,12 +24,12 @@ if theme.activate_power_mode.enable
 if theme.click_heart && theme.click_heart.enable
   script#click-heart(src=url_for(theme.asset.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
-if theme.ClickShowText && theme.ClickShowText.enable
+if theme.clickShowText && theme.clickShowText.enable
   script#click-show-text(
-    src= url_for(theme.asset.ClickShowText)
-    data-mobile= `${theme.ClickShowText.mobile}`
-    data-text= theme.ClickShowText.text.join(",")
-    data-fontsize= theme.ClickShowText.fontSize
-    data-random= `${theme.ClickShowText.random}`
+    src= url_for(theme.asset.clickShowText)
+    data-mobile= `${theme.clickShowText.mobile}`
+    data-text= theme.clickShowText.text.join(",")
+    data-fontsize= theme.clickShowText.fontSize
+    data-random= `${theme.clickShowText.random}`
     async
   )

layout/includes/third-party/math/mathjax.pug

@@ -3,7 +3,7 @@ script.
   if (!window.MathJax) {
     window.MathJax = {
       tex: {
-        inlineMath: [ ['$','$'], ["\\(","\\)"]],
+        inlineMath: [['$', '$'], ['\\(', '\\)']],
         tags: 'ams'
       },
       chtml: {
@@ -21,16 +21,7 @@ script.
               math.end = {node: text, delim: '', n: 0}
               doc.math.push(math)
             }
-          }, ''],
-          insertScript: [200, () => {
-            document.querySelectorAll('mjx-container').forEach(node => {
-              if (node.hasAttribute('display')) {
-                btf.wrap(node, 'div', { class: 'mathjax-overflow' })
-              } else {
-                btf.wrap(node, 'span', { class: 'mathjax-overflow' })
-              }
-            });
-          }, '', false]
+          }, '']
         }
       }
     }
@@ -43,5 +34,5 @@ script.
   } else {
     MathJax.startup.document.state(0)
     MathJax.texReset()
-    MathJax.typeset()
+    MathJax.typesetPromise()
   }

layout/includes/third-party/math/mermaid.pug

@@ -1,26 +1,38 @@
 script.
   (() => {
-    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
-    if ($mermaidWrap.length) {
-      window.runMermaid = () => {
-        window.loadMermaid = true
-        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
+    const $mermaid = document.querySelectorAll('#article-container .mermaid-wrap')
+    if ($mermaid.length === 0) return
+    const runMermaid = () => {
+      window.loadMermaid = true
+      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
 
-        Array.from($mermaidWrap).forEach((item, index) => {
-          const mermaidSrc = item.firstElementChild
-          const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
-          const mermaidID = 'mermaid-' + index
-          const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
-          mermaid.mermaidAPI.render(mermaidID, mermaidDefinition, (svgCode) => {
-            mermaidSrc.insertAdjacentHTML('afterend', svgCode)
+      Array.from($mermaid).forEach((item, index) => {
+        const mermaidSrc = item.firstElementChild
+        const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
+        const mermaidID = 'mermaid-' + index
+        const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
+
+        const renderFn = mermaid.render(mermaidID, mermaidDefinition)
+
+        const renderV10 = () => {
+          renderFn.then(({svg}) => {
+            mermaidSrc.insertAdjacentHTML('afterend', svg)
           })
-        })
-      }
+        }
 
-      const loadMermaid = () => {
-        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
-      }
+        const renderV9 = svg => {
+          mermaidSrc.insertAdjacentHTML('afterend', svg)
+        }
 
-      window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
+        typeof renderFn === 'string' ? renderV9(renderFn) : renderV10()
+      })
     }
+
+    const loadMermaid = () => {
+      window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
+    }
+
+    btf.addGlobalFn('themeChange', runMermaid, 'mermaid')
+
+    window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
   })()

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

@@ -1,6 +1,6 @@
-- const { server, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar ? option.gravatar.mirror : 'https://sdn.geekzu.org/avatar/'
-- const avatarDefault = option !== null && option.gravatar ? option.gravatar.default : 'mp'
+- const { server, site, option } = theme.artalk
+- const avatarCdn = option !== null && option.gravatar && option.gravatar.mirror
+- const avatarDefault = option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)
 
 script.
   window.addEventListener('load', () => {
@@ -40,30 +40,54 @@ 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)
     }
 
-    const getComment = () => {
-      fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}',{method: "POST"})
-        .then(response => response.json())
-        .then(d => {
-          const artalk = d.data.map(function (e) {
-            return {
-              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
-              'content': changeContent(e.content_marked),
-              'nick': e.nick,
-              'url': e.page_url,
-              'date': e.date,
-            }
-          })
-          saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
-          generateHtml(artalk)
-        }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+    const getSetting = async () => {
+      try {
+        const res = await fetch('!{server}/api/v2/conf', { method: 'GET' })
+        return await res.json()
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    const headerList = {
+      method: 'GET',
+    }
+
+    const searchParams = new URLSearchParams({
+      'site_name': '!{site}',
+      'limit': '!{theme.newest_comments.limit}',
+    })
+
+    const getComment = async () => {
+      try {
+        const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`, headerList)
+        const result = await res.json()
+        const avatarStr = await getSetting()
+        const { mirror, params, default:defaults } = avatarStr.frontend_conf.gravatar
+        const avatarCdn = !{avatarCdn} || mirror
+        let avatarDefault = !{avatarDefault} || params || defaults
+        avatarDefault = avatarDefault.startsWith('d=') ? avatarDefault : `d=${avatarDefault}`
+        const artalk = result.data.map(function (e) {
+          return {
+            'avatar': `${avatarCdn}${e.email_encrypted}?${avatarDefault}`,
+            'content': changeContent(e.content_marked),
+            'nick': e.nick,
+            'url': e.page_url,
+            'date': e.date,
+          }
         })
+        saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
+        generateHtml(artalk)
+      } catch (e) {
+        console.log(e)
+        const $dom = document.querySelector('#card-newest-comments .aside-list')
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+      }
     }
 
     const newestCommentInit = () => {

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

@@ -32,7 +32,7 @@ script.
           generateHtml(disqusArray)
         }).catch(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')}"
         })
     }
 
@@ -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

@@ -17,7 +17,10 @@ script.
     const findTrueUrl = (array) => {
       Promise.all(array.map(item =>
         fetch(item.url).then(resp => resp.json()).then(data => {
-          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
+          let urlArray = data.body ? data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig) : []
+          if (!Array.isArray(urlArray) || urlArray.length === 0) {
+            urlArray = [`${data.html_url}`]
+          }
           if (data.user.login === 'utterances-bot') {
             return urlArray.pop()
           } else {
@@ -48,7 +51,7 @@ script.
           const githubArray = data.map(item => {
             return {
               'avatar': item.user.avatar_url,
-              'content': changeContent(item.body_html),
+              'content': changeContent(item.body_html || item.body),
               'nick': item.user.login,
               'url': item.issue_url,
               'date': item.updated_at,
@@ -58,7 +61,7 @@ script.
           findTrueUrl(githubArray)
         }).catch(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')}"
         })
     }
 
@@ -84,7 +87,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)
     }
@@ -60,7 +60,7 @@ script.
           generateHtml(remark42)
         }).catch(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/twikoo-comment.pug

@@ -36,7 +36,7 @@ script.
           generateHtml(twikooArray)
         }).catch(function (err) {
           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')}"
         })
       }
 
@@ -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)
     }
@@ -79,7 +79,7 @@ script.
           generateHtml(valineArray)
         }).catch(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/waline.pug

@@ -1,6 +1,8 @@
+- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const changeContent = content => {
       if (content === '') return content
 
       content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
@@ -36,36 +38,31 @@ 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)
     }
 
-    const getComment = () => {
-      const loadWaline = () => {
-        Waline.RecentComments({
-          serverURL: '!{theme.waline.serverURL}',
-          count: !{theme.newest_comments.limit}
-        }).then(({comments}) => {
-          const walineArray = comments.map(e => {
-            return {
-              'content': changeContent(e.comment),
-              'avatar': e.avatar,
-              'nick': e.nick,
-              'url': e.url + '#' + e.objectId,
-              'date': e.insertedAt,
-            }
-          })
-          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
-          generateHtml(walineArray)
-        }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-        }) 
+    const getComment = async () => {
+      try {
+        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.newest_comments.limit}', { method: 'GET' })
+        const result = await res.json()
+        const walineArray = result.data.map(e => {
+          return {
+            'content': changeContent(e.comment),
+            'avatar': e.avatar,
+            'nick': e.nick,
+            'url': e.url + '#' + e.objectId,
+            'date': e.time || e.insertedAt
+          }
+        })
+        saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+        generateHtml(walineArray)
+      } catch (err) {
+        console.error(err)
+        const $dom = document.querySelector('#card-newest-comments .aside-list')
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
       }
-
-      if (typeof Waline === 'object') loadWaline()
-      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pjax.pug

@@ -26,11 +26,11 @@ script.
 
   document.addEventListener('pjax:send', function () {
 
-    // removeEventListener scroll 
-    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
-    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
+    // removeEventListener
+    btf.removeGlobalFnEvent('pjax')
+    btf.removeGlobalFnEvent('themeChange')
 
-    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
+    document.getElementById('rightside').classList.remove('rightside-show')
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -62,7 +62,6 @@ script.
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
-    typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
     // google analytics
@@ -77,8 +76,8 @@ script.
     typeof Prism === 'object' && Prism.highlightAll()
   })
 
-  document.addEventListener('pjax:error', (e) => {
+  document.addEventListener('pjax:error', e => {
     if (e.request.status === 404) {
-      pjax.loadUrl('/404.html')
+      pjax.loadUrl('!{url_for("/404.html")}')
     }
   })

layout/includes/third-party/search/algolia.pug

@@ -16,3 +16,7 @@
           .algolia-poweredBy
   
   #search-mask
+
+  script(src=url_for(theme.asset.algolia_search))
+  script(src=url_for(theme.asset.instantsearch))
+  script(src=url_for(theme.asset.algolia_js))

layout/includes/third-party/search/docsearch.pug

@@ -0,0 +1,28 @@
+- const { appId, apiKey, indexName, option } = theme.docsearch
+
+.docsearch-wrap
+  #docsearch(style="display:none")
+  link(rel="stylesheet" href=url_for(theme.asset.docsearch_css))
+  script(src=url_for(theme.asset.docsearch_js))
+  script.
+    (() => {
+      docsearch(Object.assign({
+        appId: '!{appId}',
+        apiKey: '!{apiKey}',
+        indexName: '!{indexName}',
+        container: '#docsearch',
+      }, !{JSON.stringify(option)}))
+
+      const handleClick = () => {
+        document.querySelector('.DocSearch-Button').click()
+      }
+
+      const searchClickFn = () => {
+        btf.addEventListenerPjax(document.querySelector('#search-button > .search'), 'click', handleClick)
+      }
+
+      searchClickFn()
+      window.addEventListener('pjax:complete', searchClickFn)
+    })()
+
+

layout/includes/third-party/search/index.pug

@@ -1,4 +1,6 @@
 if theme.algolia_search.enable
   include ./algolia.pug
 else if theme.local_search.enable
-  include ./local-search.pug
+  include ./local-search.pug
+else if theme.docsearch.enable
+  include ./docsearch.pug

layout/includes/third-party/search/local-search.pug

@@ -16,5 +16,7 @@
           input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
       hr
       #local-search-results
+      #local-search-stats-wrap
+  #search-mask
 
-  #search-mask
+  script(src=url_for(theme.asset.local_search))

layout/includes/third-party/share/add-this.pug

@@ -1,2 +0,0 @@
-.addthis_inline_share_toolbox
-script(src=`//s7.addthis.com/js/300/addthis_widget.js#pubid=${theme.addThis.pubid}` async)

layout/includes/third-party/share/index.pug

@@ -1,7 +1,5 @@
 .post_share
-  if theme.addThis.enable
-    !=partial('includes/third-party/share/add-this', {}, {cache: true})
-  else if theme.sharejs.enable
+  if theme.sharejs.enable
     include ./share-js.pug
   else if theme.addtoany.enable
     !=partial('includes/third-party/share/addtoany', {}, {cache: true})

layout/includes/third-party/subtitle.pug

@@ -38,7 +38,7 @@ case source
               sub.unshift(data.hitokoto, from)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').innerHTML = data.hitokoto
+              document.getElementById('subtitle').textContent = data.hitokoto
             }
           })
       }
@@ -55,7 +55,7 @@ case source
             sub.unshift(con, from)
             typedJSFn.init(sub)
           } else {
-            document.getElementById('subtitle').innerHTML = con
+            document.getElementById('subtitle').textContent = con
           }
         })
       }
@@ -72,7 +72,7 @@ case source
               sub.unshift(content)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').innerHTML = result.data.content
+              document.getElementById('subtitle').textContent = result.data.content
             }
           })
         })
@@ -86,7 +86,7 @@ case source
         if (!{effect}) {
           typedJSFn.init(!{JSON.stringify(subContent)})
         } else {
-          document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
+          document.getElementById("subtitle").textContent = !{JSON.stringify(subContent[0])}
         }
       }
       typedJSFn.run(subtitleType)

layout/includes/widget/card_author.pug

@@ -24,4 +24,4 @@ if theme.aside.card_author.enable
   
     if(theme.social)
         .card-info-social-icons.is-center
-          !=fragment_cache('social', function(){return partial('includes/header/social')}) 
+          !=partial('includes/header/social', {}, {cache: true})

layout/includes/widget/card_newest_comment.pug

@@ -1,4 +1,4 @@
-if theme.newest_comments.enable && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
+if theme.newest_comments.enable && theme.comments.use && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
   .card-widget#card-newest-comments
     .item-headline
       i.fas.fa-comment-dots

layout/includes/widget/card_post_series.pug

@@ -0,0 +1,21 @@
+if theme.aside.card_post_series.enable
+  - const array = fragment_cache('seriesArr', groupPosts)
+  .card-widget.card-post-series
+    .item-headline
+      i.fa-solid.fa-layer-group
+      span= theme.aside.card_post_series.series_title ? page.series : _p('aside.card_post_series')
+    .aside-list
+      each item in array[page.series]
+        - const { path, title = _p('no_title'), cover, cover_type, date:dateA } = item
+        - let link = url_for(path)
+        - let no_cover = cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        .aside-list-item(class=no_cover)
+          if cover && theme.cover.aside_enable
+            a.thumbnail(href=link title=title)
+              if cover_type === 'img'
+                img(src=url_for(cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+              else
+                div(style=`background: ${cover}`)
+          .content
+            a.title(href=link title=title)= title
+            time(datetime=date_xml(dateA) title=_p('post.created') + ' ' + full_date(dateA)) #[=date(dateA, config.date_format)]

layout/includes/widget/card_post_toc.pug

@@ -1,5 +1,5 @@
-- let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
-- let tocExpand = page.toc_expand !== undefined ? page.toc_expand : theme.toc.expand
+- let tocNumber = typeof page.toc_number === 'boolean' ? page.toc_number : theme.toc.number
+- let tocExpand = typeof page.toc_expand === 'boolean' ? page.toc_expand : theme.toc.expand
 - let tocExpandClass = tocExpand ? 'is-expand' : ''
 
 #card-toc.card-widget

layout/includes/widget/card_tags.pug

@@ -5,8 +5,10 @@ if theme.aside.card_tags.enable
         i.fas.fa-tags
         span= _p('aside.card_tags')
 
-      - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
+      - let { limit, orderby, order } = theme.aside.card_tags
+      - limit = limit === 0 ? 0 : limit || 40
+
       if theme.aside.card_tags.color
-        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.15, maxfontsize: 1.45, limit: tagLimit, unit: 'em'})
+        .card-tag-cloud!= cloudTags({source: site.tags, orderby: orderby, order: order, minfontsize: 1.15, maxfontsize: 1.45, limit: limit, unit: 'em'})
       else
-        .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})
+        .card-tag-cloud!= tagcloud({orderby: orderby, order: order, min_font: 1.1, max_font: 1.5, amount: limit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})

layout/includes/widget/index.pug

@@ -13,13 +13,15 @@
       .sticky_layout
         if showToc
           include ./card_post_toc.pug
+        if page.series
+          include ./card_post_series.pug
         !=partial('includes/widget/card_recent_post', {}, {cache: true})
         !=partial('includes/widget/card_ad', {}, {cache: true})
   else
     //- page
     !=partial('includes/widget/card_author', {}, {cache: true})
     !=partial('includes/widget/card_announcement', {}, {cache: true})
-    !=partial('includes/widget/card_top_self', {}, {cache: true})      
+    !=partial('includes/widget/card_top_self', {}, {cache: true})
 
     .sticky_layout
       if showToc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.6.1",
+  "version": "4.13.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,7 +23,7 @@
     "email": "my@crazywong.com"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^2.1.0",
+    "hexo-renderer-stylus": "^3.0.1",
     "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",

plugins.yml

@@ -1,11 +1,11 @@
-algolia_search_v4:
+algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.14.3
-instantsearch_v4:
+  version: 4.22.1
+instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.49.4
+  version: 4.65.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -37,17 +37,17 @@ disqusjs_css:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.8
+  version: 1.6.31
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 2.14.7
+  version: 3.1.2
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 2.14.7
+  version: 3.1.2
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js
@@ -64,16 +64,16 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.16.4
+  version: 0.16.9
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.4
+  version: 0.16.9
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 9.3.0
+  version: 10.8.0
 canvas_ribbon:
   name: butterfly-extsrc
   file: dist/canvas-ribbon.min.js
@@ -98,40 +98,40 @@ click_heart:
   name: butterfly-extsrc
   file: dist/click-heart.min.js
   version: 1.1.3
-ClickShowText:
+clickShowText:
   name: butterfly-extsrc
   file: dist/click-show-text.min.js
   version: 1.1.3
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
-  version: 17.8.3
+  version: 17.8.8
 instantpage:
   name: instant.page
   file: instantpage.js
-  version: 5.1.1
+  version: 5.2.0
 typed:
   name: typed.js
-  file: lib/typed.min.js
-  version: 2.0.12
+  file: dist/typed.umd.js
+  version: 2.1.0
 pangu:
   name: pangu
   file: dist/browser/pangu.min.js
   version: 4.0.7
-fancybox_css_v4:
+fancybox_css:
   name: '@fancyapps/ui'
-  file: dist/fancybox.css
-  version: 4.0.31
+  file: dist/fancybox/fancybox.css
+  version: 5.0.33
   other_name: fancyapps-ui
-fancybox_v4:
+fancybox:
   name: '@fancyapps/ui'
-  file: dist/fancybox.umd.js
-  version: 4.0.31
+  file: dist/fancybox/fancybox.umd.js
+  version: 5.0.33
   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
@@ -140,19 +140,16 @@ snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js
   version: 0.1.16
-fontawesomeV6:
+fontawesome:
   name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
   other_name: font-awesome
-  version: 6.2.1
-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
+  version: 6.5.1
+egjs_infinitegrid:
+  name: '@egjs/infinitegrid'
+  other_name: egjs-infinitegrid
+  file: dist/infinitegrid.min.js
+  version: 4.11.1
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -183,11 +180,11 @@ prismjs_autoloader:
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.4.4
+  version: 2.8.2
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.4.4
+  version: 2.8.2
 pace_js:
   name: pace-js
   other_name: pace
@@ -198,3 +195,17 @@ pace_default_css:
   other_name: pace
   file: themes/blue/pace-theme-minimal.css
   version: 1.2.4
+docsearch_js:
+  name: '@docsearch/js'
+  other_name: docsearch-js
+  file: dist/umd/index.js
+  version: 3.5.2
+docsearch_css:
+  name: '@docsearch/css'
+  other_name: docsearch-css
+  file: dist/style.css
+  version: 3.5.2
+abcjs_basic_js:
+  name: abcjs
+  file: dist/abcjs-basic-min.js
+  version: 6.3.0

scripts/events/cdn.js

@@ -41,20 +41,19 @@ hexo.extend.filter.register('before_generate', () => {
     }
   }
 
-  const minFile = (file) => {
+  const minFile = file => {
     return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
   }
 
   const createCDNLink = (data, type, cond = '') => {
     Object.keys(data).forEach(key => {
       let { name, version, file, other_name } = data[key]
-
-      const min_file = minFile(file)
       const cdnjs_name = other_name || name
       const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
       const min_cdnjs_file = minFile(cdnjs_file)
       if (cond === 'internal') file = `source/${file}`
-      const verType = CDN.version ? `@${version}` : ''
+      const min_file = minFile(file)
+      const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
 
       const value = {
         version,
@@ -67,7 +66,7 @@ hexo.extend.filter.register('before_generate', () => {
       }
 
       const cdnSource = {
-        local: cond === 'internal' ? cdnjs_file : `/pluginsSrc/${name}/${file}`,
+        local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
         jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
         unpkg: `https://unpkg.com/${name}${verType}/${file}`,
         cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
@@ -77,7 +76,7 @@ hexo.extend.filter.register('before_generate', () => {
       data[key] = cdnSource[type]
     })
 
-    if (cond === 'internal') data.main_css = 'css/index.css'
+    if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
     return data
   }
 
@@ -90,6 +89,9 @@ hexo.extend.filter.register('before_generate', () => {
     return obj
   }
 
-  themeConfig.asset = Object.assign(createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
-    createCDNLink(thirdPartySrc, CDN.third_party_provider), deleteNullValue(CDN.option))
+  themeConfig.asset = Object.assign(
+    createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
+    createCDNLink(thirdPartySrc, CDN.third_party_provider),
+    deleteNullValue(CDN.option)
+  )
 })

scripts/events/init.js

@@ -1,21 +1,19 @@
 hexo.extend.filter.register('before_generate', () => {
   // Get first two digits of the Hexo version number
-  const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-  const logger = hexo.log
+  const { version, log, locals } = hexo
+  const hexoVer = version.replace(/(^.*\..*)\..*/, '$1')
 
   if (hexoVer < 5.3) {
-    logger.error('Please update Hexo to V5.3.0 or higher!')
-    logger.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
+    log.error('Please update Hexo to V5.3.0 or higher!')
+    log.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
     process.exit(-1)
   }
 
-  if (hexo.locals.get) {
-    const data = hexo.locals.get('data')
+  if (locals.get) {
+    const data = locals.get('data')
     if (data && data.butterfly) {
-      logger.error(
-        " 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' "
-      )
-      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
+      log.error("'butterfly.yml' is deprecated. Please use '_config.butterfly.yml'")
+      log.error("'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml'")
       process.exit(-1)
     }
   }

scripts/events/merge_config.js

@@ -0,0 +1,545 @@
+hexo.extend.filter.register('before_generate', () => {
+  const defaultConfig = {
+    nav: {
+      logo: null,
+      display_title: true,
+      fixed: false
+    },
+    menu: null,
+    highlight_theme: 'light',
+    highlight_copy: true,
+    highlight_lang: true,
+    highlight_shrink: false,
+    highlight_height_limit: false,
+    code_word_wrap: false,
+    social: null,
+    favicon: '/img/favicon.png',
+    avatar: {
+      img: 'https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png',
+      effect: false
+    },
+    disable_top_img: false,
+    index_img: null,
+    default_top_img: null,
+    archive_img: null,
+    tag_img: null,
+    tag_per_img: null,
+    category_img: null,
+    category_per_img: null,
+    cover: {
+      index_enable: true,
+      aside_enable: true,
+      archives_enable: true,
+      position: 'both',
+      default_cover: null
+    },
+    error_img: {
+      flink: '/img/friend_404.gif',
+      post_page: '/img/404.jpg'
+    },
+    error_404: {
+      enable: false,
+      subtitle: 'Page Not Found',
+      background: 'https://i.loli.net/2020/05/19/aKOcLiyPl2JQdFD.png'
+    },
+    post_meta: {
+      page: {
+        date_type: 'created',
+        date_format: 'date',
+        categories: true,
+        tags: false,
+        label: true
+      },
+      post: {
+        date_type: 'both',
+        date_format: 'date',
+        categories: true,
+        tags: true,
+        label: true
+      }
+    },
+    index_post_content: {
+      method: 3,
+      length: 500
+    },
+    anchor: {
+      auto_update: false,
+      click_to_scroll: false
+    },
+    photofigcaption: false,
+    copy: {
+      enable: true,
+      copyright: {
+        enable: false,
+        limit_count: 50
+      }
+    },
+    toc: {
+      post: true,
+      page: false,
+      number: true,
+      expand: false,
+      style_simple: false,
+      scroll_percent: true
+    },
+    post_copyright: {
+      enable: true,
+      decode: false,
+      author_href: null,
+      license: 'CC BY-NC-SA 4.0',
+      license_url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/'
+    },
+    reward: {
+      enable: false,
+      text: null,
+      QR_code: null
+    },
+    post_edit: {
+      enable: false,
+      url: null
+    },
+    related_post: {
+      enable: true,
+      limit: 6,
+      date_type: 'created'
+    },
+    post_pagination: 1,
+    noticeOutdate: {
+      enable: false,
+      style: 'flat',
+      limit_day: 500,
+      position: 'top',
+      message_prev: 'It has been',
+      message_next: 'days since the last update, the content of the article may be outdated.'
+    },
+    footer: {
+      owner: {
+        enable: true,
+        since: 2020
+      },
+      custom_text: null,
+      copyright: true
+    },
+    aside: {
+      enable: true,
+      hide: false,
+      button: true,
+      mobile: true,
+      position: 'right',
+      display: {
+        archive: true,
+        tag: true,
+        category: true
+      },
+      card_author: {
+        enable: true,
+        description: null,
+        button: {
+          enable: true,
+          icon: 'fab fa-github',
+          text: 'Follow Me',
+          link: 'https://github.com/xxxxxx'
+        }
+      },
+      card_announcement: {
+        enable: true,
+        content: 'This is my Blog'
+      },
+      card_recent_post: {
+        enable: true,
+        limit: 5,
+        sort: 'date',
+        sort_order: null
+      },
+      card_categories: {
+        enable: true,
+        limit: 8,
+        expand: 'none',
+        sort_order: null
+      },
+      card_tags: {
+        enable: true,
+        limit: 40,
+        color: false,
+        orderby: 'random',
+        order: 1,
+        sort_order: null
+      },
+      card_archives: {
+        enable: true,
+        type: 'monthly',
+        format: 'MMMM YYYY',
+        order: -1,
+        limit: 8,
+        sort_order: null
+      },
+      card_webinfo: {
+        enable: true,
+        post_count: true,
+        last_push_date: true,
+        sort_order: null
+      },
+      card_post_series: {
+        enable: true,
+        series_title: false,
+        orderBy: 'date',
+        order: -1
+      }
+    },
+    busuanzi: {
+      site_uv: true,
+      site_pv: true,
+      page_pv: true
+    },
+    runtimeshow: {
+      enable: false,
+      publish_date: null
+    },
+    newest_comments: {
+      enable: false,
+      sort_order: null,
+      limit: 6,
+      storage: 10,
+      avatar: true
+    },
+    translate: {
+      enable: false,
+      default: '繁',
+      defaultEncoding: 2,
+      translateDelay: 0,
+      msgToTraditionalChinese: '繁',
+      msgToSimplifiedChinese: '簡'
+    },
+    readmode: true,
+    darkmode: {
+      enable: true,
+      button: true,
+      autoChangeMode: false,
+      start: null,
+      end: null
+    },
+    rightside_scroll_percent: false,
+    rightside_item_order: {
+      enable: false,
+      hide: null,
+      show: null
+    },
+    mathjax: {
+      enable: false,
+      per_page: false
+    },
+    katex: {
+      enable: false,
+      per_page: false,
+      hide_scrollbar: true
+    },
+    algolia_search: {
+      enable: false,
+      hits: {
+        per_page: 6
+      }
+    },
+    local_search: {
+      enable: false,
+      preload: false,
+      top_n_per_article: 1,
+      unescape: false,
+      CDN: null
+    },
+    docsearch: {
+      enable: false,
+      appId: null,
+      apiKey: null,
+      indexName: null,
+      option: null
+    },
+    sharejs: {
+      enable: true,
+      sites: 'facebook,twitter,wechat,weibo,qq'
+    },
+    addtoany: {
+      enable: false,
+      item: 'facebook,twitter,wechat,sina_weibo,facebook_messenger,email,copy_link'
+    },
+    comments: {
+      use: null,
+      text: true,
+      lazyload: false,
+      count: false,
+      card_post_count: false
+    },
+    disqus: {
+      shortname: null,
+      apikey: null
+    },
+    disqusjs: {
+      shortname: null,
+      apikey: null,
+      option: null
+    },
+    livere: {
+      uid: null
+    },
+    gitalk: {
+      client_id: null,
+      client_secret: null,
+      repo: null,
+      owner: null,
+      admin: null,
+      option: null
+    },
+    valine: {
+      appId: null,
+      appKey: null,
+      avatar: 'monsterid',
+      serverURLs: null,
+      bg: null,
+      visitor: false,
+      option: null
+    },
+    waline: {
+      serverURL: null,
+      bg: null,
+      pageview: false,
+      option: null
+    },
+    utterances: {
+      repo: null,
+      issue_term: 'pathname',
+      light_theme: 'github-light',
+      dark_theme: 'photon-dark'
+    },
+    facebook_comments: {
+      app_id: null,
+      user_id: null,
+      pageSize: 10,
+      order_by: 'social',
+      lang: 'zh_TW'
+    },
+    twikoo: {
+      envId: null,
+      region: null,
+      visitor: false,
+      option: null
+    },
+    giscus: {
+      repo: null,
+      repo_id: null,
+      category_id: null,
+      theme: {
+        light: 'light',
+        dark: 'dark'
+      },
+      option: null
+    },
+    remark42: {
+      host: null,
+      siteId: null,
+      option: null
+    },
+    artalk: {
+      server: null,
+      site: null,
+      visitor: false,
+      option: null
+    },
+    chat_btn: false,
+    chat_hide_show: false,
+    chatra: {
+      enable: false,
+      id: null
+    },
+    tidio: {
+      enable: false,
+      public_key: null
+    },
+    daovoice: {
+      enable: false,
+      app_id: null
+    },
+    crisp: {
+      enable: false,
+      website_id: null
+    },
+    messenger: {
+      enable: false,
+      pageID: null,
+      lang: 'zh_TW'
+    },
+    baidu_analytics: null,
+    google_analytics: null,
+    cloudflare_analytics: null,
+    microsoft_clarity: null,
+    google_adsense: {
+      enable: false,
+      auto_ads: true,
+      js: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+      client: null,
+      enable_page_level_ads: true
+    },
+    site_verification: null,
+    index_site_info_top: null,
+    index_top_img_height: null,
+    category_ui: null,
+    tag_ui: null,
+    text_align_justify: false,
+    background: null,
+    footer_bg: false,
+    mask: {
+      header: true,
+      footer: true
+    },
+    rightside_bottom: null,
+    enter_transitions: true,
+    activate_power_mode: {
+      enable: false,
+      colorful: true,
+      shake: true,
+      mobile: false
+    },
+    canvas_ribbon: {
+      enable: false,
+      size: 150,
+      alpha: 0.6,
+      zIndex: -1,
+      click_to_change: false,
+      mobile: false
+    },
+    canvas_fluttering_ribbon: {
+      enable: false,
+      mobile: false
+    },
+    canvas_nest: {
+      enable: false,
+      color: '0,0,255',
+      opacity: 0.7,
+      zIndex: -1,
+      count: 99,
+      mobile: false
+    },
+    fireworks: {
+      enable: false,
+      zIndex: 9999,
+      mobile: false
+    },
+    click_heart: {
+      enable: false,
+      mobile: false
+    },
+    clickShowText: {
+      enable: false,
+      text: null,
+      fontSize: '15px',
+      random: false,
+      mobile: false
+    },
+    display_mode: 'light',
+    beautify: {
+      enable: false,
+      field: 'post',
+      'title-prefix-icon': null,
+      'title-prefix-icon-color': null
+    },
+    font: {
+      'global-font-size': null,
+      'code-font-size': null,
+      'font-family': null,
+      'code-font-family': null
+    },
+    blog_title_font: {
+      font_link: null,
+      'font-family': null
+    },
+    hr_icon: {
+      enable: true,
+      icon: null,
+      'icon-top': null
+    },
+    subtitle: {
+      enable: false,
+      effect: true,
+      typed_option: null,
+      source: false,
+      sub: null
+    },
+    preloader: {
+      enable: false,
+      source: 1,
+      pace_css_url: null
+    },
+    wordcount: {
+      enable: false,
+      post_wordcount: true,
+      min2read: true,
+      total_wordcount: true
+    },
+    medium_zoom: false,
+    fancybox: true,
+    series: {
+      enable: true,
+      orderBy: 'title',
+      order: 1,
+      number: true
+    },
+    abcjs: {
+      enable: false,
+      per_page: true
+    },
+    mermaid: {
+      enable: false,
+      theme: {
+        light: 'default',
+        dark: 'dark'
+      }
+    },
+    note: {
+      style: 'flat',
+      icons: true,
+      border_radius: 3,
+      light_bg_offset: 0
+    },
+    pjax: {
+      enable: false,
+      exclude: null
+    },
+    aplayerInject: {
+      enable: false,
+      per_page: true
+    },
+    snackbar: {
+      enable: false,
+      position: 'bottom-left',
+      bg_light: '#49b1f5',
+      bg_dark: '#1f1f1f'
+    },
+    instantpage: false,
+    pangu: {
+      enable: false,
+      field: 'site'
+    },
+    lazyload: {
+      enable: false,
+      field: 'site',
+      placeholder: null,
+      blur: false
+    },
+    Open_Graph_meta: {
+      enable: true,
+      option: null
+    },
+    css_prefix: true,
+    inject: {
+      head: null,
+      bottom: null
+    },
+    CDN: {
+      internal_provider: 'local',
+      third_party_provider: 'jsdelivr',
+      version: true,
+      custom_format: null,
+      option: null
+    }
+  }
+
+  hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+}, 1)

scripts/events/stylus.js

@@ -1,15 +1,23 @@
 /**
- * stylus
+ * Stylus renderer
  */
 
 'use strict'
 
-hexo.extend.filter.register('stylus:renderer', function (style) {
-  const { highlight, prismjs } = hexo.config
-  style
-    .define('$highlight_enable', highlight && highlight.enable)
-    .define('$highlight_line_number', highlight && highlight.line_number)
-    .define('$prismjs_enable', prismjs && prismjs.enable)
-    .define('$prismjs_line_number', prismjs && prismjs.line_number)
-    // .import(this.source_dir.replace(/\\/g, '/') + '_data/css/*')
+hexo.extend.filter.register('stylus:renderer', style => {
+  const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
+  let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
+  let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
+
+  // for hexo > 7.0
+  if (syntaxHighlighter) {
+    highlightEnable = syntaxHighlighter === 'highlight.js'
+    prismjsEnable = syntaxHighlighter === 'prismjs'
+  }
+
+  style.define('$highlight_enable', highlightEnable)
+    .define('$highlight_line_number', highlightLineNumber)
+    .define('$prismjs_enable', prismjsEnable)
+    .define('$prismjs_line_number', prismjsLineNumber)
+  // .import(`${this.source_dir.replace(/\\/g, '/')}_data/css/*`)
 })

scripts/filters/post_lazyload.js

@@ -8,22 +8,20 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function lazyload (htmlContent) {
+const lazyload = htmlContent => {
   const bg = hexo.theme.config.lazyload.placeholder ? urlFor(hexo.theme.config.lazyload.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
   return htmlContent.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
 }
 
-hexo.extend.filter.register('after_render:html', function (data) {
-  const config = hexo.theme.config.lazyload
-  if (!config.enable) return
-  if (config.field !== 'site') return
-  return lazyload.call(this, data)
+hexo.extend.filter.register('after_render:html', data => {
+  const { enable, field } = hexo.theme.config.lazyload
+  if (!enable || field !== 'site') return
+  return lazyload(data)
 })
 
 hexo.extend.filter.register('after_post_render', data => {
-  const config = hexo.theme.config.lazyload
-  if (!config.enable) return
-  if (config.field !== 'post') return
-  data.content = lazyload.call(this, data.content)
+  const { enable, field } = hexo.theme.config.lazyload
+  if (!enable || field !== 'post') return
+  data.content = lazyload(data.content)
   return data
 })

scripts/filters/random_cover.js

@@ -5,40 +5,35 @@
 
 'use strict'
 
-hexo.extend.filter.register('before_post_render', function (data) {
-  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
-  let randomCover
-  let coverVal = data.cover
+hexo.extend.filter.register('before_post_render', data => {
+  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
+  let { cover: coverVal, top_img: topImg } = data
 
   // Add path to top_img and cover if post_asset_folder is enabled
   if (hexo.config.post_asset_folder) {
-    const topImg = data.top_img
-    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = data.path + topImg
-    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = data.path + coverVal
+    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = `${data.path}${topImg}`
+    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
   }
 
   const randomCoverFn = () => {
-    const theme = hexo.theme.config
-    if (!(theme.cover && theme.cover.default_cover)) return false
-    if (!Array.isArray(theme.cover.default_cover)) return theme.cover.default_cover
-    const num = Math.floor(Math.random() * theme.cover.default_cover.length)
-    return theme.cover.default_cover[num]
+    const { cover: { default_cover: defaultCover } } = hexo.theme.config
+    if (!defaultCover) return false
+    if (!Array.isArray(defaultCover)) return defaultCover
+    const num = Math.floor(Math.random() * defaultCover.length)
+    return defaultCover[num]
   }
 
   if (coverVal === false) return data
 
   // If cover is not set, use random cover
   if (!coverVal) {
-    randomCover = randomCoverFn()
+    const randomCover = randomCoverFn()
     data.cover = randomCover
     coverVal = randomCover // update coverVal
   }
 
-  if (coverVal) {
-    if (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal)) {
-      data.cover_type = 'img'
-      return data
-    }
+  if (coverVal && (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal))) {
+    data.cover_type = 'img'
   }
 
   return data

scripts/helpers/aside_categories.js

@@ -31,6 +31,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
     if (parent) { query.parent = parent } else { query.parent = { $exists: false } }
     return categories.find(query).sort(orderby, order).filter((cat) => cat.length)
   }
+  let expandBtn = ''
 
   const hierarchicalList = (t, level, parent, topparent = true) => {
     let result = ''
@@ -59,6 +60,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
           }
 
           if (isExpand && isTopParent && child) {
+            expandBtn = ' expandBtn'
             result += `<i class="fas fa-caret-left ${expandClass}"></i>`
           }
 
@@ -91,7 +93,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
             <span>${this._p('aside.card_categories')}</span>
             ${moreButton()}
             </div>
-            <ul class="card-category-list" id="aside-cat-list">
+            <ul class="card-category-list${expandBtn}" id="aside-cat-list">
             ${list[0]}
             </ul>`
 })

scripts/helpers/findArchiveLength.js

@@ -1,36 +1,36 @@
-hexo.extend.helper.register('findArchiveLength', function (func) {
-  const allPostsLength = this.site.posts.length
-  if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false) return allPostsLength
-  const { yearly, monthly, daily } = hexo.config.archive_generator
+hexo.extend.helper.register('getArchiveLength', function () {
+  const { archive_generator: archiveGenerator } = hexo.config
+  if (archiveGenerator && archiveGenerator.enable === false) return this.site.posts.length
+  const { yearly, monthly, daily } = archiveGenerator
   const { year, month, day } = this.page
-  if (yearly === false || !year) return allPostsLength
+  if (yearly === false || !year) return this.site.posts.length
 
   const posts = this.site.posts.sort('date')
 
   const compareFunc = (type, y1, m1, d1, y2, m2, d2) => {
-    if (type === 'year') {
-      return y1 === y2
-    } else if (type === 'month') {
-      return y1 === y2 && m1 === m2
-    } else if (type === 'day') {
-      return y1 === y2 && m1 === m2 && d1 === d2
+    switch (type) {
+      case 'year':
+        return y1 === y2
+      case 'month':
+        return y1 === y2 && m1 === m2
+      case 'day':
+        return y1 === y2 && m1 === m2 && d1 === d2
+      default:
+        return false
     }
   }
 
   const generateDateObj = (type) => {
-    const dateObj = []
-    let length = 0
-
-    posts.forEach(post => {
+    return posts.reduce((dateObj, post) => {
       const date = post.date.clone()
       const year = date.year()
       const month = date.month() + 1
       const day = date.date()
-      const lastData = dateObj[length - 1]
+      const lastData = dateObj[dateObj.length - 1]
 
       if (!lastData || !compareFunc(type, lastData.year, lastData.month, lastData.day, year, month, day)) {
         const name = type === 'year' ? year : type === 'month' ? `${year}-${month}` : `${year}-${month}-${day}`
-        length = dateObj.push({
+        dateObj.push({
           name,
           year,
           month,
@@ -40,19 +40,19 @@ hexo.extend.helper.register('findArchiveLength', function (func) {
       } else {
         lastData.count++
       }
-    })
 
-    return dateObj
+      return dateObj
+    }, [])
   }
 
-  const data = func('createArchiveObj', () => {
-    const yearObj = yearly ? generateDateObj('year') : []
-    const monthObj = monthly ? generateDateObj('month') : []
-    const dayObj = daily ? generateDateObj('day') : []
-    const fullObj = [...yearObj, ...monthObj, ...dayObj]
-    return fullObj
+  const data = this.fragment_cache('createArchiveObj', () => {
+    const dateObjs = []
+    if (yearly) dateObjs.push(...generateDateObj('year'))
+    if (monthly) dateObjs.push(...generateDateObj('month'))
+    if (daily) dateObjs.push(...generateDateObj('day'))
+    return dateObjs
   })
 
-  const name = month ? day ? `${year}-${month}-${day}` : `${year}-${month}` : year
+  const name = month ? (day ? `${year}-${month}-${day}` : `${year}-${month}`) : year
   return data.find(item => item.name === name).count
 })

scripts/helpers/inject_head_js.js

@@ -7,80 +7,99 @@
 
 hexo.extend.helper.register('inject_head_js', function () {
   const { darkmode, aside } = this.theme
-
+  const start = darkmode.start || 6
+  const end = darkmode.end || 18
   const { theme_color } = hexo.theme.config
   const themeColorLight = (theme_color && theme_color.enable && theme_color.meta_theme_color_light) || '#ffffff'
   const themeColorDark = (theme_color && theme_color.enable && theme_color.meta_theme_color_dark) || '#0d0d0d'
 
-  const localStore = `
-    win.saveToLocal = {
-      set: function setWithExpiry(key, value, ttl) {
-        if (ttl === 0) return
-        const now = new Date()
-        const expiryDay = ttl * 86400000
-        const item = {
-          value: value,
-          expiry: now.getTime() + expiryDay,
+  const createLocalStore = () => {
+    return `
+      win.saveToLocal = {
+        set: (key, value, ttl) => {
+          if (ttl === 0) return
+          const now = Date.now()
+          const expiry = now + ttl * 86400000
+          const item = {
+            value,
+            expiry
+          }
+          localStorage.setItem(key, JSON.stringify(item))
+        },
+      
+        get: key => {
+          const itemStr = localStorage.getItem(key)
+      
+          if (!itemStr) {
+            return undefined
+          }
+          const item = JSON.parse(itemStr)
+          const now = Date.now()
+      
+          if (now > item.expiry) {
+            localStorage.removeItem(key)
+            return undefined
+          }
+          return item.value
         }
-        localStorage.setItem(key, JSON.stringify(item))
-      },
-
-      get: function getWithExpiry(key) {
-        const itemStr = localStorage.getItem(key)
-
-        if (!itemStr) {
-          return undefined
-        }
-        const item = JSON.parse(itemStr)
-        const now = new Date()
-
-        if (now.getTime() > item.expiry) {
-          localStorage.removeItem(key)
-          return undefined
-        }
-        return item.value
       }
-    }
-  `
+    `
+  }
 
   // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
-  const getScript = `
-    win.getScript = url => new Promise((resolve, reject) => {
-      const script = document.createElement('script')
-      script.src = url
-      script.async = true
-      script.onerror = reject
-      script.onload = script.onreadystatechange = function() {
-        const loadState = this.readyState
-        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-        script.onload = script.onreadystatechange = null
-        resolve()
-      }
-      document.head.appendChild(script)
-    })
-  `
+  const createGetScript = () => {
+    return `
+      win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
+        const script = document.createElement('script')
+        script.src = url
+        script.async = true
+        script.onerror = reject
+        script.onload = script.onreadystatechange = function() {
+          const loadState = this.readyState
+          if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+          script.onload = script.onreadystatechange = null
+          resolve()
+        }
 
-  const getCSS = `
-    win.getCSS = url => new Promise((resolve, reject) => {
-      const link = document.createElement('link')
-      link.rel = 'stylesheet'
-      link.href = url
-      link.onload = () => resolve()
-      link.onerror = () => reject()
-      document.head.appendChild(link)
-    })
-  `
+        Object.keys(attr).forEach(key => {
+          script.setAttribute(key, attr[key])
+        })
 
-  let darkmodeJs = ''
-  if (darkmode.enable) {
-    darkmodeJs = `
-      win.activateDarkMode = function () {
+        document.head.appendChild(script)
+      })
+    `
+  }
+
+  const createGetCSS = () => {
+    return `
+      win.getCSS = (url, id = false) => new Promise((resolve, reject) => {
+        const link = document.createElement('link')
+        link.rel = 'stylesheet'
+        link.href = url
+        if (id) link.id = id
+        link.onerror = reject
+        link.onload = link.onreadystatechange = function() {
+          const loadState = this.readyState
+          if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+          link.onload = link.onreadystatechange = null
+          resolve()
+        }
+        document.head.appendChild(link)
+      })
+    `
+  }
+
+  const createDarkmodeJs = () => {
+    if (!darkmode.enable) return ''
+
+    let darkmodeJs = `
+      win.activateDarkMode = () => {
         document.documentElement.setAttribute('data-theme', 'dark')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorDark}')
         }
       }
-      win.activateLightMode = function () {
+      win.activateLightMode = () => {
         document.documentElement.setAttribute('data-theme', 'light')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorLight}')
@@ -104,10 +123,10 @@ hexo.extend.helper.register('inject_head_js', function () {
             else if (isNotSpecified || hasNoSupport) {
               const now = new Date()
               const hour = now.getHours()
-              const isNight = hour <= 6 || hour >= 18
+              const isNight = hour <= ${start} || hour >= ${end}
               isNight ? activateDarkMode() : activateLightMode()
             }
-            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+            window.matchMedia('(prefers-color-scheme: dark)').addListener(e => {
               if (saveToLocal.get('theme') === undefined) {
                 e.matches ? activateDarkMode() : activateLightMode()
               }
@@ -119,22 +138,25 @@ hexo.extend.helper.register('inject_head_js', function () {
       darkmodeJs += `
           const now = new Date()
           const hour = now.getHours()
-          const isNight = hour <= 6 || hour >= 18
+          const isNight = hour <= ${start} || hour >= ${end}
           if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
           else if (t === 'light') activateLightMode()
           else activateDarkMode()
         `
     } else {
       darkmodeJs += `
-          if (t === 'dark') activateDarkMode()
-          else if (t === 'light') activateLightMode()
-        `
+        if (t === 'dark') activateDarkMode()
+        else if (t === 'light') activateLightMode()
+      `
     }
+
+    return darkmodeJs
   }
 
-  let asideStatus = ''
-  if (aside.enable && aside.button) {
-    asideStatus = `
+  const createAsideStatus = () => {
+    if (!aside.enable || !aside.button) return ''
+
+    return `
       const asideStatus = saveToLocal.get('aside-status')
       if (asideStatus !== undefined) {
         if (asideStatus === 'hide') {
@@ -146,14 +168,16 @@ hexo.extend.helper.register('inject_head_js', function () {
     `
   }
 
-  const detectApple = `
-    const detectApple = () => {
-      if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
-        document.documentElement.classList.add('apple')
+  const createDetectApple = () => {
+    return `
+      const detectApple = () => {
+        if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
+          document.documentElement.classList.add('apple')
+        }
       }
-    }
-    detectApple()
+      detectApple()
     `
+  }
 
-  return `<script>(win=>{${localStore + getScript + getCSS + darkmodeJs + asideStatus + detectApple}})(window)</script>`
+  return `<script>(win=>{${createLocalStore() + createGetScript() + createGetCSS() + createDarkmodeJs() + createAsideStatus() + createDetectApple()}})(window)</script>`
 })

scripts/helpers/page.js

@@ -1,10 +1,3 @@
-/**
- * Butterfly
- * @example
- *  page_description()
- *  cloudTags(source, minfontsize, maxfontsize, limit)
- */
-
 'use strict'
 
 const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
@@ -24,11 +17,8 @@ hexo.extend.helper.register('page_description', function () {
 
 hexo.extend.helper.register('cloudTags', function (options = {}) {
   const env = this
-  let source = options.source
-  const minfontsize = options.minfontsize
-  const maxfontsize = options.maxfontsize
-  const limit = options.limit
-  const unit = options.unit || 'px'
+  let { source, minfontsize, maxfontsize, limit, unit, orderby, order } = options
+  unit = unit || 'px'
 
   let result = ''
   if (limit > 0) {
@@ -43,7 +33,7 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
   })
 
   const length = sizes.length - 1
-  source.forEach(tag => {
+  source.sort(orderby, order).forEach(tag => {
     const ratio = length ? sizes.indexOf(tag.length) / length : 0
     const size = minfontsize + ((maxfontsize - minfontsize) * ratio)
     let style = `font-size: ${parseFloat(size.toFixed(2))}${unit};`
@@ -63,12 +53,8 @@ hexo.extend.helper.register('md5', function (path) {
 })
 
 hexo.extend.helper.register('injectHtml', function (data) {
-  let result = ''
   if (!data) return ''
-  for (let i = 0; i < data.length; i++) {
-    result += data[i]
-  }
-  return result
+  return data.join('')
 })
 
 hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
@@ -97,9 +83,6 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
 })
 
 hexo.extend.helper.register('isImgOrUrl', function (path) {
-  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
-  if (path.indexOf('//') !== -1 || imgTestReg.test(path)) {
-    return true
-  }
-  return false
+  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
+  return path.indexOf('//') !== -1 || imgTestReg.test(path)
 })

scripts/helpers/series.js

@@ -0,0 +1,22 @@
+'use strict'
+
+hexo.extend.helper.register('groupPosts', function () {
+  const getGroupArray = array => {
+    const groups = {}
+    array.forEach(item => {
+      const Key = item.series
+      if (!Key) return
+      groups[Key] = groups[Key] || []
+      groups[Key].push(item)
+    })
+    return groups
+  }
+
+  const sortPosts = posts => {
+    const { orderBy = 'date', order = 1 } = this.theme.aside.card_post_series
+    if (orderBy === 'title') return posts.sort('title', order)
+    return posts.sort('date', order)
+  }
+
+  return getGroupArray(sortPosts(this.site.posts))
+})

scripts/tag/button.js

@@ -9,17 +9,9 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function btn (args) {
+const btn = args => {
   args = args.join(' ').split(',')
-  let url = args[0] || ''
-  let text = args[1] || ''
-  let icon = args[2] || ''
-  let option = args[3] || ''
-
-  url = url.trim()
-  text = text.trim()
-  icon = icon.trim()
-  option = option.trim()
+  const [url = '', text = '', icon = '', option = ''] = args.map(arg => arg.trim())
 
   return `<a class="btn-beautify ${option}" href="${urlFor(url)}" 
   title="${text}">${icon.length ? `<i class="${icon}"></i>` : ''}${text.length ? `<span>${text}</span>` : ''}</a>`

scripts/tag/gallery.js

@@ -2,56 +2,60 @@
  * Butterfly
  * galleryGroup and gallery
  * {% galleryGroup [name] [descr] [url] [img] %}
- * {% gallery [lazyload],[rowHeight],[limit] %}
+ *
+ * {% gallery [button],%}
+ * {% gallery url,[url],[button]%}
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function gallery (args, content) {
-  const { data, languages } = hexo.theme.i18n
+const gallery = (args, content) => {
   args = args.join(' ').split(',')
-  const rowHeight = args[1] || 220
-  const limit = args[2] || 10
-  const lazyload = args[0] === 'true'
-  const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
-  const lazyloadClass = lazyload ? 'lazyload' : ''
-  let m
-  const arr = []
-  while ((m = regex.exec(content)) !== null) {
-    if (m.index === regex.lastIndex) {
-      regex.lastIndex++
+  let button = false
+  let type = 'data'
+  let dataStr = ''
+
+  if (args[0] === 'url') {
+    [type, dataStr, button] = args // url,[link],[lazyload]
+  } else {
+    [button] = args // [lazyload]
+    const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
+    let m
+    const arr = []
+    while ((m = regex.exec(content)) !== null) {
+      if (m.index === regex.lastIndex) {
+        regex.lastIndex++
+      }
+      arr.push({
+        url: m[2],
+        alt: m[1],
+        title: m[3]
+      })
     }
 
-    arr.push({
-      url: m[2],
-      alt: m[1],
-      title: m[3]
-    })
+    dataStr = JSON.stringify(arr)
   }
 
-  return `<div class="gallery">
-    <div class="fj-gallery ${lazyloadClass}" data-rowHeight="${rowHeight}" data-limit="${limit}">
-    <span class="gallery-data">${JSON.stringify(arr)}</span>
-    </div>
-    <button class="gallery-load-more"><span>${data[languages[0]].load_more}</span><i class="fa-solid fa-arrow-down"></i></button>
+  return `<div class="gallery-container" data-type="${type}" data-button="${button}">
+      <div class="gallery-data">${dataStr}</div>
+      <div class="gallery-items">
+      </div>
     </div>`
 }
 
-function galleryGroup (args) {
-  const name = args[0]
-  const descr = args[1]
-  const url = urlFor(args[2])
-  const img = urlFor(args[3])
+const galleryGroup = args => {
+  const [name, descr, url, img] = args
+  const imgUrl = urlFor(img)
+  const urlLink = urlFor(url)
 
-  return `
-  <figure class="gallery-group">
-  <img class="gallery-group-img no-lightbox" src='${img}' alt="Group Image Gallery">
+  return `<figure class="gallery-group">
+  <img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
   <figcaption>
   <div class="gallery-group-name">${name}</div>
   <p>${descr}</p>
-  <a href='${url}'></a>
+  <a href='${urlLink}'></a>
   </figcaption>
   </figure>
   `

scripts/tag/hide.js

@@ -16,51 +16,46 @@
 
 'use strict'
 
-function hideInline (args) {
-  args = args.join(' ').split(',')
-  const content = args[0]
-  const display = args[1] || 'Click'
-  const bg = args[2] || false
-  const color = args[3] || false
-  let group = 'style="'
+const parseArgs = args => {
+  return args.join(' ').split(',')
+}
 
-  if (bg) group += `background-color: ${bg};`
-  if (color) group += `color: ${color}`
-  group += '"'
+const generateStyle = (bg, color) => {
+  let style = 'style="'
+  if (bg) {
+    style += `background-color: ${bg};`
+  }
+  if (color) {
+    style += `color: ${color}`
+  }
+  style += '"'
+  return style
+}
+
+const hideInline = args => {
+  const [content, display = 'Click', bg = false, color = false] = parseArgs(args)
+  const group = generateStyle(bg, color)
 
   return `<span class="hide-inline"><button type="button" class="hide-button" ${group}>${display}
   </button><span class="hide-content">${content}</span></span>`
 }
 
-function hideBlock (args, content) {
-  args = args.join(' ').split(',')
-  const display = args[0] || 'Click'
-  const bg = args[1] || false
-  const color = args[2] || false
-  let group = 'style="'
-
-  if (bg) group += `background-color: ${bg};`
-  if (color) group += `color: ${color}`
-  group += '"'
+const hideBlock = (args, content) => {
+  const [display = 'Click', bg = false, color = false] = parseArgs(args)
+  const group = generateStyle(bg, color)
 
   return `<div class="hide-block"><button type="button" class="hide-button" ${group}>${display}
     </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
-function hideToggle (args, content) {
-  args = args.join(' ').split(',')
-  const display = args[0]
-  const bg = args[1] || false
-  const color = args[2] || false
-  let group = 'style="'
+const hideToggle = (args, content) => {
+  const [display, bg = false, color = false] = parseArgs(args)
+  const group = generateStyle(bg, color)
   let border = ''
 
   if (bg) {
     border = `style="border: 1px solid ${bg}"`
-    group += `background-color: ${bg};`
   }
-  if (color) group += `color: ${color}`
-  group += '"'
 
   return `<details class="toggle" ${border}><summary class="toggle-button" ${group}>${display}</summary><div class="toggle-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></details>`
 }

scripts/tag/inlineImg.js

@@ -1,17 +1,19 @@
 /**
  * inlineImg 圖片
- * {% inlineImg src height %}
+ * @param {Array} args 圖片名稱和高度
+ * @param {string} args[0] 圖片名稱
+ * @param {number} args[1] 圖片高度
+ * @returns {string} 圖片標籤
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function inlineImg (args) {
-  const img = args[0]
-  const height = args[1] ? `style="height:${args[1]}"` : ''
-
-  return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
+const inlineImg = ([img, height = '']) => {
+  const heightStyle = height ? `style="height:${height}"` : ''
+  const src = urlFor(img)
+  return `<img class="inline-img" src="${src}" ${heightStyle} />`
 }
 
 hexo.extend.tag.register('inlineImg', inlineImg, { ends: false })

scripts/tag/label.js

@@ -6,10 +6,8 @@
 
 'use strict'
 
-function addLabel (args, content) {
-  const text = args[0]
-  const className = args[1] || 'default'
-
+const addLabel = args => {
+  const [text, className = 'default'] = args
   return `<mark class="hl-label ${className}">${text}</mark> `
 }
 

scripts/tag/mermaid.js

@@ -8,7 +8,7 @@
 
 const { escapeHTML } = require('hexo-util')
 
-function mermaid (args, content) {
+const mermaid = (args, content) => {
   return `<div class="mermaid-wrap"><pre class="mermaid-src" hidden>
   ${escapeHTML(content)}
   </pre></div>`