Merge branch 'dev' into master

fix: 修復jquery在一些介面仍然載入問題
fix: 修復medium zoom 報錯的 bug

.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,63 +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: 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,30 +1,22 @@
-<div align="right">
-  Language:
-  🇺🇸
-  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
-</div>
-
 # hexo-theme-butterfly
 
 ![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/)  ||   🤞 [MYW](https://immyw.com/)
-
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
 
 Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
-## 💻 Installation
+## Installation
 
 ### GIT
 
-> If you are in Mainland China, you can download in [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)
+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)
 
 Stable branch [recommend]:
 
@@ -48,7 +40,7 @@ In Hexo site root directory
 npm i hexo-theme-butterfly
 ```
 
-## ⚙ Configuration
+## Configuration
 
  Set theme in the hexo work folder's root config file `_config.yml`: 
 
@@ -58,7 +50,7 @@ npm i hexo-theme-butterfly
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
-## 🎉 Features
+## Features
 
 - [x] Card UI Design
 - [X] Support sub-menu
@@ -79,17 +71,17 @@ npm i hexo-theme-butterfly
 - [x] Related articles
 - [x] Displays outdated notice for a post
 - [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)
 - [x] Multiple Comment System Support
-- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp/messenger)
+- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
-- [x] Web analytics
+- [x] Web analytics (Baidu Analytics/Google Analytics/Tencent Analytics/CNZZ Analytics)
 - [x] Google AdSense
-- [x] Webmaster Verification
+- [x] Webmaster Verification (google/Bing/Baidu/360/Yandex)
 - [x] Change website colour scheme
 - [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
@@ -97,17 +89,8 @@ npm i hexo-theme-butterfly
 - [x] Lazyload images
 - [x] Instantpage/Pangu/Snackbar notification toast/PWA......
 
-## ✨ Contributors
+## Screenshots
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=jerryc127/hexo-theme-butterfly" />
-</a>
-
-## 📷 Screenshots
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-1.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg)
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
+
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)

README_CN.md

@@ -1,30 +1,22 @@
-<div align="right">
-  語言:
-  中文
-  <a title="English" href="/README.md">英文</a>
-</div>
-
 # hexo-theme-butterfly
 
 ![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/)  ||  🤞 [MYW](https://immyw.com/)
-
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
 
 文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
-## 💻 安裝
+## 安裝
 
 ### Git 安裝
 
-> 本倉庫同時上傳到 [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
 
 在博客根目錄裡安裝穩定版【推薦】
 
@@ -48,8 +40,7 @@ git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/bu
 npm i hexo-theme-butterfly
 ```
 
-## ⚙ 應用主題
+## 應用主題
-
 修改hexo配置文件`_config.yml`，把主題改為`Butterfly`
 
 ```
@@ -58,7 +49,7 @@ theme: butterfly
 
 >如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
-## 🎉 特色
+## 特色
 
 - [x] 卡片化設計
 - [X] 支持二級目錄
@@ -79,17 +70,17 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [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）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp/messenger）
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
-- [x] 多種分析系統
+- [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
 - [x] 谷歌廣告/手動廣告位置
 - [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
 - [x] 多種鼠標點擊特效（煙花/文字/愛心）
-- [x] 內置一種 Preloader 加載動畫和 pace.js 加載動畫條
+- [x] 內置一種 Preloader 加載動畫
 - [x] 不蒜子訪問統計
 - [x] 兩種大圖模式（Medium Zoom/Fancybox）
 - [x] Mermaid 圖表顯示
@@ -97,17 +88,8 @@ 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" />
-</a>
-
-## 📷 截圖
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-1.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg)
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
+
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)

_config.yml

@@ -1,18 +1,25 @@
 # Main menu navigation (導航目錄)
-# see https://butterfly.js.org/posts/4aa8abbe/#導航菜單
 # --------------------------------------
 
+# format: name: link || icon
+# sub-menu
+# name || icon:
+#   name || link || icon
+
 menu:
   # Home: / || fas fa-home
   # Archives: /archives/ || fas fa-archive
   # Tags: /tags/ || fas fa-tags
   # Categories: /categories/ || fas fa-folder-open
   # List||fas fa-list:
-  #   Music: /music/ || fas fa-music
+  #   - Music || /music/ || fas fa-music
-  #   Movie: /movies/ || fas fa-video
+  #   - Movie || /movies/ || fas fa-video
   # Link: /link/ || fas fa-link
   # About: /about/ || fas fa-heart
 
+# Hide the child menu items in mobile sidebar
+hide_sidebar_menu_child: false
+
 # Code Blocks (代碼相關)
 # --------------------------------------
 
@@ -20,7 +27,6 @@ highlight_theme: light #  darker / pale night / light / ocean / mac / mac light
 highlight_copy: true # copy button
 highlight_lang: true # show the code language
 highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button
-highlight_height_limit: false # unit: px
 code_word_wrap: false
 
 # copy settings
@@ -39,7 +45,6 @@ social:
   # fas fa-envelope: mailto:xxxxxx@gmail.com || Email
 
 # search (搜索)
-# see https://butterfly.js.org/posts/ceeb73f/#搜索系統
 # --------------------------------------
 
 # Algolia search
@@ -51,8 +56,6 @@ algolia_search:
 # Local search
 local_search:
   enable: false
-  preload: false
-  CDN:
 
 # Math (數學)
 # --------------------------------------
@@ -80,7 +83,7 @@ favicon: /img/favicon.png
 
 # Avatar (頭像)
 avatar:
-  img: https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png
+  img:
   effect: false
 
 # Disable all banner image
@@ -151,7 +154,6 @@ post_meta:
     label: true # true or false 顯示描述性文字
 
 # wordcount (字數統計)
-# see https://butterfly.js.org/posts/ceeb73f/#字數統計
 wordcount:
   enable: false
   post_wordcount: true
@@ -167,29 +169,18 @@ index_post_content:
   method: 3
   length: 500 # if you set method to 2 or 3, the length need to config
 
-# anchor
-anchor:
-  button:
-    enable: false
-    always_show: false
-    icon: # the unicode value of Font Awesome icon, such as '\3423'
-  auto_update: false # when you scroll in post, the URL will update according to header id.
-
 # Post
 # --------------------------------------
 
 # toc (目錄)
 toc:
-  post: true
+  enable: true
-  page: false
   number: true
-  expand: false
+  style_simple: false
-  style_simple: false # for post
 
 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/
 
@@ -228,6 +219,10 @@ photofigcaption: false
 # false: disable pagination
 post_pagination: 1
 
+# anchor
+# when you scroll in post, the URL will update according to header id.
+anchor: false
+
 # Displays outdated notice for a post (文章過期提醒)
 noticeOutdate:
   enable: false
@@ -263,8 +258,10 @@ 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
-  use: # Valine,Disqus
+  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.
   # If you set it to true, the comment count will be invalid
@@ -276,15 +273,18 @@ comments:
 # https://disqus.com/
 disqus:
   shortname:
-  apikey: # For newest comments widget
 
 # Alternative Disqus - Render comments with Disqus API
 # DisqusJS 評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版
 # https://github.com/SukkaW/DisqusJS
 disqusjs:
   shortname:
+  siteName:
   apikey:
-  option:
+  api:
+  nocomment: # display when a blog post or an article has no comment attached
+  admin:
+  adminLabel:
 
 # livere (來必力)
 # https://www.livere.com/
@@ -299,25 +299,37 @@ gitalk:
   repo:
   owner:
   admin:
-  option:
+  language: en # en, zh-CN, zh-TW, es-ES, fr, ru
+  perPage: 10 # Pagination size, with maximum 100.
+  distractionFreeMode: false # Facebook-like distraction free mode.
+  pagerDirection: last # Comment sorting direction, available values are last and first.
+  createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically
 
 # valine
 # https://valine.js.org
 valine:
   appId: # leancloud application app id
   appKey: # leancloud application app key
+  pageSize: 10 # comment list page size
   avatar: monsterid # gravatar style https://valine.js.org/#/avatar
+  lang: en # i18n: zh-CN/zh-TW/en/ja
+  placeholder: Please leave your footprints # valine comment input placeholder (like: Please leave your footprints)
+  guest_info: nick,mail,link # valine comment header info (nick/mail/link)
+  recordIP: false # Record reviewer IP
   serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
   bg: # valine background
-  visitor: false
+  emojiCDN: # emoji CDN
+  enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
+  requiredFields: nick,mail # required fields (nick/mail)
   option:
 
 # waline - A simple comment system with backend support fork from Valine
 # https://waline.js.org/
 waline:
   serverURL: # Waline server address url
+  avatar: monsterid # gravatar style https://zh-tw.gravatar.com/site/implement/images/#default-image
+  emojiCDN: # emoji CDN
   bg: # waline background
-  pageview: false
   option:
 
 # utterances
@@ -337,40 +349,13 @@ 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
 twikoo:
   envId:
   region:
-  visitor: false
-  option:
-
-# Giscus
-# https://giscus.app/
-giscus:
-  repo:
-  repo_id:
-  category_id:
-  theme:
-    light: light
-    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
@@ -413,13 +398,6 @@ crisp:
   enable: false
   website_id:
 
-# messenger
-# https://developers.facebook.com/docs/messenger-platform/discovery/facebook-chat-plugin/
-messenger:
-  enable: false
-  pageID:
-  lang: zh_TW # Language en_US/zh_CN/zh_TW and so on
-
 # Footer Settings
 # --------------------------------------
 footer:
@@ -440,6 +418,10 @@ baidu_analytics:
 # https://analytics.google.com/analytics/web/
 google_analytics:
 
+# Tencent Analytics ID
+# https://mta.qq.com
+tencent_analytics:
+
 # CNZZ Analytics
 # https://www.umeng.com/
 cnzz_analytics:
@@ -472,11 +454,25 @@ google_adsense:
 # Verification (站長驗證)
 # --------------------------------------
 
-site_verification:
+# Google Webmaster tools verification setting
-  # - name: google-site-verification
+# See: https://www.google.com/webmasters/
-  #   content: xxxxxx
+google_site_verification:
-  # - name: baidu-site-verification
+
-  #   content: xxxxxxx
+# Bing Webmaster tools verification setting
+# See: https://www.bing.com/webmaster/
+bing_site_verification:
+
+# Baidu Webmaster tools verification setting
+# See: https://ziyuan.baidu.com/site/
+baidu_site_verification:
+
+# 360 Webmaster tools verification setting
+# see http://zhanzhang.so.com/
+qihu_site_verification:
+
+# Yandex Webmaster tools verification setting
+# see https://webmaster.yandex.com/
+yandex_site_verification:
 
 # Beautify/Effect (美化/效果)
 # --------------------------------------
@@ -498,9 +494,6 @@ site_verification:
 #   toc_color: "#00c4b6"
 #   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在中間)
@@ -595,8 +588,8 @@ display_mode: light
 beautify:
   enable: false
   field: post # site/post
-  title-prefix-icon: # '\f0c1'
+  title-prefix-icon: '\f0c1'
-  title-prefix-icon-color: # '#F47466'
+  title-prefix-icon-color: '#F47466'
 
 # Global font settings
 # Don't modify the following settings unless you know how they work (非必要不要修改)
@@ -623,31 +616,24 @@ subtitle:
   enable: false
   # Typewriter Effect (打字效果)
   effect: true
-  # Effect Speed Options (打字效果速度參數)
-  startDelay: 300 # time before typing starts in milliseconds
-  typeSpeed: 150 # type speed in milliseconds
-  backSpeed: 50 # backspacing speed in milliseconds
   # loop (循環打字)
   loop: true
-  # source 調用第三方服務
+  # source調用第三方服務
   # source: false 關閉調用
-  # source: 1  調用一言網的一句話（簡體） https://hitokoto.cn/
+  # source: 1  調用搏天api的隨機語錄（簡體）
-  # source: 2  調用一句網（簡體） http://yijuzhan.com/
+  # source: 2  調用一言網的一句話（簡體）
-  # source: 3  調用今日詩詞（簡體） https://www.jinrishici.com/
+  # source: 3  調用一句網（簡體）
+  # source: 4  調用今日詩詞（簡體）
   # subtitle 會先顯示 source , 再顯示 sub 的內容
   source: false
-  # 如果關閉打字效果，subtitle 只會顯示 sub 的第一行文字
+  # 如果有英文逗號' , ',請使用轉義字元 ,
+  # 如果有英文雙引號' " ',請使用轉義字元 "
+  # 開頭不允許轉義字元，如需要，請把整個句子用雙引號包住
+  # 如果關閉打字效果，subtitle只會顯示sub的第一行文字
   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:
 
 # aside (側邊欄)
 # --------------------------------------
@@ -658,10 +644,6 @@ aside:
   button: true
   mobile: true # display on mobile
   position: right # left or right
-  display:
-    archive: true
-    tag: true
-    category: true
   card_author:
     enable: true
     description:
@@ -721,10 +703,24 @@ newest_comments:
   limit: 6
   storage: 10 # unit: mins, save data to localStorage
   avatar: true
+  # You can only choose one, or neither
+  valine: false
+  github_issues:
+    enable: false
+    repo:
+  disqus:
+    enable: false
+    forum:
+    api_key:
+  twikoo: false
+  waline: false
 
 # Bottom right button (右下角按鈕)
 # --------------------------------------
 
+# Change font size
+change_font_size: false
+
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
   enable: false
@@ -753,14 +749,6 @@ darkmode:
   # 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 (圖片大圖查看模式)
 # --------------------------------------
 # You can only choose one, or neither (只能選擇一個 或者 兩個都不選)
@@ -777,13 +765,11 @@ fancybox: true
 # --------------------------------------
 
 # mermaid
-# see https://github.com/mermaid-js/mermaid
+# see https://github.com/knsv/mermaid
 mermaid:
   enable: false
   # built-in themes: default/forest/dark/neutral
-  theme:
+  theme: default
-    light: default
-    dark: dark
 
 # Note (Bootstrap Callout)
 note:
@@ -802,7 +788,14 @@ note:
 # other
 # --------------------------------------
 
-# Pjax
+# Artitalk
+# see https://artitalk.js.org/
+artitalk:
+  appId:
+  appKey:
+  option:
+
+# Pjax [Beta]
 # It may contain bugs and unstable, give feedback when you find the bugs.
 # https://github.com/MoOx/pjax
 pjax:
@@ -824,7 +817,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 (預加載)
@@ -837,12 +830,10 @@ pangu:
   field: site # site/post
 
 # Lazyload (圖片懶加載)
-# https://github.com/verlok/vanilla-lazyload
+# https://github.com/verlok/lazyload
 lazyload:
   enable: false
-  field: site # site/post
+  post: /img/loading.gif
-  placeholder:
-  blur: false
 
 # PWA
 # See https://github.com/JLHwung/hexo-offline
@@ -857,16 +848,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
@@ -884,72 +866,89 @@ 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: /css/index.css
-  # Dev version can only choose. ( dev版的主題只能設置為 local )
+  jquery: https://cdn.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js
-  internal_provider: local
+  main: /js/main.js
+  utils: /js/utils.js
 
-  # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
+  # pjax
-  # option: local/jsdelivr/unpkg/cdnjs/custom
+  pjax: https://cdn.jsdelivr.net/npm/pjax/pjax.min.js
-  # when set it to local, you need to install hexo-butterfly-extjs
-  third_party_provider: jsdelivr
 
-  # Add version number to CDN, true or false  
+  # comments
-  version: false
+  gitalk: https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js
+  gitalk_css: https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css
+  valine: https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js
+  disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js
+  disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css
+  utterances: https://utteranc.es/client.js
+  twikoo: https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js
+  waline: https://cdn.jsdelivr.net/npm/@waline/client/dist/Waline.min.js
 
-  # Custom format
+  # share
-  # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
+  addtoany: https://static.addtoany.com/menu/page.js
-  custom_format:
+  sharejs: https://cdn.jsdelivr.net/npm/social-share.js/dist/js/social-share.min.js
+  sharejs_css: https://cdn.jsdelivr.net/npm/social-share.js/dist/css/share.min.css
 
-  option:
+  # search
-    # main_css:
+  local_search: /js/search/local-search.js
-    # main:
+  algolia_js: /js/search/algolia.js
-    # utils:
+  algolia_search: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.js
-    # translate:
+  algolia_search_css: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.css
-    # local_search:
+
-    # algolia_js:
+  # math
-    # algolia_search_v4:
+  mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
-    # instantsearch_v4:
+  katex: https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css
-    # pjax:
+  katex_copytex: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.js
-    # gitalk:
+  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css
-    # gitalk_css:
+  mermaid: https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js
-    # blueimp_md5:
+
-    # valine:
+  # count
-    # disqusjs:
+  busuanzi: //busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js
-    # disqusjs_css:
+
-    # twikoo:
+  # background effect
-    # waline_js:
+  canvas_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js
-    # waline_css:
+  canvas_fluttering_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js
-    # sharejs:
+  canvas_nest: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js
-    # sharejs_css:
+
-    # mathjax:
+  lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
-    # katex:
+  instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
-    # katex_copytex:
+  typed: https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js
-    # mermaid:
+  pangu: https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js
-    # canvas_ribbon:
+
-    # canvas_fluttering_ribbon:
+  # photo
-    # canvas_nest:
+  fancybox_css: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.css
-    # lazyload:
+  fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.js
-    # instantpage:
+  medium_zoom: https://cdn.jsdelivr.net/npm/medium-zoom/dist/medium-zoom.min.js
-    # typed:
+
-    # pangu:
+  # snackbar
-    # fancybox_css_v4:
+  snackbar_css: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.css
-    # fancybox_v4:
+  snackbar: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js
-    # medium_zoom:
+
-    # snackbar_css:
+  # effect
-    # snackbar:
+  activate_power_mode: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js
-    # activate_power_mode:
+  fireworks: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js
-    # fireworks:
+  click_heart: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js
-    # click_heart:
+  ClickShowText: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js
-    # ClickShowText:
+
-    # fontawesomeV6:
+  # fontawesome
-    # flickr_justified_gallery_js:
+  fontawesome: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css
-    # flickr_justified_gallery_css:
+
-    # aplayer_css:
+  # Conversion between Traditional and Simplified Chinese
-    # aplayer_js:
+  translate: /js/tw_cn.js
-    # meting_js:
+
-    # prismjs_js:
+  # justifiedGallery
-    # prismjs_lineNumber_js:
+  justifiedGallery_js: https://cdn.jsdelivr.net/npm/justifiedGallery/dist/js/jquery.justifiedGallery.min.js
-    # prismjs_autoloader:
+  justifiedGallery_css: https://cdn.jsdelivr.net/npm/justifiedGallery/dist/css/justifiedGallery.min.css
-    # artalk_js:
+
-    # artalk_css:
+  # aplayer
+  aplayer_css: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css
+  aplayer_js: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js
+  meting_js: https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js
+
+  # Prism.js
+  prismjs_js: https://cdn.jsdelivr.net/npm/prismjs/prism.min.js
+  prismjs_lineNumber_js: https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js
+  prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
+
+  artitalk: https://cdn.jsdelivr.net/npm/artitalk

languages/default.yml

@@ -34,15 +34,14 @@ post:
   recommend: Related Articles
   edit: Edited on
 
-search:
+search: Search
-  title: Search
+algolia_search:
-  load_data: Loading the Database
-  algolia_search:
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}."
   hits_stats: '${hits} results found in ${time} ms'
 
-  local_search:
+local_search:
+  label: Local search
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}"
 
@@ -95,6 +94,8 @@ share: Share
 
 rightside:
   readmode_title: Read Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
   translate_title: Toggle Between Traditional Chinese And Simplified Chinese
   night_mode_title: Toggle Between Light And Dark Mode
   back_to_top: Back To Top
@@ -102,7 +103,6 @@ rightside:
   scroll_to_comment: Scroll To Comments
   setting: Setting
   aside: Toggle between single-column and double-column
-  chat: Chat
 
 copy_copyright:
   author: Author
@@ -118,4 +118,6 @@ Snackbar:
 
 loading: Loading...
 
-error404: Page not found
+error404:
+  error_title: Page not found
+  back_button: Go back home

languages/en.yml

@@ -34,15 +34,14 @@ post:
   recommend: Related Articles
   edit: Edited on
 
-search:
+search: Search
-  title: Search
+algolia_search:
-  load_data: Loading the Database
-  algolia_search:
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}."
   hits_stats: '${hits} results found in ${time} ms'
 
-  local_search:
+local_search:
+  label: Local search
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}"
 
@@ -95,6 +94,8 @@ share: Share
 
 rightside:
   readmode_title: Read Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
   translate_title: Switch Between Traditional Chinese And Simplified Chinese
   night_mode_title: Switch Between Light And Dark Mode
   back_to_top: Back To Top
@@ -102,7 +103,6 @@ rightside:
   scroll_to_comment: Scroll To Comments
   setting: Setting
   aside: Toggle between single-column and double-column
-  chat: Chat
 
 copy_copyright:
   author: Author
@@ -118,4 +118,6 @@ Snackbar:
 
 loading: Loading...
 
-error404: Page not found
+error404:
+  error_title: Page not found
+  back_button: Go back home

languages/zh-CN.yml

@@ -35,15 +35,14 @@ post:
   recommend: 相关推荐
   edit: 编辑
 
-search:
+search: 搜索
-  title: 搜索
+algolia_search:
-  load_data: 数据库加载中
-  algolia_search:
   input_placeholder: 搜索文章
   hits_empty: '找不到您查询的内容：${query}'
   hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
-  local_search:
+local_search:
+  label: 本地搜索
   input_placeholder: 搜索文章
   hits_empty: '找不到您查询的内容：${query}'
 
@@ -96,6 +95,8 @@ share: 分享
 
 rightside:
   readmode_title: 阅读模式
+  font_plus_title: 放大字体
+  font_minus_title: 缩小字体
   translate_title: 简繁转换
   night_mode_title: 浅色和深色模式转换
   back_to_top: 回到顶部
@@ -103,7 +104,6 @@ rightside:
   scroll_to_comment: 直达评论
   setting: 设置
   aside: 单栏和双栏切换
-  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -119,4 +119,6 @@ Snackbar:
 
 loading: 加载中...
 
-error404: 页面没有找到
+error404:
+  error_title: 页面没有找到
+  back_button: 回到主页

languages/zh-TW.yml

@@ -35,15 +35,14 @@ post:
   recommend: 相關推薦
   edit: 編輯
 
-search:
+search: 搜尋
-  title: 搜尋
+algolia_search:
-  load_data: 資料庫載入中
-  algolia_search:
   input_placeholder: 搜尋文章
   hits_empty: '找不到您查詢的內容：${query}'
   hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
-  local_search:
+local_search:
+  label: 本地搜尋
   input_placeholder: 搜尋文章
   hits_empty: '找不到您查詢的內容：${query}'
 
@@ -66,7 +65,7 @@ aside:
     headline: 網站資訊
     article_name: 文章數目
     runtime:
-      name: 已執行時間
+      name: 已運行時間
       unit: 天
     last_push_date:
       name: 最後更新時間
@@ -81,7 +80,7 @@ aside:
     zero: 沒有評論
     image: 圖片
     link: 連結
-    code: 程式碼
+    code: 代碼
   card_toc: 目錄
 
 date_suffix:
@@ -96,6 +95,8 @@ share: 分享
 
 rightside:
   readmode_title: 閱讀模式
+  font_plus_title: 放大字型
+  font_minus_title: 縮小字型
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
   back_to_top: 回到頂部
@@ -103,7 +104,6 @@ rightside:
   scroll_to_comment: 直達評論
   setting: 設定
   aside: 單欄和雙欄切換
-  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -119,4 +119,6 @@ Snackbar:
 
 loading: 載入中...
 
-error404: 頁面沒有找到
+error404:
+  error_title: 頁面沒有找到
+  back_button: 回到主頁

layout/404.pug

@@ -0,0 +1,28 @@
+- var top_img = theme.error_404.background || theme.default_top_img
+- var bg_img = `background-image: url('${url_for(top_img)}')`
+
+doctype html
+html(lang=config.language data-theme=theme.display_mode)
+  head
+    include includes/head.pug
+  body
+    if theme.preloader
+      !=partial('includes/loading/loading', {}, {cache: true})
+
+    if theme.fireworks && theme.fireworks.enable
+      canvas.fireworks
+    
+    if theme.background
+      #web_bg
+
+    #error-wrap
+      .error-content
+        .error-img(style=bg_img)
+        .error-info
+          h1.error_title= '404'
+          .error_subtitle= theme.error_404.subtitle
+          a.button--animated(href=config.root)
+            i.fas.fa-rocket
+            = _p('error404.back_button')
+          
+    include includes/additional-js.pug

layout/archive.pug

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

layout/includes/404.pug

@@ -1,12 +0,0 @@
-- var top_img_404 = theme.error_404.background || theme.default_top_img
-
-#body-wrap.error404
-  include ./header/index.pug
-
-  #error-wrap
-    .error-content
-      .error-img
-        img(src=url_for(top_img_404) alt='Page not found')
-      .error-info
-        h1.error_title= '404'
-        .error_subtitle= theme.error_404.subtitle || _p('error404')

layout/includes/additional-js.pug

@@ -1,38 +1,37 @@
 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_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 })
+    !=partial('includes/third-party/pangu.pug', {}, {cache: true})
 
   //- search
   if theme.algolia_search.enable
-    script(src=url_for(theme.asset.algolia_search_v4))
+    script(src=url_for(theme.CDN.algolia_js))
-    script(src=url_for(theme.asset.instantsearch_v4))
-    script(src=url_for(theme.asset.algolia_js))
   else if theme.local_search.enable
-    script(src=url_for(theme.asset.local_search))
+    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 })
+      !=partial('includes/third-party/card-post-count/index', {}, {cache: true})
     
     if loadSubJs
       include ./third-party/subtitle.pug
@@ -42,19 +41,19 @@ div
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
-  != partial("includes/third-party/prismjs", {}, { cache: true })
+  !=partial('includes/third-party/prismjs', {}, {cache: true})
 
   if theme.aside.enable && theme.newest_comments.enable
     if theme.pjax.enable
-      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
     else if (!is_post() && page.aside !== false)
-      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
 
-  != fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
+  !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-  != partial("includes/third-party/effect", {}, { cache: true })
+  !=partial('includes/third-party/effect', {}, {cache: true})
 
-  != partial("includes/third-party/chat/index", {}, { cache: true })
+  !=partial('includes/third-party/chat/index', {}, {cache: true})
   
   if theme.aplayerInject && theme.aplayerInject.enable
     if theme.pjax.enable || theme.aplayerInject.per_page
@@ -63,7 +62,7 @@ div
       include ./third-party/aplayer.pug
 
   if theme.pjax.enable
-    != partial("includes/third-party/pjax", {}, { cache: true })
+    !=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='//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
+    script(async data-pjax src=url_for(theme.CDN.busuanzi))

layout/includes/head.pug

@@ -1,22 +1,29 @@
 - var pageTitle
-- is_archive() ? page.title = findArchivesTitle(page, theme.menu, date) : ''
+- if (is_archive()) pageTitle = _p('page.archives')
-- 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_current('/404.html', [strict])) pageTitle = _p('error404')
+- 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.error_title')
 - 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, maximum-scale=1.0, user-scalable=no")
+meta(name="viewport" content="width=device-width,initial-scale=1")
 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")
@@ -39,14 +46,15 @@ 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.fontawesomeV6) 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
+if theme.algolia_search.enable
-  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css_v4) media="print" onload="this.media='all'")
+  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css) media="print" onload="this.media='all'")
+  script(src=url_for(theme.CDN.algolia_search) defer)
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})

layout/includes/head/Open_Graph.pug

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

layout/includes/head/analytics.pug

@@ -16,6 +16,18 @@ if theme.google_analytics
     gtag('js', new Date());
     gtag('config', '!{theme.google_analytics}');
 
+if theme.tencent_analytics
+  script.
+    var _mtac = {};
+    (function() {
+        var mta = document.createElement("script");
+        mta.src = "//pingjs.qq.com/h5/stats.js?v2.0.4";
+        mta.setAttribute("name", "MTAH5");
+        mta.setAttribute("sid", "!{theme.tencent_analytics}");
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(mta, s);
+    })();
+
 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}`)
 

layout/includes/head/config.pug

@@ -9,9 +9,9 @@
       hits: theme.algolia_search.hits,
       // search languages
       languages: {
-        input_placeholder: _p("search.algolia_search.input_placeholder"),
+        input_placeholder: _p("algolia_search.input_placeholder"),
-        hits_empty: _p("search.algolia_search.hits_empty"),
+        hits_empty: _p("algolia_search.hits_empty"),
-        hits_stats: _p("search.algolia_search.hits_stats"),
+        hits_stats: _p("algolia_search.hits_stats")
       }
     })
   }
@@ -19,11 +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,
       languages: {
         // search languages
-        hits_empty: _p("search.local_search.hits_empty"),
+        hits_empty: _p("local_search.hits_empty")
       }
     })
   }
@@ -79,8 +78,7 @@
     highlight = JSON.stringify({
       plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
       highlightCopy: theme.highlight_copy,
-      highlightLang: theme.highlight_lang,
+      highlightLang: theme.highlight_lang
-      highlightHeightLimit: theme.highlight_height_limit
     })
   }
 
@@ -113,12 +111,17 @@ script.
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
     source: {
+      jQuery: '!{url_for(theme.CDN.jquery)}',
       justifiedGallery: {
-        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
+        js: '!{url_for(theme.CDN.justifiedGallery_js)}',
-        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
+        css: '!{url_for(theme.CDN.justifiedGallery_css)}'
+      },
+      fancybox: {
+        js: '!{url_for(theme.CDN.fancybox)}',
+        css: '!{url_for(theme.CDN.fancybox_css)}'
       }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
-    isAnchor: !{theme.anchor.auto_update}
+    isanchor: !{theme.anchor}
   }

layout/includes/head/config_site.pug

@@ -1,27 +1,16 @@
 -
-  const titleVal = pageTitle.replace(/'/ig,"\\'")
-
   let isHighlightShrink
   if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined'
   else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink
   else isHighlightShrink = theme.highlight_shrink
 
-  var showToc = false
+  var pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
-  if (theme.aside.enable && page.aside !== false) {
+  var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
-    let tocEnable = false
-    if (is_post()) {
-      if (theme.toc.post) tocEnable = true
-    } else if (is_page()) {
-      if (theme.toc.page) tocEnable = true
-    }
-    const pageToc = page.toc === true || page.toc === false ? page.toc : tocEnable
-    showToc = pageToc && (toc(page.content) !== '' || page.encrypt == true )
-  }
 -
 
-script#config-diff.
+script#config-diff
+  .
     var GLOBAL_CONFIG_SITE = { 
-    title: '!{titleVal}',
       isPost: !{is_post()},
       isHome: !{is_home()},
       isHighlightShrink: !{isHighlightShrink},

layout/includes/head/preconnect.pug

@@ -6,6 +6,9 @@ if theme.google_analytics
 if theme.baidu_analytics
   link(rel="preconnect" href="//hm.baidu.com")
 
+if theme.tencent_analytics
+  link(rel="preconnect" href="//pingjs.qq.com")
+
 if theme.cnzz_analytics
   link(rel="preconnect" href="//s4.cnzz.com")
 

layout/includes/head/site_verification.pug

@@ -1,3 +1,14 @@
-if theme.site_verification
+if theme.google_site_verification
-  each item in theme.site_verification
+  meta(name="google-site-verification" content=theme.google_site_verification)
-    meta(name=item.name content=item.content)
+
+if theme.bing_site_verification
+  meta(name="msvalidate.01" content=theme.bing_site_verification)
+
+if theme.baidu_site_verification
+  meta(name="baidu-site-verification" content=theme.baidu_site_verification)
+
+if theme.qihu_site_verification
+  meta(name="360-site-verification" content=theme.qihu_site_verification)
+
+if theme.yandex_site_verification
+  meta(name="yandex-verification" content=theme.yandex_site_verification)

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 || page.randomcover
+    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
   else if is_page()
     - var top_img = page.top_img || theme.default_top_img
   else if is_tag()
@@ -19,7 +19,7 @@ if !theme.disable_top_img && page.top_img !== false
   if top_img !== false
     - 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() ? _p('page.archives') : page.title || page.tag || page.category || config.title
     - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else

layout/includes/header/menu_item.pug

@@ -1,27 +1,26 @@
 if theme.menu
+  //- for mobile sidebar
+  - let sidebarChildHide = theme.hide_sidebar_menu_child ? 'hide' : ''
+
   .menus_items
     each value, label in theme.menu
-      if typeof value !== 'object'
+      if !Array.isArray(value)
         .menus_item
-          - const valueArray = value.split('||')
+          a.site-page(href=url_for(trim(value.split('||')[0])))
-          a.site-page(href=url_for(trim(valueArray[0])))
+            if value.split('||')[1]
-            if valueArray[1]
+              i.fa-fw(class=trim(value.split('||')[1]))
-              i.fa-fw(class=trim(valueArray[1]))
             span=' '+label
       else
         .menus_item
-          - const labelArray = label.split('||')
+          a.site-page(href='javascript:void(0);')
-          - const hideClass = labelArray[2] && trim(labelArray[2]) === 'hide' ? 'hide' : ''
+            if label.split('||')[1]
-          a.site-page.group(class=`${hideClass}` href='javascript:void(0);')
+              i.fa-fw(class=trim(label.split('||')[1]))
-            if labelArray[1]
+            span=' '+ trim(label.split('||')[0])
-              i.fa-fw(class=trim(labelArray[1]))
+            i.fas.fa-chevron-down.expand(class=sidebarChildHide)
-            span=' '+ trim(labelArray[0])
-            i.fas.fa-chevron-down
           ul.menus_item_child
-            each val,lab in value 
+            each i in value
-              - const valArray = val.split('||')
               li
-                a.site-page.child(href=url_for(trim(valArray[0])))
+                a.site-page(href=url_for(trim(i.split('||')[1])))
-                  if valArray[1]
+                  if i.split('||')[2]
-                    i.fa-fw(class=trim(valArray[1]))
+                    i.fa-fw(class=trim(i.split('||')[2]))
-                  span=' '+ lab
+                  span=' '+trim(i.split('||')[0])

layout/includes/header/nav.pug

@@ -7,8 +7,8 @@ nav#nav
       #search-button
         a.site-page.social-icon.search
           i.fas.fa-search.fa-fw
-          span=' '+_p('search.title')
+          span=' '+_p('search')
-    !=partial('includes/header/menu_item', {}, {cache: true})
+    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
 
     #toggle-menu
       a.site-page

layout/includes/header/post-info.pug

@@ -1,4 +1,3 @@
-- let comments = theme.comments
 #post-info
   h1.post-title= page.title || _p('no_title')
     if theme.post_edit.enable
@@ -21,9 +20,9 @@
             - let data_type_update = theme.post_meta.post.date_type === 'updated'
             - let date_type = data_type_update ? 'updated' : 'date'
             - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt'
-            - let date_title = data_type_update ? _p('post.updated') : _p('post.created')
+            - let data_info = data_type_update ? _p('post.updated') : _p('post.created')
             i.fa-fw.post-meta-icon(class=date_icon)
-            span.post-meta-label= date_title
+            span.post-meta-label= data_info
             time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format)
       if (theme.post_meta.post.categories && page.categories.data.length > 0)
         span.post-meta-categories
@@ -52,44 +51,15 @@
             span.post-meta-label= _p('post.min2read') + ':'
             span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
     
-      //- for pv and count
+      if theme.busuanzi.page_pv
-      mixin pvBlock(parent_id,parent_class,parent_title)
         span.post-meta-separator |
-        span(class=parent_class id=parent_id data-flag-title=page.title)
+        span.post-meta-pv-cv
           i.far.fa-eye.fa-fw.post-meta-icon
           span.post-meta-label=_p('post.page_pv') + ':'
-          if block
-            block
-
-      - const commentUse = comments.use
-      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
 
-      if comments.count && !comments.lazyload && page.comments !== false && comments.use
+      if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
-        - var whichCount = comments.use[0]
+        - var whichCount = theme.comments.use[0]
 
         mixin countBlock
           span.post-meta-separator |
@@ -101,46 +71,27 @@
         
         case whichCount
           when 'Disqus'
+          when 'Disqusjs'
             +countBlock
               span.disqus-comment-count
                 a(href=full_url_for(page.path) + '#disqus_thread')
-                  i.fa-solid.fa-spinner.fa-spin
-          when 'Disqusjs'
-            +countBlock
-              a(href=full_url_for(page.path) + '#disqusjs')
-                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
-                  i.fa-solid.fa-spinner.fa-spin
           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/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,15 +7,14 @@ 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
       
     !=partial('includes/sidebar', {}, {cache: true})
 
-    if page.type !== '404'
     #body-wrap(class=pageType)
       include ./header/index.pug
 
@@ -40,9 +38,6 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
       footer#footer(style=footer_bg)
         !=partial('includes/footer', {}, {cache: true})
 
-    else
-      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,28 +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 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() })
-
-  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,2 +0,0 @@
-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,6 +11,9 @@ 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 theme.lazyload.enable
+              img(data-lazy-src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
+            else
               img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
         .article-sort-item-info
           .article-sort-item-time

layout/includes/mixins/post-ui.pug

@@ -1,19 +1,17 @@
 mixin postUI(posts)
   each article , index in page.posts.data
     .recent-post-item
-      -
+      - let link = article.link || article.path
-        let link = article.link || article.path
+      - let title = article.title || _p('no_title')
-        let title = article.title || _p('no_title')
+      - let leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
-        const position = theme.cover.position
+      - let post_cover = article.cover
-        let leftOrRight = position === 'both'
+      - let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
-          ? index%2 == 0 ? 'left' : 'right'
-          : position === 'left' ? 'left' : 'right'
-        let post_cover = article.cover
-        let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
-      -
       if post_cover && theme.cover.index_enable
         .post_cover(class=leftOrRight)
           a(href=url_for(link) title=title)      
+            if theme.lazyload.enable
+              img.post_bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
+            else
               img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
       .recent-post-info(class=no_cover)
         a.article-title(href=url_for(link) title=title)= title
@@ -22,14 +20,14 @@ mixin postUI(posts)
             span.article-meta
               i.fas.fa-thumbtack.sticky
               span.sticky= _p('sticky')
-              span.article-meta-separator |
+              span.article-meta__separator |
           if (theme.post_meta.page.date_type)
             span.post-meta-date
               if (theme.post_meta.page.date_type === 'both')               
                 i.far.fa-calendar-alt
                 span.article-meta-label=_p('post.created')
                 time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))=date(article.date, config.date_format)
-                span.article-meta-separator |
+                span.article-meta__separator |
                 i.fas.fa-history
                 span.article-meta-label=_p('post.updated')
                 time.post-meta-date-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated))=date(article.updated, config.date_format)
@@ -43,25 +41,25 @@ mixin postUI(posts)
                 time(datetime=date_xml(article[date_type]) title=date_title + ' ' + full_date(article[date_type]))=date(article[date_type], config.date_format)
           if (theme.post_meta.page.categories && article.categories.data.length > 0)
             span.article-meta
-              span.article-meta-separator |
+              span.article-meta__separator |
               i.fas.fa-inbox
               each item, index in article.categories.data
                 a(href=url_for(item.path)).article-meta__categories #[=item.name]
                 if (index < article.categories.data.length - 1)
-                  i.fas.fa-angle-right.article-meta-link
+                  i.fas.fa-angle-right
           if (theme.post_meta.page.tags && article.tags.data.length > 0)
             span.article-meta.tags
-              span.article-meta-separator |
+              span.article-meta__separator |
               i.fas.fa-tag
               each item, index in article.tags.data
                 a(href=url_for(item.path)).article-meta__tags #[=item.name]
                 if (index < article.tags.data.length - 1)
-                  span.article-meta-link #[='•']
+                  span.article-meta__link #[='•']
           
           mixin countBlockInIndex
             - needLoadCountJs = true
             span.article-meta
-              span.article-meta-separator |
+              span.article-meta__separator |
               i.fas.fa-comments
               if block
                 block
@@ -70,42 +68,24 @@ mixin postUI(posts)
           if theme.comments.card_post_count
             case theme.comments.use[0]
               when 'Disqus'
-                +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqus_thread')
-                    i.fa-solid.fa-spinner.fa-spin
               when 'Disqusjs'
                 +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqusjs')
+                  a(href=full_url_for(link) + '#disqus_thread')
-                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
-                      i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment')
+                  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(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/artitalk.pug

@@ -0,0 +1,28 @@
+- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
+
+if top_img === false
+  h1.page-title= page.title
+
+#artitalk_main
+script.
+  (()=>{
+    let setting = {
+      appId: '!{theme.artitalk.appId}',
+      appKey: '!{theme.artitalk.appKey}',
+    }
+
+    if (!{Boolean(option)}) {
+      const otherSetting = !{option}
+      setting = Object.assign(setting, otherSetting)
+    }
+
+    const init = () => {
+      new Artitalk(setting)
+    }
+
+    if (typeof Artitalk === 'function') {
+      init()
+    } else {
+      getScript('!{theme.CDN.artitalk}').then(init)
+    }
+  })()

layout/includes/page/categories.pug

@@ -1 +1,5 @@
-.category-lists!= list_categories()
+.category-lists
+  .category-title.is-center= _p('page.category')
+    |  - 
+    span.category-amount= site.categories.length
+  div!= list_categories()

layout/includes/page/default-page.pug

@@ -1,2 +1,4 @@
 #article-container
+  if top_img === false
+    h1.page-title= page.title
   != page.content

layout/includes/page/flink.pug

@@ -1,69 +1,23 @@
 #article-container
+  if top_img === false
+    h1.page-title= page.title
+
   .flink
-    - let pageContent = page.content
-    if page.flink_url
-      script.
-        (()=>{
-          const replaceSymbol = (str) => {
-            return str.replace(/[\p{P}\p{S}]/gu, "-")
-          }
-
-          let result = ""
-          fetch("!{url_for(page.flink_url)}")
-            .then(response => response.json())
-            .then(str => {
-              for(let i = 0; i < str.length; i++){
-                const replaceClassName = replaceSymbol(str[i].class_name)
-                const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
-                const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
-                
-                let listResult = ""
-                const lists = str[i].link_list
-                for(let j = 0; j < lists.length; j++){
-                  listResult += `
-                    <div class="flink-list-item">
-                      <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
-                        <div class="flink-item-icon">
-                          <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
-                        </div>
-                        <div class="flink-item-name">${lists[j].name}</div> 
-                        <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
-                      </a>
-                    </div>`
-                }
-
-                result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
-              }
-
-              document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-            })
-        })()
-
-    else
     if site.data.link
-        - let result = ""
       each i in site.data.link
-          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ""
+        if i.class_name
-          - let classDesc = i.class_desc ? `<div class="flink-desc">${i.class_desc}</div>` : ""
+          h2!= i.class_name
-
+        if i.class_desc
-          - let listResult = ""
+          .flink-desc!=i.class_desc
-
+        .flink-list
-          each j in i.link_list
+          each item in i.link_list
-            - 
+            .flink-list-item
-              listResult += `
+              a(href=url_for(item.link)  title=item.name target="_blank")
-                <div class="flink-list-item">
+                if theme.lazyload.enable
-                  <a href="${j.link}" title="${j.name}" target="_blank">
+                  img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
-                    <div class="flink-item-icon">
+                else
-                      <img class="no-lightbox" src="${j.avatar}" onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt="${j.name}" />
+                  img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
-                    </div>
+                span.flink-item-name= item.name 
-                    <div class="flink-item-name">${j.name}</div> 
+                span.flink-item-desc(title=item.descr)= item.descr
-                    <div class="flink-item-desc" title="${j.descr}">${j.descr}</div>
+    != page.content
-                  </a>
-                </div>`
-            -
-
-          - result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
-
-        - pageContent = result + pageContent
-    != pageContent
 

layout/includes/page/tags.pug

@@ -1,2 +1,5 @@
+.tag-cloud-title.is-center= _p('page.tag')
+  |  - 
+  span.tag-cloud-amount= site.tags.length
 .tag-cloud-list.is-center
   !=cloudTags({source: site.tags, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})

layout/includes/pagination.pug

@@ -6,7 +6,11 @@
     escape: false
   }
 
-if is_post()
+if(!is_post())
+  nav#pagination
+    div.pagination
+      !=paginator(options)
+else
   - let prev = theme.post_pagination === 1 ? page.prev : page.next
   - let next = theme.post_pagination === 1 ? page.next : page.prev
   nav#pagination.pagination-post
@@ -15,6 +19,9 @@ if is_post()
       .prev-post(class=hasPageNext)
         - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
         a(href=url_for(prev.path))
+          if theme.lazyload.enable
+            img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
+          else
             img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
           .pagination-info
             .label=_p('pagination.prev')
@@ -25,13 +32,10 @@ if is_post()
       - var pagination_cover = next.cover == false ? next.randomcover : next.cover
       .next-post(class=hasPagePrev)
         a(href=url_for(next.path))
+          if theme.lazyload.enable
+            img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
+          else
             img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
           .pagination-info
             .label=_p('pagination.next')
             .next_info=next.title 
-else
-  nav#pagination
-    .pagination
-      if is_home()
-        - options.format = 'page/%d/#content-inner'
-      !=paginator(options)

layout/includes/post/post-copyright.pug

@@ -1,8 +1,8 @@
 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= _p('post.copyright.author') + ": "

layout/includes/post/reward.pug

@@ -1,5 +1,5 @@
 .post-reward
-  .reward-button
+  .reward-button.button--animated
     i.fas.fa-qrcode
     = ' ' + _p('donate')
   .reward-main
@@ -8,6 +8,9 @@
         - var clickTo = item.link ? item.link : item.img
         li.reward-item
           a(href=url_for(clickTo) target='_blank')
+            if theme.lazyload.enable
+              img.post-qr-code-img(data-lazy-src=url_for(item.img) alt=item.text)
+            else
               img.post-qr-code-img(src=url_for(item.img) alt=item.text)
           .post-qr-code-desc=item.text
 

layout/includes/rightside.pug

@@ -1,60 +1,38 @@
-- const { readmode, translate, darkmode, aside, chat_btn } = theme
+#rightside
-mixin rightsideItem(array)
+  #rightside-config-hide
-  each item in array
+    if is_post() && theme.readmode
-    case item
-      when 'readmode'
-        if is_post() && readmode
       button#readmode(type="button" title=_p('rightside.readmode_title'))
         i.fas.fa-book-open
-      when 'translate'
+    if theme.change_font_size
-        if translate.enable
+      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
-          button#translateLink(type="button" title=_p('rightside.translate_title'))= translate.default
+        i.fas.fa-plus
-      when 'darkmode'
+      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
-        if darkmode.enable && darkmode.button
+        i.fas.fa-minus
+    if theme.translate.enable
+      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
+    if theme.darkmode.enable && theme.darkmode.button
       button#darkmode(type="button" title=_p('rightside.night_mode_title'))
         i.fas.fa-adjust
-      when 'hideAside'
+    if theme.aside.enable && theme.aside.button && page.aside !== false
-        if aside.enable && aside.button && page.aside !== false
       button#hide-aside-btn(type="button" title=_p('rightside.aside'))
         i.fas.fa-arrows-alt-h
-      when 'toc'
+  #rightside-config-show
+    if is_post()
+      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size)
+        button#rightside_config(type="button" title=_p("rightside.setting"))
+          i.fas.fa-cog.fa-spin
       if showToc
         button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
           i.fas.fa-list-ul
-      when 'chat'
+    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size
-        if chat_btn
+      button#rightside_config(type="button" title=_p("rightside.setting"))
-          button#chat_btn(type="button" title=_p("rightside.chat"))
+        i.fas.fa-cog.fa-spin
+
+    if theme.chat_btn
+      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
         i.fas.fa-sms
-      when 'comment'
     if commentsJsLoad
       a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
         i.fas.fa-comments
-
-#rightside
-  - const { enable, hide, show } = theme.rightside_item_order
-  - const hideArray = enable ? hide && hide.split(',') : ['readmode','translate','darkmode','hideAside']
-  - const showArray = enable ? show && show.split(',') : ['toc','chat','comment']
-
-  
-  #rightside-config-hide
-    if hideArray
-      +rightsideItem(hideArray)
-  #rightside-config-show
-    if enable
-      if hide
-        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"))
-            i.fas.fa-cog.fa-spin
-      else if translate.enable || (darkmode.enable && darkmode.button)
-        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"))
       i.fas.fa-arrow-up

layout/includes/sidebar.pug

@@ -1,18 +1,31 @@
 #sidebar
   #menu-mask
   #sidebar-menus
-    .avatar-img.is-center
+    .author-avatar
-      img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+      if theme.lazyload.enable
-    .sidebar-site-data.site-data.is-center
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+      else
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    .site-data
+      if site.posts.length
+        .data-item.is-center
+          .data-item-link
             a(href=url_for(config.archive_dir) + '/')
               .headline= _p('aside.articles') 
               .length-num= site.posts.length
+
+      if site.tags.length
+        .data-item.is-center
+          .data-item-link
             a(href=url_for(config.tag_dir) + '/' )
               .headline= _p('aside.tags')
               .length-num= site.tags.length
+
+      if site.categories.length
+        .data-item.is-center
+          .data-item-link
             a(href=url_for(config.category_dir) + '/')
               .headline= _p('aside.categories') 
               .length-num= site.categories.length
-
     hr
-    !=partial('includes/header/menu_item', {}, {cache: true})
+    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})

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,20 +0,0 @@
-- const { server, site } = theme.artalk
-
-script.
-  (() => {
-    const getArtalkCount = () => {
-      const runWidget = () => {
-        Artalk.LoadCountWidget({
-          server: '!{server}',
-          site: '!{site}',
-          countEl: '.artalk-count'
-        })
-      }
-
-      if (typeof Artalk === 'function') runWidget()
-      else getScript('!{theme.asset.artalk_js}').then(runWidget)
-    }
-
-
-    window.pjax ? getArtalkCount() : window.addEventListener('load', getArtalkCount)
-  })()

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

@@ -1,13 +1,10 @@
-- const fbSDKVer = 'v15.0'
-- const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
-
 script.
   (()=>{
     function loadFBComment () {
-      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

@@ -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

@@ -3,15 +3,15 @@ script.
     function loadWaline () {
       function initWaline () {
         let initData = {
-          el: null,
+          el: '#waline-wrap',
           serverURL: '!{theme.waline.serverURL}',
-          comment: true
         }
-        const waline = Waline.init(initData)
+        
+        const waline = new Waline(initData)
       }
 
       if (typeof Waline === 'function') initWaline() 
-      else getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+      else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
     }
 
     window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)

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

@@ -8,5 +8,3 @@ 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,42 +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: 'v15.0'
-    });
-  };
-
-  (function(d, s, id) {
-    var js, fjs = d.getElementsByTagName(s)[0];
-    if (d.getElementById(id)) return;
-    js = d.createElement(s); js.id = id;
-    js.src = 'https://connect.facebook.net/!{lang}/sdk/xfbml.customerchat.js';
-    fjs.parentNode.insertBefore(js, fjs);
-  }(document, 'script', 'facebook-jssdk'));
-
-  if (!{theme.chat_btn}) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        FB.CustomerChat.show();
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        FB.CustomerChat.hide()
-      }
-      function chatBtnShow () {
-        FB.CustomerChat.show(false)
-      }
-    }
-  }
-

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

@@ -1,45 +0,0 @@
-- const { server, site, option } = theme.artalk
-
-script.
-  function addArtalkSource () {
-    const ele = document.createElement('link')
-    ele.rel = 'stylesheet'
-    ele.href= '!{theme.asset.artalk_css}'
-    document.getElementsByTagName('head')[0].appendChild(ele)
-  }
-
-  function loadArtalk () {
-    function initArtalk () {
-      window.artalkItem = new Artalk(Object.assign({
-        el: '#artalk-wrap',
-        server: '!{server}',
-        site: '!{site}',
-        pageKey: location.pathname,
-        darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
-        countEl: '.artalk-count'
-      },!{JSON.stringify(option)}))
-    }
-
-    if (typeof window.artalkItem === 'object') setTimeout(()=>{initArtalk()},200)
-    else {
-      addArtalkSource()
-      typeof Artalk !== 'function' ? getScript('!{theme.asset.artalk_js}').then(initArtalk)
-                                  : setTimeout(()=>{initArtalk()},200)
-    }
-  }
-
-  document.getElementById('darkmode').addEventListener('click',()=> {
-    if (typeof window.artalkItem !== 'object') return
-    let isDark = document.documentElement.getAttribute('data-theme') === 'dark'
-    window.artalkItem.setDarkMode(!isDark)
-  })
-
-  
-  if ('!{theme.comments.use[0]}' === 'Artalk' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
-    else loadArtalk()
-  } else {
-    function loadOtherComment () {
-      loadArtalk()
-    }
-  }

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

@@ -1,11 +1,9 @@
-- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
-
 script.
   function loadDisqus () {
     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 }'
+      this.page.title = '!{ page.title }'
     };
 
     window.disqusReset = () => {
@@ -24,10 +22,6 @@ script.
         (d.head || d.body).appendChild(s);
       })();
     }
-
-    document.getElementById('darkmode').addEventListener('click', () => {
-      setTimeout(() => window.disqusReset(), 200)
-    })
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {

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

@@ -1,47 +1,41 @@
-- let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+- let disqusjsApi = theme.disqusjs.api || 'https://disqus.skk.moe/disqus/'
-
 script.
   function loadDisqusjs () {
     function addDisqusjsCSS () {
       const ele = document.createElement('link')
       ele.rel = 'stylesheet'
-      ele.href= '!{url_for(theme.asset.disqusjs_css)}'
+      ele.href= '!{url_for(theme.CDN.disqusjs_css)}'
       document.getElementsByTagName('head')[0].appendChild(ele)
     }
 
     function initDisqusjs () {
-      window.disqusjs = null
+      window.DISQUS = null
-      disqusjs = new DisqusJS(Object.assign({
+      new DisqusJS({
         shortname: '!{theme.disqusjs.shortname}',
-        identifier: '!{ url_for(page.path) }',
+        siteName: '!{theme.disqusjs.siteName}',
+        identifier: '!{ page.path }',
         url: '!{ page.permalink }',
-        title: '!{ disqusjsPageTitle }',
+        title: '!{ page.title }',
+        api: '!{disqusjsApi}',
         apikey: '!{theme.disqusjs.apikey}',
-      },!{JSON.stringify(theme.disqusjs.option)}))
+        nocomment: '!{theme.disqusjs.nocomment}',
-
+        admin: '!{theme.disqusjs.admin}',
-      disqusjs.render(document.getElementById('disqusjs'))
+        adminLabel: '!{theme.disqusjs.adminLabel}'
+      });
     }
 
-    const themeChange = () => {
+    window.disqusReset = initDisqusjs
-      const ele = document.getElementById('disqus_thread')
-      if(!ele) return
-      disqusjs.destroy()
-      initDisqusjs()
-    }
-
-
-    document.getElementById('darkmode').addEventListener('click', themeChange)
 
     if (window.disqusJsLoad) initDisqusjs()
     else {
       addDisqusjsCSS()
-      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
+      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
       window.disqusJsLoad = true
     }
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
     else loadDisqusjs()
   }
   else {

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

@@ -1,26 +1,16 @@
-- const fbSDKVer = 'v15.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 () {
-    document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
+    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+    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]
-    $fbComment.setAttribute('data-colorscheme',themeNow)
-    $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
-
-    if (typeof FB === 'object') {
-      FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
-      FB.XFBML.parse(document.getElementById('post-comment'))
-    }
     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')
-      ele.setAttribute('id', 'facebook-jssdk')
       document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
     }   
   }

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

@@ -1,49 +0,0 @@
-- const { repo, repo_id, category_id, option } = theme.giscus
-- const themes = theme.giscus.theme
-script.
-  function loadGiscus () {
-    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-
-    const config = Object.assign({
-      src: 'https://giscus.app/client.js',
-      'data-repo': '!{repo}',
-      'data-repo-id': '!{repo_id}',
-      'data-category-id': '!{category_id}',
-      'data-mapping': 'pathname',
-      'data-theme': nowTheme,
-      'data-reactions-enabled': '1',
-      crossorigin: 'anonymous',
-      async: true
-    },!{JSON.stringify(option)})
-
-    let ele = document.createElement('script')
-    for (let key in config) {
-      ele.setAttribute(key, config[key])
-    }
-    document.getElementById('giscus-wrap').insertAdjacentElement('afterbegin',ele)
-  }
-
-  function changeGiscusTheme () {
-    const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
-
-    function sendMessage(message) {
-      const iframe = document.querySelector('iframe.giscus-frame');
-      if (!iframe) return;
-      iframe.contentWindow.postMessage({ giscus: message }, 'https://giscus.app');
-    }
-
-    sendMessage({
-      setConfig: {
-        theme: theme
-      }
-    });
-  }
-
-  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()
-    }
-  }

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

@@ -2,29 +2,33 @@ script.
   function addGitalkSource () {
     const ele = document.createElement('link')
     ele.rel = 'stylesheet'
-    ele.href= '!{url_for(theme.asset.gitalk_css)}'
+    ele.href= '!{url_for(theme.CDN.gitalk_css)}'
     document.getElementsByTagName('head')[0].appendChild(ele)
   }
 
   function loadGitalk () {
     function initGitalk () {
-      var gitalk = new Gitalk(Object.assign({
+      var gitalk = new Gitalk({
         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)}',
+        language: '!{theme.gitalk.language}',
+        perPage: !{theme.gitalk.perPage},
+        distractionFreeMode: !{theme.gitalk.distractionFreeMode},
+        pagerDirection: '!{theme.gitalk.pagerDirection}',
+        createIssueManually: !{theme.gitalk.createIssueManually},
         updateCountCallback: commentCount
-      },!{JSON.stringify(theme.gitalk.option)}))
+      })
-
       gitalk.render('gitalk-container')
     }
 
     if (typeof Gitalk === 'function') initGitalk()
     else {
       addGitalkSource()
-      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
+      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
     }
   }
   

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

@@ -22,7 +22,7 @@ hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqusjs
+            #disqus_thread
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'
@@ -33,14 +33,8 @@ hr
             #twikoo-wrap
           when 'Waline'
             #waline-wrap
-          when 'Giscus'
-            #giscus-wrap
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         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

@@ -16,11 +16,5 @@ each name in theme.comments.use
       !=partial('includes/third-party/comments/twikoo', {}, {cache: true})
     when 'Waline'
       !=partial('includes/third-party/comments/waline', {}, {cache: true})
-    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/remark42.pug

@@ -1,67 +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()
-      })
-    }
-  }
-
-  document.getElementById('darkmode').addEventListener('click',()=>{
-    if (!window.REMARK42) return
-    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
-    window.REMARK42.changeTheme(theme)
-  })
-
-  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

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

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

@@ -2,7 +2,7 @@ script.
   function loadUtterances () {
     let ele = document.createElement('script')
     ele.setAttribute('id', 'utterances_comment')
-    ele.setAttribute('src', 'https://utteranc.es/client.js')
+    ele.setAttribute('src', '!{url_for(theme.CDN.utterances)}')
     ele.setAttribute('repo', '!{theme.utterances.repo}')
     ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
     let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
@@ -13,13 +13,13 @@ script.
   }
 
   function utterancesTheme () {
-    const iframe = document.querySelector('.utterances-frame')
+    if (document.querySelector('.utterances-frame')) {
-    if (iframe) {
       const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
       const message = {
         type: 'set-theme',
         theme: theme
       };
+      const iframe = document.querySelector('.utterances-frame');
       iframe.contentWindow.postMessage(message, 'https://utteranc.es');
     }
   }

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

@@ -1,3 +1,4 @@
+- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
@@ -5,20 +6,37 @@ if site.data.valine
 script.
   function loadValine () {
     function initValine () {
-      const valine = new Valine(Object.assign({
+      let initData = {
         el: '#vcomment',
         appId: '#{theme.valine.appId}',
         appKey: '#{theme.valine.appKey}',
+        placeholder: '#{theme.valine.placeholder}',
         avatar: '#{theme.valine.avatar}',
+        meta: '#{theme.valine.guest_info }'.split(','),
+        pageSize: '#{theme.valine.pageSize}',
+        lang: '#{theme.valine.lang}',
+        recordIP: #{theme.valine.recordIP},
         serverURLs: '#{theme.valine.serverURLs}',
+        emojiCDN: '#{theme.valine.emojiCDN}',
         emojiMaps: !{emojiMaps},
+        enableQQ: #{theme.valine.enableQQ},
         path: window.location.pathname,
-        visitor: #{theme.valine.visitor}
+      }
-      }, !{JSON.stringify(theme.valine.option)}))
+
+      if (!{Boolean(theme.valine.requiredFields)}) { 
+        initData.requiredFields= ('!{theme.valine.requiredFields}'.split(','))
+      }
+      
+      if (!{Boolean(option)}) {
+        const otherData = !{option}
+        initData = Object.assign(initData, otherData)
+      }
+      
+      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)
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {

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

@@ -1,35 +1,34 @@
-- const { serverURL, option, pageview } = theme.waline
+- let option = theme.waline.option ? JSON.stringify(theme.waline.option) : false
-- const { lazyload, count, use } = theme.comments
+- let emojiMaps = '""'
+if site.data.waline
+  - emojiMaps = JSON.stringify(site.data.waline)
 
 script.
   function loadWaline () {
-    function insertCSS () {
+    function initWaline () {
-      const link = document.createElement("link")
+      let initData = {
-      link.rel = "stylesheet"
+        el: '#waline-wrap',
-      link.href = "!{url_for(theme.asset.waline_css)}"
+        serverURL: '!{theme.waline.serverURL}',
-      document.head.appendChild(link)
+        avatar: '#{theme.waline.avatar}',
+        path: location.pathname,
+        emojiCDN: '#{theme.waline.emojiCDN}',
+        emojiMaps: !{emojiMaps},
       }
       
-    function initWaline () {
+      if (!{Boolean(option)}) {
-      const waline = Waline.init(Object.assign({
+        const otherData = !{option}
-        el: '#waline-wrap',
+        initData = Object.assign(initData, otherData)
-        serverURL: '!{serverURL}',
+      }
-        pageview: !{lazyload ? false : pageview},
+      
-        dark: 'html[data-theme="dark"]',
+      const waline = new Waline(initData)
-        path: window.location.pathname,
-        comment: !{lazyload ? false : count},
-      }, !{JSON.stringify(option)}))
     }
 
     if (typeof Waline === 'function') initWaline() 
-    else {
+    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
-      insertCSS()
-      getScript('!{url_for(theme.asset.waline_js)}').then(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 {
     function loadOtherComment () {

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,11 +22,11 @@ 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
   script#click-show-text(
-    src= url_for(theme.asset.ClickShowText)
+    src= url_for(theme.CDN.ClickShowText)
     data-mobile= `${theme.ClickShowText.mobile}`
     data-text= theme.ClickShowText.text.join(",")
     data-fontsize= theme.ClickShowText.fontSize

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

@@ -1,6 +1,6 @@
 if theme.mathjax && theme.mathjax.enable
   if theme.mathjax.per_page
-    if is_post() || is_page()
+    if is_post() && is_page()
       include ./mathjax.pug
   else
     if page.mathjax
@@ -8,7 +8,7 @@ if theme.mathjax && theme.mathjax.enable
 
 if theme.katex && theme.katex.enable
   if theme.katex.per_page
-    if is_post() || is_page()
+    if is_post() && is_page()
       include ./katex.pug
   else
     if page.katex

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

@@ -1,9 +1,10 @@
-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 => {
-      btf.wrap(item, 'div', { class: 'katex-wrap'})
+      btf.wrap(item, 'div', '', 'katex-wrap')
     })
   })()
   

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

@@ -1,14 +1,21 @@
 //- Mathjax 3
+//- http://docs.mathjax.org/en/latest/upgrading/v2.html#changes-in-the-mathjax-api
+//- https://github.com/mathjax/MathJax/issues/2209
+//- http://docs.mathjax.org/en/latest/options/input/tex.html#the-configuration-block
+//- http://docs.mathjax.org/en/latest/web/typeset.html#resetting-automatic-equation-numbering
+
 script.
   if (!window.MathJax) {
     window.MathJax = {
+      loader: {
+        source: {
+          '[tex]/amsCd': '[tex]/amscd'
+        }
+      },
       tex: {
         inlineMath: [ ['$','$'], ["\\(","\\)"]],
         tags: 'ams'
       },
-      chtml: {
-        scale: 1.2
-      },
       options: {
         renderActions: {
           findScript: [10, doc => {
@@ -22,22 +29,20 @@ script.
               doc.math.push(math)
             }
           }, ''],
-          insertScript: [200, () => {
+          addClass: [200,() => {
-            document.querySelectorAll('mjx-container:not\([display]\)').forEach(node => {
+            document.querySelectorAll('mjx-container:not([display=\'true\']').forEach( node => {
               const target = node.parentNode
-              if (target.nodeName.toLowerCase() === 'li') {
+              if (!target.classList.contains('has-jax')) {
-                target.parentNode.classList.add('has-jax')
+                target.classList.add('mathjax-overflow')
-              } 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)

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

@@ -1,26 +1,15 @@
 script.
-  (() => {
+  if (document.getElementsByClassName('mermaid').length) {
-    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
+    if (window.mermaidJsLoad) mermaid.init()
-    if ($mermaidWrap.length) {
+    else {
-      window.runMermaid = () => {
+      getScript('!{theme.CDN.mermaid}').then(() => {
-        window.loadMermaid = true
+        window.mermaidJsLoad = true
-        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
+        mermaid.initialize({
-
+          theme: '!{theme.mermaid.theme}',
-        Array.from($mermaidWrap).forEach((item, index) => {
-          const mermaidSrc = item.firstElementChild
-          const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
-          const mermaidID = 'mermaid-' + index
-          const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
-          mermaid.mermaidAPI.render(mermaidID, mermaidDefinition, (svgCode) => {
-            mermaidSrc.insertAdjacentHTML('afterend', svgCode)
         })
+        !{theme.pjax.enable} && mermaid.init()
       })
     }
-
-      const loadMermaid = () => {
-        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
   }
 
-      window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
+
-    }
-  })()

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

@@ -1,82 +0,0 @@
-- const { server, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar ? option.gravatar.mirror : 'https://sdn.geekzu.org/avatar/'
-- const avatarDefault = option !== null && option.gravatar ? option.gravatar.default : 'mp'
-
-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('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}',{method: "POST"})
-        .then(response => response.json())
-        .then(d => {
-          const artalk = d.data.map(function (e) {
-            return {
-              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
-              'content': changeContent(e.content_marked),
-              'nick': e.nick,
-              'url': e.page_url,
-              'date': e.date,
-            }
-          })
-          saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
-          generateHtml(artalk)
-        }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-        })
-    }
-
-    const 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

@@ -15,7 +15,7 @@ script.
     }
 
     const getComment = () => {
-      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{apiKey}')
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}')
         .then(response => response.json())
         .then(data => {
           const disqusArray = data.response.map(item => {
@@ -49,7 +49,7 @@ script.
           }
           
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
           <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }

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

@@ -15,13 +15,15 @@ script.
     }
 
     const findTrueUrl = (array) => {
+      let url = ''
       Promise.all(array.map(item =>
         fetch(item.url).then(resp => resp.json()).then(data => {
-          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
           if (data.user.login === 'utterances-bot') {
-            return urlArray.pop()
+            url = data.body.match(/https?\:\/\/[^\" ]+/ig).slice(-1)
+            return url[0]
           } else {
-            return urlArray.shift()
+            url = data.body.match(/https?\:\/\/[^\" ]+/i)
+            return url[0]
           }
         })
       )).then(res => {
@@ -38,7 +40,7 @@ script.
     }
 
     const getComment = () => {
-      fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1',{
+      fetch('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1',{
         "headers": {
           Accept: 'application/vnd.github.v3.html+json'
         }
@@ -75,7 +77,7 @@ script.
           }
 
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}'>${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>`
         }

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

@@ -1,30 +1,12 @@
-- let { use } = theme.comments
+- let config = theme.newest_comments
 
-if use
+if config.valine
-  - let forum,apiKey,userRepo
-  case use[0]
-    when 'Valine'
   include ./valine.pug
-    when 'Waline'
+else if config.waline
   include ./waline.pug
-    when 'Twikoo'
+else if config.github_issues.enable
+  include ./github-issues.pug
+else if config.disqus.enable
+  include ./disqus-comment.pug
+else if config.twikoo
   include ./twikoo-comment.pug
-    when 'Disqus'
-      - forum = theme.disqus.shortname
-      - apiKey = theme.disqus.apikey
-      include ./disqus-comment.pug
-    when 'Disqusjs'
-      - forum = theme.disqusjs.shortname
-      - apiKey = theme.disqusjs.apikey
-      include ./disqus-comment.pug
-    when 'Gitalk'
-      - let { repo,owner } = theme.gitalk
-      - userRepo = owner + '/' + repo
-      include ./github-issues.pug
-    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.innerHTML= "!{_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

@@ -43,7 +43,7 @@ script.
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
       }
     }
 
@@ -60,7 +60,7 @@ script.
           }
           
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}'>${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>`
         }

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="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
@@ -37,7 +37,7 @@ script.
           }
 
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}'>${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>`
         }

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

@@ -1,3 +1,5 @@
+- let default_avatar = theme.waline.avatar
+
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
@@ -14,6 +16,13 @@ script.
       return content
     }
 
+    const getIcon = (avatar,mail) => {
+      if (avatar) return avatar
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
+      let iconUrl = `https://gravatar.loli.net/avatar/${mail + defaultIcon}`
+      return iconUrl
+    }
+
     const generateHtml = array => {
       let result = ''
 
@@ -27,7 +36,7 @@ script.
           }
 
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}'>${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>`
         }
@@ -43,17 +52,18 @@ script.
 
     const getComment = () => {
       const loadWaline = () => {
-        Waline.RecentComments({
+        Waline.Widget.RecentComments({
+          el: '#card-newest-comments .aside-list',
           serverURL: '!{theme.waline.serverURL}',
           count: !{theme.newest_comments.limit}
-        }).then(({comments}) => {
+        }).then(comments => {
-          const walineArray = comments.map(e => {
+          const walineArray = comments.map(function (e) {
             return {
               'content': changeContent(e.comment),
-              'avatar': e.avatar,
+              'avatar': getIcon(e.QQAvatar,e.mail),
               'nick': e.nick,
               'url': e.url + '#' + e.objectId,
-              'date': e.insertedAt,
+              'date': e.updatedAt,
             }
           })
           saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
@@ -65,7 +75,7 @@ script.
       }
 
       if (typeof Waline === 'function') loadWaline() 
-      else getScript('!{url_for(theme.asset.waline_js)}').then(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,18 +3,20 @@ 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']
+script(src=url_for(theme.CDN.pjax))
-
-- let choose = theme.comments.use
-if choose
-  if theme.Open_Graph_meta.enable && (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.
-  let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
+  let pjaxSelectors = [
+    'title',
+    '#config-diff',
+    '#body-wrap',
+    '#rightside-config-hide',
+    '#rightside-config-show',
+    '.js-pjax'
+  ]
+
+  if (!{Boolean(theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere'))}) {
+    pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+  }
 
   var pjax = new Pjax({
     elements: '!{pjaxExclude}',
@@ -24,31 +26,6 @@ script.
     scrollRestoration: false
   })
 
-  document.addEventListener('pjax:send', function () {
-
-    // removeEventListener scroll 
-    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
-    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
-
-    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
-    
-    if (window.aplayers) {
-      for (let i = 0; i < window.aplayers.length; i++) {
-        if (!window.aplayers[i].options.fixed) {
-          window.aplayers[i].destroy()
-        }
-      }
-    }
-
-    typeof typed === 'object' && typed.destroy()
-
-    //reset readmode
-    const $bodyClassList = document.body.classList
-    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
-
-    typeof disqusjs === 'object' && disqusjs.destroy()
-  })
-
   document.addEventListener('pjax:complete', function () {
     window.refreshFn()
 
@@ -65,16 +42,41 @@ script.
     typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
-    // google analytics
+    if (typeof gtag === 'function') {
-    typeof gtag === 'function' && gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
+      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
-
+    }
-    // baidu analytics
-    typeof _hmt === 'object' && _hmt.push(['_trackPageview',window.location.pathname]);
 
     typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
 
+    // Analytics
+    if (!{theme.tencent_analytics ? true : false}) {
+      MtaH5.pgv()
+    }
+
     // prismjs
     typeof Prism === 'object' && Prism.highlightAll()
+
+    typeof preloader === 'object' && preloader.endLoading()
+  })
+
+
+  document.addEventListener('pjax:send', function () {
+    typeof preloader === 'object' && preloader.initLoading()
+    
+    if (window.aplayers) {
+      for (let i = 0; i < window.aplayers.length; i++) {
+        if (!window.aplayers[i].options.fixed) {
+          window.aplayers[i].destroy()
+        }
+      }
+    }
+
+    typeof typed === 'object' && typed.destroy()
+
+    //reset readmode
+    const $bodyClassList = document.body.classList
+    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
+
   })
 
   document.addEventListener('pjax:error', (e) => {

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,18 +1,13 @@
 #algolia-search
   .search-dialog
-    nav.search-nav
+    #algolia-search-title.search-dialog__title Algolia
-      span.search-dialog-title= _p('search.title')
+    #algolia-input-panel
-      button.search-close-button
-        i.fas.fa-times
-
-    .search-wrap
       #algolia-search-input
     hr
     #algolia-search-results
       #algolia-hits
       #algolia-pagination
-        #algolia-info
+      #algolia-stats
-          .algolia-stats
+    span.search-close-button
-          .algolia-poweredBy
+      i.fas.fa-times
-  
   #search-mask

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

@@ -1,20 +1,12 @@
 #local-search
   .search-dialog
-    nav.search-nav
+    #local-search-title.search-dialog__title=_p("local_search.label")
-      span.search-dialog-title= _p('search.title')
+    #local-input-panel
-      span#loading-status
-      button.search-close-button
-        i.fas.fa-times
-
-    #loading-database.is-center
-      i.fas.fa-spinner.fa-pulse
-      span= '  ' + _p("search.load_data")
-
-    .search-wrap
       #local-search-input
         .local-search-box
-          input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
+          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
     hr
     #local-search-results
-
+    span.search-close-button
+      i.fas.fa-times
   #search-mask

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/share-js.pug

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

layout/includes/third-party/subtitle.pug

@@ -1,35 +1,33 @@
-- const { effect,loop,source,sub,startDelay,typeSpeed,backSpeed } = theme.subtitle
+- let source = theme.subtitle.source
-- let subContent = sub || new Array()
 
 case source
   when 1
     script.
       function subtitleType () {
-        fetch('https://v1.hitokoto.cn')
+        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json')
           .then(response => response.json())
           .then(data => {
-            if (!{effect}) {
+            if (!{theme.subtitle.effect}) {
-              const from = '出自 ' + data.from
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-              const sub = !{JSON.stringify(subContent)}
+              var both = sub.unshift(data.text)
-              sub.unshift(data.hitokoto, from)
+              typed = new Typed('#subtitle', {
-              window.typed = new Typed('#subtitle', {
                 strings: sub,
-                startDelay: !{startDelay},
+                startDelay: 300,
-                typeSpeed: !{typeSpeed},
+                typeSpeed: 150,
-                loop: !{loop},
+                loop: !{theme.subtitle.loop},
-                backSpeed: !{backSpeed},
+                backSpeed: 50,
               })
             } else {
-              document.getElementById('subtitle').innerHTML = data.hitokoto
+              document.getElementById('subtitle').innerHTML = data.text
             }
           })
       }
 
-      if (!{effect}) {
+      if (!{theme.subtitle.effect}) {
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
@@ -38,30 +36,31 @@ case source
   when 2
     script.
       function subtitleType () {
-        getScript('https://yijuzhan.com/api/word.php?m=js').then(() => {
+        fetch('https://v1.hitokoto.cn')
-          const con = str[0]
+          .then(response => response.json())
-          if (!{effect}) {
+          .then(data => {
-            const from = '出自 ' + str[1]
+            if (!{theme.subtitle.effect}) {
-            const sub = !{JSON.stringify(subContent)}
+              var from = '出自 ' + data.from
-            sub.unshift(con, from)
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            window.typed = new Typed('#subtitle', {
+              var both = sub.unshift(data.hitokoto, from)
+              var typed = new Typed('#subtitle', {
                 strings: sub,
-              startDelay: !{startDelay},
+                startDelay: 300,
-              typeSpeed: !{typeSpeed},
+                typeSpeed: 150,
-              loop: !{loop},
+                loop: !{theme.subtitle.loop},
-              backSpeed: !{backSpeed},
+                backSpeed: 50,
               })
             } else {
-            document.getElementById('subtitle').innerHTML = con
+              document.getElementById('subtitle').innerHTML = data.hitokoto
             }
           })
       }
 
-      if (!{effect}) {
+      if (!{theme.subtitle.effect}) {
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
@@ -70,18 +69,50 @@ case source
   when 3
     script.
       function subtitleType () {
-        getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => {
+        getScript('http://yijuzhan.com/api/word.php?m=js').then(() => {
-          jinrishici.load(result =>{
+          var con = str[0]
-            if (!{effect}) {
+          if (!{theme.subtitle.effect}) {
-              const sub = !{JSON.stringify(subContent)}
+            var from = '出自 ' + str[1]
-              const content = result.data.content
+            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-              sub.unshift(content)
+            var both = sub.unshift(con, from)
-              window.typed = new Typed('#subtitle', {
+            var typed = new Typed('#subtitle', {
               strings: sub,
-                startDelay: !{startDelay},
+              startDelay: 300,
-                typeSpeed: !{typeSpeed},
+              typeSpeed: 150,
-                loop: !{loop},
+              loop: !{theme.subtitle.loop},
-                backSpeed: !{backSpeed},
+              backSpeed: 50,
+            })
+          } else {
+            document.getElementById('subtitle').innerHTML = con
+          }
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
+
+  when 4
+    script.
+      function subtitleType () {
+        getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => {
+          jinrishici.load(function (result) {
+            if (!{theme.subtitle.effect}) {
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var content = result.data.content
+              var both = sub.unshift(content)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
               })
             } else {
               document.getElementById('subtitle').innerHTML = result.data.content
@@ -90,38 +121,37 @@ case source
         })
       }
 
-      if (!{effect}) {
+      if (!{theme.subtitle.effect}) {
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
       }
 
   default
-    - subContent = subContent.length ? subContent : new Array(config.subtitle)
     script.
       function subtitleType () {
-        if (!{effect}) { 
+        if (!{theme.subtitle.effect}) { 
-          window.typed = new Typed("#subtitle", {
+          var typed = new Typed("#subtitle", {
-            strings: !{JSON.stringify(subContent)},
+            strings: "!{theme.subtitle.sub}".split(","),
-            startDelay: !{startDelay},
+            startDelay: 300,
-            typeSpeed: !{typeSpeed},
+            typeSpeed: 150,
-            loop: !{loop},
+            loop: !{theme.subtitle.loop},
-            backSpeed: !{backSpeed}
+            backSpeed: 50
           })
         } else {
-          document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
+          document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
         }
       }
 
-      if (!{effect}) {
+      if (!{theme.subtitle.effect}) {
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
+          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

layout/includes/widget/card_author.pug

@@ -1,24 +1,34 @@
 if theme.aside.card_author.enable
   .card-widget.card-info
-    .is-center
+    .card-info-avatar.is-center
-      .avatar-img
+      if theme.lazyload.enable
-        img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+      else
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
       .author-info__name= config.author
       .author-info__description!= theme.aside.card_author.description || config.description
 
-    .card-info-data.site-data.is-center
+    .card-info-data
+      if site.posts.length
+        .card-info-data-item.is-center
           a(href=url_for(config.archive_dir) + '/')
             .headline= _p('aside.articles') 
             .length-num= site.posts.length
+
+      if site.tags.length
+        .card-info-data-item.is-center
           a(href=url_for(config.tag_dir) + '/')
             .headline= _p('aside.tags')
             .length-num= site.tags.length
+
+      if site.categories.length
+        .card-info-data-item.is-center
           a(href=url_for(config.category_dir) + '/')
             .headline= _p('aside.categories') 
             .length-num= site.categories.length
 
     if theme.aside.card_author.button.enable
-      a#card-info-btn(href=theme.aside.card_author.button.link)
+      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
         i(class=theme.aside.card_author.button.icon)
         span=theme.aside.card_author.button.text
   

layout/includes/widget/card_newest_comment.pug

@@ -1,7 +1,7 @@
-if theme.newest_comments.enable && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
+if theme.newest_comments.enable
   .card-widget#card-newest-comments
     .item-headline
-      i.fas.fa-comment-dots
+      i.fas.fa-bolt
       span= _p('aside.card_newest_comments.headline')
     .aside-list
       span= _p('aside.card_newest_comments.loading_text')

layout/includes/widget/card_post_toc.pug

@@ -1,15 +1,12 @@
 - let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
-- let tocExpand = page.toc_expand !== undefined ? page.toc_expand : theme.toc.expand
-- let tocExpandClass = tocExpand ? 'is-expand' : ''
 
 #card-toc.card-widget
   .item-headline
     i.fas.fa-stream
     span= _p('aside.card_toc')
-    span.toc-percentage
 
   if (page.encrypt == true)
-    .toc-content.toc-div-class(class=tocExpandClass style="display:none")!=toc(page.origin, {list_number: tocNumber})
+    .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
   else 
-    .toc-content(class=tocExpandClass)!=toc(page.content, {list_number: tocNumber})
+    .toc-content!=toc(page.content, {list_number: tocNumber})
       

layout/includes/widget/card_recent_post.pug

@@ -14,6 +14,9 @@ if theme.aside.card_recent_post.enable
         .aside-list-item(class=no_cover)
           if post_cover && theme.cover.aside_enable
             a.thumbnail(href=url_for(link) title=title)
+              if theme.lazyload.enable
+                img(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+              else
                 img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
           .content
             a.title(href=url_for(link) title=title)= title

layout/includes/widget/card_self.pug

@@ -1,5 +1,5 @@
-if site.data.widget && site.data.widget.bottom
+if site.data.widget
-  each item in site.data.widget.bottom
+  each item in site.data.widget
     .card-widget(class=item.class_name id=item.id_name style=item.order ? `order: ${item.order}` : '')
       .item-headline
         i(class=item.icon)

layout/includes/widget/card_tags.pug

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

layout/includes/widget/card_top_self.pug

@@ -1,8 +0,0 @@
-if site.data.widget && site.data.widget.top
-  each item in site.data.widget.top
-    .card-widget(class=item.class_name id=item.id_name)
-      .item-headline
-        i(class=item.icon)
-        span=item.name
-      .item-content
-        !=item.html