Merge branch 'dev'

fix: 修復子目錄下，第三方插件本地資源無法加載的 bug closed #908
fix: 評論系統開啟時 busuanzi 的 page_pv 不顯示的 bug closed #902
fix: 修復 pjax 下，使用 mermaid 跳轉會重新加載的 bug

README.md

@@ -1,5 +1,7 @@
 <div align="right">
-<a title="Chinese" href="/README_CN.md">中文</a>
+  Language:
+  🇺🇸
+  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
 </div>
 
 # hexo-theme-butterfly
@@ -12,9 +14,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-📢 Demo: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
 
-📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) || [Chinese](https://butterfly.js.org/posts/21cfbf15/)
+Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
@@ -60,26 +62,26 @@ npm i hexo-theme-butterfly
 
 - [x] Card UI Design
 - [X] Support sub-menu
-- [x] Two-column layout
+- [x] Two Column designs
 - [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] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean/mac/mac light), also support customization
+- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
 - [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 Search/Local Search)
+- [X] Search (Algolia SearchZ/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 (Sharejs/Addtoany)
+- [x] Share (AddThis/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/Crisp/messenger)
+- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp/messenger)
 - [x] Web analytics
 - [x] Google AdSense
 - [x] Webmaster Verification

README_CN.md

@@ -1,5 +1,7 @@
 <div align="right">
-  <a title="English" href="/README.md">English</a>
+  語言:
+  中文
+  <a title="English" href="/README.md">英文</a>
 </div>
 
 # hexo-theme-butterfly
@@ -12,9 +14,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-📢 預覽: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
 
-📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) || [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
+文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
@@ -70,16 +72,16 @@ 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] 多種分享系統（Sharejs/Addtoany）
+- [x] 多種分享系統（AddThis/Sharejs/Addtoany）
 - [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp/messenger）
 - [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
 - [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）

_config.yml

@@ -1,13 +1,7 @@
-# Navigation bar settings (導航欄設置)
+# Main menu navigation (導航目錄)
-# see https://butterfly.js.org/posts/4aa8abbe/##導航欄設置-Navigation-bar-settings
+# see https://butterfly.js.org/posts/4aa8abbe/#導航菜單
 # --------------------------------------
 
-nav:
-  logo: # image
-  display_title: true
-  fixed: false # fixed navigation bar
-
-# Menu 目錄
 menu:
   # Home: / || fas fa-home
   # Archives: /archives/ || fas fa-archive
@@ -29,12 +23,54 @@ highlight_shrink: false # true: shrink the code blocks / false: expand the code
 highlight_height_limit: false # unit: px
 code_word_wrap: false
 
-# Social Settings (社交圖標設置)
+# copy settings
+# copyright: Add the copyright information after copied content (複製的內容後面加上版權信息)
+copy:
+  enable: true
+  copyright:
+    enable: false
+    limit_count: 50
+
+# social settings (社交圖標設置)
 # formal:
-#   icon: link || the description || color
+#   icon: link || the description
 social:
-  # fab fa-github: https://github.com/xxxxx || Github || '#24292e'
+  # fab fa-github: https://github.com/xxxxx || Github
-  # fas fa-envelope: mailto:xxxxxx@gmail.com || Email || '#4a7dbe'
+  # 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
 
 # Image (圖片設置)
 # --------------------------------------
@@ -114,6 +150,14 @@ 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)
@@ -125,21 +169,11 @@ index_post_content:
 
 # anchor
 anchor:
-  # when you scroll, the URL will update according to header id.
+  button:
-  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
-    limit_count: 50
+    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.
 
 # Post
 # --------------------------------------
@@ -151,7 +185,6 @@ toc:
   number: true
   expand: false
   style_simple: false # for post
-  scroll_percent: true
 
 post_copyright:
   enable: true
@@ -163,7 +196,6 @@ post_copyright:
 # Sponsor/reward
 reward:
   enable: false
-  text:
   QR_code:
     # - img: /img/wechat.jpg
     #   link:
@@ -186,6 +218,9 @@ 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
@@ -202,188 +237,14 @@ noticeOutdate:
   message_prev: It has been
   message_next: days since the last update, the content of the article may be outdated.
 
-# Footer Settings
+# Share System (分享功能)
-# --------------------------------------
-footer:
-  owner:
-    enable: true
-    since: 2020
-  custom_text:
-  copyright: true # Copyright of theme and framework
-
-# aside (側邊欄)
 # --------------------------------------
 
-aside:
+# AddThis
-  enable: true
+# https://www.addthis.com/
-  hide: false
+addThis:
-  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
-    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
-  publish_date:
+  pubid:
-
-# 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
@@ -535,11 +396,17 @@ tidio:
   public_key:
 
 # daovoice
-# http://dashboard.daovoice.io/app
+# http://daovoice.io/
 daovoice:
   enable: false
   app_id:
 
+# gitter
+# https://gitter.im/
+gitter:
+  enable: false
+  room:
+
 # crisp
 # https://crisp.chat/en/
 crisp:
@@ -553,6 +420,15 @@ 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
 # --------------------------------------
 
@@ -564,6 +440,10 @@ baidu_analytics:
 # https://analytics.google.com/analytics/web/
 google_analytics:
 
+# CNZZ Analytics
+# https://www.umeng.com/
+cnzz_analytics:
+
 # Cloudflare Analytics
 # https://www.cloudflare.com/zh-tw/web-analytics/
 cloudflare_analytics:
@@ -635,9 +515,6 @@ 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)
@@ -646,25 +523,12 @@ 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 (背景特效)
 # --------------------------------------
 
@@ -693,6 +557,14 @@ 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
@@ -705,7 +577,7 @@ click_heart:
   mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
-clickShowText:
+ClickShowText:
   enable: false
   text:
     # - I
@@ -751,13 +623,16 @@ subtitle:
   enable: false
   # Typewriter Effect (打字效果)
   effect: true
-  # Customize typed.js (配置typed.js)
+  # Effect Speed Options (打字效果速度參數)
-  # https://github.com/mattboldt/typed.js/#customization
+  startDelay: 300 # time before typing starts in milliseconds
-  typed_option:
+  typeSpeed: 150 # type speed in milliseconds
+  backSpeed: 50 # backspacing speed in milliseconds
+  # loop (循環打字)
+  loop: true
   # source 調用第三方服務
   # source: false 關閉調用
   # source: 1  調用一言網的一句話（簡體） https://hitokoto.cn/
-  # source: 2  調用一句網（簡體） https://yijuzhan.com/
+  # source: 2  調用一句網（簡體） http://yijuzhan.com/
   # source: 3  調用今日詩詞（簡體） https://www.jinrishici.com/
   # subtitle 會先顯示 source , 再顯示 sub 的內容
   source: false
@@ -774,13 +649,117 @@ preloader:
   # pace theme (see https://codebyzach.github.io/pace/)
   pace_css_url:
 
-# wordcount (字數統計)
+# aside (側邊欄)
-# see https://butterfly.js.org/posts/ceeb73f/#字數統計
+# --------------------------------------
-wordcount:
+
+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:
   enable: false
-  post_wordcount: true
+  publish_date:
-  min2read: true
+
-  total_wordcount: true
+# 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
+
+# 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
 
 # Lightbox (圖片大圖查看模式)
 # --------------------------------------
@@ -791,25 +770,12 @@ wordcount:
 medium_zoom: false
 
 # fancybox
-# https://fancyapps.com/fancybox/
+# http://fancyapps.com/fancybox/3/
 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:
@@ -928,7 +894,7 @@ CDN:
   # when set it to local, you need to install hexo-butterfly-extjs
   third_party_provider: jsdelivr
 
-  # Add version number to url, true or false
+  # Add version number to CDN, true or false  
   version: false
 
   # Custom format
@@ -936,58 +902,54 @@ CDN:
   custom_format:
 
   option:
-    # abcjs_basic_js:
+    # main_css:
-    # activate_power_mode:
+    # main:
+    # utils:
+    # translate:
+    # local_search:
     # algolia_js:
-    # algolia_search:
+    # algolia_search_v4:
-    # aplayer_css:
+    # instantsearch_v4:
-    # aplayer_js:
+    # pjax:
-    # 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:
+    # blueimp_md5:
-    # instantpage:
+    # valine:
-    # instantsearch:
+    # disqusjs:
-    # katex:
+    # disqusjs_css:
-    # katex_copytex:
+    # twikoo:
-    # lazyload:
+    # waline_js:
-    # local_search:
+    # waline_css:
-    # main:
-    # main_css:
-    # mathjax:
-    # medium_zoom:
-    # mermaid:
-    # meting_js:
-    # pangu:
-    # prismjs_autoloader:
-    # prismjs_js:
-    # prismjs_lineNumber_js:
-    # pjax:
     # sharejs:
     # sharejs_css:
-    # snackbar:
+    # mathjax:
-    # snackbar_css:
+    # katex:
-    # translate:
+    # katex_copytex:
-    # twikoo:
+    # mermaid:
+    # canvas_ribbon:
+    # canvas_fluttering_ribbon:
+    # canvas_nest:
+    # lazyload:
+    # instantpage:
     # typed:
-    # utils:
+    # pangu:
-    # valine:
+    # fancybox_css_v4:
-    # waline_css:
+    # fancybox_v4:
-    # waline_js:
+    # medium_zoom:
+    # snackbar_css:
+    # snackbar:
+    # activate_power_mode:
+    # fireworks:
+    # click_heart:
+    # ClickShowText:
+    # fontawesomeV6:
+    # flickr_justified_gallery_js:
+    # flickr_justified_gallery_css:
+    # aplayer_css:
+    # aplayer_js:
+    # meting_js:
+    # prismjs_js:
+    # prismjs_lineNumber_js:
+    # prismjs_autoloader:
+    # artalk_js:
+    # artalk_css:

languages/default.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy Successful
+  success: Copy successfully
-  error: Copy Error
+  error: Copy error
-  noSupport: Browser Not Supported
+  noSupport: The browser does not support
 
 page:
   articles: Articles
@@ -15,15 +15,16 @@ page:
 
 card_post_count: comments
 
-no_title: Untitled
+sticky: Sticky
+no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word Count
+  wordcount: Word count
-  min2read: Reading Time
+  min2read: Reading time
-  min2read_unit: mins
+  min2read_unit: min
-  page_pv: Post Views
+  page_pv: Post View
   comments: Comments
   copyright:
     author: Author
@@ -44,11 +45,10 @@ 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
+  prev: Previous Post
-  next: Next
+  next: Next Post
 
 comment: Comment
 
@@ -65,33 +65,32 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Runtime
+      name: Run time
       unit: days
     last_push_date:
-      name: Last Update
+      name: Last Push
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: View More
+  more_button: More
   card_newest_comments:
-    headline: Latest Comments
+    headline: Newest Comments
     loading_text: loading...
-    error: Unable to retrieve comments, please check the configuration
+    error: Unable to get the data, please make sure the settings are correct.
-    zero: No comments
+    zero: No Comment
     image: image
     link: link
     code: code
-  card_toc: Contents
+  card_toc: Catalog
-  card_post_series: Series
 
 date_suffix:
-  just: Just now
+  just: Just
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Sponsor
+donate: Donate
 share: Share
 
 rightside:
@@ -102,7 +101,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:
@@ -112,12 +111,11 @@ 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: You have switched to Traditional Chinese
+  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: You have switched to Simplified Chinese
+  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: You have switched to Dark Mode
+  day_to_night: Dark Mode Activated Manually
-  night_to_day: You have switched to Light Mode
+  night_to_day: Light Mode Activated Manually
 
 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 Successful
+  success: Copy successfully
-  error: Copy Error
+  error: Copy error
-  noSupport: Browser Not Supported
+  noSupport: The browser does not support
 
 page:
   articles: Articles
@@ -15,15 +15,16 @@ page:
 
 card_post_count: comments
 
-no_title: Untitled
+sticky: Sticky
+no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word Count
+  wordcount: Word count
-  min2read: Reading Time
+  min2read: Reading time
-  min2read_unit: mins
+  min2read_unit: min
-  page_pv: Post Views
+  page_pv: Post View
   comments: Comments
   copyright:
     author: Author
@@ -44,11 +45,10 @@ 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
+  prev: Previous Post
-  next: Next
+  next: Next Post
 
 comment: Comment
 
@@ -65,44 +65,43 @@ aside:
     headline: Info
     article_name: Article
     runtime:
-      name: Runtime
+      name: Run time
       unit: days
     last_push_date:
-      name: Last Update
+      name: Last Push
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: View More
+  more_button: More
   card_newest_comments:
-    headline: Latest Comments
+    headline: Newest Comments
     loading_text: loading...
-    error: Unable to retrieve comments, please check the configuration
+    error: Unable to get the data, please make sure the settings are correct.
-    zero: No comments
+    zero: No Comment
     image: image
     link: link
     code: code
-  card_toc: Contents
+  card_toc: Catalog
-  card_post_series: Series
 
 date_suffix:
-  just: Just now
+  just: Just
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Sponsor
+donate: Donate
 share: Share
 
 rightside:
   readmode_title: Read Mode
-  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  translate_title: Switch Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Toggle Between Light And Dark Mode
+  night_mode_title: Switch 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:
@@ -112,12 +111,11 @@ 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: You have switched to Traditional Chinese
+  chs_to_cht: Traditional Chinese Activated Manually
-  cht_to_chs: You have switched to Simplified Chinese
+  cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: You have switched to Dark Mode
+  day_to_night: Dark Mode Activated Manually
-  night_to_day: You have switched to Light Mode
+  night_to_day: Light Mode Activated Manually
 
 loading: Loading...
-load_more: Load More
 
-error404: Page Not Found
+error404: Page not found

languages/zh-CN.yml

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

languages/zh-TW.yml

@@ -15,7 +15,8 @@ page:
 
 card_post_count: 條評論
 
-no_title: 無標題
+sticky: 置頂
+no_title: 無題
 
 post:
   created: 發表於
@@ -45,8 +46,7 @@ search:
   local_search:
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
-    hits_stats: '共找到 ${hits} 篇文章'
+
-    
 pagination:
   prev: 上一篇
   next: 下一篇
@@ -83,7 +83,6 @@ aside:
     link: 連結
     code: 程式碼
   card_toc: 目錄
-  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -92,14 +91,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: 設定
@@ -110,15 +109,14 @@ copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體中文
+  chs_to_cht: 你已切換為繁體
-  cht_to_chs: 你已切換為簡體中文
+  cht_to_chs: 你已切換為簡體
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 
 loading: 載入中...
-load_more: 載入更多
 
 error404: 頁面沒有找到

layout/archive.pug

@@ -3,6 +3,7 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    .article-sort-title= `${_p('page.articles')} - ${getArchiveLength()}`
+    - const archiveLength = findArchiveLength(fragment_cache)
+    .article-sort-title= _p('page.articles') + ' - ' + archiveLength
     +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))
+    script(src=url_for(theme.asset.fancybox_v4))
 
   if theme.instantpage
     script(src=url_for(theme.asset.instantpage), type='module')
@@ -22,6 +22,14 @@ 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 })
@@ -31,8 +39,6 @@ div
 
     include ./third-party/math/index.pug
 
-    include ./third-party/abcjs/index.pug
-
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
@@ -60,6 +66,4 @@ div
     != partial("includes/third-party/pjax", {}, { cache: true })
 
   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')
+    script(async data-pjax src='//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,viewport-fit=cover")
+meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no")
 title= tabTitle
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
@@ -26,7 +26,7 @@ meta(name="theme-color" content=themeColor)
 include ./head/Open_Graph.pug
 
 !=favicon_tag(theme.favicon || config.favicon)
-link(rel="canonical" href=urlNoIndex(null,config.pretty_urls.trailing_index,config.pretty_urls.trailing_html))
+link(rel="canonical" href=urlNoIndex())
 
 //- 預解析
 !=partial('includes/head/preconnect', {}, {cache: true})
@@ -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.fontawesome) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'")
 
 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) media="print" onload="this.media='all'")
+  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css_v4) media="print" onload="this.media='all'")
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})
@@ -55,14 +55,15 @@ 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/Open_Graph.pug

@@ -1,9 +1,8 @@
 if theme.Open_Graph_meta.enable
   -
-    const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
     let ogOption = Object.assign({
       type: is_post() ? 'article' : 'website',
-      image: coverVal ? full_url_for(coverVal) : '',
+      image: (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : '',
       fb_admins: theme.facebook_comments.user_id || '',
       fb_app_id: theme.facebook_comments.app_id || '',
     }, theme.Open_Graph_meta.option)

layout/includes/head/analytics.pug

@@ -16,6 +16,9 @@ if theme.google_analytics
     gtag('js', new Date());
     gtag('config', '!{theme.google_analytics}');
 
+if theme.cnzz_analytics
+  script(async data-pjax src=`https://s4.cnzz.com/z_stat.php?id=${theme.cnzz_analytics}&web_id=${theme.cnzz_analytics}`)
+
 if theme.cloudflare_analytics
   script(defer data-pjax src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon=`{"token": "${theme.cloudflare_analytics}"}`)
 

layout/includes/head/config.pug

@@ -21,12 +21,9 @@
     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"),
       }
     })
   }
@@ -88,7 +85,7 @@
   }
 
 script.
-  const GLOBAL_CONFIG = {
+  const GLOBAL_CONFIG = { 
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -105,7 +102,7 @@ script.
       post: !{theme.post_meta.post.date_format === 'relative'}
     },
     runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
-    dateSuffix: {
+    date_suffix: {
       just: '!{_p("date_suffix.just")}',
       min: '!{_p("date_suffix.min")}',
       hour: '!{_p("date_suffix.hour")}',
@@ -115,16 +112,13 @@ script.
     copyright: !{copyright},
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
-    infinitegrid: {
+    source: {
-      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
+      justifiedGallery: {
-      buttonText: '!{_p("load_more")}'
+        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
+        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
+      }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
-    isAnchor: !{theme.anchor.auto_update || false},
+    isAnchor: !{theme.anchor.auto_update || false}
-    percent: {
-      toc: !{theme.toc.scroll_percent},
-      rightside: !{theme.rightside_scroll_percent},
-    },
-    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

layout/includes/head/noscript.pug

@@ -0,0 +1,14 @@
+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,20 +1,4 @@
--
+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='')
@@ -22,6 +6,9 @@ if theme.google_analytics
 if theme.baidu_analytics
   link(rel="preconnect" href="//hm.baidu.com")
 
+if theme.cnzz_analytics
+  link(rel="preconnect" href="//s4.cnzz.com")
+
 if theme.cloudflare_analytics
   link(rel="preconnect" href="//static.cloudflareinsights.com")
 
@@ -31,5 +18,5 @@ if theme.microsoft_clarity
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
   link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')
 
-if !theme.asset.busuanzi && (theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv)
+if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
   link(rel="preconnect" href="//busuanzi.ibruce.info")

layout/includes/header/index.pug

@@ -1,6 +1,6 @@
 if !theme.disable_top_img && page.top_img !== false
   if is_post()
-    - var top_img = page.top_img || page.cover || theme.default_top_img
+    - var top_img = page.top_img || page.cover || page.randomcover
   else if is_page()
     - var top_img = page.top_img || theme.default_top_img
   else if is_tag()
@@ -17,7 +17,7 @@ if !theme.disable_top_img && page.top_img !== false
     - var top_img = page.top_img || theme.default_top_img
 
   if top_img !== false
-    - var imgSource = top_img && isImgOrUrl(top_img) ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''
     - var site_title = page.title || page.tag || page.category || config.title
     - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
@@ -28,9 +28,7 @@ else
   - var top_img = false
   - var isHomeClass = 'not-top-img'
 
-- const isFixedClass = theme.nav.fixed ? ' fixed' : ''
+header#page-header(class=isHomeClass style=bg_img)
-
-header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
   !=partial('includes/header/nav', {}, {cache: true})
   if top_img !== false
     if is_post()
@@ -44,7 +42,7 @@ header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
             span#subtitle
         if(theme.social)
           #site_social_icons
-            !=partial('includes/header/social', {}, {cache: true})
+            !=fragment_cache('social', function(){return partial('includes/header/social')})
       #scroll-down
         i.fas.fa-angle-down.scroll-down-effects
     else

layout/includes/header/nav.pug

@@ -1,21 +1,17 @@
 nav#nav
-  span#blog-info
+  span#blog_name
-    a(href=url_for('/') title=config.title)
+    a#site-name(href=url_for('/')) #[=config.title]
-      if theme.nav.logo
-        img.site-icon(src=url_for(theme.nav.logo))
-      if theme.nav.display_title
-        span.site-name=config.title
     
   #menus
-    if (theme.algolia_search.enable || theme.local_search.enable || theme.docsearch.enable)
+    if (theme.algolia_search.enable || theme.local_search.enable)
       #search-button
-        a.site-page.social-icon.search(href="javascript:void(0);")
+        a.site-page.social-icon.search
           i.fas.fa-search.fa-fw
           span=' '+_p('search.title')
     !=partial('includes/header/menu_item', {}, {cache: true})
 
     #toggle-menu
-      a.site-page(href="javascript:void(0);")
+      a.site-page
         i.fas.fa-bars.fa-fw
 
 

layout/includes/header/post-info.pug

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

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 style=url.split('||')[2] === undefined ? '' : `color: ${trim(url.split('||')[2]).replace(/[\'\"]/g, '')};`)
+    i(class=icon)

layout/includes/layout.pug

@@ -33,7 +33,7 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
           if (footerBg === true)
             - var footer_bg = bg_img
           else
-            - var footer_bg = isImgOrUrl(theme.footer_bg) ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
+            - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
         else
           - var footer_bg = ''
 
@@ -44,4 +44,5 @@ 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,25 +9,20 @@
     .loading-word= _p('loading')
 
 script.
-  (()=>{
+  const preloader = {
-    const $loadingBox = document.getElementById('loading-box')
+    endLoading: () => {
-    const $body = document.body
+      document.body.style.overflow = 'auto';
-    const preloader = {
+      document.getElementById('loading-box').classList.add("loaded")
-      endLoading: () => {
+    },
-        $body.style.overflow = ''
+    initLoading: () => {
-        $loadingBox.classList.add('loaded')
+      document.body.style.overflow = '';
-      },
+      document.getElementById('loading-box').classList.remove("loaded")
-      initLoading: () => {
-        $body.style.overflow = 'hidden'
-        $loadingBox.classList.remove('loaded')
-      }
-    }
 
-    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() })
     }
-  })()
+  }
+  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,11 +1,2 @@
-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/article-sort.pug

@@ -11,10 +11,7 @@ mixin articleSort(posts)
       .article-sort-item(class=no_cover)
         if article.cover && theme.cover.archives_enable
           a.article-sort-item-img(href=url_for(article.path) title=title)
-            if article.cover_type === 'img'
+            img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
-              img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
-            else
-              div(style=`background: ${article.cover}`)
         .article-sort-item-info
           .article-sort-item-time
             i.far.fa-calendar-alt

layout/includes/mixins/post-ui.pug

@@ -14,16 +14,15 @@ mixin postUI(posts)
       if post_cover && theme.cover.index_enable
         .post_cover(class=leftOrRight)
           a(href=url_for(link) title=title)
-            if article.cover_type === 'img'
+            img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
-              img.post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-            else
-              div.post-bg(style=`background: ${post_cover}`)
       .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)
+        a.article-title(href=url_for(link) title=title)= title
-          if (is_home() && (article.top || article.sticky > 0))
-            i.fas.fa-thumbtack.sticky
-          = title
         .article-meta-wrap
+          if (is_home() && (article.top || article.sticky > 0))
+            span.article-meta
+              i.fas.fa-thumbtack.sticky
+              span.sticky= _p('sticky')
+              span.article-meta-separator |
           if (theme.post_meta.page.date_type)
             span.post-meta-date
               if (theme.post_meta.page.date_type === 'both')
@@ -68,13 +67,17 @@ mixin postUI(posts)
                 block
               span.article-meta-label= ' ' + _p('card_post_count')
           
-          if theme.comments.card_post_count && theme.comments.use
+          if theme.comments.card_post_count
             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.disqus-count(href=full_url_for(link) + '#post-comment')
+                  a(href=full_url_for(link) + '#disqusjs')
-                    i.fa-solid.fa-spinner.fa-spin
+                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
@@ -83,7 +86,7 @@ mixin postUI(posts)
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
-                    span.waline-comment-count(data-path=url_for(link))
+                    span.waline-comment-count(id=url_for(link))
                       i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex

layout/includes/page/flink.pug

@@ -1,10 +1,7 @@
 #article-container
   .flink
-    - let { content, random, flink_url } = page
+    - let pageContent = page.content
-    - let pageContent = content
+    if page.flink_url
-
-    if flink_url || random
-      - const linkData = flink_url ? false : site.data.link || false
       script.
         (()=>{
           const replaceSymbol = (str) => {
@@ -12,45 +9,34 @@
           }
 
           let result = ""
-          const add = (str) => {
+          fetch("!{url_for(page.flink_url)}")
-            for(let i = 0; i < str.length; i++){
+            .then(response => response.json())
-              const replaceClassName = replaceSymbol(str[i].class_name)
+            .then(str => {
-              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>` : ""
+              for(let i = 0; i < str.length; i++){
-              const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
+                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>`
+                }
 
-              let listResult = ""
+                result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
-              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>`
               }
 
-              result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+              document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-            }
+            })
-
-            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
@@ -80,3 +66,4 @@
 
         - pageContent = result + pageContent
     != pageContent
+

layout/includes/page/tags.pug

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

layout/includes/pagination.pug

@@ -13,23 +13,19 @@ if is_post()
     if(prev)
       - var hasPageNext = next ? 'pull-left' : 'pull-full'
       .prev-post(class=hasPageNext)
-        a(href=url_for(prev.path) title=prev.title)
+        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
-          if prev.cover_type === 'img'
+        a(href=url_for(prev.path))
-            img.cover(src=url_for(prev.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
+          img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
-          else
-            .cover(style=`background: ${prev.cover || 'var(--default-bg-color)'}`)
           .pagination-info
             .label=_p('pagination.prev')
             .prev_info=prev.title
           
     if(next)
       - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
+      - var pagination_cover = next.cover == false ? next.randomcover : next.cover
       .next-post(class=hasPagePrev)
-        a(href=url_for(next.path) title=next.title)
+        a(href=url_for(next.path))
-          if next.cover_type === 'img'
+          img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
-            img.cover(src=url_for(next.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
-          else
-            .cover(style=`background: ${next.cover || 'var(--default-bg-color)'}`)
           .pagination-info
             .label=_p('pagination.next')
             .next_info=next.title

layout/includes/post/post-copyright.pug

@@ -5,19 +5,13 @@ 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
+      span.post-copyright-meta= _p('post.copyright.author') + ": "
-        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
+      span.post-copyright-meta= _p('post.copyright.link') + ": "
-        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
+      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
-        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
-    = theme.reward.text || _p('donate')
+    = ' ' + _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,20 +42,19 @@ 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
       +rightsideItem(showArray)
 
     button#go-up(type="button" title=_p("rightside.back_to_top"))
-      span.scroll-percent
       i.fas.fa-arrow-up

layout/includes/sidebar.pug

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

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

@@ -1,15 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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,34 +2,19 @@
 
 script.
   (() => {
-    const getArtalkCount = async() => {
+    const getArtalkCount = () => {
-      try {
+      const runWidget = () => {
-        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
+        Artalk.LoadCountWidget({
-        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
+          server: '!{server}',
-
+          site: '!{site}',
-        const headerList = {
+          countEl: '.artalk-count'
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Origin': window.location.origin
-          },
-          body: new URLSearchParams({
-            'site_name': '!{site}',
-            'type':'page_comment',
-            'page_keys': keyArray
-          })
-        }
-
-        const res = await fetch('!{server}/api/stat', 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,25 +1,16 @@
-- const { shortname, apikey } = theme.disqus
 script.
   (() => {
-    const getCount = async () => {
+    const getCount = () => {
-      try {
+      if (window.DISQUSWIDGETS === undefined) {
-        const eleGroup = document.querySelectorAll('#recent-posts .disqus-count')
+        var d = document, s = d.createElement('script');
-        const cleanedLinks = Array.from(eleGroup).map(i => `thread:link=${i.href.replace(/#post-comment$/, '')}`);
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-
+        s.id = 'dsq-count-scr';
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&${cleanedLinks.join('&')}`,{
+        (d.head || d.body).appendChild(s);
-          method: 'GET'
+      } else {
-        })
+        DISQUSWIDGETS.getCount({reset: true});
-        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 = 'v16.0'
+- const fbSDKVer = 'v15.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.textContent = res[index].count
+            item.innerText = res[index].count
           })
         }).catch(function (err) {
           console.log(err)

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

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

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

@@ -1,50 +1,33 @@
 //- https://chatra.io/help/api/
 script.
-  (() => {
+  (function(d, w, c) {
-    const isChatBtn = !{theme.chat_btn}
+      w.ChatraID = '#{theme.chatra.id}';
-    const isChatHideShow = !{theme.chat_hide_show}
+      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');
 
-    if (isChatBtn) {
+  if (!{theme.chat_btn}) {
-      const close = () => {
+    var chatBtnFn = () => {
-        Chatra('minimizeWidget')
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        Chatra('openChat')
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
         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,45 +1,36 @@
 script.
-  (() => {
+  window.$crisp = [];
-    window.$crisp = [];
+  window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
-    window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
+  (function () {
-    (function () {
+    d = document;
-      d = document;
+    s = d.createElement("script");
-      s = d.createElement("script");
+    s.src = "https://client.crisp.chat/l.js";
-      s.src = "https://client.crisp.chat/l.js";
+    s.async = 1;
-      s.async = 1;
+    d.getElementsByTagName("head")[0].appendChild(s);
-      d.getElementsByTagName("head")[0].appendChild(s);
+  })();
-    })();
+  $crisp.push(["safe", true])
-    $crisp.push(["safe", true])
 
-    const isChatBtn = !{theme.chat_btn}
+  if (!{theme.chat_btn}) {
-    const isChatHideShow = !{theme.chat_hide_show}
+    $crisp.push(["do", "chat:hide"])
-
+    $crisp.push(["on", "chat:closed", function() {
-    if (isChatBtn) {
+      $crisp.push(["do", "chat:hide"])
-      const open = () => {
+    }])
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
         $crisp.push(["do", "chat:show"])
         $crisp.push(["do", "chat:open"])
-      }
 
-      const close = () => {
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
         $crisp.push(["do", "chat:hide"])
       }
-
+      function chatBtnShow () {
-      close()
+        $crisp.push(["do", "chat:show"])
-      $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")
 
-    const isChatBtn = !{theme.chat_btn}
+script.
-    const isChatHideShow = !{theme.chat_hide_show}
+  var isChatBtn = !{theme.chat_btn}
+  daovoice('init', {
+    app_id: '!{theme.daovoice.app_id}',},{
+    launcher: { 
+       disableLauncherIcon: isChatBtn // 悬浮 ICON 是否显示
+    },
+  });
+  daovoice('update');
 
-    daovoice('init', {
+  if (isChatBtn) {
-      app_id: '!{theme.daovoice.app_id}',},{
+    var chatBtnFn = () => {
-      launcher: { 
+      var chatBtn = document.getElementById("chat_btn")
-        disableLauncherIcon: isChatBtn
+      chatBtn.addEventListener("click", function(){
-      },
+        daovoice('show')
-    });
+      });
-    daovoice('update');
+    }
-
+    chatBtnFn()
-    if (isChatBtn) {
+  } else {
-      window.chatBtnFn = () => {
+    if (!{theme.chat_hide_show}) {
-        const isShow = document.getElementById('daodream-messenger').classList.contains('daodream-messenger-active')
+      function chatBtnHide () {
-        isShow ? daovoice('hide') : daovoice('show')
+        daovoice('update', {},{
+          launcher: { 
+          disableLauncherIcon: true // 悬浮 ICON 是否显示
+          },
+        });
       }
-    } else if (isChatHideShow) {
+      function chatBtnShow () {
-      window.chatBtn = {
+        daovoice('update', {},{
-        hide: () => {
+          launcher: { 
-          daovoice('update', {},{
+          disableLauncherIcon: false // 悬浮 ICON 是否显示
-            launcher: {
+          },
-              disableLauncherIcon: true
+        });
-            }
-          })
-        },
-        show: () => {
-          daovoice('update', {}, {
-            launcher: {
-              disableLauncherIcon: false
-            }
-          })
-        }
       }
     }
-  })()
+  }

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

@@ -0,0 +1,43 @@
+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,6 +4,8 @@ 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,41 +4,39 @@
 #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() {
+  window.fbAsyncInit = function() {
-      FB.init({
+    FB.init({
-        xfbml: true,
+      xfbml: true,
-        version: 'v16.0'
+      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();
       });
-    };
+    }
-
+    chatBtnFn()
-    (function(d, s, id) {
+  } else {
-      var js, fjs = d.getElementsByTagName(s)[0];
+    if (!{theme.chat_hide_show}) {
-      if (d.getElementById(id)) return;
+      function chatBtnHide () {
-      js = d.createElement(s); js.id = id;
+        FB.CustomerChat.hide()
-      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) {
+      function chatBtnShow () {
-      window.chatBtn = {
+        FB.CustomerChat.show(false)
-        hide: () => {
-          FB.CustomerChat.hide()
-        },
-        show: () => {
-          FB.CustomerChat.show(false)
-        }
       }
     }
-  })()
+  }
 

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

@@ -1,45 +1,41 @@
 script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async)
-script.
-  (() => {
-    const isChatBtn = !{theme.chat_btn}
-    const isChatHideShow = !{theme.chat_hide_show}
 
-    if (isChatBtn) {
+if theme.chat_btn
-      let isShow = false
+  script.
-      const close = () => {
+    function onTidioChatApiReady() {
-        window.tidioChatApi.hide()
+      window.tidioChatApi.hide();
-        isShow = false
+      window.tidioChatApi.on("close", function() {
-      }
+        window.tidioChatApi.hide();
-      
+      });
-      const open = () => {
+    }
-        window.tidioChatApi.open()
+    if (window.tidioChatApi) {
-        window.tidioChatApi.show()
+      window.tidioChatApi.on("ready", onTidioChatApiReady);
-        isShow = true
+    } else {
-      }
+      document.addEventListener("tidioChat-ready", onTidioChatApiReady);
+    }
 
-      const onTidioChatApiReady = () => {
+    var chatBtnFn = () => {
-        window.tidioChatApi.hide()
+      document.getElementById("chat_btn").addEventListener("click", function(){
-        window.tidioChatApi.on("close", close)
+        window.tidioChatApi.show();
-      }
+        window.tidioChatApi.open();
+      });
+    }
+    chatBtnFn()
+
+else if theme.chat_hide_show
+  script.
+    function chatBtnHide () {
       if (window.tidioChatApi) {
-        window.tidioChatApi.on("ready", onTidioChatApiReady)
+        //- window.tidioChatApi.hide();
-      } else {
+        document.getElementById('tidio-chat').style.display= 'none'
-        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,9 +1,15 @@
 - const { server, site, option } = theme.artalk
-- const { use, lazyload } = theme.comments
 
 script.
-  (() => {
+  function addArtalkSource () {
-    const initArtalk = () => {
+    const ele = document.createElement('link')
+    ele.rel = 'stylesheet'
+    ele.href= '!{theme.asset.artalk_css}'
+    document.getElementsByTagName('head')[0].appendChild(ele)
+  }
+
+  function loadArtalk () {
+    function initArtalk () {
       window.artalkItem = new Artalk(Object.assign({
         el: '#artalk-wrap',
         server: '!{server}',
@@ -12,41 +18,28 @@ script.
         darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
         countEl: '.artalk-count'
       },!{JSON.stringify(option)}))
-
-      if (GLOBAL_CONFIG.lightbox === 'null') return
-      window.artalkItem.use(ctx => {
-        ctx.on('list-loaded', () => {
-          ctx.getCommentList().forEach(comment => {
-            const $content = comment.getRender().$content
-            btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
-          })
-        })
-      })
     }
 
-    const loadArtalk = async () => {
+    if (typeof window.artalkItem === 'object') setTimeout(()=>{initArtalk()},200)
-      if (typeof window.artalkItem === 'object') initArtalk()
+    else {
-      else {
+      addArtalkSource()
-        await getCSS('!{theme.asset.artalk_css}')
+      typeof Artalk !== 'function' ? getScript('!{theme.asset.artalk_js}').then(initArtalk)
-        await getScript('!{theme.asset.artalk_js}')
+                                  : setTimeout(()=>{initArtalk()},200)
-        initArtalk()
-      }
     }
+  }
+
+  document.getElementById('darkmode').addEventListener('click',()=> {
+    if (typeof window.artalkItem !== 'object') return
+    let isDark = document.documentElement.getAttribute('data-theme') === 'dark'
+    window.artalkItem.setDarkMode(!isDark)
+  })
 
-    const artalkChangeMode = theme => {
-      const artalkWrap = document.getElementById('artalk-wrap')
-      if (!(artalkWrap && artalkWrap.children.length)) return
-      const isDark = theme === 'dark'
-      window.artalkItem.setDarkMode(isDark)
-    }
   
-
+  if ('!{theme.comments.use[0]}' === 'Artalk' || !!{theme.comments.lazyload}) {
-    btf.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
-    
+    else loadArtalk()
-    if ('!{use[0]}' === 'Artalk' || !!{lazyload}) {
+  } else {
-      if (!{lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+    function loadOtherComment () {
-      else loadArtalk()
+      loadArtalk()
-    } else {
-      window.loadOtherComment = loadArtalk
     }
-  })()
+  }

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

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

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

@@ -1,19 +1,25 @@
 - let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
-- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  (() => {
+  function loadDisqusjs () {
-    const initDisqusjs = () => {
+    function addDisqusjsCSS () {
+      const ele = document.createElement('link')
+      ele.rel = 'stylesheet'
+      ele.href= '!{url_for(theme.asset.disqusjs_css)}'
+      document.getElementsByTagName('head')[0].appendChild(ele)
+    }
+
+    function initDisqusjs () {
       window.disqusjs = null
       disqusjs = new DisqusJS(Object.assign({
-        shortname: '!{dqShortname}',
+        shortname: '!{theme.disqusjs.shortname}',
         identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
-        apikey: '!{dqApikey}',
+        apikey: '!{theme.disqusjs.apikey}',
-      },!{JSON.stringify(dqOption)}))
+      },!{JSON.stringify(theme.disqusjs.option)}))
 
-      disqusjs.render(document.getElementById('disqusjs-wrap'))
+      disqusjs.render(document.getElementById('disqusjs'))
     }
 
     const themeChange = () => {
@@ -23,42 +29,36 @@ script.
       initDisqusjs()
     }
 
-    btf.addGlobalFn('themeChange', themeChange, 'disqusjs')
 
-    const loadDisqusjs = async() => {
+    document.getElementById('darkmode').addEventListener('click', themeChange)
-      if (window.disqusJsLoad) initDisqusjs()
+
-      else {
+    if (window.disqusJsLoad) initDisqusjs()
-        await getCSS('!{url_for(theme.asset.disqusjs_css)}')
+    else {
-        await getScript('!{url_for(theme.asset.disqusjs)}')
+      addDisqusjsCSS()
-        initDisqusjs()
+      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
-        window.disqusJsLoad = true
+      window.disqusJsLoad = true
-      }
     }
+  }
 
-    const getCount = async() => {
+  if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-      try {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
-        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
+    else loadDisqusjs()
-        if (!eleGroup) return
+  }
-        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+  else {
-
+    function loadOtherComment () {
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{dqShortname}&api_key=!{dqApikey}&thread:link=${cleanedLinks}`,{
+      loadDisqusjs()
-          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 ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
+
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs-wrap'), loadDisqusjs)
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
-      else {
+  script.
-        loadDisqusjs()
+    if (window.DISQUSWIDGETS === undefined) {
-        !{ theme.comments.count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
+      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 {
-      window.loadOtherComment = loadDisqusjs
+      DISQUSWIDGETS.getCount({reset: true});
     }
-  })()
+

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

@@ -1,46 +1,36 @@
-- const fbSDKVer = 'v16.0'
+- const fbSDKVer = 'v15.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 () {
-    const loadFBComment = () => {
+    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>')
 
-      const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+    const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+    const $fbComment = document.getElementsByClassName('fb-comments')[0]
-      $fbComment.setAttribute('data-colorscheme',themeNow)
+    $fbComment.setAttribute('data-colorscheme',themeNow)
-      $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
+    $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
 
-      if (typeof FB === 'object') {
+    if (typeof FB === 'object') {
-        FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
+      FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
-        FB.XFBML.parse(document.getElementById('post-comment'))
+      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)
+    }   
+  }
 
-    const fbModeChange = theme => {
+  if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
-      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
-      if ($fbComment && typeof FB === 'object') {
+    else loadFBComment()
-        $fbComment.setAttribute('data-colorscheme',theme)
+  } else {
-        FB.XFBML.parse(document.getElementById('post-comment'))
+    function loadOtherComment () {
-      }
+      loadFBComment()
     }
-
+  }
-    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,54 +1,49 @@
-- const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
+- const { repo, repo_id, category_id, option } = theme.giscus
-- const giscusUrl = theme.asset.giscus || 'https://giscus.app/client.js'
+- const themes = theme.giscus.theme
-- const giscusOriginUrl = new URL(giscusUrl).origin
-- const { use, lazyload } = theme.comments
-
 script.
-  (()=>{
+  function loadGiscus () {
-    const getGiscusTheme = theme => {
+    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-      return 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 loadGiscus = () => {
+    sendMessage({
-      const config = Object.assign({
+      setConfig: {
-        src: '!{giscusUrl}',
+        theme: theme
-        '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])
       }
-      document.getElementById('giscus-wrap').appendChild(ele)
+    });
+  }
+
+  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()
     }
-
+  }
-    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,44 +1,48 @@
-- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
-
 script.
-  (() => {
+  function addGitalkSource () {
-    const initGitalk = () => {
+    const ele = document.createElement('link')
-      const gitalk = new Gitalk(Object.assign({
+    ele.rel = 'stylesheet'
-        clientID: '!{client_id}',
+    ele.href= '!{url_for(theme.asset.gitalk_css)}'
-        clientSecret: '!{client_secret}',
+    document.getElementsByTagName('head')[0].appendChild(ele)
-        repo: '!{repo}',
+  }
-        owner: '!{owner}',
+
-        admin: ['!{admin}'],
+  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}'],
         id: '!{md5(page.path)}',
         updateCountCallback: commentCount
-      },!{JSON.stringify(option)}))
+      },!{JSON.stringify(theme.gitalk.option)}))
 
       gitalk.render('gitalk-container')
     }
 
-    const loadGitalk = async() => {
+    if (typeof Gitalk === 'function') initGitalk()
-      if (typeof Gitalk === 'function') initGitalk()
+    else {
-      else {
+      addGitalkSource()
-        await getCSS('!{url_for(theme.asset.gitalk_css)}')
+      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
-        await getScript('!{url_for(theme.asset.gitalk)}')
-        initGitalk()
-      }
     }
-    
+  }
-    const commentCount = n => {
+  
-      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+  function commentCount(n){
-      if (isCommentCount) {
+    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-        isCommentCount.textContent= n
+    if (isCommentCount) {
-      }
+      isCommentCount.innerHTML= n
     }
+  }
 
-    if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
+  if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
-      else loadGitalk()
+    else loadGitalk()
-    } else {
+  } else {
-      window.loadOtherComment = loadGitalk
+    function loadOtherComment () {
+      loadGitalk()
     }
-  })()
+  }
 
 
 

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

@@ -1,5 +1,5 @@
 - let defaultComment = theme.comments.use[0]
-hr.custom-hr
+hr
 #post-comment
   .comment-head
     .comment-headline
@@ -7,9 +7,9 @@ hr.custom-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.custom-hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqusjs-wrap
+            #disqusjs
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'

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

@@ -1,25 +1,26 @@
-- const { use, lazyload } = theme.comments
-
 script.
-  (()=>{
+  function loadLivere () {
-    const loadLivere = () => {
+    if (typeof LivereTower === 'object') {
-      if (typeof LivereTower === 'object') window.LivereTower.init()
+      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');
-      }
     }
+    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 ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
-      else loadLivere()
+    else loadLivere()
-    } else {
+  }
-      window.loadOtherComment = loadLivere
+  else {
+    function loadOtherComment () {
+      loadLivere()
     }
-  })()
+  }

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

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

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

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

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

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

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

@@ -2,8 +2,15 @@
 - const { lazyload, count, use } = theme.comments
 
 script.
-  (() => {
+  function loadWaline () {
-    const initWaline = () => {
+    function insertCSS () {
+      const link = document.createElement("link")
+      link.rel = "stylesheet"
+      link.href = "!{url_for(theme.asset.waline_css)}"
+      document.head.appendChild(link)
+    }
+
+    function initWaline () {
       const waline = Waline.init(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
@@ -14,20 +21,20 @@ script.
       }, !{JSON.stringify(option)}))
     }
 
-    const loadWaline = async () => {
+    if (typeof Waline === 'function') initWaline()
-      if (typeof Waline === 'object') initWaline()
+    else {
-      else {
+      insertCSS()
-        await getCSS('!{url_for(theme.asset.waline_css)}')
+      getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
-        await getScript('!{url_for(theme.asset.waline_js)}')
-        initWaline()
-      }
     }
+  }
 
-    if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+  if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
-      else setTimeout(loadWaline, 0)
+    else setTimeout(loadWaline, 0)
-    } else {
+  } else {
-      window.loadOtherComment = loadWaline
+    function 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)
+    src= url_for(theme.asset.ClickShowText)
-    data-mobile= `${theme.clickShowText.mobile}`
+    data-mobile= `${theme.ClickShowText.mobile}`
-    data-text= theme.clickShowText.text.join(",")
+    data-text= theme.ClickShowText.text.join(",")
-    data-fontsize= theme.clickShowText.fontSize
+    data-fontsize= theme.ClickShowText.fontSize
-    data-random= `${theme.clickShowText.random}`
+    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,7 +21,16 @@ 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]
         }
       }
     }
@@ -34,5 +43,5 @@ script.
   } else {
     MathJax.startup.document.state(0)
     MathJax.texReset()
-    MathJax.typesetPromise()
+    MathJax.typeset()
   }

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

@@ -1,38 +1,26 @@
 script.
   (() => {
-    const $mermaid = document.querySelectorAll('#article-container .mermaid-wrap')
+    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
-    if ($mermaid.length === 0) return
+    if ($mermaidWrap.length) {
-    const runMermaid = () => {
+      window.runMermaid = () => {
-      window.loadMermaid = true
+        window.loadMermaid = true
-      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
+        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
 
-      Array.from($mermaid).forEach((item, index) => {
+        Array.from($mermaidWrap).forEach((item, index) => {
-        const mermaidSrc = item.firstElementChild
+          const mermaidSrc = item.firstElementChild
-        const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
+          const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
-        const mermaidID = 'mermaid-' + index
+          const mermaidID = 'mermaid-' + index
-        const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
+          const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
-
+          mermaid.mermaidAPI.render(mermaidID, mermaidDefinition, (svgCode) => {
-        const renderFn = mermaid.render(mermaidID, mermaidDefinition)
+            mermaidSrc.insertAdjacentHTML('afterend', svgCode)
-
-        const renderV10 = () => {
-          renderFn.then(({svg}) => {
-            mermaidSrc.insertAdjacentHTML('afterend', svg)
           })
-        }
+        })
+      }
 
-        const renderV9 = svg => {
+      const loadMermaid = () => {
-          mermaidSrc.insertAdjacentHTML('afterend', svg)
+        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
-        }
+      }
 
-        typeof renderFn === 'string' ? renderV9(renderFn) : renderV10()
+      window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
-      })
     }
-
-    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, site, option } = theme.artalk
+- const { server, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar && option.gravatar.mirror
+- const avatarCdn = option !== null && option.gravatar ? option.gravatar.mirror : 'https://sdn.geekzu.org/avatar/'
-- const avatarDefault = option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)
+- const avatarDefault = option !== null && option.gravatar ? option.gravatar.default : 'mp'
 
 script.
   window.addEventListener('load', () => {
@@ -45,53 +45,25 @@ script.
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getSetting = async () => {
+    const getComment = () => {
-      try {
+      fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}',{method: "POST"})
-        const res = await fetch('!{server}/api/conf', { method: 'GET' })
+        .then(response => response.json())
-        return await res.json()
+        .then(d => {
-      } catch (e) {
+          const artalk = d.data.map(function (e) {
-        console.log(e)
+            return {
-      }
+              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
-    }
+              'content': changeContent(e.content_marked),
-
+              'nick': e.nick,
-    const headerList = {
+              'url': e.page_url,
-      method: 'POST',
+              'date': e.date,
-      headers: {
+            }
-        'Content-Type': 'application/x-www-form-urlencoded',
+          })
-        'Origin': window.location.origin
+          saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
-      },
+          generateHtml(artalk)
-      body: new URLSearchParams({
+        }).catch(e => {
-        'site_name': '!{site}',
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
-        'limit': '!{theme.newest_comments.limit}',
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-        'type':'latest_comments'
-      })
-    }
-
-    const getComment = async () => {
-      try {
-        const res = await fetch('!{server}/api/stat', headerList)
-        const result = await res.json()
-        const avatarStr = await getSetting()
-        const { mirror, params, default:defaults } = avatarStr.data.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.innerHTML= "!{_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.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

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

@@ -58,7 +58,7 @@ script.
           findTrueUrl(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

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

@@ -60,7 +60,7 @@ script.
           generateHtml(remark42)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_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.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         })
       }
 

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

@@ -79,7 +79,7 @@ script.
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         }) 
     }
 

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

@@ -1,8 +1,6 @@
-- 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
@@ -43,26 +41,31 @@ script.
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getComment = async () => {
+    const getComment = () => {
-      try {
+      const loadWaline = () => {
-        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.newest_comments.limit}', { method: 'GET' })
+        Waline.RecentComments({
-        const result = await res.json()
+          serverURL: '!{theme.waline.serverURL}',
-        const walineArray = result.data.map(e => {
+          count: !{theme.newest_comments.limit}
-          return {
+        }).then(({comments}) => {
-            'content': changeContent(e.comment),
+          const walineArray = comments.map(e => {
-            'avatar': e.avatar,
+            return {
-            'nick': e.nick,
+              'content': changeContent(e.comment),
-            'url': e.url + '#' + e.objectId,
+              'avatar': e.avatar,
-            'date': e.time || e.insertedAt
+              '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 (err) {
+          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
-        console.error(err)
+          generateHtml(walineArray)
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
+        }).catch(e => {
-        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
       }
+
+      if (typeof Waline === 'function') 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
+    // removeEventListener scroll 
-    btf.removeGlobalFnEvent('pjax')
+    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
-    btf.removeGlobalFnEvent('themeChange')
+    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
 
-    document.getElementById('rightside').classList.remove('rightside-show')
+    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -62,6 +62,7 @@ script.
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
+    typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
     // google analytics
@@ -76,8 +77,8 @@ script.
     typeof Prism === 'object' && Prism.highlightAll()
   })
 
-  document.addEventListener('pjax:error', e => {
+  document.addEventListener('pjax:error', (e) => {
     if (e.request.status === 404) {
-      pjax.loadUrl('!{url_for("/404.html")}')
+      pjax.loadUrl('/404.html')
     }
   })

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

@@ -16,7 +16,3 @@
           .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

@@ -1,28 +0,0 @@
-- 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,6 +1,4 @@
 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,7 +16,5 @@
           input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
       hr
       #local-search-results
-      #local-search-stats-wrap
-  #search-mask
 
-  script(src=url_for(theme.asset.local_search))
+  #search-mask

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

@@ -0,0 +1,2 @@
+.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,5 +1,7 @@
 .post_share
-  if theme.sharejs.enable
+  if theme.addThis.enable
+    !=partial('includes/third-party/share/add-this', {}, {cache: true})
+  else 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/share/share-js.pug

@@ -1,4 +1,3 @@
-- const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
+.social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites)
-.social-share(data-image=url_for(coverVal) data-sites= theme.sharejs.sites)
 link(rel='stylesheet' href=url_for(theme.asset.sharejs_css) media="print" onload="this.media='all'")
 script(src=url_for(theme.asset.sharejs) defer)

layout/includes/third-party/subtitle.pug

@@ -1,30 +1,6 @@
-- const { effect,source,sub,typed_option } = theme.subtitle
+- const { effect,loop,source,sub,startDelay,typeSpeed,backSpeed } = theme.subtitle
 - let subContent = sub || new Array()
 
-script.
-  window.typedJSFn = {
-    init: (str) => {
-      window.typed = new Typed('#subtitle', Object.assign({
-        strings: str,
-        startDelay: 300,
-        typeSpeed: 150,
-        loop: true,
-        backSpeed: 50,
-      }, !{JSON.stringify(typed_option)}))
-    },
-    run: (subtitleType) => {
-      if (!{effect}) {
-        if (typeof Typed === 'function') {
-          subtitleType()
-        } else {
-          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
-        }
-      } else {
-        subtitleType()
-      }
-    }
-  }
-
 case source
   when 1
     script.
@@ -36,13 +12,28 @@ case source
               const from = '出自 ' + data.from
               const sub = !{JSON.stringify(subContent)}
               sub.unshift(data.hitokoto, from)
-              typedJSFn.init(sub)
+              window.typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: !{startDelay},
+                typeSpeed: !{typeSpeed},
+                loop: !{loop},
+                backSpeed: !{backSpeed},
+              })
             } else {
-              document.getElementById('subtitle').textContent = data.hitokoto
+              document.getElementById('subtitle').innerHTML = data.hitokoto
             }
           })
       }
-      typedJSFn.run(subtitleType)
+
+      if (!{effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
 
   when 2
     script.
@@ -53,13 +44,28 @@ case source
             const from = '出自 ' + str[1]
             const sub = !{JSON.stringify(subContent)}
             sub.unshift(con, from)
-            typedJSFn.init(sub)
+            window.typed = new Typed('#subtitle', {
+              strings: sub,
+              startDelay: !{startDelay},
+              typeSpeed: !{typeSpeed},
+              loop: !{loop},
+              backSpeed: !{backSpeed},
+            })
           } else {
-            document.getElementById('subtitle').textContent = con
+            document.getElementById('subtitle').innerHTML = con
           }
         })
       }
-      typedJSFn.run(subtitleType)
+
+      if (!{effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
 
   when 3
     script.
@@ -70,23 +76,53 @@ case source
               const sub = !{JSON.stringify(subContent)}
               const content = result.data.content
               sub.unshift(content)
-              typedJSFn.init(sub)
+              window.typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: !{startDelay},
+                typeSpeed: !{typeSpeed},
+                loop: !{loop},
+                backSpeed: !{backSpeed},
+              })
             } else {
-              document.getElementById('subtitle').textContent = result.data.content
+              document.getElementById('subtitle').innerHTML = result.data.content
             }
           })
         })
       }
-      typedJSFn.run(subtitleType)
+
+      if (!{effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
 
   default
     - subContent = subContent.length ? subContent : new Array(config.subtitle)
     script.
       function subtitleType () {
-        if (!{effect}) {
+        if (!{effect}) { 
-          typedJSFn.init(!{JSON.stringify(subContent)})
+          window.typed = new Typed("#subtitle", {
+            strings: !{JSON.stringify(subContent)},
+            startDelay: !{startDelay},
+            typeSpeed: !{typeSpeed},
+            loop: !{loop},
+            backSpeed: !{backSpeed}
+          })
         } else {
-          document.getElementById("subtitle").textContent = !{JSON.stringify(subContent[0])}
+          document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
         }
       }
-      typedJSFn.run(subtitleType)
+
+      if (!{effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+        }
+      } else {
+        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
-          !=partial('includes/header/social', {}, {cache: true})
+          !=fragment_cache('social', function(){return partial('includes/header/social')}) 

layout/includes/widget/card_newest_comment.pug

@@ -1,4 +1,4 @@
-if theme.newest_comments.enable && theme.comments.use && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
+if theme.newest_comments.enable && !['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

@@ -1,21 +0,0 @@
-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= _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_recent_post.pug

@@ -14,10 +14,7 @@ if theme.aside.card_recent_post.enable
         .aside-list-item(class=no_cover)
           if post_cover && theme.cover.aside_enable
             a.thumbnail(href=url_for(link) title=title)
-              if article.cover_type === 'img'
+              img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-                img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-              else
-                div(style=`background: ${post_cover}`)
           .content
             a.title(href=url_for(link) title=title)= title
             if theme.aside.card_recent_post.sort === 'updated'

layout/includes/widget/card_tags.pug

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

layout/includes/widget/index.pug

@@ -13,15 +13,13 @@
       .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.10.0",
+  "version": "4.5.1",
   "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": "^3.0.0",
+    "hexo-renderer-stylus": "^2.1.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",

plugins.yml

@@ -1,11 +1,11 @@
-algolia_search:
+algolia_search_v4:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.20.0
+  version: 4.14.2
-instantsearch:
+instantsearch_v4:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.57.0
+  version: 4.49.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.22
+  version: 1.6.7
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 2.15.8
+  version: 2.13.0
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 2.15.8
+  version: 2.13.0
 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.9
+  version: 0.16.3
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.3
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 10.5.0
+  version: 9.1.7
 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.4
+  version: 17.8.3
 instantpage:
   name: instant.page
   file: instantpage.js
-  version: 5.2.0
+  version: 5.1.1
 typed:
   name: typed.js
-  file: dist/typed.umd.js
+  file: lib/typed.min.js
-  version: 2.0.16
+  version: 2.0.12
 pangu:
   name: pangu
   file: dist/browser/pangu.min.js
   version: 4.0.7
-fancybox_css:
+fancybox_css_v4:
   name: '@fancyapps/ui'
-  file: dist/fancybox/fancybox.css
+  file: dist/fancybox.css
-  version: 5.0.24
+  version: 4.0.31
   other_name: fancyapps-ui
-fancybox:
+fancybox_v4:
   name: '@fancyapps/ui'
-  file: dist/fancybox/fancybox.umd.js
+  file: dist/fancybox.umd.js
-  version: 5.0.24
+  version: 4.0.31
   other_name: fancyapps-ui
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js
-  version: 1.0.8
+  version: 1.0.6
 snackbar_css:
   name: node-snackbar
   file: dist/snackbar.min.css
@@ -140,16 +140,19 @@ snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js
   version: 0.1.16
-fontawesome:
+fontawesomeV6:
   name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
   other_name: font-awesome
-  version: 6.4.2
+  version: 6.2.0
-egjs_infinitegrid:
+flickr_justified_gallery_js:
-  name: '@egjs/infinitegrid'
+  name: flickr-justified-gallery
-  other_name: egjs-infinitegrid
+  file: dist/fjGallery.min.js
-  file: dist/infinitegrid.min.js
+  version: 2.1.2
-  version: 4.10.1
+flickr_justified_gallery_css:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.css
+  version: 2.1.2
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -180,11 +183,11 @@ prismjs_autoloader:
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.6.3
+  version: 2.4.3
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.6.3
+  version: 2.4.3
 pace_js:
   name: pace-js
   other_name: pace
@@ -195,17 +198,3 @@ 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.2.2

scripts/events/cdn.js

@@ -12,7 +12,7 @@ hexo.extend.filter.register('before_generate', () => {
   const themeConfig = hexo.theme.config
   const { CDN } = themeConfig
 
-  const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
+  const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir,'/plugins.yml'), engine: 'yaml'})
   const internalSrc = {
     main: {
       name: 'hexo-theme-butterfly',
@@ -41,19 +41,20 @@ 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 => {
+    Object.keys(data).map(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 min_file = minFile(file)
+      const verType = CDN.version ? `@${version}` : ''
-      const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
 
       const value = {
         version,
@@ -64,19 +65,18 @@ hexo.extend.filter.register('before_generate', () => {
         min_cdnjs_file,
         cdnjs_name
       }
-
       const cdnSource = {
-        local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
+        local: cond === 'internal' ? cdnjs_file : `/pluginsSrc/${name}/${file}`,
         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}`,
         custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1])
       }
-
+      
       data[key] = cdnSource[type]
     })
 
-    if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
+    if (cond === 'internal') data['main_css'] = 'css/index.css'
     return data
   }
 
@@ -89,9 +89,6 @@ hexo.extend.filter.register('before_generate', () => {
     return obj
   }
 
-  themeConfig.asset = Object.assign(
+  themeConfig.asset = Object.assign(createCDNLink(internalSrc,CDN.internal_provider,'internal'),
-    createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
+  createCDNLink(thirdPartySrc,CDN.third_party_provider), deleteNullValue(CDN.option))
-    createCDNLink(thirdPartySrc, CDN.third_party_provider),
-    deleteNullValue(CDN.option)
-  )
 })

scripts/events/comment.js

@@ -11,4 +11,4 @@ hexo.extend.filter.register('before_generate', () => {
   }
   const newArray = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
   themeConfig.comments.use = newArray
-})
+})

scripts/events/init.js

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

scripts/events/stylus.js

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

scripts/events/welcome.js

@@ -1,13 +1,17 @@
+const logger = require('hexo-log')()
+
 hexo.on('ready', () => {
   const { version } = require('../../package.json')
-  hexo.log.info(`
+  logger.info(`
   ===================================================================
-      #####  #    # ##### ##### ###### #####  ###### #      #   #
+                                                                     
-      #    # #    #   #     #   #      #    # #      #       # #
+      #####  #    # ##### ##### ###### #####  ###### #      #   #    
-      #####  #    #   #     #   #####  #    # #####  #        #
+      #    # #    #   #     #   #      #    # #      #       # #     
-      #    # #    #   #     #   #      #####  #      #        #
+      #####  #    #   #     #   #####  #    # #####  #        #     
-      #    # #    #   #     #   #      #   #  #      #        #
+      #    # #    #   #     #   #      #####  #      #        #      
-      #####   ####    #     #   ###### #    # #      ######   #
+      #    # #    #   #     #   #      #   #  #      #        #    
+      #####   ####    #     #   ###### #    # #      ######   #  
+
                             ${version}
   ===================================================================`)
 })

scripts/filters/post_lazyload.js

@@ -8,20 +8,22 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const lazyload = htmlContent => {
+function 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', data => {
+hexo.extend.filter.register('after_render:html', function (data) {
-  const { enable, field } = hexo.theme.config.lazyload
+  const config = hexo.theme.config.lazyload
-  if (!enable || field !== 'site') return
+  if (!config.enable) return
-  return lazyload(data)
+  if (config.field !== 'site') return
+  return lazyload.call(this, data)
 })
 
 hexo.extend.filter.register('after_post_render', data => {
-  const { enable, field } = hexo.theme.config.lazyload
+  const config = hexo.theme.config.lazyload
-  if (!enable || field !== 'post') return
+  if (!config.enable) return
-  data.content = lazyload(data.content)
+  if (config.field !== 'post') return
+  data.content = lazyload.call(this, data.content)
   return data
 })

scripts/filters/random_cover.js

@@ -5,36 +5,41 @@
 
 'use strict'
 
-hexo.extend.filter.register('before_post_render', data => {
+hexo.extend.filter.register('before_post_render', function (data) {
-  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
+  const { config } = this
-  let { cover: coverVal, top_img: topImg } = data
+  if (config.post_asset_folder) {
-
+    const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
-  // Add path to top_img and cover if post_asset_folder is enabled
+    const topImg = data.top_img
-  if (hexo.config.post_asset_folder) {
+    const cover = data.cover
-    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = `${data.path}${topImg}`
+    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 (cover && cover.indexOf('/') === -1) data.cover = data.path + cover
   }
 
-  const randomCoverFn = () => {
+  if (data.cover === false) {
-    const { cover: { default_cover: defaultCover } } = hexo.theme.config
+    data.randomcover = randomCover()
-    if (!defaultCover) return false
+    return data
-    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) {
-    const randomCover = randomCoverFn()
-    data.cover = randomCover
-    coverVal = randomCover // update coverVal
-  }
-
-  if (coverVal && (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal))) {
-    data.cover_type = 'img'
   }
 
+  data.cover = data.cover || randomCover()
   return data
 })
+
+function randomCover () {
+  const theme = hexo.theme.config
+  let cover
+  let num
+
+  if (theme.cover && theme.cover.default_cover) {
+    if (!Array.isArray(theme.cover.default_cover)) {
+      cover = theme.cover.default_cover
+      return cover
+    } else {
+      num = Math.floor(Math.random() * theme.cover.default_cover.length)
+      cover = theme.cover.default_cover[num]
+      return cover
+    }
+  } else {
+    cover = theme.default_top_img || 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
+    return cover
+  }
+}

scripts/helpers/aside_categories.js

@@ -31,7 +31,6 @@ 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 = ''
@@ -60,7 +59,6 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
           }
 
           if (isExpand && isTopParent && child) {
-            expandBtn = ' expandBtn'
             result += `<i class="fas fa-caret-left ${expandClass}"></i>`
           }
 
@@ -93,7 +91,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
             <span>${this._p('aside.card_categories')}</span>
             ${moreButton()}
             </div>
-            <ul class="card-category-list${expandBtn}" id="aside-cat-list">
+            <ul class="card-category-list" id="aside-cat-list">
             ${list[0]}
             </ul>`
 })

scripts/helpers/findArchiveLength.js

@@ -1,36 +1,36 @@
-hexo.extend.helper.register('getArchiveLength', function () {
+hexo.extend.helper.register('findArchiveLength', function (func) {
-  const { archive_generator: archiveGenerator } = hexo.config
+  const allPostsLength = this.site.posts.length;
-  if (archiveGenerator && archiveGenerator.enable === false) return this.site.posts.length
+  if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false ) return allPostsLength
-  const { yearly, monthly, daily } = archiveGenerator
+  const { yearly, monthly, daily } = hexo.config.archive_generator
   const { year, month, day } = this.page
-  if (yearly === false || !year) return this.site.posts.length
+  if (yearly === false || !year) return allPostsLength
 
   const posts = this.site.posts.sort('date')
 
-  const compareFunc = (type, y1, m1, d1, y2, m2, d2) => {
+  const compareFunc = (type,y1,m1,d1,y2,m2,d2) => {
-    switch (type) {
+    if (type === 'year') {
-      case 'year':
+      return y1 === y2
-        return y1 === y2
+    } else if (type === 'month') {
-      case 'month':
+      return y1 === y2 && m1 === m2
-        return y1 === y2 && m1 === m2
+    } else if (type === 'day') {
-      case 'day':
+      return y1 === y2 && m1 === m2 && d1 === d2
-        return y1 === y2 && m1 === m2 && d1 === d2
-      default:
-        return false
     }
   }
 
   const generateDateObj = (type) => {
-    return posts.reduce((dateObj, post) => {
+    let dateObj = []
-      const date = post.date.clone()
+    let length = 0
+
+    posts.forEach(post => {
+      let date = post.date.clone()
       const year = date.year()
       const month = date.month() + 1
       const day = date.date()
-      const lastData = dateObj[dateObj.length - 1]
+      let lastData = 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}`
-        dateObj.push({
+        length = dateObj.push({
           name,
           year,
           month,
@@ -40,19 +40,19 @@ hexo.extend.helper.register('getArchiveLength', function () {
       } else {
         lastData.count++
       }
+    });
 
-      return dateObj
+    return dateObj
-    }, [])
   }
 
-  const data = this.fragment_cache('createArchiveObj', () => {
+  const data = func('createArchiveObj', ()=> {
-    const dateObjs = []
+    const yearObj = yearly ? generateDateObj('year') : []
-    if (yearly) dateObjs.push(...generateDateObj('year'))
+    const monthObj = monthly ? generateDateObj('month') : []
-    if (monthly) dateObjs.push(...generateDateObj('month'))
+    const dayObj = daily ? generateDateObj('day') : []
-    if (daily) dateObjs.push(...generateDateObj('day'))
+    const fullObj = [...yearObj, ...monthObj, ...dayObj]
-    return dateObjs
+    return fullObj
   })
 
-  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,99 +7,69 @@
 
 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 createLocalStore = () => {
+  const { theme_color } = hexo.theme.config
-    return `
+  const themeColorLight = theme_color && theme_color.enable && theme_color.meta_theme_color_light || '#ffffff'
-      win.saveToLocal = {
+  const themeColorDark = theme_color && theme_color.enable && theme_color.meta_theme_color_dark || '#0d0d0d'
-        set: (key, value, ttl) => {
+
-          if (ttl === 0) return
+  const localStore = `
-          const now = Date.now()
+    win.saveToLocal = {
-          const expiry = now + ttl * 86400000
+      set: function setWithExpiry(key, value, ttl) {
-          const item = {
+        if (ttl === 0) return
-            value,
+        const now = new Date()
-            expiry
+        const expiryDay = ttl * 86400000
-          }
+        const item = {
-          localStorage.setItem(key, JSON.stringify(item))
+          value: value,
-        },
+          expiry: now.getTime() + expiryDay,
-      
-        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 createGetScript = () => {
+  const getScript = `
-    return `
+    win.getScript = url => new Promise((resolve, reject) => {
-      win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
+      const script = document.createElement('script')
-        const script = document.createElement('script')
+      script.src = url
-        script.src = url
+      script.async = true
-        script.async = true
+      script.onerror = reject
-        script.onerror = reject
+      script.onload = script.onreadystatechange = function() {
-        script.onload = script.onreadystatechange = function() {
+        const loadState = this.readyState
-          const loadState = this.readyState
+        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-          if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+        script.onload = script.onreadystatechange = null
-          script.onload = script.onreadystatechange = null
+        resolve()
-          resolve()
+      }
-        }
+      document.head.appendChild(script)
+    })
+  `
 
-        Object.keys(attr).forEach(key => {
+  let darkmodeJs = ''
-          script.setAttribute(key, attr[key])
+  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 = () => {
+      win.activateLightMode = function () {
         document.documentElement.setAttribute('data-theme', 'light')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorLight}')
@@ -123,10 +93,10 @@ hexo.extend.helper.register('inject_head_js', function () {
             else if (isNotSpecified || hasNoSupport) {
               const now = new Date()
               const hour = now.getHours()
-              const isNight = hour <= ${start} || hour >= ${end}
+              const isNight = hour <= 6 || hour >= 18
               isNight ? activateDarkMode() : activateLightMode()
             }
-            window.matchMedia('(prefers-color-scheme: dark)').addListener(e => {
+            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
               if (saveToLocal.get('theme') === undefined) {
                 e.matches ? activateDarkMode() : activateLightMode()
               }
@@ -138,25 +108,22 @@ hexo.extend.helper.register('inject_head_js', function () {
       darkmodeJs += `
           const now = new Date()
           const hour = now.getHours()
-          const isNight = hour <= ${start} || hour >= ${end}
+          const isNight = hour <= 6 || hour >= 18
           if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
           else if (t === 'light') activateLightMode()
           else activateDarkMode()
         `
     } else {
       darkmodeJs += `
-        if (t === 'dark') activateDarkMode()
+          if (t === 'dark') activateDarkMode()
-        else if (t === 'light') activateLightMode()
+          else if (t === 'light') activateLightMode()
-      `
+        `
     }
-
-    return darkmodeJs
   }
 
-  const createAsideStatus = () => {
+  let asideStatus = ''
-    if (!aside.enable || !aside.button) return ''
+  if (aside.enable && aside.button) {
-
+    asideStatus = `
-    return `
       const asideStatus = saveToLocal.get('aside-status')
       if (asideStatus !== undefined) {
         if (asideStatus === 'hide') {
@@ -168,16 +135,14 @@ hexo.extend.helper.register('inject_head_js', function () {
     `
   }
 
-  const createDetectApple = () => {
+  const detectApple = `
-    return `
+    const detectApple = () => {
-      const detectApple = () => {
+      if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
-        if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
+        document.documentElement.classList.add('apple')
-          document.documentElement.classList.add('apple')
-        }
       }
-      detectApple()
+    }
+    detectApple()
     `
-  }
 
-  return `<script>(win=>{${createLocalStore() + createGetScript() + createGetCSS() + createDarkmodeJs() + createAsideStatus() + createDetectApple()}})(window)</script>`
+  return `<script>(win=>{${localStore + getScript + darkmodeJs + asideStatus + detectApple}})(window)</script>`
 })

scripts/helpers/page.js

@@ -1,3 +1,10 @@
+/**
+ * Butterfly
+ * @example
+ *  page_description()
+ *  cloudTags(source, minfontsize, maxfontsize, limit)
+ */
+
 'use strict'
 
 const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
@@ -17,8 +24,11 @@ hexo.extend.helper.register('page_description', function () {
 
 hexo.extend.helper.register('cloudTags', function (options = {}) {
   const env = this
-  let { source, minfontsize, maxfontsize, limit, unit, orderby, order } = options
+  let source = options.source
-  unit = unit || 'px'
+  const minfontsize = options.minfontsize
+  const maxfontsize = options.maxfontsize
+  const limit = options.limit
+  const unit = options.unit || 'px'
 
   let result = ''
   if (limit > 0) {
@@ -33,7 +43,7 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
   })
 
   const length = sizes.length - 1
-  source.sort(orderby, order).forEach(tag => {
+  source.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};`
@@ -44,8 +54,8 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
   return result
 })
 
-hexo.extend.helper.register('urlNoIndex', function (url = null, trailingIndex = false, trailingHtml = false) {
+hexo.extend.helper.register('urlNoIndex', function (url = null) {
-  return prettyUrls(url || this.url, { trailing_index: trailingIndex, trailing_html: trailingHtml })
+  return prettyUrls(url || this.url, { trailing_index: false, trailing_html: false })
 })
 
 hexo.extend.helper.register('md5', function (path) {
@@ -53,15 +63,19 @@ hexo.extend.helper.register('md5', function (path) {
 })
 
 hexo.extend.helper.register('injectHtml', function (data) {
+  let result = ''
   if (!data) return ''
-  return data.join('')
+  for (let i = 0; i < data.length; i++) {
+    result += data[i]
+  }
+  return result
 })
 
 hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
   if (page.year) {
     const dateStr = page.month ? `${page.year}-${page.month}` : `${page.year}`
-    const dateFormat = page.month ? hexo.theme.config.aside.card_archives.format : 'YYYY'
+    const date_format = page.month ? hexo.theme.config.aside.card_archives.format : 'YYYY'
-    return date(dateStr, dateFormat)
+    return date(dateStr, date_format)
   }
 
   const defaultTitle = this._p('page.archives')
@@ -81,8 +95,3 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
 
   return loop(menu) || defaultTitle
 })
-
-hexo.extend.helper.register('isImgOrUrl', function (path) {
-  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
-  return path.indexOf('//') !== -1 || imgTestReg.test(path)
-})

scripts/helpers/related_post.js

@@ -15,7 +15,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
           title: post.title,
           path: post.path,
           cover: post.cover,
-          cover_type: post.cover_type,
+          randomcover: post.randomcover,
           weight: 1,
           updated: post.updated,
           created: post.date
@@ -50,14 +50,13 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     result += '<div class="relatedPosts-list">'
 
     for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
-      const cover = relatedPosts[i].cover || 'var(--default-bg-color)'
+      const cover =
+        relatedPosts[i].cover === false
+          ? relatedPosts[i].randomcover
+          : relatedPosts[i].cover
       const title = this.escape_html(relatedPosts[i].title)
       result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
-      if (relatedPosts[i].cover_type === 'img') {
+      result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
-        result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
-      } else {
-        result += `<div class="cover" style="background: ${cover}"></div>`
-      }
       if (dateType === 'created') {
         result += `<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i> ${this.date(relatedPosts[i].created, hexoConfig.date_format)}</div>`
       } else {

scripts/helpers/series.js

@@ -1,22 +0,0 @@
-'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,9 +9,17 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const btn = args => {
+function btn (args) {
   args = args.join(' ').split(',')
-  const [url = '', text = '', icon = '', option = ''] = args.map(arg => arg.trim())
+  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()
 
   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

@@ -1,61 +1,30 @@
 /**
  * Butterfly
- * galleryGroup and gallery
+ * galleryGroup and allery
- * {% galleryGroup [name] [descr] [url] [img] %}
- *
- * {% gallery [button],%}
- * {% gallery url,[url],[button]%}
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-const gallery = (args, content) => {
+function gallery (args, content) {
-  args = args.join(' ').split(',')
+  return `<div class="fj-gallery">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
-  let button = false
+          </div>`
-  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]
-      })
-    }
-
-    dataStr = JSON.stringify(arr)
-  }
-
-  return `<div class="gallery-container" data-type="${type}" data-button="${button}">
-      <div class="gallery-data">${dataStr}</div>
-      <div class="gallery-items">
-      </div>
-    </div>`
 }
 
-const galleryGroup = args => {
+function galleryGroup (args) {
-  const [name, descr, url, img] = args
+  const name = args[0]
-  const imgUrl = urlFor(img)
+  const desrc = args[1]
-  const urlLink = urlFor(url)
+  const url = urlFor(args[2])
+  const img = urlFor(args[3])
 
-  return `<figure class="gallery-group">
+  return `
-  <img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
+  <figure class="gallery-group">
+  <img class="gallery-group-img no-lightbox" src='${img}' alt="Group Image Gallery">
   <figcaption>
   <div class="gallery-group-name">${name}</div>
-  <p>${descr}</p>
+  <p>${desrc}</p>
-  <a href='${urlLink}'></a>
+  <a href='${url}'></a>
   </figcaption>
   </figure>
   `