label 4.0.0

fix: 修復使用本地搜索時，搜索插件配置為不搜索文章內容會無法使用搜索的 bug close #666
fix: 修復可能導致相關文章鏈接出錯的 bug close #549
improvement: 調整代碼框滾動條顏色 close #651
improvement: 當圖片沒有 figcaption 時，不會添加 figcaption 代碼

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Do not delete the template (不要刪除模板) -->
+
+<!--
+IMPORTANT: Please follow the template to create a new issue.
+重要：請依照該模板來提交。
+
+If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
+如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去(如有)
+
+If you are a problem when visiting the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
+如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站
+-->
+
+
+## I want to create a Bug report <!-- 我想要建立一個 Bug report --> 
+
+<!-- Check all with "x" especially FAQ & Documentation!! (使用 "x" 選擇) -->
+<!-- 請確認是否都已經翻閲過如下的資料, 尤其是安裝文件！！ -->
+- [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html).
+- [] Yes, I have read [Butterfly Documentation](https://butterfly.js.org/posts/21cfbf15/).
+- [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me.
+
+## Butterfly Information
+
+<!-- Butterfly的版本 -->
+<!-- 檢視主題的package.json -->
+**Butterfly Version:**
+
+<!-- Windows/macOS/Linux/Android/iOS -->
+**Platform:**
+
+<!-- Chrome/Safari/FireFox/.. -->
+**Browser:**
+
+## Expected behavior <!-- (預期行為) -->
+
+## Actual behavior <!-- (實際行為) -->
+
+## Steps to reproduce the behavior <!-- (重現步驟) -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+<!-- If applicable, add screenshots to help explain your problem -->
+<!-- 請儘量提供截圖來定位問題 -->
+## Screenshots <!-- (截圖) -->
+
+<!-- Provide your website to find the issues -->
+## Website
+
+## Describe the bug

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,73 +0,0 @@
-name: Bug report
-description: Create a report to help us improve
-title: '[Bug]: '
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        重要：請依照該模板來提交 
-        Please follow the template to create a new issue
-  - type: input
-    id: butterfly-ver
-    attributes:
-      label: 使用的 Butterfly 版本？ | What version of Butterfly are you use?
-      description: 檢視主題的 package.json | Check the theme's package.json
-    validations:
-      required: true
-
-  - type: dropdown
-    id: modify
-    attributes:
-      label: 是否修改过主题文件？ || Has the theme files been modified?
-      options:
-        - 是 (Yes)
-        - 不是 (No)
-    validations:
-      required: true
-
-  - type: dropdown
-    id: browser
-    attributes:
-      label: 使用的瀏覽器？ || What browse are you using?
-      options:
-        - Chrome
-        - Edge
-        - Safari
-        - Opera
-        - Other
-    validations:
-      required: true
-
-  - type: dropdown
-    id: platform
-    attributes:
-      label: 使用的系統？ || What operating system are you using?
-      options:
-        - Windows
-        - macOS 
-        - Linux
-        - Android
-        - iOS
-        - Other
-    validations:
-      required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 問題描述 | Describe the bug
-      description: 請描述你的問題現象 | A clear and concise description of what the bug is.
-      placeholder: 請儘量提供截圖來定位問題 | If applicable, add screenshots to help explain your problem
-      value:
-    validations:
-      required: true
-
-  - type: input
-    id: website
-    attributes:
-      label: 出現問題網站 | Website
-      description: 請提供下可復現網站地址 | Please supply a website url which can reproduce problem.
-      placeholder:
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,22 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Questions about Butterfly
-    url: https://github.com/jerryc127/hexo-theme-butterfly/discussions
-    about: 一些使用問題請到 Discussion 詢問。 Please ask questions in Discussion.
-
-  - name: Butterfly Q&A
-    url: https://butterfly.js.org/posts/98d20436/
-    about: Butterfly Q&A
-
-  - name: Telegram
-    url: https://t.me/bu2fly
-    about: 'Official Telegram Group'
-
-  - name: QQ 1群
-    url: https://jq.qq.com/?_wv=1027&k=KU9105XR
-    about: '群號 1070540070，不要兩個Q群都添加'
-
-  - name: QQ 2群
-    url: https://jq.qq.com/?_wv=1027&k=r1nK0DQz
-    about: '群號 978221020，不要兩個Q群都添加'
-

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,9 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,14 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project
-title: '[Feature]: '
-
-body:
-  - type: textarea
-    id: feature-request
-    attributes:
-      label: 想要的功能 | What feature do you want?
-      description: 請描述你需要的新功能 | A clear and concise description of what the feature is.
-      placeholder:
-      value:
-    validations:
-      require: true

.github/stale.yml

@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - bug
+  - enhancement
+  - documentation 
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/stale.yml

@@ -1,19 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v5
-        with:
-          days-before-issue-stale: 30
-          days-before-pr-stale: -1
-          days-before-close: 7
-          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-          close-pr-message: 'This issue has not seen any activity since it was marked stale. Closing.'
-          stale-issue-label: 'Stale'
-          exempt-issue-labels: 'pinned,bug,enhancement,documentation,Plan'
-          operations-per-run: 1000

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
@@ -7,14 +9,14 @@
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
 ![](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] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus)
 - [x] Multiple Comment System Support
-- [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)
+- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
 - [x] Web analytics
 - [x] Google AdSense
 - [x] Webmaster Verification
@@ -87,7 +89,7 @@ npm i hexo-theme-butterfly
 - [x] Typewriter Effect: activate_power_mode
 - [x] Background effects (Canvas ribbon/canvas_ribbon_piao/canvas_nest)
 - [x] Mouse click effects (Fireworks/Heart/Text)
-- [x] Preloader/Loading Animation/pace.js
+- [x] Preloader/Loading Animation
 - [x] Busuanzi visitor counter
 - [x] Medium Zoom/Fancybox
 - [x] Mermaid

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
@@ -7,14 +9,14 @@
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
 ![](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] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
 - [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
@@ -87,7 +89,7 @@ theme: butterfly
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
 - [x] 多種鼠標點擊特效（煙花/文字/愛心）
-- [x] 內置一種 Preloader 加載動畫和 pace.js 加載動畫條
+- [x] 內置一種 Preloader 加載動畫
 - [x] 不蒜子訪問統計
 - [x] 兩種大圖模式（Medium Zoom/Fancybox）
 - [x] Mermaid 圖表顯示
@@ -95,7 +97,7 @@ theme: butterfly
 - [x] 圖片懶加載
 - [x] Instantpage/Pangu/Snackbar彈窗/PWA......
 
-## ✨ 貢獻者
+## ✨ 贡献者
 
 <a href="https://github.com/jerryc127/hexo-theme-butterfly/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=jerryc127/hexo-theme-butterfly" />

_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,51 @@ 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 (搜索)
+# --------------------------------------
+
+# Algolia search
+algolia_search:
+  enable: false
+  hits:
+    per_page: 6
+
+# Local search
+local_search:
+  enable: false
+
+# 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 +147,13 @@ post_meta:
     tags: true # true or false 文章頁是否顯示標籤
     label: true # true or false 顯示描述性文字
 
+# wordcount (字數統計)
+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)
@@ -124,22 +164,8 @@ index_post_content:
   length: 500 # if you set method to 2 or 3, the length need to config
 
 # anchor
-anchor:
+# when you scroll in post, the URL will update according to header id.
-  # when you scroll, the URL will update according to header id.
+anchor: false
-  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
 
 # Post
 # --------------------------------------
@@ -151,19 +177,16 @@ toc:
   number: true
   expand: false
   style_simple: false # for post
-  scroll_percent: true
 
 post_copyright:
   enable: true
   decode: false
-  author_href:
   license: CC BY-NC-SA 4.0
   license_url: https://creativecommons.org/licenses/by-nc-sa/4.0/
 
 # Sponsor/reward
 reward:
   enable: false
-  text:
   QR_code:
     # - img: /img/wechat.jpg
     #   link:
@@ -186,6 +209,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 +228,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
@@ -402,7 +254,7 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/Artalk
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus
   use: # Valine,Disqus
   text: true # Display the comment name next to the button
   # lazyload: The comment system will be load when comment element enters the browser's viewport.
@@ -456,7 +308,7 @@ valine:
 waline:
   serverURL: # Waline server address url
   bg: # waline background
-  pageview: false
+  visitor: false
   option:
 
 # utterances
@@ -476,7 +328,7 @@ facebook_comments:
   user_id: # optional
   pageSize: 10 # The number of comments to show
   order_by: social # social/time/reverse_time
-  lang: zh_TW # Language en_US/zh_CN/zh_TW and so on
+  lang: en_US # Language en_US/zh_CN/zh_TW and so on
 
 # Twikoo
 # https://github.com/imaegoo/twikoo
@@ -497,21 +349,6 @@ giscus:
     dark: dark
   option:
 
-# Remark42
-# https://remark42.com/docs/configuration/frontend/
-remark42:
-  host: # Your Host URL
-  siteId: # Your Site ID
-  option:
-
-# Artalk
-# https://artalk.js.org/guide/frontend/config.html
-artalk:
-  server:
-  site:
-  visitor: false
-  option:
-
 # Chat Services
 # --------------------------------------
 
@@ -535,23 +372,31 @@ 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:
   enable: false
   website_id:
 
-# messenger
+# Footer Settings
-# https://developers.facebook.com/docs/messenger-platform/discovery/facebook-chat-plugin/
+# --------------------------------------
-messenger:
+footer:
-  enable: false
+  owner:
-  pageID:
+    enable: true
-  lang: zh_TW # Language en_US/zh_CN/zh_TW and so on
+    since: 2020
+  custom_text:
+  copyright: true # Copyright of theme and framework
 
 # Analysis
 # --------------------------------------
@@ -564,6 +409,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:
@@ -619,8 +468,6 @@ site_verification:
 #   blockquote_padding_color: "#49b1f5"
 #   blockquote_background_color: "#49b1f5"
 #   scrollbar_color: "#49b1f5"
-#   meta_theme_color_light: "ffffff"
-#   meta_theme_color_dark: "#0d0d0d"
 
 # The top_img settings of home page
 # default: top img - full screen, site info - middle (默認top_img全屏，site_info在中間)
@@ -635,9 +482,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 +490,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 +524,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 +544,7 @@ click_heart:
   mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
-clickShowText:
+ClickShowText:
   enable: false
   text:
     # - I
@@ -751,13 +590,12 @@ subtitle:
   enable: false
   # Typewriter Effect (打字效果)
   effect: true
-  # Customize typed.js (配置typed.js)
+  # loop (循環打字)
-  # https://github.com/mattboldt/typed.js/#customization
+  loop: true
-  typed_option:
   # 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
@@ -765,22 +603,115 @@ subtitle:
   sub:
 
 # Loading Animation (加載動畫)
-preloader:
+preloader: false
-  enable: false
-  # source
-  # 1. fullpage-loading
-  # 2. pace (progress bar)
-  source: 1
-  # 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
+  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 +722,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:
@@ -858,7 +776,7 @@ snackbar:
   enable: false
   position: bottom-left
   bg_light: '#49b1f5' # The background color of Toast Notification in light mode
-  bg_dark: '#1f1f1f' # The background color of Toast Notification in dark mode
+  bg_dark: '#121212' # The background color of Toast Notification in dark mode
 
 # https://instant.page/
 # prefetch (預加載)
@@ -891,16 +809,7 @@ lazyload:
 
 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/
-Open_Graph_meta:
+Open_Graph_meta: true
-  enable: true
-  option:
-    # twitter_card:
-    # twitter_image:
-    # twitter_id:
-    # twitter_site:
-    # google_plus:
-    # fb_admins:
-    # fb_app_id:
 
 # Add the vendor prefixes to ensure compatibility
 css_prefix: true
@@ -918,76 +827,88 @@ inject:
 # Don't modify the following settings unless you know how they work
 # 非必要請不要修改
 CDN:
-  # The CDN provider of internal scripts (主題內部 js 的 cdn 配置)
+  # main
-  # option: local/jsdelivr/unpkg/cdnjs/custom
+  main_css:
-  # Dev version can only choose. ( dev版的主題只能設置為 local )
+  main:
-  internal_provider: local
+  utils:
 
-  # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
+  # pjax
-  # option: local/jsdelivr/unpkg/cdnjs/custom
+  pjax:
-  # when set it to local, you need to install hexo-butterfly-extjs
-  third_party_provider: jsdelivr
 
-  # Add version number to url, true or false
+  # comments
-  version: false
+  gitalk:
+  gitalk_css:
+  blueimp_md5:
+  valine:
+  disqusjs:
+  disqusjs_css:
+  utterances:
+  twikoo:
+  waline:
+  giscus:
 
-  # Custom format
+  # share
-  # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
+  addtoany:
-  custom_format:
+  sharejs:
+  sharejs_css:
 
-  option:
+  # search
-    # abcjs_basic_js:
+  local_search:
-    # activate_power_mode:
+  algolia_js:
-    # algolia_js:
+  algolia_search_v4:
-    # algolia_search:
+  instantsearch_v4:
-    # aplayer_css:
+
-    # aplayer_js:
+  # math
-    # artalk_css:
+  mathjax:
-    # artalk_js:
+  katex:
-    # blueimp_md5:
+  katex_copytex:
-    # busuanzi:
+  katex_copytex_css:
-    # canvas_fluttering_ribbon:
+  mermaid:
-    # canvas_nest:
+
-    # canvas_ribbon:
+  # count
-    # click_heart:
+  busuanzi:
-    # clickShowText:
+
-    # disqusjs:
+  # background effect
-    # disqusjs_css:
+  canvas_ribbon:
-    # docsearch_css:
+  canvas_fluttering_ribbon:
-    # docsearch_js:
+  canvas_nest:
-    # egjs_infinitegrid:
+
-    # fancybox:
+  lazyload:
-    # fancybox_css:
+  instantpage:
-    # fireworks:
+  typed:
-    # fontawesome:
+  pangu:
-    # gitalk:
+
-    # gitalk_css:
+  # photo
-    # giscus:
+  fancybox_css_v4:
-    # instantpage:
+  fancybox_v4:
-    # instantsearch:
+  medium_zoom:
-    # katex:
+
-    # katex_copytex:
+  # snackbar
-    # lazyload:
+  snackbar_css:
-    # local_search:
+  snackbar:
-    # main:
+
-    # main_css:
+  # effect
-    # mathjax:
+  activate_power_mode:
-    # medium_zoom:
+  fireworks:
-    # mermaid:
+  click_heart:
-    # meting_js:
+  ClickShowText:
-    # pangu:
+
-    # prismjs_autoloader:
+  # fontawesome
-    # prismjs_js:
+  fontawesome:
-    # prismjs_lineNumber_js:
+
-    # pjax:
+  # Conversion between Traditional and Simplified Chinese
-    # sharejs:
+  translate:
-    # sharejs_css:
+
-    # snackbar:
+  # flickr-justified-gallery
-    # snackbar_css:
+  flickr_justified_gallery_js:
-    # translate:
+  flickr_justified_gallery_css:
-    # twikoo:
+
-    # typed:
+  # aplayer
-    # utils:
+  aplayer_css:
-    # valine:
+  aplayer_js:
-    # waline_css:
+  meting_js:
-    # waline_js:
+
+  # Prism.js
+  prismjs_js:
+  prismjs_lineNumber_js:
+  prismjs_autoloader:

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
@@ -42,13 +43,13 @@ search:
     hits_stats: '${hits} results found in ${time} ms'
 
   local_search:
+    label: 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 +66,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,8 +102,7 @@ rightside:
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between Single-column and Double-column
+  aside: Toggle between single-column and double-column
-  chat: Chat
 
 copy_copyright:
   author: Author
@@ -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
@@ -42,13 +43,13 @@ search:
     hits_stats: '${hits} results found in ${time} ms'
 
   local_search:
+    label: 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,45 +66,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:
   author: Author
@@ -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:
@@ -43,9 +44,9 @@ search:
     hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
   local_search:
+    label: 本地搜索
     input_placeholder: 搜索文章
     hits_empty: '找不到您查询的内容：${query}'
-    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -83,7 +84,6 @@ aside:
     link: 链接
     code: 代码
   card_toc: 目录
-  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -92,7 +92,7 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 赞助
+donate: 打赏
 share: 分享
 
 rightside:
@@ -104,7 +104,6 @@ rightside:
   scroll_to_comment: 直达评论
   setting: 设置
   aside: 单栏和双栏切换
-  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -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: 發表於
@@ -43,9 +44,9 @@ search:
     hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
   local_search:
+    label: 本地搜尋
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
-    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -83,7 +84,6 @@ aside:
     link: 連結
     code: 程式碼
   card_toc: 目錄
-  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -92,33 +92,31 @@ 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: 設定
   aside: 單欄和雙欄切換
-  chat: 聊天
 
 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,6 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    .article-sort-title= `${_p('page.articles')} - ${getArchiveLength()}`
+    .article-sort-title= _p('page.articles') + ' - ' + site.posts.length
     +articleSort(page.posts)
     include includes/pagination.pug

layout/includes/additional-js.pug

@@ -1,27 +1,38 @@
 div
-  script(src=url_for(theme.asset.utils))
+  script(src=url_for(theme.CDN.utils))
-  script(src=url_for(theme.asset.main))
+  script(src=url_for(theme.CDN.main))
 
   if theme.translate.enable
-    script(src=url_for(theme.asset.translate))
+    script(src=url_for(theme.CDN.translate))
 
   if theme.medium_zoom
-    script(src=url_for(theme.asset.medium_zoom))
+    script(src=url_for(theme.CDN.medium_zoom))
   else if theme.fancybox
-    script(src=url_for(theme.asset.fancybox))
+    script(src=url_for(theme.CDN.fancybox_v4))
 
   if theme.instantpage
-    script(src=url_for(theme.asset.instantpage), type='module')
+    script(src=url_for(theme.CDN.instantpage), type='module')
 
   if theme.lazyload.enable
-    script(src=url_for(theme.asset.lazyload))
+    script(src=url_for(theme.CDN.lazyload))
 
   if theme.snackbar.enable
-    script(src=url_for(theme.asset.snackbar))
+    script(src=url_for(theme.CDN.snackbar))
 
   if theme.pangu.enable
     != partial("includes/third-party/pangu.pug", {}, { cache: true })
 
+  //- search
+  if theme.algolia_search.enable
+    script(src=url_for(theme.CDN.algolia_search_v4))
+    script(src=url_for(theme.CDN.instantsearch_v4))
+    script(src=url_for(theme.CDN.algolia_js))
+  else if theme.local_search.enable
+    script(src=url_for(theme.CDN.local_search))
+
+  if theme.preloader
+    != partial("includes/loading/loading-js", {}, { cache: true })
+
   .js-pjax
     if needLoadCountJs
       != partial("includes/third-party/card-post-count/index", {}, { cache: true })
@@ -31,8 +42,6 @@ div
 
     include ./third-party/math/index.pug
 
-    include ./third-party/abcjs/index.pug
-
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
@@ -60,6 +69,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=url_for(theme.CDN.busuanzi))
-
-  !=partial('includes/third-party/search/index', {}, {cache: true})

layout/includes/head.pug

@@ -1,22 +1,29 @@
 - var pageTitle
-- is_archive() ? page.title = findArchivesTitle(page, theme.menu, date) : ''
+- if (is_archive()) pageTitle = fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);})
-- if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
+- else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
 - else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
+- else if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
+- else if (is_year()) pageTitle += ': ' + page.year
 - else if (is_current('/404.html', [strict])) pageTitle = _p('error404')
 - else pageTitle = page.title || config.title || ''
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
+
+- var pageKeywords
+- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
+- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
+- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
-- var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#ffffff'
+- var themeColor = theme.display_mode === 'dark' ? '#0d0d0d' : '#ffffff'
-- var themeColorDark = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_dark || '#0d0d0d'
-- var themeColor = theme.display_mode === 'dark' ? themeColorDark : themeColorLight
 
 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
+if pageKeywords
+  meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
@@ -26,7 +33,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})
@@ -39,14 +46,14 @@ if (theme.pwa && theme.pwa.enable)
   !=partial('includes/head/pwa', {}, {cache: true})
 
 //- main css
-link(rel='stylesheet', href=url_for(theme.asset.main_css))
+link(rel='stylesheet', href=url_for(theme.CDN.main_css))
-link(rel='stylesheet', href=url_for(theme.asset.fontawesome) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome) 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'")
+  link(rel='stylesheet', href=url_for(theme.CDN.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.CDN.fancybox_css_v4) media="print" onload="this.media='all'")
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})
@@ -55,13 +62,14 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font && theme.blog_title_font.font_link
+if theme.blog_title_font &&　theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
+include ./head/noscript.pug
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 

layout/includes/head/Open_Graph.pug

@@ -1,14 +1,11 @@
-if theme.Open_Graph_meta.enable
+if theme.Open_Graph_meta
-  -
+  - let contentType = is_post() ? 'article' : 'website'
-    const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
+  - let metaImage = (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : ''
-    let ogOption = Object.assign({
+  - let fb_appId = theme.facebook_comments.app_id || ''
-      type: is_post() ? 'article' : 'website',
+  - let fb_admins = theme.facebook_comments.user_id || ''
-      image: coverVal ? full_url_for(coverVal) : '',
+
-      fb_admins: theme.facebook_comments.user_id || '',
+  != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
-      fb_app_id: theme.facebook_comments.app_id || '',
+
-    }, theme.Open_Graph_meta.option)
-  -
-  != open_graph(ogOption)
 else
   meta(name="description" content=page_description())
 

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

@@ -19,14 +19,10 @@
   let localSearch = 'undefined';
   if (theme.local_search && theme.local_search.enable) {
     localSearch = JSON.stringify({
-      path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
+      path: 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"),
       }
     })
   }
@@ -105,7 +101,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 +111,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.CDN.flickr_justified_gallery_js)}',
+        css: '!{url_for(theme.CDN.flickr_justified_gallery_css)}'
+      }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
-    isAnchor: !{theme.anchor.auto_update || false},
+    isAnchor: !{theme.anchor}
-    percent: {
-      toc: !{theme.toc.scroll_percent},
-      rightside: !{theme.rightside_scroll_percent},
-    },
-    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

layout/includes/head/config_site.pug

@@ -7,7 +7,7 @@
   else isHighlightShrink = theme.highlight_shrink
 
   var showToc = false
-  if (theme.aside.enable && page.aside !== false) {
+  if (theme.aside.enable) {
     let tocEnable = false
     if (is_post()) {
       if (theme.toc.post) tocEnable = true

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,9 +17,9 @@ 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 site_title = is_archive() ? fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);}) : page.title || page.tag || page.category || config.title
     - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else
@@ -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

@@ -61,32 +61,16 @@
           if block
             block
 
-      - const commentUse = comments.use
+      if theme.busuanzi.page_pv
-      if page.comments !== false && commentUse && !comments.lazyload
-        if commentUse[0] === 'Valine' && theme.valine.visitor
-          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
-            span.leancloud-visitors-count
-              i.fa-solid.fa-spinner.fa-spin
-        else if commentUse[0] === 'Waline' && theme.waline.pageview
-          +pvBlock('','','')
-            span.waline-pageview-count(data-path=url_for(page.path))
-              i.fa-solid.fa-spinner.fa-spin
-        else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor
-          +pvBlock('','','')
-            span#twikoo_visitors
-              i.fa-solid.fa-spinner.fa-spin
-        else if commentUse[0] === 'Artalk' && theme.artalk.visitor
-          +pvBlock('','','')
-            span#ArtalkPV
-              i.fa-solid.fa-spinner.fa-spin
-        else if theme.busuanzi.page_pv
-          +pvBlock('','post-meta-pv-cv','')
-            span#busuanzi_value_page_pv
-              i.fa-solid.fa-spinner.fa-spin
-      else if theme.busuanzi.page_pv
         +pvBlock('','post-meta-pv-cv','')
           span#busuanzi_value_page_pv
-            i.fa-solid.fa-spinner.fa-spin
+      else if comments.use && !comments.lazyload
+        if (comments.use.includes('Valine') && theme.valine.visitor) || (comments.use.includes('Waline') && theme.waline.visitor)
+          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+            span.leancloud-visitors-count
+        else if (comments.use.includes('Twikoo') && theme.twikoo.visitor)
+          +pvBlock('','','')
+            span#twikoo_visitors
 
       if comments.count && !comments.lazyload && page.comments !== false && comments.use
         - var whichCount = comments.use[0]
@@ -101,44 +85,27 @@
         
         case whichCount
           when 'Disqus'
-            +countBlock
-              a.disqus-comment-count(href=full_url_for(page.path) + '#post-comment')
-                i.fa-solid.fa-spinner.fa-spin
           when 'Disqusjs'
             +countBlock
-              a.disqusjs-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')
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                  i.fa-solid.fa-spinner.fa-spin
           when 'Waline'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.waline-comment-count(data-path=url_for(page.path))
+                span.waline-comment-count(id=url_for(page.path))
-                  i.fa-solid.fa-spinner.fa-spin
           when 'Gitalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.gitalk-comment-count
-                  i.fa-solid.fa-spinner.fa-spin
           when 'Twikoo'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span#twikoo-count
-                  i.fa-solid.fa-spinner.fa-spin
           when 'Facebook Comments'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.fb-comments-count(data-href=urlNoIndex())
-          when 'Remark42'
-            +countBlock
-              a(href=url_for(page.path) + '#post-comment')
-                span.remark42__counter(data-url=urlNoIndex())
-                  i.fa-solid.fa-spinner.fa-spin
-          when 'Artalk'
-            +countBlock
-              a(href=url_for(page.path) + '#post-comment')
-                span.artalk-count
-                  i.fa-solid.fa-spinner.fa-spin

layout/includes/header/social.pug

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

layout/includes/layout.pug

@@ -1,5 +1,4 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
-- page.aside = is_archive() ? theme.aside.display.archive: is_category() ? theme.aside.display.category : is_tag() ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 - var pageType = is_post() ? 'post' : 'page'
 
@@ -8,8 +7,8 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
   head
     include ./head.pug
   body
-    if theme.preloader.enable
+    if theme.preloader
-      !=partial('includes/loading/index', {}, {cache: true})
+      !=partial('includes/loading/loading', {}, {cache: true})
 
     if theme.background
       #web_bg
@@ -33,7 +32,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 +43,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

@@ -1,33 +0,0 @@
-#loading-box
-  .loading-left-bg
-  .loading-right-bg
-  .spinner-box
-    .configure-border-1
-      .configure-core
-    .configure-border-2
-      .configure-core
-    .loading-word= _p('loading')
-
-script.
-  (()=>{
-    const $loadingBox = document.getElementById('loading-box')
-    const $body = document.body
-    const preloader = {
-      endLoading: () => {
-        $body.style.overflow = ''
-        $loadingBox.classList.add('loaded')
-      },
-      initLoading: () => {
-        $body.style.overflow = 'hidden'
-        $loadingBox.classList.remove('loaded')
-      }
-    }
-
-    preloader.initLoading()
-    window.addEventListener('load',() => { preloader.endLoading() })
-
-    if (!{theme.pjax && theme.pjax.enable}) {
-      document.addEventListener('pjax:send', () => { preloader.initLoading() })
-      document.addEventListener('pjax:complete', () => { preloader.endLoading() })
-    }
-  })()

layout/includes/loading/index.pug

@@ -1,4 +0,0 @@
-if theme.preloader.source === 1
-  include ./fullpage-loading.pug
-else
-  include ./pace.pug

layout/includes/loading/loading-js.pug

@@ -0,0 +1,13 @@
+script.
+  var preloader = {
+    endLoading: () => {
+      document.body.style.overflow = 'auto';
+      document.getElementById('loading-box').classList.add("loaded")
+    },
+    initLoading: () => {
+      document.body.style.overflow = '';
+      document.getElementById('loading-box').classList.remove("loaded")
+
+    }
+  }
+  window.addEventListener('load',preloader.endLoading())

layout/includes/loading/loading.pug

@@ -0,0 +1,9 @@
+#loading-box
+  .loading-left-bg
+  .loading-right-bg
+  .spinner-box
+    .configure-border-1
+      .configure-core
+    .configure-border-2
+      .configure-core
+    .loading-word= _p('loading')

layout/includes/loading/pace.pug

@@ -1,11 +0,0 @@
-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,41 +67,27 @@ 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'
               when 'Disqusjs'
                 +countBlockInIndex
-                  a.disqus-count(href=full_url_for(link) + '#post-comment')
+                  a(href=full_url_for(link) + '#disqus_thread')
-                    i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment')
+                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
-                    span.valine-comment-count(data-xid=url_for(link))
+                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
-                      i.fa-solid.fa-spinner.fa-spin
               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
                   a.twikoo-count(href=url_for(link) + '#post-comment')
-                    i.fa-solid.fa-spinner.fa-spin
               when 'Facebook Comments'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.fb-comments-count(data-href=urlNoIndex(article.permalink))
-              when 'Remark42'
-                +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment')
-                    span.remark42__counter(data-url=urlNoIndex(article.permalink))
-                      i.fa-solid.fa-spinner.fa-spin
-              when 'Artalk'
-                +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment')
-                    span.artalk-count(data-page-key=url_for(link))
-                      i.fa-solid.fa-spinner.fa-spin
 
         //- Display the article introduction on homepage
         case theme.index_post_content.method

layout/includes/page/flink.pug

@@ -1,82 +1,68 @@
 #article-container
   .flink
-    - let { content, random, flink_url } = page
+    if page.flink_url
-    - let pageContent = content
-
-    if flink_url || random
-      - const linkData = flink_url ? false : site.data.link || false
       script.
         (()=>{
           const replaceSymbol = (str) => {
-            return str.replace(/[\p{P}\p{S}]/gu, "-")
+            return str.replace(/[\p{P}\p{S}]/gu, '-')
           }
 
-          let result = ""
+          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 = ""
+                let listResult = ''
-              const lists = str[i].link_list
+                const lists = str[i].link_list
-              if (!{random === true}) {
+                for(let j = 0; j < lists.length; j++){
-                lists.sort(() => Math.random() - 0.5)
+                  listResult += `
-              }
+                    <div class="flink-list-item">
-              for(let j = 0; j < lists.length; j++){
+                      <a href='${lists[j].link}' title='${lists[j].name}' target='_blank'>
-                listResult += `
+                        <div class='flink-item-icon'>
-                  <div class="flink-list-item">
+                          <img class='no-lightbox' src='${lists[j].avatar}' onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt='${lists[j].name}' />
-                    <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
+                        </div>
-                      <div class="flink-item-icon">
+                        <div class='flink-item-name'>${lists[j].name}</div> 
-                        <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 class='flink-item-desc' title='${lists[j].descr}'>${lists[j].descr}</div>
-                      </div>
+                      </a>
-                      <div class="flink-item-name">${lists[j].name}</div> 
+                    </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>`
               }
 
-              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
       if site.data.link
-        - let result = ""
+        - let result = ''
         each i in site.data.link
-          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ""
+          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ''
-          - let classDesc = i.class_desc ? `<div class="flink-desc">${i.class_desc}</div>` : ""
+          - let classDesc = i.class_desc ? `<div class='flink-desc'>${i.class_desc}</div>` : ''
 
-          - let listResult = ""
+          - let listResult = ''
 
           each j in i.link_list
             - 
               listResult += `
                 <div class="flink-list-item">
-                  <a href="${j.link}" title="${j.name}" target="_blank">
+                  <a href='${j.link}' title='${j.name}' target='_blank'>
-                    <div class="flink-item-icon">
+                    <div class='flink-item-icon'>
-                      <img class="no-lightbox" src="${j.avatar}" onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt="${j.name}" />
+                      <img class='no-lightbox' src='${j.avatar}' onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt='${j.name}' />
                     </div>
-                    <div class="flink-item-name">${j.name}</div> 
+                    <div class='flink-item-name'>${j.name}</div> 
-                    <div class="flink-item-desc" title="${j.descr}">${j.descr}</div>
+                    <div class='flink-item-desc' title='${j.descr}'>${j.descr}</div>
                   </a>
                 </div>`
             -
 
-          - result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+          - result += `${className}${classDesc} <div class='flink-list'>${listResult}</div>`
+
+        - page.content = result + page.content
+    != page.content
 
-        - 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

@@ -1,23 +1,17 @@
 if theme.post_copyright.enable && page.copyright !== false
-  - let author = page.copyright_author || config.author
+  - let author = page.copyright_author ? page.copyright_author : config.author
-  - let authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
+  - let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}`
-  - let url = page.copyright_url || page.permalink
+  - let url = page.copyright_url ? page.copyright_url : page.permalink
-  - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
+  - let info = page.copyright_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_btn"))
             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

@@ -3,16 +3,21 @@
   #sidebar-menus
     .avatar-img.is-center
       img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-    .sidebar-site-data.site-data.is-center
+    .site-data.is-center
-      a(href=url_for(config.archive_dir) + '/')
+      .data-item
-        .headline= _p('aside.articles') 
+        a(href=url_for(config.archive_dir) + '/')
-        .length-num= site.posts.length
+          .headline= _p('aside.articles') 
-      a(href=url_for(config.tag_dir) + '/' )
+          .length-num= site.posts.length
-        .headline= _p('aside.tags')
-        .length-num= site.tags.length
-      a(href=url_for(config.category_dir) + '/')
-        .headline= _p('aside.categories') 
-        .length-num= site.categories.length
 
-    hr.custom-hr
+      .data-item
+        a(href=url_for(config.tag_dir) + '/' )
+          .headline= _p('aside.tags')
+          .length-num= site.tags.length
+
+      .data-item
+        a(href=url_for(config.category_dir) + '/')
+          .headline= _p('aside.categories') 
+          .length-num= site.categories.length
+
+    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/aplayer.pug

@@ -1,3 +1,3 @@
-link(rel='stylesheet' href=url_for(theme.asset.aplayer_css) media="print" onload="this.media='all'")
+link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css) media="print" onload="this.media='all'")
-script(src=url_for(theme.asset.aplayer_js))
+script(src=url_for(theme.CDN.aplayer_js))
-script(src=url_for(theme.asset.meting_js))
+script(src=url_for(theme.CDN.meting_js))

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

@@ -1,35 +0,0 @@
-- const { server, site } = theme.artalk
-
-script.
-  (() => {
-    const getArtalkCount = async() => {
-      try {
-        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
-        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
-
-        const headerList = {
-          method: '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)
-      }
-    }
-
-    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,13 +1,10 @@
-- const fbSDKVer = 'v16.0'
-- const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
-
 script.
   (()=>{
     function loadFBComment () {
-      if (typeof FB === 'object') FB.XFBML.parse(document.getElementById('recent-posts'))
+      if (typeof FB === 'object') FB.XFBML.parse()
       else {
         let ele = document.createElement('script')
-        ele.setAttribute('src','!{fbSDK}')
+        ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v9.0')
         ele.setAttribute('async', 'true')
         ele.setAttribute('defer', 'true')
         ele.setAttribute('crossorigin', 'anonymous')

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

@@ -10,7 +10,3 @@ case theme.comments.use[0]
     include ./waline.pug
   when 'Facebook Comments'
     include ./fb.pug
-  when 'Remark42'
-    include ./remark42.pug
-  when 'Artalk'
-    include ./artalk.pug

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

@@ -1,18 +0,0 @@
-- const { host, siteId, option } = theme.remark42
-
-script.
-  (()=>{
-    window.remark_config = Object.assign({
-      host: '!{host}',
-      site_id: '!{siteId}',
-    },!{JSON.stringify(option)})
-
-    function getCount () {
-      const s = document.createElement('script')
-      s.src = remark_config.host + '/web/counter.js'
-      s.defer = true
-      document.head.appendChild(s)
-    }
-
-    window.pjax ? getCount() : window.addEventListener('load', getCount)
-  })()

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)
@@ -28,7 +28,7 @@ script.
         if (typeof twikoo === 'object') {
           runTwikoo()
         } else {
-          getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+          getScript('!{theme.CDN.twikoo}').then(runTwikoo)
         }
     }
 

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

@@ -6,14 +6,13 @@ script.
           el: '#vcomment',
           appId: '#{theme.valine.appId}',
           appKey: '#{theme.valine.appKey}',
-          serverURLs: '#{theme.valine.serverURLs}'
         }
         
         const valine = new Valine(initData)
       }
 
       if (typeof Valine === 'function') initValine() 
-      else getScript('!{url_for(theme.asset.valine)}').then(initValine)
+      else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
     }
 
     window.pjax ? loadValine() : window.addEventListener('load', loadValine)

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

@@ -1,20 +1,16 @@
-- 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' })
+        }
-        const result = await res.json()
+        const waline = new Waline(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.CDN.waline)}').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,7 +4,7 @@ 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
-  include ./messenger.pug

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

@@ -1,44 +0,0 @@
-- let { pageID, lang } = theme.messenger
-- lang = theme.comments.use && theme.comments.use.includes('Facebook Comments') ? theme.facebook_comments.lang : lang
-
-#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>')
-
-    window.fbAsyncInit = function() {
-      FB.init({
-        xfbml: true,
-        version: 'v16.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'));
-
-    const isChatBtn = !{theme.chat_btn}
-    const isChatHideShow = !{theme.chat_hide_show}
-
-    if (isChatBtn) {
-      window.chatBtnFn = () => {
-        const isShow = document.querySelector('.fb_customer_chat_bounce_in_v2')
-        isShow ? FB.CustomerChat.hide() : FB.CustomerChat.show()
-      }
-    } else if (isChatHideShow) {
-      window.chatBtn = {
-        hide: () => {
-          FB.CustomerChat.hide()
-        },
-        show: () => {
-          FB.CustomerChat.show(false)
-        }
-      }
-    }
-  })()
-

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

@@ -1,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();
+      });
+    }
+    if (window.tidioChatApi) {
+      window.tidioChatApi.on("ready", onTidioChatApiReady);
+    } else {
+      document.addEventListener("tidioChat-ready", onTidioChatApiReady);
+    }
 
-      const open = () => {
+    var chatBtnFn = () => {
-        window.tidioChatApi.open()
+      document.getElementById("chat_btn").addEventListener("click", function(){
-        window.tidioChatApi.show()
+        window.tidioChatApi.show();
-        isShow = true
+        window.tidioChatApi.open();
-      }
+      });
+    }
+    chatBtnFn()
 
-      const onTidioChatApiReady = () => {
+else if theme.chat_hide_show
-        window.tidioChatApi.hide()
+  script.
-        window.tidioChatApi.on("close", close)
+    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,52 +0,0 @@
-- const { server, site, option } = theme.artalk
-- const { use, lazyload } = theme.comments
-
-script.
-  (() => {
-    const initArtalk = () => {
-      window.artalkItem = new Artalk(Object.assign({
-        el: '#artalk-wrap',
-        server: '!{server}',
-        site: '!{site}',
-        pageKey: location.pathname,
-        darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
-        countEl: '.artalk-count'
-      },!{JSON.stringify(option)}))
-
-      if (GLOBAL_CONFIG.lightbox === 'null') return
-      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') initArtalk()
-      else {
-        await getCSS('!{theme.asset.artalk_css}')
-        await getScript('!{theme.asset.artalk_js}')
-        initArtalk()
-      }
-    }
-
-    const artalkChangeMode = theme => {
-      const artalkWrap = document.getElementById('artalk-wrap')
-      if (!(artalkWrap && artalkWrap.children.length)) return
-      const isDark = theme === 'dark'
-      window.artalkItem.setDarkMode(isDark)
-    }
-  
-
-    btf.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
-    
-    if ('!{use[0]}' === 'Artalk' || !!{lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
-      else loadArtalk()
-    } else {
-      window.loadOtherComment = loadArtalk
-    }
-  })()

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

@@ -1,59 +1,47 @@
-- 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.identifier = '!{ 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() => {
+  if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {
-      try {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
-        const eleGroup = document.querySelector('#post-meta .disqus-comment-count')
+    else loadDisqus()
-        if (!eleGroup) return
+  } else {
-        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+    function loadOtherComment () {
-
+      loadDisqus()
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&thread:link=${cleanedLinks}`,{
-          method: 'GET'
-        })
-        const result = await res.json()
-
-        const count = result.response.length ? result.response[0].posts : 0
-        eleGroup.textContent = count
-      } catch (err) {
-        console.error(err)
-      }
     }
+  }
 
-    if ('!{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,64 +1,55 @@
 - let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
-- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  (() => {
+  function loadDisqusjs () {
-    const initDisqusjs = () => {
+    function addDisqusjsCSS () {
-      window.disqusjs = null
+      const ele = document.createElement('link')
-      disqusjs = new DisqusJS(Object.assign({
+      ele.rel = 'stylesheet'
-        shortname: '!{dqShortname}',
+      ele.href= '!{url_for(theme.CDN.disqusjs_css)}'
-        identifier: '!{ url_for(page.path) }',
+      document.getElementsByTagName('head')[0].appendChild(ele)
+    }
+
+    function initDisqusjs () {
+      window.DISQUS = null
+      new DisqusJS(Object.assign({
+        shortname: '!{theme.disqusjs.shortname}',
+        identifier: '!{ 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'))
     }
 
-    const themeChange = () => {
+
-      const ele = document.getElementById('disqus_thread')
+    window.disqusReset = initDisqusjs
-      if(!ele) return
+
-      disqusjs.destroy()
+    if (window.disqusJsLoad) initDisqusjs()
-      initDisqusjs()
+    else {
+      addDisqusjsCSS()
+      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
+      window.disqusJsLoad = true
     }
+  }
 
-    btf.addGlobalFn('themeChange', themeChange, 'disqusjs')
+  if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
-    const loadDisqusjs = async() => {
+    else loadDisqusjs()
-      if (window.disqusJsLoad) initDisqusjs()
+  }
-      else {
+  else {
-        await getCSS('!{url_for(theme.asset.disqusjs_css)}')
+    function loadOtherComment () {
-        await getScript('!{url_for(theme.asset.disqusjs)}')
+      loadDisqusjs()
-        initDisqusjs()
-        window.disqusJsLoad = true
-      }
     }
+  }
 
-    const getCount = async() => {
-      try {
-        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
-        if (!eleGroup) return
-        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
 
-        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{dqShortname}&api_key=!{dqApikey}&thread:link=${cleanedLinks}`,{
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
-          method: 'GET'
+  script.
-        })
+    if (window.DISQUSWIDGETS === undefined) {
-        const result = await res.json()
+      var d = document, s = d.createElement('script');
-        const count = result.response.length ? result.response[0].posts : 0
+      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-        eleGroup.textContent = count
+      s.id = 'dsq-count-scr';
-      } catch (err) {
+      (d.head || d.body).appendChild(s);
-        console.error(err)
-      }
-    }
-
-    if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs-wrap'), loadDisqusjs)
-      else {
-        loadDisqusjs()
-        !{ theme.comments.count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : '' }
-      }
     } else {
-      window.loadOtherComment = loadDisqusjs
+      DISQUSWIDGETS.getCount({reset: true});
     }
-  })()
+

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

@@ -1,46 +1,26 @@
-- const fbSDKVer = 'v16.0'
+#fb-root
-- 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 = () => {
+    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-      document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
+    document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow)
 
-      const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+    if (typeof FB === 'object') FB.XFBML.parse()
-      const $fbComment = document.getElementsByClassName('fb-comments')[0]
+    else {
-      $fbComment.setAttribute('data-colorscheme',themeNow)
+      let ele = document.createElement('script')
-      $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v11.0')
-
+      ele.setAttribute('async', 'true')
-      if (typeof FB === 'object') {
+      ele.setAttribute('defer', 'true')
-        FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
+      ele.setAttribute('crossorigin', 'anonymous')
-        FB.XFBML.parse(document.getElementById('post-comment'))
+      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: '!{theme.CDN.giscus}',
+      '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.CDN.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.CDN.gitalk)}').then(initGitalk)
-        await getScript('!{url_for(theme.asset.gitalk)}')
-        initGitalk()
-      }
     }
+  }
   
-    const commentCount = n => {
+  function commentCount(n){
-      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-      if (isCommentCount) {
+    if (isCommentCount) {
-        isCommentCount.textContent= n
+      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
+            #disqus_thread
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'
@@ -40,7 +40,3 @@ hr.custom-hr
                         data-numposts= theme.facebook_comments.pageSize || 10
                         data-order-by= theme.facebook_comments.order_by || 'social'
                         data-width="100%")
-          when 'Remark42'
-            #remark42
-          when 'Artalk'
-            #artalk-wrap

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

@@ -19,8 +19,4 @@ each name in theme.comments.use
     when 'Giscus'
       !=partial('includes/third-party/comments/giscus', {}, {cache: true})
     when 'Facebook Comments'
-      include ./facebook_comments.pug
+      !=partial('includes/third-party/comments/facebook_comments', {}, {cache: true})
-    when 'Remark42'
-      !=partial('includes/third-party/comments/remark42', {}, {cache: true})
-    when 'Artalk'
-      !=partial('includes/third-party/comments/artalk', {}, {cache: true})

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

@@ -1,68 +0,0 @@
-- const { host, siteId, option } = theme.remark42
-script.
-  var remark_config = Object.assign({
-    host: '!{host}',
-    site_id: '!{siteId}',
-    components: ['embed'],
-    theme: document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-  },!{JSON.stringify(option)})
-
-  function addRemark42(){
-    for (let i = 0; i < remark_config.components.length; i++) {
-      const s = document.createElement('script')
-      s.src = remark_config.host + '/web/' + remark_config.components[i] + '.js'
-      s.defer = true
-      document.head.appendChild(s)
-    }
-  }
-
-  function initRemark42() {
-    if (window.REMARK42) {
-      if (this.remark42Instance) {
-        this.remark42Instance.destroy()
-      }
-
-      this.remark42Instance = window.REMARK42.createInstance({
-        ...remark_config
-      })
-    }
-  }
-
-  function getCount () {
-    const ele = document.querySelector('.remark42__counter')
-    if (ele) {
-      const s = document.createElement('script')
-      s.src = remark_config.host + '/web/counter.js'
-      s.defer = true
-      document.head.appendChild(s)
-    }
-  }
-
-  function loadRemark42 () {
-    if (window.REMARK42) {
-      this.initRemark42()
-      getCount()
-    } else {
-      addRemark42()
-      window.addEventListener('REMARK42::ready', () => {
-        this.initRemark42()
-        getCount()
-      })
-    }
-  }
-
-  function remarkChangeMode (theme) {
-    if (!window.REMARK42) return
-    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)
-    else loadRemark42()
-  } else {
-    function loadOtherComment () {
-      loadRemark42()
-    }
-  }

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

@@ -2,45 +2,50 @@
 - 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)'))
+          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.vemoji)'))
         }
       }, !{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
       twikoo.getCommentsCount({
         envId: '!{envId}',
         region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
-      }).then(res => {
+      }).then(function (res) {
-        countELement.textContent = res[0].count
+        document.getElementById('twikoo-count').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('!{theme.CDN.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', '!{url_for(theme.CDN.utterances)}')
-      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.CDN.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

@@ -1,33 +1,28 @@
-- const { serverURL, option, pageview } = theme.waline
+- const { serverURL, visitor, option } = theme.waline
-- const { lazyload, count, use } = theme.comments
 
 script.
-  (() => {
+  function loadWaline () {
-    const initWaline = () => {
+    function initWaline () {
-      const waline = Waline.init(Object.assign({
+      const waline = new Waline(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
-        pageview: !{lazyload ? false : pageview},
+        path: location.pathname,
-        dark: 'html[data-theme="dark"]',
+        visitor: !{visitor},
-        path: window.location.pathname,
+        dark: 'html[data-theme="dark"]'
-        comment: !{lazyload ? false : count},
       }, !{JSON.stringify(option)}))
     }
 
-    const loadWaline = async () => {
+    if (typeof Waline === 'function') initWaline()
-      if (typeof Waline === 'object') initWaline()
+    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
-      else {
+  }
-        await getCSS('!{url_for(theme.asset.waline_css)}')
-        await getScript('!{url_for(theme.asset.waline_js)}')
-        initWaline()
-      }
-    }
 
-    if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+  if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
-      if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    if (!{theme.comments.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

@@ -1,19 +1,19 @@
 if theme.fireworks && theme.fireworks.enable
   canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
-  script(src=url_for(theme.asset.fireworks))
+  script(src=url_for(theme.CDN.fireworks))
 
 if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  script(defer id="ribbon" src=url_for(theme.asset.canvas_ribbon) size=theme.canvas_ribbon.size
+  script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
   alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)
 
 if (theme.canvas_fluttering_ribbon && theme.canvas_fluttering_ribbon.enable)
-  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.asset.canvas_fluttering_ribbon))
+  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.CDN.canvas_fluttering_ribbon))
 
 if (theme.canvas_nest && theme.canvas_nest.enable)
-  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.asset.canvas_nest))
+  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))
 
 if theme.activate_power_mode.enable
-  script(src=url_for(theme.asset.activate_power_mode))
+  script(src=url_for(theme.CDN.activate_power_mode))
   script.
     POWERMODE.colorful = !{theme.activate_power_mode.colorful};
     POWERMODE.shake = !{theme.activate_power_mode.shake};
@@ -22,14 +22,14 @@ 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}`)
+  script#click-heart(src=url_for(theme.CDN.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.CDN.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/katex.pug

@@ -1,5 +1,6 @@
-link(rel="stylesheet" type="text/css" href=url_for(theme.asset.katex))
+link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
-script(src=url_for(theme.asset.katex_copytex))
+script(src=url_for(theme.CDN.katex_copytex))
+link(rel="stylesheet" type="text/css" href=theme.CDN.katex_copytex_css)
 script.
   (() => {
     document.querySelectorAll('#article-container span.katex-display').forEach(item => {

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

@@ -3,11 +3,11 @@ script.
   if (!window.MathJax) {
     window.MathJax = {
       tex: {
-        inlineMath: [['$', '$'], ['\\(', '\\)']],
+        inlineMath: [ ['$','$'], ["\\(","\\)"]],
         tags: 'ams'
       },
       chtml: {
-        scale: 1.1
+        scale: 1.2
       },
       options: {
         renderActions: {
@@ -21,18 +21,28 @@ script.
               math.end = {node: text, delim: '', n: 0}
               doc.math.push(math)
             }
-          }, '']
+          }, ''],
+          insertScript: [200, () => {
+            document.querySelectorAll('mjx-container:not\([display]\)').forEach(node => {
+              const target = node.parentNode
+              if (target.nodeName.toLowerCase() === 'li') {
+                target.parentNode.classList.add('has-jax')
+              } else {
+                target.classList.add('has-jax')
+              }
+            });
+          }, '', false]
         }
       }
     }
     
     const script = document.createElement('script')
-    script.src = '!{url_for(theme.asset.mathjax)}'
+    script.src = '!{theme.CDN.mathjax}'
     script.id = 'MathJax-script'
     script.async = true
     document.head.appendChild(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('!{theme.CDN.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,110 +0,0 @@
-- const { server, site, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar && option.gravatar.mirror
-- const avatarDefault = option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)
-
-script.
-  window.addEventListener('load', () => {
-    const changeContent = (content) => {
-      if (content === '') return content
-
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
-      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
-      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
-      content = content.replace(/<[^>]+>/g,"") // remove html tag
-
-      if (content.length > 150) {
-        content = content.substring(0,150) + '...'
-      }
-      return content
-    }
-
-    const generateHtml = array => {
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const getSetting = async () => {
-      try {
-        const res = await fetch('!{server}/api/conf', { method: 'GET' })
-        return await res.json()
-      } catch (e) {
-        console.log(e)
-      }
-    }
-
-    const headerList = {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Origin': window.location.origin
-      },
-      body: new URLSearchParams({
-        'site_name': '!{site}',
-        'limit': '!{theme.newest_comments.limit}',
-        '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 = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('artalk-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', 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/index.pug

@@ -24,7 +24,3 @@ if use
     when 'Utterances'
       - userRepo = theme.utterances.repo
       include ./github-issues.pug
-    when 'Remark42'
-      include ./remark42.pug
-    when 'Artalk'
-      include ./artalk.pug

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

@@ -1,80 +0,0 @@
-- const { host, siteId } = theme.remark42
-
-script.
-  window.addEventListener('load', () => {
-    const changeContent = (content) => {
-      if (content === '') return content
-
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
-      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
-      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
-      content = content.replace(/<[^>]+>/g,"") // remove html tag
-
-      if (content.length > 150) {
-        content = content.substring(0,150) + '...'
-      }
-      return content
-    }
-
-    const generateHtml = array => {
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const getComment = () => {
-      fetch('!{host}/api/v1/last/!{theme.newest_comments.limit}?site=!{siteId}')
-        .then(response => response.json())
-        .then(data => {
-          const remark42 = data.map(function (e) {
-            return {
-              'avatar': e.user.picture,
-              'content': changeContent(e.text),
-              'nick': e.user.name,
-              'url': e.locator.url,
-              'date': e.time,
-            }
-          })
-          saveToLocal.set('remark42-newest-comments', JSON.stringify(remark42), !{theme.newest_comments.storage}/(60*24))
-          generateHtml(remark42)
-        }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
-        })
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('remark42-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
-  })

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

@@ -36,14 +36,14 @@ 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')}"
         })
       }
 
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
       }
     }
 

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

@@ -1,6 +1,6 @@
 - let default_avatar = theme.valine.avatar
 
-script(src=url_for(theme.asset.blueimp_md5))
+script(src=url_for(theme.CDN.blueimp_md5))
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
@@ -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,8 @@
-- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
+- let { avatar,avatarCDN } = theme.waline
 
 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 +43,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.Widget.RecentComments({
-        const result = await res.json()
+          serverURL: '!{theme.waline.serverURL}',
-        const walineArray = result.data.map(e => {
+          count: !{theme.newest_comments.limit}
-          return {
+        }).then(res => {
-            'content': changeContent(e.comment),
+          const walineArray = res.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(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
         }) 
-        saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
-        generateHtml(walineArray)
-      } catch (err) {
-        console.error(err)
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
       }
+
+      if (typeof Waline === 'function') loadWaline() 
+      else getScript('!{url_for(theme.CDN.waline)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pangu.pug

@@ -2,7 +2,7 @@ script.
   function panguFn () {
     if (typeof pangu === 'object') pangu.autoSpacingPage()
     else {
-      getScript('!{url_for(theme.asset.pangu)}')
+      getScript('!{url_for(theme.CDN.pangu)}')
         .then(() => {
           pangu.autoSpacingPage()
         })

layout/includes/third-party/pjax.pug

@@ -3,16 +3,16 @@ if theme.pjax.exclude
   each val in theme.pjax.exclude
     - pjaxExclude = pjaxExclude + `:not([href="${val}"])`
 
-- let pjaxSelectors = ['head > title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
+- let pjaxSelectors = ['title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
 
 - let choose = theme.comments.use
 if choose
-  if theme.Open_Graph_meta.enable && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
+  if theme.Open_Graph_meta && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
     - pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
   if choose.includes('Utterances') || choose.includes('Giscus')
     - pjaxSelectors.unshift('link[rel="canonical"]')
 
-script(src=url_for(theme.asset.pjax))
+script(src=url_for(theme.CDN.pjax))
 script.
   let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
 
@@ -26,11 +26,11 @@ script.
 
   document.addEventListener('pjax:send', function () {
 
-    // removeEventListener
+    // removeEventListener scroll 
-    btf.removeGlobalFnEvent('pjax')
+    window.removeEventListener('scroll', window.tocScrollFn)
-    btf.removeGlobalFnEvent('themeChange')
+    window.removeEventListener('scroll', scrollCollect)
 
-    document.getElementById('rightside').classList.remove('rightside-show')
+    typeof preloader === 'object' && preloader.initLoading()
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -46,7 +46,6 @@ script.
     const $bodyClassList = document.body.classList
     $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
-    typeof disqusjs === 'object' && disqusjs.destroy()
   })
 
   document.addEventListener('pjax:complete', function () {
@@ -62,6 +61,7 @@ script.
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
+    typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
     // google analytics
@@ -74,10 +74,12 @@ script.
 
     // prismjs
     typeof Prism === 'object' && Prism.highlightAll()
+
+    typeof preloader === 'object' && preloader.endLoading()
   })
 
-  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/prismjs.pug

@@ -1,5 +1,5 @@
 if config.prismjs && config.prismjs.enable && !config.prismjs.preprocess
-  script(src=url_for(theme.asset.prismjs_js))
+  script(src=url_for(theme.CDN.prismjs_js))
-  script(src=url_for(theme.asset.prismjs_autoloader))
+  script(src=url_for(theme.CDN.prismjs_autoloader))
   if config.prismjs.line_number
-    script(src=url_for(theme.asset.prismjs_lineNumber_js))
+    script(src=url_for(theme.CDN.prismjs_lineNumber_js))

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

@@ -1,7 +1,7 @@
 #algolia-search
   .search-dialog
     nav.search-nav
-      span.search-dialog-title= _p('search.title')
+      span.search-dialog-title= 'Algolia'
       button.search-close-button
         i.fas.fa-times
 
@@ -11,12 +11,6 @@
       #algolia-search-results
         #algolia-hits
         #algolia-pagination
-        #algolia-info
+        #algolia-stats
-          .algolia-stats
-          .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

@@ -2,5 +2,3 @@ if theme.algolia_search.enable
   include ./algolia.pug
 else if theme.local_search.enable
   include ./local-search.pug
-else if theme.docsearch.enable
-  include ./docsearch.pug

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

@@ -1,7 +1,7 @@
 #local-search
   .search-dialog
     nav.search-nav
-      span.search-dialog-title= _p('search.title')
+      span.search-dialog-title=_p("search.local_search.label")
       span#loading-status
       button.search-close-button
         i.fas.fa-times
@@ -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/addtoany.pug

@@ -5,6 +5,6 @@
       a(class="a2a_button_" + name)
 
     a.a2a_dd(href="https://www.addtoany.com/share")
-script(async src='https://static.addtoany.com/menu/page.js')
+script(async src=url_for(theme.CDN.addtoany))
 
 

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.CDN.sharejs_css) media="print" onload="this.media='all'")
-link(rel='stylesheet' href=url_for(theme.asset.sharejs_css) media="print" onload="this.media='all'")
+script(src=url_for(theme.CDN.sharejs) defer)
-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 } = 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: 300,
+                typeSpeed: 150,
+                loop: !{loop},
+                backSpeed: 50,
+              })
             } 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.CDN.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: 300,
+              typeSpeed: 150,
+              loop: !{loop},
+              backSpeed: 50,
+            })
           } 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.CDN.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: 300,
+                typeSpeed: 150,
+                loop: !{loop},
+                backSpeed: 50,
+              })
             } 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.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
 
   default
     - subContent = subContent.length ? subContent : new Array(config.subtitle)
     script.
       function subtitleType () {
         if (!{effect}) { 
-          typedJSFn.init(!{JSON.stringify(subContent)})
+          window.typed = new Typed("#subtitle", {
+            strings: !{JSON.stringify(subContent)},
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{loop},
+            backSpeed: 50
+          })
         } 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.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }

layout/includes/widget/card_announcement.pug

@@ -1,6 +1,6 @@
 if theme.aside.card_announcement.enable
   .card-widget.card-announcement
     .item-headline
-      i.fas.fa-bullhorn.fa-shake
+      i.fas.fa-bullhorn.card-announcement-animation
       span= _p('aside.card_announcement')
     .announcement_content!= theme.aside.card_announcement.content