Merge branch 'dev' of https://github.com/jerryc127/hexo-theme-butterfly into dev

perf: 调整本地搜索结果间距

.github/ISSUE_TEMPLATE/bug_report.md

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

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

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

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

.github/ISSUE_TEMPLATE/feature_request.md

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

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

@@ -10,7 +10,7 @@ exemptLabels:
   - enhancement
   - documentation 
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # 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

.github/workflows/publish.yml

@@ -0,0 +1,19 @@
+name: npm publish
+
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # Setup .npmrc file to publish to npm
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+        registry-url: 'https://registry.npmjs.org'
+    - run: npm install
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -1,22 +1,30 @@
+<div align="right">
+  Language:
+  🇺🇸
+  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
+</div>
+
 # hexo-theme-butterfly
 
-![version](https://img.shields.io/github/package-json/v/jerryc127/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-4.2+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [JerryC](https://jerryc.me/)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
+
+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/iamjerryw/hexo-theme-butterfly)
+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)
 
 Stable branch [recommend]:
 
@@ -40,7 +48,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`: 
 
@@ -50,7 +58,7 @@ npm i hexo-theme-butterfly
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
-## Features
+## 🎉 Features
 
 - [x] Card UI Design
 - [X] Support sub-menu
@@ -71,12 +79,12 @@ 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/Utterances/Facebook Comments/Twikoo）
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
-- [x] Web analytics (Baidu Analytics/Google Analytics/Tencent Analytics/CNZZ Analytics)
+- [x] Web analytics
 - [x] Google AdSense
-- [x] Webmaster Verification (google/Bing/Baidu/360/Yandex)
+- [x] Webmaster Verification
 - [x] Change website colour scheme
 - [x] Typewriter Effect: activate_power_mode
 - [x] Background effects (Canvas ribbon/canvas_ribbon_piao/canvas_nest)
@@ -89,8 +97,17 @@ npm i hexo-theme-butterfly
 - [x] Lazyload images
 - [x] Instantpage/Pangu/Snackbar notification toast/PWA......
 
-## Screenshots
+## ✨ Contributors
 
+<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,23 +1,30 @@
+<div align="right">
+  語言:
+  中文
+  <a title="English" href="/README.md">英文</a>
+</div>
+
 # hexo-theme-butterfly
 
-![version](https://img.shields.io/github/package-json/v/jerryc127/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-4.2+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
 ![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/)  ||  🤞 [JerryC](https://jerryc.me/)
+預覽: 👍 [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/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
 
 在博客根目錄裡安裝穩定版【推薦】
 
@@ -41,7 +48,8 @@ git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/bu
 npm i hexo-theme-butterfly
 ```
 
-## 應用主題
+## ⚙ 應用主題
+
 修改hexo配置文件`_config.yml`，把主題改為`Butterfly`
 
 ```
@@ -50,7 +58,7 @@ theme: butterfly
 
 >如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
-## 特色
+## 🎉 特色
 
 - [x] 卡片化設計
 - [X] 支持二級目錄
@@ -71,10 +79,10 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
-- [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
+- [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
 - [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
 - [x] 修改網站配色
@@ -89,8 +97,17 @@ 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,25 +1,18 @@
 # 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 (代碼相關)
 # --------------------------------------
 
@@ -27,6 +20,7 @@ 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
@@ -45,6 +39,7 @@ social:
   # fas fa-envelope: mailto:xxxxxx@gmail.com || Email
 
 # search (搜索)
+# see https://butterfly.js.org/posts/ceeb73f/#搜索系統
 # --------------------------------------
 
 # Algolia search
@@ -56,6 +51,8 @@ algolia_search:
 # Local search
 local_search:
   enable: false
+  preload: false
+  CDN:
 
 # Math (數學)
 # --------------------------------------
@@ -83,9 +80,12 @@ favicon: /img/favicon.png
 
 # Avatar (頭像)
 avatar:
-  img:
+  img: https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png
   effect: false
 
+# Disable all banner image
+disable_top_img: false
+
 # The banner image of home page
 index_img:
 
@@ -151,6 +151,7 @@ post_meta:
     label: true # true or false 顯示描述性文字
 
 # wordcount (字數統計)
+# see https://butterfly.js.org/posts/ceeb73f/#字數統計
 wordcount:
   enable: false
   post_wordcount: true
@@ -166,18 +167,25 @@ index_post_content:
   method: 3
   length: 500 # if you set method to 2 or 3, the length need to config
 
+# anchor
+# when you scroll in post, the URL will update according to header id.
+anchor: false
+
 # Post
 # --------------------------------------
 
 # toc (目錄)
 toc:
-  enable: true
+  post: true
+  page: false
   number: true
-  style_simple: false
+  expand: 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/
 
@@ -192,6 +200,14 @@ reward:
     #   link:
     #   text: alipay
 
+# Post edit
+# Easily browse and edit blog source code online.
+post_edit:
+  enable: false
+  # url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/
+  # For example: https://github.com/jerryc127/butterfly.js.org/edit/main/source/
+  url:
+
 # Related Articles
 related_post:
   enable: true
@@ -201,9 +217,12 @@ related_post:
 # figcaption (圖片描述文字)
 photofigcaption: false
 
-# anchor
+# post_pagination (分頁)
-# when you scroll in post, the URL will update according to header id.
+# value: 1 || 2 || false
-anchor: false
+# 1: The 'next post' will link to old post
+# 2: The 'next post' will link to new post
+# false: disable pagination
+post_pagination: 1
 
 # Displays outdated notice for a post (文章過期提醒)
 noticeOutdate:
@@ -240,32 +259,28 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus
-  use:
+  use: # Valine,Disqus
-  # - 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
   lazyload: false
-  count: false # Display comment count in top_img
+  count: false # Display comment count in post's top_img
+  card_post_count: false # Display comment count in Home Page
 
 # disqus
 # 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:
-  api:
+  option:
-  nocomment: # display when a blog post or an article has no comment attached
-  admin:
-  adminLabel:
 
 # livere (來必力)
 # https://www.livere.com/
@@ -280,28 +295,25 @@ gitalk:
   repo:
   owner:
   admin:
-  language: en # en, zh-CN, zh-TW, es-ES, fr, ru
+  option:
-  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
-  emojiCDN: # emoji CDN
+  visitor: false
-  enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
+  option:
-  requiredFields: nick,mail # required fields (nick/mail)
+
+# waline - A simple comment system with backend support fork from Valine
+# https://waline.js.org/
+waline:
+  serverURL: # Waline server address url
+  bg: # waline background
+  pageview: false
   option:
 
 # utterances
@@ -326,6 +338,21 @@ facebook_comments:
 # 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:
 
 # Chat Services
 # --------------------------------------
@@ -387,14 +414,18 @@ 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:
 
+# Cloudflare Analytics
+# https://www.cloudflare.com/zh-tw/web-analytics/
+cloudflare_analytics:
+
+# Microsoft Clarity
+# https://clarity.microsoft.com/
+microsoft_clarity:
+
 # Advertisement
 # --------------------------------------
 
@@ -415,25 +446,11 @@ google_adsense:
 # Verification (站長驗證)
 # --------------------------------------
 
-# Google Webmaster tools verification setting
+site_verification:
-# See: https://www.google.com/webmasters/
+  # - name: google-site-verification
-google_site_verification:
+  #   content: xxxxxx
-
+  # - name: baidu-site-verification
-# Bing Webmaster tools verification setting
+  #   content: xxxxxxx
-# 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 (美化/效果)
 # --------------------------------------
@@ -455,6 +472,9 @@ yandex_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在中間)
@@ -549,8 +569,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 (非必要不要修改)
@@ -581,15 +601,11 @@ subtitle:
   loop: true
   # source 調用第三方服務
   # source: false 關閉調用
-  # source: 1  調用搏天api的隨機語錄（簡體） https://api.btstu.cn/
+  # source: 1  調用一言網的一句話（簡體） https://hitokoto.cn/
-  # source: 2  調用一言網的一句話（簡體） https://hitokoto.cn/
+  # source: 2  調用一句網（簡體） http://yijuzhan.com/
-  # source: 3  調用一句網（簡體） http://yijuzhan.com/
+  # source: 3  調用今日詩詞（簡體） https://www.jinrishici.com/
-  # source: 4  調用今日詩詞（簡體） https://www.jinrishici.com/
   # subtitle 會先顯示 source , 再顯示 sub 的內容
   source: false
-  # 如果有英文逗號' , ',請使用轉義字元 ,
-  # 如果有英文雙引號' " ',請使用轉義字元 "
-  # 開頭不允許轉義字元，如需要，請把整個句子用雙引號包住
   # 如果關閉打字效果，subtitle 只會顯示 sub 的第一行文字
   sub:
 
@@ -605,10 +621,12 @@ aside:
   button: true
   mobile: true # display on mobile
   position: right # left or right
+  archives: true
   card_author:
     enable: true
     description:
     button:
+      enable: true
       icon: fab fa-github
       text: Follow Me
       link: https://github.com/xxxxxx
@@ -619,24 +637,29 @@ aside:
     enable: true
     limit: 5 # if set 0 will show all
     sort: date # date or updated
+    sort_order: # Don't modify the setting unless you know how it works
   card_categories:
     enable: true
     limit: 8 # if set 0 will show all
     expand: none # none/true/false
+    sort_order: # Don't modify the setting unless you know how it works
   card_tags:
     enable: true
     limit: 40 # if set 0 will show all
     color: false
+    sort_order: # Don't modify the setting unless you know how it works
   card_archives:
     enable: true
     type: monthly # yearly or monthly
     format: MMMM YYYY # eg: YYYY年MM月
     order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
     limit: 8 # if set 0 will show all
+    sort_order: # Don't modify the setting unless you know how it works
   card_webinfo:
     enable: true
     post_count: true
     last_push_date: true
+    sort_order: # Don't modify the setting unless you know how it works
 
 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -654,29 +677,14 @@ runtimeshow:
 # Aside widget - Newest Comments
 newest_comments:
   enable: false
+  sort_order: # Don't modify the setting unless you know how it works
   limit: 6
+  storage: 10 # unit: mins, save data to localStorage
   avatar: true
-  leancloud:
-    enable: false
-    appId: # leancloud application app id
-    appKey: # leancloud application app key
-    serverURL: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
-    default_avatar: # mp/identicon/monsterid/wavatar/retro/robohash/blank
-  github_issues:
-    enable: false
-    repo:
-  disqus:
-    enable: false
-    forum:
-    api_key:
-  twikoo: false
 
 # Bottom right button (右下角按鈕)
 # --------------------------------------
 
-# Change font size
-change_font_size: false
-
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
   enable: false
@@ -705,6 +713,14 @@ 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 (只能選擇一個 或者 兩個都不選)
@@ -721,11 +737,13 @@ fancybox: true
 # --------------------------------------
 
 # mermaid
-# see https://github.com/knsv/mermaid
+# see https://github.com/mermaid-js/mermaid
 mermaid:
   enable: false
   # built-in themes: default/forest/dark/neutral
-  theme: default
+  theme:
+    light: default
+    dark: dark
 
 # Note (Bootstrap Callout)
 note:
@@ -744,14 +762,7 @@ note:
 # other
 # --------------------------------------
 
-# Artitalk
+# Pjax
-# 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:
@@ -773,10 +784,7 @@ snackbar:
   enable: false
   position: bottom-left
   bg_light: '#49b1f5' # The background color of Toast Notification in light mode
-  bg_dark: '#121212' # The background color of Toast Notification in dark mode
+  bg_dark: '#1f1f1f' # The background color of Toast Notification in dark mode
-
-# Baidu Push (百度推送)
-baidu_push: false
 
 # https://instant.page/
 # prefetch (預加載)
@@ -789,32 +797,28 @@ pangu:
   field: site # site/post
 
 # Lazyload (圖片懶加載)
-# https://github.com/verlok/lazyload
+# https://github.com/verlok/vanilla-lazyload
 lazyload:
   enable: false
-  post: /img/loading.gif
+  field: site # site/post
+  placeholder:
+  blur: false
 
 # PWA
 # See https://github.com/JLHwung/hexo-offline
 # ---------------
 # pwa:
 #   enable: false
-#   manifest: /image/pwa/manifest.json
+#   manifest: /pwa/manifest.json
-#   apple_touch_icon: /image/pwa/apple-touch-icon.png
+#   apple_touch_icon: /pwa/apple-touch-icon.png
-#   favicon_32_32: /image/pwa/32.png
+#   favicon_32_32: /pwa/32.png
-#   favicon_16_16: /image/pwa/16.png
+#   favicon_16_16: /pwa/16.png
-#   mask_icon: /image/pwa/safari-pinned-tab.svg
+#   mask_icon: /pwa/safari-pinned-tab.svg
-
-# Disable Baidu transformation on mobile devices (禁止百度轉碼)
-disable_baidu_transformation: true
 
 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/
 Open_Graph_meta: true
 
-# Caches the contents in a fragment, speed up the generation (開啟hexo自帶的緩存,加快生成速度)
-fragment_cache: true
-
 # Add the vendor prefixes to ensure compatibility
 css_prefix: true
 
@@ -831,88 +835,62 @@ inject:
 # Don't modify the following settings unless you know how they work
 # 非必要請不要修改
 CDN:
-  # main
+  # The CDN provider of internal scripts (主題內部 js 的 cdn 配置)
-  main_css: /css/index.css
+  # option: local/jsdelivr
-  jquery: https://cdn.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js
+  # Dev version cannot choose jsdelivr (dev版的主題不能設置為 jsdelivr)
-  main: /js/main.js
+  internal_provider: local
-  utils: /js/utils.js
+  # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
-
+  # option: local/jsdelivr
-  # pjax
+  # when set it to local, you need to install hexo-butterfly-extjs
-  pjax: https://cdn.jsdelivr.net/npm/pjax/pjax.min.js
+  third_party_provider: jsdelivr
-
+  option:
-  # comments
+    # main_css:
-  gitalk: https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js
+    # main:
-  gitalk_css: https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css
+    # utils:
-  valine: https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js
+    # translate:
-  disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js
+    # local_search:
-  disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css
+    # algolia_js:
-  utterances: https://utteranc.es/client.js
+    # algolia_search_v4:
-  twikoo: https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js
+    # instantsearch_v4:
-
+    # pjax:
-  # share
+    # gitalk:
-  addtoany: https://static.addtoany.com/menu/page.js
+    # gitalk_css:
-  sharejs: https://cdn.jsdelivr.net/npm/social-share.js/dist/js/social-share.min.js
+    # blueimp_md5:
-  sharejs_css: https://cdn.jsdelivr.net/npm/social-share.js/dist/css/share.min.css
+    # valine:
-
+    # disqusjs:
-  # search
+    # disqusjs_css:
-  local_search: /js/search/local-search.js
+    # twikoo:
-  algolia_js: /js/search/algolia.js
+    # waline_js:
-  algolia_search: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.js
+    # waline_css:
-  algolia_search_css: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.css
+    # sharejs:
-
+    # sharejs_css:
-  # math
+    # mathjax:
-  mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
+    # katex:
-  katex: https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css
+    # katex_copytex:
-  katex_copytex: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.js
+    # katex_copytex_css:
-  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css
+    # mermaid:
-  mermaid: https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js
+    # canvas_ribbon:
-
+    # canvas_fluttering_ribbon:
-  # count
+    # canvas_nest:
-  busuanzi: //busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js
+    # lazyload:
-
+    # instantpage:
-  # background effect
+    # typed:
-  canvas_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js
+    # pangu:
-  canvas_fluttering_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js
+    # fancybox_css_v4:
-  canvas_nest: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js
+    # fancybox_v4:
-
+    # medium_zoom:
-  lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
+    # snackbar_css:
-  instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
+    # snackbar:
-  typed: https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js
+    # activate_power_mode:
-  pangu: https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js
+    # fireworks:
-
+    # click_heart:
-  # photo
+    # ClickShowText:
-  fancybox_css: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.css
+    # fontawesomeV6:
-  fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.js
+    # flickr_justified_gallery_js:
-  medium_zoom: https://cdn.jsdelivr.net/npm/medium-zoom/dist/medium-zoom.min.js
+    # flickr_justified_gallery_css:
-
+    # aplayer_css:
-  # snackbar
+    # aplayer_js:
-  snackbar_css: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.css
+    # meting_js:
-  snackbar: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js
+    # prismjs_js:
-
+    # prismjs_lineNumber_js:
-  # effect
+    # prismjs_autoloader:
-  activate_power_mode: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js
-  fireworks: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js
-  click_heart: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js
-  ClickShowText: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js
-
-  # fontawesome
-  fontawesome: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css
-
-  # Conversion between Traditional and Simplified Chinese
-  translate: /js/tw_cn.js
-
-  # justifiedGallery
-  justifiedGallery_js: https://cdn.jsdelivr.net/npm/justifiedGallery/dist/js/jquery.justifiedGallery.min.js
-  justifiedGallery_css: https://cdn.jsdelivr.net/npm/justifiedGallery/dist/css/justifiedGallery.min.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

@@ -13,6 +13,8 @@ page:
   category: Category
   archives: Archives
 
+card_post_count: comments
+
 sticky: Sticky
 no_title: No title
 
@@ -30,15 +32,17 @@ post:
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
   recommend: Related Articles
+  edit: Edited on
 
-search: Search
+search:
+  title: 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:
-  label: Local search
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
 
@@ -74,6 +78,9 @@ aside:
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
     zero: No Comment
+    image: image
+    link: link
+    code: code
   card_toc: Catalog
 
 date_suffix:
@@ -88,8 +95,6 @@ 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
@@ -97,6 +102,7 @@ rightside:
   scroll_to_comment: Scroll To Comments
   setting: Setting
   aside: Toggle between single-column and double-column
+  chat: Chat
 
 copy_copyright:
   author: Author
@@ -112,6 +118,4 @@ Snackbar:
 
 loading: Loading...
 
-error404:
+error404: Page not found
-  error_title: Page not found
-  back_button: Go back home

languages/en.yml

@@ -13,6 +13,8 @@ page:
   category: Category
   archives: Archives
 
+card_post_count: comments
+
 sticky: Sticky
 no_title: No title
 
@@ -30,15 +32,17 @@ post:
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
   recommend: Related Articles
+  edit: Edited on
 
-search: Search
+search:
+  title: 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:
-  label: Local search
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
 
@@ -74,6 +78,9 @@ aside:
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
     zero: No Comment
+    image: image
+    link: link
+    code: code
   card_toc: Catalog
 
 date_suffix:
@@ -88,8 +95,6 @@ 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
@@ -97,6 +102,7 @@ rightside:
   scroll_to_comment: Scroll To Comments
   setting: Setting
   aside: Toggle between single-column and double-column
+  chat: Chat
 
 copy_copyright:
   author: Author
@@ -112,6 +118,4 @@ Snackbar:
 
 loading: Loading...
 
-error404:
+error404: Page not found
-  error_title: Page not found
-  back_button: Go back home

languages/zh-CN.yml

@@ -13,6 +13,8 @@ page:
   category: 分类
   archives: 归档
 
+card_post_count: 条评论
+
 sticky: 置顶
 no_title: 无题
 
@@ -31,15 +33,17 @@ post:
     copyright_content: '本博客所有文章除特别声明外，均采用
       <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
   recommend: 相关推荐
+  edit: 编辑
 
-search: 搜索
+search:
+  title: 搜索
+  load_data: 数据库加载中
   algolia_search:
     input_placeholder: 搜索文章
     hits_empty: '找不到您查询的内容：${query}'
     hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
   local_search:
-  label: 本地搜索
     input_placeholder: 搜索文章
     hits_empty: '找不到您查询的内容：${query}'
 
@@ -75,6 +79,9 @@ aside:
     loading_text: 正在加载中...
     error: 无法获取评论，请确认相关配置是否正确
     zero: 没有评论
+    image: 图片
+    link: 链接
+    code: 代码
   card_toc: 目录
 
 date_suffix:
@@ -89,8 +96,6 @@ share: 分享
 
 rightside:
   readmode_title: 阅读模式
-  font_plus_title: 放大字体
-  font_minus_title: 缩小字体
   translate_title: 简繁转换
   night_mode_title: 浅色和深色模式转换
   back_to_top: 回到顶部
@@ -98,6 +103,7 @@ rightside:
   scroll_to_comment: 直达评论
   setting: 设置
   aside: 单栏和双栏切换
+  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -113,6 +119,4 @@ Snackbar:
 
 loading: 加载中...
 
-error404:
+error404: 页面没有找到
-  error_title: 页面没有找到
-  back_button: 回到主页

languages/zh-TW.yml

@@ -13,6 +13,8 @@ page:
   category: 分類
   archives: 歸檔
 
+card_post_count: 條評論
+
 sticky: 置頂
 no_title: 無題
 
@@ -20,7 +22,7 @@ post:
   created: 發表於
   updated: 更新於
   wordcount: 字數總計
-  min2read: 閲讀時長
+  min2read: 閱讀時長
   min2read_unit: 分鐘
   page_pv: 閱讀量
   comments: 評論數
@@ -31,15 +33,17 @@ post:
     copyright_content: '本部落格所有文章除特別聲明外，均採用
       <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
   recommend: 相關推薦
+  edit: 編輯
 
-search: 搜尋
+search:
+  title: 搜尋
+  load_data: 資料庫載入中
   algolia_search:
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
     hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
   local_search:
-  label: 本地搜尋
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
 
@@ -62,7 +66,7 @@ aside:
     headline: 網站資訊
     article_name: 文章數目
     runtime:
-      name: 已運行時間
+      name: 已執行時間
       unit: 天
     last_push_date:
       name: 最後更新時間
@@ -72,9 +76,12 @@ aside:
   more_button: 檢視更多
   card_newest_comments:
     headline: 最新評論
-    loading_text: 正在加載中...
+    loading_text: 正在載入中...
     error: 無法獲取評論，請確認相關配置是否正確
     zero: 沒有評論
+    image: 圖片
+    link: 連結
+    code: 程式碼
   card_toc: 目錄
 
 date_suffix:
@@ -89,8 +96,6 @@ share: 分享
 
 rightside:
   readmode_title: 閱讀模式
-  font_plus_title: 放大字型
-  font_minus_title: 縮小字型
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
   back_to_top: 回到頂部
@@ -98,6 +103,7 @@ rightside:
   scroll_to_comment: 直達評論
   setting: 設定
   aside: 單欄和雙欄切換
+  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -113,6 +119,4 @@ Snackbar:
 
 loading: 載入中...
 
-error404:
+error404: 頁面沒有找到
-  error_title: 頁面沒有找到
-  back_button: 回到主頁

layout/404.pug

@@ -1,28 +0,0 @@
-- 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:theme.fragment_cache})
-
-    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/includes/404.pug

@@ -0,0 +1,12 @@
+- 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,36 +1,43 @@
 div
-  script(src=url_for(theme.CDN.utils))
+  script(src=url_for(theme.asset.utils))
-  script(src=url_for(theme.CDN.main))
+  script(src=url_for(theme.asset.main))
 
-  if theme.translate && theme.translate.enable
+  if theme.translate.enable
-    script(src=url_for(theme.CDN.translate))
+    script(src=url_for(theme.asset.translate))
 
   if theme.medium_zoom
-    script(src=url_for(theme.CDN.medium_zoom))
+    script(src=url_for(theme.asset.medium_zoom))
+  else if theme.fancybox
+    script(src=url_for(theme.asset.fancybox_v4))
 
   if theme.instantpage
-    script(src=url_for(theme.CDN.instantpage) type="module")
+    script(src=url_for(theme.asset.instantpage), type='module')
 
   if theme.lazyload.enable
-    script(src=url_for(theme.CDN.lazyload))
+    script(src=url_for(theme.asset.lazyload))
 
-  if (theme.snackbar && theme.snackbar.enable)
+  if theme.snackbar.enable
-    script(src=url_for(theme.CDN.snackbar))
+    script(src=url_for(theme.asset.snackbar))
 
-  if theme.pangu && theme.pangu.enable
+  if theme.pangu.enable
-    !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache})
+    != partial("includes/third-party/pangu.pug", {}, { cache: true })
 
   //- search
   if theme.algolia_search.enable
-    script(src=url_for(theme.CDN.algolia_js))
+    script(src=url_for(theme.asset.algolia_search_v4))
+    script(src=url_for(theme.asset.instantsearch_v4))
+    script(src=url_for(theme.asset.algolia_js))
   else if theme.local_search.enable
-    script(src=url_for(theme.CDN.local_search))
+    script(src=url_for(theme.asset.local_search))
 
   if theme.preloader
-    !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
+    != partial("includes/loading/loading-js", {}, { cache: true })
 
   .js-pjax
-    if theme.subtitle.enable && is_home() && theme.index_img !== false
+    if needLoadCountJs
+      != partial("includes/third-party/card-post-count/index", {}, { cache: true })
+
+    if loadSubJs
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug
@@ -38,22 +45,19 @@ div
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
-    if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+  != partial("includes/third-party/prismjs", {}, { cache: true })
-      script(async src=url_for(theme.CDN.busuanzi))
-
-  !=partial('includes/third-party/prismjs', {}, {cache:theme.fragment_cache})
 
   if theme.aside.enable && theme.newest_comments.enable
     if theme.pjax.enable
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
     else if (!is_post() && page.aside !== false)
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
 
   != fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
+  != partial("includes/third-party/effect", {}, { cache: true })
 
-  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
+  != partial("includes/third-party/chat/index", {}, { cache: true })
 
   if theme.aplayerInject && theme.aplayerInject.enable
     if theme.pjax.enable || theme.aplayerInject.per_page
@@ -62,7 +66,7 @@ div
       include ./third-party/aplayer.pug
 
   if theme.pjax.enable
-    !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
+    != partial("includes/third-party/pjax", {}, { cache: true })
-  
-  !=partial('includes/third-party/baidu_push', {}, {cache:theme.fragment_cache})
 
+  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')

layout/includes/head.pug

@@ -1,10 +1,10 @@
 - var pageTitle
-- if (is_archive()) pageTitle = _p('page.archives')
+- if (is_archive()) pageTitle = fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);})
 - else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
 - else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
 - else if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
 - else if (is_year()) pageTitle += ': ' + page.year
-- else if (is_current('/404.html', [strict])) pageTitle = _p('error404.error_title')
+- else if (is_current('/404.html', [strict])) pageTitle = _p('error404')
 - else pageTitle = page.title || config.title || ''
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
@@ -16,11 +16,13 @@
 - 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 themeColor = theme.display_mode === 'dark' ? '#0d0d0d' : '#ffffff'
+- var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#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")
+meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no")
 title= tabTitle
 if pageKeywords
   meta(name="keywords" content=pageKeywords)
@@ -29,10 +31,6 @@ meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
 meta(name="theme-color" content=themeColor)
 
-if theme.disable_baidu_transformation
-  meta(http-equiv="Cache-Control" content="no-transform")
-  meta(http-equiv="Cache-Control" content="no-siteapp")
-
 //- Open_Graph
 include ./head/Open_Graph.pug
 
@@ -40,42 +38,41 @@ include ./head/Open_Graph.pug
 link(rel="canonical" href=urlNoIndex())
 
 //- 預解析
-!=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/preconnect', {}, {cache: true})
 
 //- 網站驗證
-!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/site_verification', {}, {cache: true})
 
 //- PWA
 if (theme.pwa && theme.pwa.enable)
-  !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
+  !=partial('includes/head/pwa', {}, {cache: true})
 
 //- main css
-link(rel='stylesheet', href=url_for(theme.CDN.main_css))
+link(rel='stylesheet', href=url_for(theme.asset.main_css))
-link(rel='stylesheet', href=url_for(theme.CDN.fontawesome) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'")
 
 if (theme.snackbar && theme.snackbar.enable)
-  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css) media="print" onload="this.media='all'")
+  link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")
 
-if theme.algolia_search.enable
+if theme.fancybox
-  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css) media="print" onload="this.media='all'")
+  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css_v4) media="print" onload="this.media='all'")
-  script(src=url_for(theme.CDN.algolia_search) defer)
 
 //- google_adsense
-!=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/google_adsense', {}, {cache: true})
 
 //- analytics
-!=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
 if theme.blog_title_font &&　theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
-!=partial('includes/head/config', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=partial('includes/head/js', {}, {cache:theme.fragment_cache})
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
 !=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

@@ -1,6 +1,6 @@
 if theme.Open_Graph_meta
   - let contentType = is_post() ? 'article' : 'website'
-  - let metaImage = full_url_for(page.cover || theme.avatar.img)
+  - let metaImage = (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : ''
   - let fb_appId = theme.facebook_comments.app_id || ''
   - let fb_admins = theme.facebook_comments.user_id || ''
 

layout/includes/head/analytics.pug

@@ -16,17 +16,16 @@ 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}`)
+
+if theme.cloudflare_analytics
+  script(defer data-pjax src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon=`{"token": "${theme.cloudflare_analytics}"}`)
+
+if theme.microsoft_clarity
+  script.
+    (function(c,l,a,r,i,t,y){
+        c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+        t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+        y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+    })(window, document, "clarity", "script", "!{theme.microsoft_clarity}");

layout/includes/head/config.pug

@@ -9,9 +9,9 @@
       hits: theme.algolia_search.hits,
       // search languages
       languages: {
-        input_placeholder: _p("algolia_search.input_placeholder"),
+        input_placeholder: _p("search.algolia_search.input_placeholder"),
-        hits_empty: _p("algolia_search.hits_empty"),
+        hits_empty: _p("search.algolia_search.hits_empty"),
-        hits_stats: _p("algolia_search.hits_stats")
+        hits_stats: _p("search.algolia_search.hits_stats"),
       }
     })
   }
@@ -19,10 +19,11 @@
   let localSearch = 'undefined';
   if (theme.local_search && theme.local_search.enable) {
     localSearch = JSON.stringify({
-      path: config.search.path,
+      path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
+      preload: theme.local_search.preload,
       languages: {
         // search languages
-        hits_empty: _p("local_search.hits_empty")
+        hits_empty: _p("search.local_search.hits_empty"),
       }
     })
   }
@@ -78,12 +79,13 @@
     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
     })
   }
 
 script.
-  var GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = { 
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -111,60 +113,12 @@ script.
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
     source: {
-      jQuery: '!{url_for(theme.CDN.jquery)}',
       justifiedGallery: {
-        js: '!{url_for(theme.CDN.justifiedGallery_js)}',
+        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
-        css: '!{url_for(theme.CDN.justifiedGallery_css)}'
+        css: '!{url_for(theme.asset.flickr_justified_gallery_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}
+    isAnchor: !{theme.anchor}
-  };
-
-  var saveToLocal = {
-    set: function setWithExpiry(key, value, ttl) {
-      const now = new Date()
-      const expiryDay = ttl * 86400000
-      const item = {
-        value: value,
-        expiry: now.getTime() + expiryDay,
   }
-      localStorage.setItem(key, JSON.stringify(item))
-    },
-
-    get: function getWithExpiry(key) {
-      const itemStr = localStorage.getItem(key)
-
-      if (!itemStr) {
-        return undefined
-      }
-      const item = JSON.parse(itemStr)
-      const now = new Date()
-
-      if (now.getTime() > item.expiry) {
-        localStorage.removeItem(key)
-        return undefined
-      }
-      return item.value
-    }
-  }
-
-  // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
-  const getScript = url => new Promise((resolve, reject) => {
-    const script = document.createElement('script')
-    script.src = url
-    script.async = true
-    script.onerror = reject
-    script.onload = script.onreadystatechange = function() {
-      const loadState = this.readyState
-      if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-      script.onload = script.onreadystatechange = null
-      resolve()
-    }
-    document.head.appendChild(script)
-  })

layout/includes/head/config_site.pug

@@ -1,16 +1,27 @@
 -
+  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 pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
+  var showToc = false
-  var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+  if (theme.aside.enable && page.aside !== false) {
+    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_change
+script#config-diff.
-  .
   var GLOBAL_CONFIG_SITE = {
+    title: '!{titleVal}',
     isPost: !{is_post()},
     isHome: !{is_home()},
     isHighlightShrink: !{isHighlightShrink},

layout/includes/head/js.pug

@@ -1,71 +0,0 @@
-script
-  | (function () {
-    
-  if theme.darkmode.enable
-    |   window.activateDarkMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'dark')
-    |     if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-    |     }
-    |   }
-    |   window.activateLightMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'light')
-    |    if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-    |     }
-    |   }
-
-    |   const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    |   const t = saveToLocal.get('theme')
-    |   if (autoChangeMode === '1') {
-    |     const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-    |     const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-    |     const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-    |     const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-    |     if (t === undefined) {
-    |       if (isLightMode) activateLightMode()
-    |       else if (isDarkMode) activateDarkMode()
-    |       else if (isNotSpecified || hasNoSupport) {
-    |         const now = new Date()
-    |         const hour = now.getHours()
-    |         const isNight = hour <= 6 || hour >= 18
-    |         isNight ? activateDarkMode() : activateLightMode()
-    |       }
-    |       window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-    |         if (saveToLocal.get('theme') === undefined) {
-    |           e.matches ? activateDarkMode() : activateLightMode()
-    |         }
-    |       })
-    |     } else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else if (autoChangeMode === '2') {
-    |     const now = new Date()
-    |     const hour = now.getHours()
-    |     const isNight = hour <= 6 || hour >= 18
-    |     if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-    |     else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else {
-    |     if (t === 'dark') activateDarkMode()
-    |     else if (t === 'light') activateLightMode()
-    |   }
-
-  if theme.aside.enable && theme.aside.button
-    | const asideStatus = saveToLocal.get('aside-status')
-    | if (asideStatus !== undefined) {
-    |    if (asideStatus === 'hide') {
-    |      document.documentElement.classList.add('hide-aside')
-    |    } else {
-    |      document.documentElement.classList.remove('hide-aside')
-    |    }
-    | }
-  
-  if theme.change_font_size
-    | const fontSizeVal = saveToLocal.get('global-font-size')
-    | if (fontSizeVal !== undefined) {
-    |   document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
-    | }
-
-  | })()
-

layout/includes/head/preconnect.pug

@@ -6,17 +6,17 @@ 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")
 
+if theme.cloudflare_analytics
+  link(rel="preconnect" href="//static.cloudflareinsights.com")
+
+if theme.microsoft_clarity
+  link(rel="preconnect" href="//www.clarity.ms")
+
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
   link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')
 
 if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
   link(rel="preconnect" href="//busuanzi.ibruce.info")
-
-if theme.baidu_push
-  link(rel="preconnect" href="//zz.bdstatic.com")

layout/includes/head/site_verification.pug

@@ -1,14 +1,3 @@
-if theme.google_site_verification
+if theme.site_verification
-  meta(name="google-site-verification" content=theme.google_site_verification)
+  each item in theme.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 page.top_img !== false
+if !theme.disable_top_img && page.top_img !== false
   if is_post()
-    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+    - var top_img = page.top_img || page.cover || page.randomcover
   else if is_page()
     - var top_img = page.top_img || theme.default_top_img
   else if is_tag()
@@ -17,25 +17,27 @@ if page.top_img !== false
     - var top_img = page.top_img || theme.default_top_img
 
   if top_img !== false
-    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''
-    - var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
+    - var site_title = is_archive() ? fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);}) : page.title || page.tag || page.category || config.title
-    - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+    - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else
-    - var isHomeClass = 'no-top-img'
+    - var isHomeClass = 'not-top-img'
 else
   - var top_img = false
-  - var isHomeClass = 'no-top-img'
+  - var isHomeClass = 'not-top-img'
 
 header#page-header(class=isHomeClass style=bg_img)
-  !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
+  !=partial('includes/header/nav', {}, {cache: true})
   if top_img !== false
     if is_post()
       include ./post-info.pug
     else if is_home() 
       #site-info
         h1#site-title=site_title
+        if theme.subtitle.enable
+          - var loadSubJs = true
           #site-subtitle
             span#subtitle
         if(theme.social)

layout/includes/header/menu_item.pug

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

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')
+          span=' '+_p('search.title')
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
+    !=partial('includes/header/menu_item', {}, {cache: true})
 
     #toggle-menu
       a.site-page

layout/includes/header/post-info.pug

@@ -1,5 +1,9 @@
+- let comments = theme.comments
 #post-info
   h1.post-title= page.title || _p('no_title')
+    if theme.post_edit.enable
+      a.post-edit-link(href=theme.post_edit.url + page.source title=_p('post.edit') target="_blank")
+        i.fas.fa-pencil-alt
         
   #post-meta
     .meta-firstline
@@ -17,9 +21,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 data_info = data_type_update ? _p('post.updated') : _p('post.created')
+            - let date_title = data_type_update ? _p('post.updated') : _p('post.created')
             i.fa-fw.post-meta-icon(class=date_icon)
-            span.post-meta-label= data_info
+            span.post-meta-label= date_title
             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
@@ -48,15 +52,36 @@
             span.post-meta-label= _p('post.min2read') + ':'
             span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
     
-      if theme.busuanzi.page_pv
+      //- for pv and count
+      mixin pvBlock(parent_id,parent_class,parent_title)
         span.post-meta-separator |
-        span.post-meta-pv-cv
+        span(class=parent_class id=parent_id data-flag-title=page.title)
           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 commentUse && !comments.lazyload
+        case commentUse[0]
+          when 'Valine'
+            if theme.valine.visitor
+              +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+                span.leancloud-visitors-count
+          when 'Waline'
+            if theme.waline.pageview
+              +pvBlock('','','')
+                span.waline-pageview-count(data-path=url_for(page.path))
+          when 'Twikoo'
+            if theme.twikoo.visitor
+              +pvBlock('','','')
+                span#twikoo_visitors
+      else if theme.busuanzi.page_pv
+        +pvBlock('','post-meta-pv-cv','')
           span#busuanzi_value_page_pv
 
-      if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
+      if comments.count && !comments.lazyload && page.comments !== false && comments.use
-        - var whichCount = theme.comments.use[0]
+        - var whichCount = comments.use[0]
 
         mixin countBlock
           span.post-meta-separator |
@@ -66,23 +91,29 @@
             if block
               block
         
-        if whichCount === 'Disqus' || whichCount === 'Disqusjs'
+        case whichCount
+          when 'Disqus'
+          when 'Disqusjs'
             +countBlock
               span.disqus-comment-count
                 a(href=full_url_for(page.path) + '#disqus_thread')
-        else if whichCount === 'Valine'
+          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")
-        else if whichCount === 'Gitalk'
+          when 'Waline'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-              span.gitalk-#card-toc
+                span.waline-comment-count(data-path=url_for(page.path))
-        else if whichCount === 'Twikoo'
+          when 'Gitalk'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.gitalk-comment-count
+          when 'Twikoo'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span#twikoo-count
-        else if whichCount === 'Facebook Comments'
+          when 'Facebook Comments'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.fb-comments-count(data-href=urlNoIndex())

layout/includes/layout.pug

@@ -1,5 +1,7 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
+- page.aside = is_archive() ? theme.aside.archives : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
+- var pageType = is_post() ? 'post' : 'page'
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
@@ -7,14 +9,15 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
     include ./head.pug
   body
     if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})
 
     if theme.background
       #web_bg
       
-    !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
+    !=partial('includes/sidebar', {}, {cache: true})
 
-    #body-wrap
+    if page.type !== '404'
+      #body-wrap(class=pageType)
         include ./header/index.pug
 
         main#content-inner.layout(class=hideAside)
@@ -30,13 +33,16 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
           if (footerBg === true)
             - var footer_bg = bg_img
           else
-          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+            - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
         else
           - var footer_bg = ''
 
         footer#footer(style=footer_bg)
-        !=partial('includes/footer', {}, {cache:theme.fragment_cache})
+          !=partial('includes/footer', {}, {cache: true})
+
+    else
+      include ./404.pug
 
     include ./rightside.pug
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/search/index', {}, {cache: true})
     include ./additional-js.pug

layout/includes/loading/loading-js.pug

@@ -10,4 +10,4 @@ script.
 
     }
   }
-  window.addEventListener('load',()=> {preloader.endLoading()})
+  window.addEventListener('load',preloader.endLoading())

layout/includes/mixins/article-sort.pug

@@ -11,9 +11,6 @@ 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,33 +1,35 @@
 mixin postUI(posts)
   each article , index in page.posts.data
     .recent-post-item
-      - let link = article.link || article.path
+      -
-      - let title = article.title || _p('no_title')
+        let link = article.link || article.path
-      - let leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
+        let title = article.title || _p('no_title')
-      - let post_cover = article.cover
+        const position = theme.cover.position
-      - let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
+        let leftOrRight = position === 'both' 
+          ? 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
         .article-meta-wrap
           if (is_home() && (article.top || article.sticky > 0))
             span.article-meta
-              i.fas.fa-thumbtack.article-meta__icon.sticky
+              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)
@@ -41,20 +43,51 @@ 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.article-meta__icon
+              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
+                  i.fas.fa-angle-right.article-meta-link
           if (theme.post_meta.page.tags && article.tags.data.length > 0)
             span.article-meta.tags
-              span.article-meta__separator |
+              span.article-meta-separator |
-              i.fas.fa-tag.article-meta__icon
+              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 |
+              i.fas.fa-comments
+              if block
+                block
+              span.article-meta-label= ' ' + _p('card_post_count')
+          
+          if theme.comments.card_post_count
+            case theme.comments.use[0]
+              when 'Disqus'
+              when 'Disqusjs'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqus_thread')
+              when 'Valine'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
+                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+              when 'Waline'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.waline-comment-count(id=url_for(link))
+              when 'Twikoo'
+                +countBlockInIndex
+                  a.twikoo-count(href=url_for(link) + '#post-comment')
+              when 'Facebook Comments'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.fb-comments-count(data-href=urlNoIndex(article.permalink))
 
         //- Display the article introduction on homepage
         case theme.index_post_content.method

layout/includes/page/artitalk.pug

@@ -1,28 +0,0 @@
-- 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,5 +1 @@
-.category-lists
+.category-lists!= list_categories()
-  .category-title.is-center= _p('page.category')
-    |  - 
-    span.category-amount= site.categories.length
-  div!= list_categories()

layout/includes/page/default-page.pug

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

layout/includes/page/flink.pug

@@ -1,19 +1,68 @@
-.flink#article-container
+#article-container
-  if site.data.link
+  .flink
-    each i in site.data.link
+    if page.flink_url
-      if i.class_name
+      script.
-        h2!= i.class_name
+        (()=>{
-      if i.class_desc
+          const replaceSymbol = (str) => {
-        .flink-desc!=i.class_desc
+            return str.replace(/[\p{P}\p{S}]/gu, "-")
-      .flink-list
+          }
-        each item in i.link_list
+
-          .flink-list-item
+          let result = ""
-            a(href=url_for(item.link)  title=item.name target="_blank")
+          fetch("!{url_for(page.flink_url)}")
-              if theme.lazyload.enable
+            .then(response => response.json())
-                img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+            .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
-                img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+      if site.data.link
-              span.flink-item-name= item.name 
+        - let result = ""
-              span.flink-item-desc(title=item.descr)= item.descr
+        each i in site.data.link
+          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ""
+          - let classDesc = i.class_desc ? `<div class="flink-desc">${i.class_desc}</div>` : ""
+
+          - let listResult = ""
+
+          each j in i.link_list
+            - 
+              listResult += `
+                <div class="flink-list-item">
+                  <a href="${j.link}" title="${j.name}" target="_blank">
+                    <div class="flink-item-icon">
+                      <img class="no-lightbox" src="${j.avatar}" onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt="${j.name}" />
+                    </div>
+                    <div class="flink-item-name">${j.name}</div> 
+                    <div class="flink-item-desc" title="${j.descr}">${j.descr}</div>
+                  </a>
+                </div>`
+            -
+
+          - result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+
+        - page.content = result + page.content
     != page.content
 

layout/includes/page/tags.pug

@@ -1,5 +1,2 @@
-.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,34 +6,32 @@
     escape: false
   }
 
-if(!is_post())
+if is_post()
-  nav#pagination
+  - let prev = theme.post_pagination === 1 ? page.prev : page.next
-    div.pagination
+  - let next = theme.post_pagination === 1 ? page.next : page.prev
-      !=paginator(options)
-else
   nav#pagination.pagination-post
-    if(page.prev)
+    if(prev)
-      - var hasPageNext = page.next ? 'pull-left' : 'pull-full'
+      - var hasPageNext = next ? 'pull-left' : 'pull-full'
       .prev-post(class=hasPageNext)
-        - var pagination_cover = page.prev.cover === false ? page.prev.randomcover : page.prev.cover
+        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
-        a(href=url_for(page.prev.path))
+        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')
-            .prev_info=page.prev.title
+            .prev_info=prev.title
           
-    if(page.next)
+    if(next)
-      - var hasPagePrev = page.prev ? 'pull-right' : 'pull-full'
+      - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
-      - var pagination_cover = page.next.cover == false ? page.next.randomcover : page.next.cover
+      - var pagination_cover = next.cover == false ? next.randomcover : next.cover
       .next-post(class=hasPagePrev)
-        a(href=url_for(page.next.path))
+        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=page.next.title 
+            .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 ? page.copyright_author : config.author
+  - let author = page.copyright_author || config.author
-  - let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}`
+  - let authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
-  - let url = page.copyright_url ? page.copyright_url : page.permalink
+  - let url = page.copyright_url || page.permalink
-  - 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)
+  - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
       span.post-copyright-meta= _p('post.copyright.author') + ": "

layout/includes/post/reward.pug

@@ -5,12 +5,9 @@
   .reward-main
     ul.reward-all
       each item in theme.reward.QR_code
-          - var clickTo = (item.itemlist||item).link ? (item.itemlist||item).link : (item.itemlist||item).img
+        - var clickTo = item.link ? item.link : item.img
         li.reward-item
-            a(href=clickTo target='_blank')
+          a(href=url_for(clickTo) target='_blank')
-              if theme.lazyload.enable
+            img.post-qr-code-img(src=url_for(item.img) alt=item.text)
-                img.post-qr-code-img(data-lazy-src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
+          .post-qr-code-desc=item.text
-              else
-                img.post-qr-code-img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
-            .post-qr-code-desc=(item.itemlist||item).text
 

layout/includes/rightside.pug

@@ -1,38 +1,60 @@
-#rightside
+- const { readmode, translate, darkmode, aside, chat_btn } = theme
-  #rightside-config-hide
+mixin rightsideItem(array)
-    if is_post() && theme.readmode
+  each item in array
+    case item
+      when 'readmode'
+        if is_post() && readmode
           button#readmode(type="button" title=_p('rightside.readmode_title'))
             i.fas.fa-book-open
-    if theme.change_font_size
+      when 'translate'
-      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
+        if translate.enable
-        i.fas.fa-plus
+          button#translateLink(type="button" title=_p('rightside.translate_title'))= translate.default
-      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
+      when 'darkmode'
-        i.fas.fa-minus
+        if darkmode.enable && darkmode.button
-    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
-    if theme.aside.enable && theme.aside.button && page.aside !== false
+      when 'hideAside'
+        if aside.enable && aside.button && page.aside !== false
           button#hide-aside-btn(type="button" title=_p('rightside.aside'))
             i.fas.fa-arrows-alt-h
-  #rightside-config-show
+      when 'toc'
-    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
-    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size
+      when 'chat'
-      button#rightside_config(type="button" title=_p("rightside.setting"))
+        if chat_btn
-        i.fas.fa-cog.fa-spin
+          button#chat_btn(type="button" title=_p("rightside.chat"))
-
-    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,31 +1,18 @@
 #sidebar
   #menu-mask
   #sidebar-menus
-    .author-avatar
+    .avatar-img.is-center
-      if theme.lazyload.enable
+      img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    .sidebar-site-data.site-data.is-center
-      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
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
+    !=partial('includes/header/menu_item', {}, {cache: true})

layout/includes/third-party/aplayer.pug

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

layout/includes/third-party/baidu_push.pug

@@ -1,15 +0,0 @@
-if theme.baidu_push
-  script.
-    (function(){
-      const bp = document.createElement('script');
-      const curProtocol = window.location.protocol.split(':')[0];
-      if (curProtocol === 'https') {
-        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-      }
-      else{
-        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-      }
-      bp.dataset.pjax = ''
-      const s = document.getElementsByTagName("script")[0];
-      s.parentNode.insertBefore(bp, s);
-    })()

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

@@ -0,0 +1,16 @@
+script.
+  (() => {
+    const getCount = () => {
+      if (window.DISQUSWIDGETS === undefined) {
+        var d = document, s = d.createElement('script');
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+        s.id = 'dsq-count-scr';
+        (d.head || d.body).appendChild(s);
+      } else {
+        DISQUSWIDGETS.getCount({reset: true});
+      }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()

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

@@ -0,0 +1,15 @@
+script.
+  (()=>{
+    function loadFBComment () {
+      if (typeof FB === 'object') FB.XFBML.parse()
+      else {
+        let ele = document.createElement('script')
+        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')
+        document.body.appendChild(ele)
+      }
+    }
+    window.pjax ? loadFBComment() : window.addEventListener('load', loadFBComment)
+  })()

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

@@ -0,0 +1,12 @@
+case theme.comments.use[0]
+  when 'Twikoo'
+    include ./twikoo.pug
+  when 'Disqus'
+  when 'Disqusjs'
+    include ./disqus.pug
+  when 'Valine'
+    include ./valine.pug
+  when 'Waline'
+    include ./waline.pug
+  when 'Facebook Comments'
+    include ./fb.pug

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

@@ -0,0 +1,37 @@
+script.
+  (() => { 
+    const getCommentUrl = () => {
+      const eleGroup = document.querySelectorAll('#recent-posts .article-title')
+      let urlArray = []
+      eleGroup.forEach(i=>{
+        urlArray.push(i.getAttribute('href'))
+      })
+      return urlArray
+    }
+
+    const getCount = () => {
+      const runTwikoo = () => {
+        twikoo.getCommentsCount({
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
+          urls: getCommentUrl(),
+          includeReply: false
+        }).then(function (res) {
+          document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
+            item.innerText = res[index].count
+          })
+        }).catch(function (err) {
+          console.log(err)
+        })
+      }
+
+        if (typeof twikoo === 'object') {
+          runTwikoo()
+        } else {
+          getScript('!{theme.asset.twikoo}').then(runTwikoo)
+        }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()

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

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

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

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

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

@@ -1,9 +1,11 @@
+- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
+
 script.
   function loadDisqus () {
     var disqus_config = function () {
       this.page.url = '!{ page.permalink }'
       this.page.identifier = '!{ page.path }'
-      this.page.title = '!{ page.title }'
+      this.page.title = '!{ disqusPageTitle }'
     };
 
     window.disqusReset = () => {

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

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

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

@@ -7,7 +7,7 @@ script.
     if (typeof FB === 'object') FB.XFBML.parse()
     else {
       let ele = document.createElement('script')
-      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v13.0&appId=!{theme.facebook_comments.app_id}&autoLogAppEvents=1')
       ele.setAttribute('async', 'true')
       ele.setAttribute('defer', 'true')
       ele.setAttribute('crossorigin', 'anonymous')

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

@@ -0,0 +1,49 @@
+- 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,33 +2,29 @@ script.
   function addGitalkSource () {
     const ele = document.createElement('link')
     ele.rel = 'stylesheet'
-    ele.href= '!{url_for(theme.CDN.gitalk_css)}'
+    ele.href= '!{url_for(theme.asset.gitalk_css)}'
     document.getElementsByTagName('head')[0].appendChild(ele)
   }
 
   function loadGitalk () {
     function initGitalk () {
-      var gitalk = new Gitalk({
+      var gitalk = new Gitalk(Object.assign({
         clientID: '!{theme.gitalk.client_id}',
         clientSecret: '!{theme.gitalk.client_secret}',
         repo: '!{theme.gitalk.repo}',
         owner: '!{theme.gitalk.owner}',
         admin: ['!{theme.gitalk.admin}'],
         id: '!{md5(page.path)}',
-        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.CDN.gitalk)}').then(initGitalk)
+      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
     }
   }
   

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

@@ -31,6 +31,10 @@ hr
             #utterances-wrap
           when 'Twikoo'
             #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

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

@@ -1,18 +1,22 @@
 each name in theme.comments.use
   case name
     when 'Valine'
-      !=partial('includes/third-party/comments/valine', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/valine', {}, {cache: true})
     when 'Disqus'
       include ./disqus.pug
     when 'Disqusjs'
       include ./disqusjs.pug
     when 'Livere'
-      !=partial('includes/third-party/comments/livere', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/livere', {}, {cache: true})
     when 'Gitalk'
       include ./gitalk.pug
     when 'Utterances'
-      !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/utterances', {}, {cache: true})
     when 'Twikoo'
-      !=partial('includes/third-party/comments/twikoo', {}, {cache:theme.fragment_cache})
+      !=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'
-      !=partial('includes/third-party/comments/facebook_comments', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/facebook_comments', {}, {cache: true})

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

@@ -1,40 +1,48 @@
+- const { envId, region, option } = theme.twikoo
+- const { use, lazyload, count } = theme.comments
+
 script.
   (()=>{
-    const $countDom = document.getElementById('twikoo-count')
     const init = () => {
-      twikoo.init({
+      twikoo.init(Object.assign({
-        envId: '!{theme.twikoo}',
+        el: '#twikoo-wrap',
-        el: '#twikoo-wrap'
+        envId: '!{envId}',
-      })
+        region: '!{region}',
+        onCommentLoaded: function () {
+          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
+        }
+      }, !{JSON.stringify(option)}))
     }
 
     const getCount = () => {
       twikoo.getCommentsCount({
-        envId: '!{theme.twikoo}',
+        envId: '!{envId}',
+        region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
       }).then(function (res) {
-        $countDom.innerText = res[0].count
+        document.getElementById('twikoo-count').innerText = res[0].count
       }).catch(function (err) {
         console.error(err);
       });
     }
 
-    const loadTwikoo = (bool = false) => {
+    const runFn = () => {
-      if (typeof twikoo === 'object') {
       init()
-        bool && $countDom && setTimeout(getCount,0)
+      !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
-      } else {
-        getScript('!{theme.CDN.twikoo}').then(()=> {
-          init()
-          bool && $countDom && setTimeout(getCount,0)
-        })
-      }
     }
 
-    if ('!{theme.comments.use[0]}' === 'Twikoo' || !!{theme.comments.lazyload}) {
+    const loadTwikoo = () => {
-      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
+      if (typeof twikoo === 'object') {
-      else loadTwikoo(true)
+        setTimeout(runFn,0)
+        return
+      } 
+      getScript('!{theme.asset.twikoo}').then(runFn)
+    }
+
+    if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
+      else loadTwikoo()
     } 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', '!{url_for(theme.CDN.utterances)}')
+    ele.setAttribute('src', 'https://utteranc.es/client.js')
     ele.setAttribute('repo', '!{theme.utterances.repo}')
     ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
     let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
@@ -13,13 +13,13 @@ script.
   }
 
   function utterancesTheme () {
-    if (document.querySelector('.utterances-frame')) {
+    const iframe = document.querySelector('.utterances-frame')
+    if (iframe) {
       const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
       const message = {
         type: 'set-theme',
         theme: theme
       };
-      const iframe = document.querySelector('.utterances-frame');
       iframe.contentWindow.postMessage(message, 'https://utteranc.es');
     }
   }

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

@@ -1,4 +1,3 @@
-- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
@@ -6,41 +5,24 @@ if site.data.valine
 script.
   function loadValine () {
     function initValine () {
-      let initData = {
+      const valine = new Valine(Object.assign({
         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.CDN.valine)}').then(initValine)
+    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
     else setTimeout(loadValine, 0)
   } else {
     function loadOtherComment () {

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

@@ -0,0 +1,40 @@
+- const { serverURL, option, pageview } = theme.waline
+- const { lazyload, count, use } = theme.comments
+
+script.
+  function loadWaline () {
+    function insertCSS () {
+      const link = document.createElement("link")
+      link.rel = "stylesheet"
+      link.href = "!{url_for(theme.asset.waline_css)}"
+      document.head.appendChild(link)
+    }
+
+    function initWaline () {
+      const waline = Waline.init(Object.assign({
+        el: '#waline-wrap',
+        serverURL: '!{serverURL}',
+        pageview: !{lazyload ? false : pageview},
+        dark: 'html[data-theme="dark"]',
+        path: window.location.pathname,
+        comment: !{lazyload ? false : count},
+      }, !{JSON.stringify(option)}))
+    }
+
+    if (typeof Waline === 'function') initWaline()
+    else {
+      insertCSS()
+      getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+    }
+  }
+
+  if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+    if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    else setTimeout(loadWaline, 0)
+  } else {
+    function loadOtherComment () {
+      loadWaline()
+    }
+  }
+  
+

layout/includes/third-party/effect.pug

@@ -1,19 +1,19 @@
 if theme.fireworks && theme.fireworks.enable
   canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
-  script(src=url_for(theme.CDN.fireworks))
+  script(src=url_for(theme.asset.fireworks))
 
 if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
+  script(defer id="ribbon" src=url_for(theme.asset.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.CDN.canvas_fluttering_ribbon))
+  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.asset.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.CDN.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.asset.canvas_nest))
 
 if theme.activate_power_mode.enable
-  script(src=url_for(theme.CDN.activate_power_mode))
+  script(src=url_for(theme.asset.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.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)
+  script#click-heart(src=url_for(theme.asset.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
 if theme.ClickShowText && theme.ClickShowText.enable
   script#click-show-text(
-    src= url_for(theme.CDN.ClickShowText)
+    src= url_for(theme.asset.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_tag() && !is_category() && !is_archive() && !is_home())
+    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_tag() && !is_category() && !is_archive() && !is_home())
+    if is_post() || is_page()
       include ./katex.pug
   else
     if page.katex

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

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

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

@@ -1,21 +1,14 @@
 //- 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 => {
@@ -29,20 +22,22 @@ script.
               doc.math.push(math)
             }
           }, ''],
-          addClass: [200,() => {
+          insertScript: [200, () => {
-            document.querySelectorAll('mjx-container:not([display=\'true\']').forEach( node => {
+            document.querySelectorAll('mjx-container:not\([display]\)').forEach(node => {
               const target = node.parentNode
-              if (!target.classList.contains('has-jax')) {
+              if (target.nodeName.toLowerCase() === 'li') {
-                target.classList.add('mathjax-overflow')
+                target.parentNode.classList.add('has-jax')
+              } else {
+                target.classList.add('has-jax')
               }
-            })
+            });
           }, '', false]
         }
       }
     }
     
     const script = document.createElement('script')
-    script.src = '!{theme.CDN.mathjax}'
+    script.src = '!{theme.asset.mathjax}'
     script.id = 'MathJax-script'
     script.async = true
     document.head.appendChild(script)

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

@@ -1,15 +1,26 @@
 script.
-  if (document.getElementsByClassName('mermaid').length) {
+  (() => {
-    if (window.mermaidJsLoad) mermaid.init()
+    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
-    else {
+    if ($mermaidWrap.length) {
-      getScript('!{theme.CDN.mermaid}').then(() => {
+      window.runMermaid = () => {
-        window.mermaidJsLoad = true
+        window.loadMermaid = true
-        mermaid.initialize({
+        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
-          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('!{theme.asset.mermaid}').then(runMermaid)
       }
 
-
+      window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
+    }
+  })()

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

@@ -3,9 +3,10 @@ script.
     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(/<code>.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
       content = content.replace(/<[^>]+>/g,"") // remove html tag
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
 
       if (content.length > 150) {
         content = content.substring(0,150) + '...'
@@ -14,7 +15,7 @@ script.
     }
 
     const getComment = () => {
-      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}')
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{apiKey}')
         .then(response => response.json())
         .then(data => {
           const disqusArray = data.response.map(item => {
@@ -26,8 +27,8 @@ script.
               'date': item.createdAt
             }
           })
-          // set expiry to 10 min
+
-          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
+          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), !{theme.newest_comments.storage}/(60*24))
           generateHtml(disqusArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
@@ -43,15 +44,12 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
-              name = 'data-lazy-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}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${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

@@ -3,9 +3,10 @@ script.
     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
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
 
       if (content.length > 150) {
         content = content.substring(0,150) + '...'
@@ -13,21 +14,48 @@ script.
       return content
     }
 
+    const findTrueUrl = (array) => {
+      Promise.all(array.map(item =>
+        fetch(item.url).then(resp => resp.json()).then(data => {
+          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
+          if (data.user.login === 'utterances-bot') {
+            return urlArray.pop()
+          } else {
+            return urlArray.shift()
+          }
+        })
+      )).then(res => {
+          array = array.map((i,index)=> {
+            return {
+              ...i,
+              url: res[index]
+            }
+          })
+
+          saveToLocal.set('github-newest-comments', JSON.stringify(array), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(array)
+      });
+    }
+
     const getComment = () => {
-      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')
+      fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1',{
+        "headers": {
+          Accept: 'application/vnd.github.v3.html+json'
+        }
+      })
         .then(response => response.json())
         .then(data => {
           const githubArray = data.map(item => {
             return {
               'avatar': item.user.avatar_url,
-              'content': changeContent(item.body),
+              'content': changeContent(item.body_html),
               'nick': item.user.login,
-              'url': item.html_url,
+              'url': item.issue_url,
-              'date': item.updated_at
+              'date': item.updated_at,
+              'githubUrl': item.html_url
             }
           })
-          saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
+          findTrueUrl(githubArray)
-          generateHtml(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
           $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
@@ -42,16 +70,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              name = 'data-lazy-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}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {

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

@@ -1,8 +1,26 @@
-if theme.newest_comments.leancloud.enable
+- let { use } = theme.comments
-  include ./leancloud.pug
+
-else if theme.newest_comments.github_issues.enable
+if use
-  include ./github-issues.pug
+  - let forum,apiKey,userRepo
-else if theme.newest_comments.disqus.enable
+  case use[0]
-  include ./disqus-comment.pug
+    when 'Valine'
-else if theme.newest_comments.twikoo
+      include ./valine.pug
+    when 'Waline'
+      include ./waline.pug
+    when '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

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

@@ -3,9 +3,10 @@ script.
     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
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
 
       if (content.length > 150) {
         content = content.substring(0,150) + '...'
@@ -16,12 +17,23 @@ script.
     const getComment = () => {
       const runTwikoo = () => {
         twikoo.getRecentComments({
-          envId: '!{theme.twikoo}',
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
           pageSize: !{theme.newest_comments.limit},
           includeReply: true
         }).then(function (res) {
-          saveToLocal.set('twikoo-newest-comments', JSON.stringify(res), 10/(60*24))
+          const twikooArray = res.map(e => {
-          generateHtml(res)
+            return {
+              'content': changeContent(e.comment),
+              'avatar': e.avatar,
+              'nick': e.nick,
+              'url': e.url + '#' + e.id,
+              'date': new Date(e.created).toISOString()
+            }
+          })
+
+          saveToLocal.set('twikoo-newest-comments', JSON.stringify(twikooArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(twikooArray)
         }).catch(function (err) {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
           $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
@@ -31,7 +43,7 @@ script.
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+        getScript('!{theme.asset.twikoo}').then(runTwikoo)
       }
     }
 
@@ -43,16 +55,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              name = 'data-lazy-src'
-            }
-            result += `<a href='${array[i].url + '#' + array[i].id}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
           }
           
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url + '#' + array[i].id}'>${changeContent(array[i].commentText)}</a>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].created, true)}</time></div>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {

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

@@ -1,12 +1,15 @@
-script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
+- let default_avatar = theme.valine.avatar
+
+script(src=url_for(theme.asset.blueimp_md5))
 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
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
 
       if (content.length > 150) {
         content = content.substring(0,150) + '...'
@@ -16,8 +19,7 @@ script.
 
     const getIcon = (icon, mail) => {
       if (icon) return icon
-      
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
-      let defaultIcon = '!{ theme.newest_comments.leancloud.default_avatar ? `?d=${theme.newest_comments.leancloud.default_avatar}` : ''}'
       let iconUrl = `https://gravatar.loli.net/avatar/${md5(mail.toLowerCase()) + defaultIcon}`
       return iconUrl
     }
@@ -30,16 +32,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              name = 'data-lazy-src'
-            }
-            result += `<a href='${array[i].url}' class="thumbnail"><img ${name}='${getIcon(array[i].avatar, array[i].mail)}' alt='${array[i].nick}'></a>`
           }
 
           result += `<div class='content'>
-          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {
@@ -53,18 +52,13 @@ script.
     }
 
     const getComment = () => {
-        let serverURL = ''
+      const serverURL = '!{theme.valine.serverURLs || `https://${theme.valine.appId.substring(0,8)}.api.lncldglobal.com` }'
-        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
-          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
-        } else {
-          serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com'
-        }
 
       var settings = {
         "method": "GET",
         "headers": {
-          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
+          "X-LC-Id": '!{theme.valine.appId}',
-          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
+          "X-LC-Key": '!{theme.valine.appKey}',
           "Content-Type": "application/json"
         },
       }
@@ -74,15 +68,14 @@ script.
         .then(data => {
           const valineArray = data.results.map(function (e) {
             return {
-              'avatar': e.QQAvatar,
+              'avatar': getIcon(e.QQAvatar, e.mail),
               'content': changeContent(e.comment),
-              'mail': e.mail,
               'nick': e.nick,
-              'url': e.url,
+              'url': e.url + '#' + e.objectId,
-              'date': e.createdAt,
+              'date': e.updatedAt,
             }
           })
-          saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
+          saveToLocal.set('valine-newest-comments', JSON.stringify(valineArray), !{theme.newest_comments.storage}/(60*24))
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
@@ -92,7 +85,7 @@ script.
 
     const newestCommentInit = () => {
       if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('leancloud-newest-comments')
+        const data = saveToLocal.get('valine-newest-comments')
         if (data) {
           generateHtml(JSON.parse(data))
         } else {

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

@@ -0,0 +1,84 @@
+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 = () => {
+      const loadWaline = () => {
+        Waline.RecentComments({
+          serverURL: '!{theme.waline.serverURL}',
+          count: !{theme.newest_comments.limit}
+        }).then(({comments}) => {
+          const walineArray = comments.map(e => {
+            return {
+              'content': changeContent(e.comment),
+              'avatar': e.avatar,
+              'nick': e.nick,
+              'url': e.url + '#' + e.objectId,
+              'date': e.insertedAt,
+            }
+          })
+          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(walineArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
+      }
+
+      if (typeof Waline === 'function') loadWaline() 
+      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('waline-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

layout/includes/third-party/pangu.pug

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

layout/includes/third-party/pjax.pug

@@ -3,20 +3,18 @@ if theme.pjax.exclude
   each val in theme.pjax.exclude
     - pjaxExclude = pjaxExclude + `:not([href="${val}"])`
 
-script(src=url_for(theme.CDN.pjax))
+- let pjaxSelectors = ['title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
-script.
-  let pjaxSelectors = [
-    'title',
-    '#config_change',
-    '#body-wrap',
-    '#rightside-config-hide',
-    '#rightside-config-show',
-    '.js-pjax'
-  ]
 
-  if (!{Boolean(theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere'))}) {
+- let choose = theme.comments.use
-    pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+if choose
-  }
+  if theme.Open_Graph_meta && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
+    - pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+  if choose.includes('Utterances') || choose.includes('Giscus')
+    - pjaxSelectors.unshift('link[rel="canonical"]')
+
+script(src=url_for(theme.asset.pjax))
+script.
+  let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
 
   var pjax = new Pjax({
     elements: '!{pjaxExclude}',
@@ -26,6 +24,31 @@ script.
     scrollRestoration: false
   })
 
+  document.addEventListener('pjax:send', function () {
+
+    // removeEventListener scroll 
+    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
+    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
+
+    typeof preloader === 'object' && preloader.initLoading()
+    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')
+
+  })
+
   document.addEventListener('pjax:complete', function () {
     window.refreshFn()
 
@@ -42,39 +65,22 @@ script.
     typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
-    if (typeof gtag === 'function') {
+    // google analytics
-      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
+    typeof gtag === 'function' && 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:error', (e) => {
-  document.addEventListener('pjax:send', function () {
+    if (e.request.status === 404) {
-    typeof preloader === 'object' && preloader.initLoading()
+      pjax.loadUrl('/404.html')
-    
-    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')
-
   })

layout/includes/third-party/prismjs.pug

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

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

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

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

@@ -1,12 +1,20 @@
 #local-search
   .search-dialog
-    #local-search-title.search-dialog__title=_p("local_search.label")
+    nav.search-nav
-    #local-input-panel
+      span.search-dialog-title= _p('search.title')
+      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("local_search.input_placeholder") type="text").local-search-box--input
+          input(placeholder=_p("search.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=url_for(theme.CDN.addtoany))
+script(async src='https://static.addtoany.com/menu/page.js')
 
 

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

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

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.CDN.sharejs_css) media="print" onload="this.media='all'")
+link(rel='stylesheet' href=url_for(theme.asset.sharejs_css) media="print" onload="this.media='all'")
-script(src=url_for(theme.CDN.sharejs) defer)
+script(src=url_for(theme.asset.sharejs) defer)

layout/includes/third-party/subtitle.pug

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

layout/includes/widget/card_announcement.pug

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

layout/includes/widget/card_archives.pug

@@ -1,10 +1,5 @@
 if theme.aside.card_archives.enable
   .card-widget.card-archives
-    .card-content
-      .item-headline
-        i.fas.fa-archive
-        span= _p('aside.card_archives')
-      
     - let type = theme.aside.card_archives.type || 'monthly'
     - let format = theme.aside.card_archives.format || 'MMMM YYYY'
     - let order = theme.aside.card_archives.order || -1

layout/includes/widget/card_author.pug

@@ -1,34 +1,24 @@
 if theme.aside.card_author.enable
   .card-widget.card-info
-    .card-content
+    .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
+    .card-info-data.site-data.is-center
-        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
 
-      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+    if theme.aside.card_author.button.enable
+      a#card-info-btn(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_bottom_self.pug

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

layout/includes/widget/card_categories.pug

@@ -1,8 +1,4 @@
 if theme.aside.card_categories.enable
   if site.categories.length
     .card-widget.card-categories
-        .card-content
-          .item-headline
-            i.fas.fa-folder-open
-            span= _p('aside.card_categories')
       !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })

layout/includes/widget/card_newest_comment.pug

@@ -1,8 +1,7 @@
-if theme.newest_comments.enable
+if theme.newest_comments.enable && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
   .card-widget#card-newest-comments
-    .card-content
     .item-headline
-        i.fas.fa-bolt
+      i.fas.fa-comment-dots
       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,13 +1,15 @@
 - 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
-  .card-content
   .item-headline
     i.fas.fa-stream
     span= _p('aside.card_toc')
+    span.toc-percentage
 
   if (page.encrypt == true)
-      .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
+    .toc-content.toc-div-class(class=tocExpandClass style="display:none")!=toc(page.origin, {list_number: tocNumber})
   else 
-      .toc-content!=toc(page.content, {list_number: tocNumber})
+    .toc-content(class=tocExpandClass)!=toc(page.content, {list_number: tocNumber})
       

layout/includes/widget/card_recent_post.pug

@@ -1,6 +1,5 @@
 if theme.aside.card_recent_post.enable
   .card-widget.card-recent-post
-    .card-content
     .item-headline
       i.fas.fa-history
       span= _p('aside.card_recent_post')
@@ -15,9 +14,6 @@ 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_tags.pug

@@ -1,13 +1,12 @@
 if theme.aside.card_tags.enable
   if site.tags.length
     .card-widget.card-tags
-      .card-content
       .item-headline
         i.fas.fa-tags
         span= _p('aside.card_tags')
 
       - 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.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
+        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.15, maxfontsize: 1.45, 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

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

layout/includes/widget/card_webinfo.pug

@@ -1,6 +1,5 @@
 if theme.aside.card_webinfo.enable
   .card-widget.card-webinfo
-    .card-content
     .item-headline
       i.fas.fa-chart-line
       span= _p('aside.card_webinfo.headline')

layout/includes/widget/index.pug

@@ -1,26 +1,34 @@
-#aside_content.aside_content
+#aside-content.aside-content
   //- post
   if is_post()
-    if showToc && theme.toc.style_simple
+    - const tocStyle = page.toc_style_simple
+    - const tocStyleVal = tocStyle === true || tocStyle === false ? tocStyle : theme.toc.style_simple
+    if showToc && tocStyleVal
       .sticky_layout
         include ./card_post_toc.pug
     else
-      !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_author', {}, {cache: true})
-      !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_announcement', {}, {cache: true})
+      !=partial('includes/widget/card_top_self', {}, {cache: true})
       .sticky_layout
         if showToc
           include ./card_post_toc.pug
-        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+        !=partial('includes/widget/card_recent_post', {}, {cache: true})
-        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
+        !=partial('includes/widget/card_ad', {}, {cache: true})
   else
     //- page
-    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_author', {}, {cache: true})
-    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_announcement', {}, {cache: true})
+    !=partial('includes/widget/card_top_self', {}, {cache: true})      
+
     .sticky_layout
-      !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+      if showToc
-      !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
+        include ./card_post_toc.pug
-      !=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_recent_post', {}, {cache: true})
-      !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_ad', {}, {cache: true})
-      !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_newest_comment', {}, {cache: true})
-      !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_categories', {}, {cache: true})
-      !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_tags', {}, {cache: true})
+      !=partial('includes/widget/card_archives', {}, {cache: true})
+      !=partial('includes/widget/card_webinfo', {}, {cache: true})
+      !=partial('includes/widget/card_bottom_self', {}, {cache: true})

layout/page.pug

@@ -2,6 +2,9 @@ extends includes/layout.pug
 
 block content
   #page
+    if top_img === false
+      h1.page-title= page.title
+
     case page.type
       when 'tags'
         include includes/page/tags.pug
@@ -9,11 +12,9 @@ block content
         include includes/page/flink.pug
       when 'categories'
         include includes/page/categories.pug
-      when 'artitalk'
-        include includes/page/artitalk.pug
       default
         include includes/page/default-page.pug
 
     if page.comments !== false && theme.comments && theme.comments.use
       - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})

layout/post.pug

@@ -14,18 +14,19 @@ block content
             a(href=url_for(item.path)).post-meta__tags #[=item.name]
       include includes/third-party/share/index.pug
         
-    if theme.reward.enable
+    if theme.reward.enable && theme.reward.QR_code
-      !=partial('includes/post/reward', {}, {cache:theme.fragment_cache})
+      !=partial('includes/post/reward', {}, {cache: true})
 
     //- ad
     if theme.ad && theme.ad.post
       .ads-wrap!=theme.ad.post
 
+    if theme.post_pagination
       include includes/pagination.pug
     if theme.related_post && theme.related_post.enable
       != related_posts(page,site.posts)
 
     if page.comments !== false && theme.comments && theme.comments.use
       - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})
       

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.4.1",
+  "version": "4.2.1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -20,13 +20,13 @@
   },
   "bugs": {
     "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues",
-    "email": "wong@jerryc.me"
+    "email": "my@crazywong.com"
   },
   "dependencies": {
     "hexo-renderer-stylus": "^2.0.1",
-    "hexo-renderer-pug": "^1.0.0"
+    "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",
-  "author": "Jerry <wong@jerryc.me>",
+  "author": "Jerry <my@crazywong.com>",
   "license": "Apache-2.0"
 }

scripts/events/404.js

@@ -9,7 +9,10 @@ hexo.extend.generator.register('404', function (locals) {
   if (!hexo.theme.config.error_404.enable) return
   return {
     path: '404.html',
-    data: locals.posts,
+    layout: ['page'],
-    layout: ['404']
+    data: {
+      type: '404',
+      top_img: false
+    }
   }
 })

scripts/events/config.js

@@ -0,0 +1,133 @@
+/**
+ * Butterfly
+ * 1. Merge CDN
+ * 2. Capitalize the first letter of comment name
+ */
+
+'use strict'
+
+const { version } = require('../../package.json')
+const path = require('path')
+
+hexo.extend.filter.register('before_generate', () => {
+  const themeConfig = hexo.theme.config
+  const { CDN, comments } = themeConfig
+
+  /**
+   * Merge CDN
+   */
+
+  const internalSrcCDN = {
+    main_css: '/css/index.css',
+    main: `https://cdn.jsdelivr.net/npm/hexo-theme-butterfly@${version}/source/js/main.min.js`,
+    utils: `https://cdn.jsdelivr.net/npm/hexo-theme-butterfly@${version}/source/js/utils.min.js`,
+    translate: `https://cdn.jsdelivr.net/npm/hexo-theme-butterfly@${version}/source/js/tw_cn.min.js`,
+    local_search: `https://cdn.jsdelivr.net/npm/hexo-theme-butterfly@${version}/source/js/search/local-search.min.js`,
+    algolia_js: `https://cdn.jsdelivr.net/npm/hexo-theme-butterfly@${version}/source/js/search/algolia.min.js`,
+  }
+
+  const internalSrcLocal = {
+    main_css: '/css/index.css',
+    main: '/js/main.js',
+    utils: '/js/utils.js',
+    translate: '/js/tw_cn.js',
+    local_search: '/js/search/local-search.js',
+    algolia_js: '/js/search/algolia.js',
+  }
+
+  const thirdPartySrcCDN = {
+    algolia_search_v4: 'https://cdn.jsdelivr.net/npm/algoliasearch@4/dist/algoliasearch-lite.umd.js',
+    instantsearch_v4: 'https://cdn.jsdelivr.net/npm/instantsearch.js@4/dist/instantsearch.production.min.js',
+    pjax: 'https://cdn.jsdelivr.net/npm/pjax/pjax.min.js',
+    gitalk: 'https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js',
+    gitalk_css: 'https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css',
+    blueimp_md5: 'https://cdn.jsdelivr.net/npm/blueimp-md5/js/md5.min.js',
+    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',
+    twikoo: 'https://cdn.jsdelivr.net/npm/twikoo@1/dist/twikoo.all.min.js',
+    waline_js: 'https://cdn.jsdelivr.net/npm/@waline/client/dist/waline.js',
+    waline_css: 'https://cdn.jsdelivr.net/npm/@waline/client/dist/waline.css',
+    sharejs: 'https://cdn.jsdelivr.net/gh/overtrue/share.js@master/dist/js/social-share.min.js',
+    sharejs_css: 'https://cdn.jsdelivr.net/npm/social-share.js/dist/css/share.min.css',
+    mathjax: 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js',
+    katex: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css',
+    katex_copytex: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.min.js',
+    katex_copytex_css: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.css',
+    mermaid: 'https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js',
+    canvas_ribbon: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js',
+    canvas_fluttering_ribbon: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js',
+    canvas_nest: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js',
+    activate_power_mode: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js',
+    fireworks: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js',
+    click_heart: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js',
+    ClickShowText: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js',
+    lazyload: 'https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js',
+    instantpage: 'https://cdn.jsdelivr.net/npm/instant.page@5/instantpage.min.js',
+    typed: 'https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js',
+    pangu: 'https://cdn.jsdelivr.net/npm/pangu@4/dist/browser/pangu.min.js',
+    fancybox_css_v4: 'https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.css',
+    fancybox_v4: 'https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.umd.js',
+    medium_zoom: 'https://cdn.jsdelivr.net/npm/medium-zoom/dist/medium-zoom.min.js',
+    snackbar_css: 'https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.css',
+    snackbar: 'https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js',
+    fontawesomeV6: 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6/css/all.min.css',
+    flickr_justified_gallery_js: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery@2/dist/fjGallery.min.js',
+    flickr_justified_gallery_css: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery@2/dist/fjGallery.min.css',
+    aplayer_css: 'https://cdn.jsdelivr.net/npm/aplayer@1/dist/APlayer.min.css',
+    aplayer_js: 'https://cdn.jsdelivr.net/npm/aplayer@1/dist/APlayer.min.js',
+    meting_js: 'https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js',
+    prismjs_js: 'https://cdn.jsdelivr.net/npm/prismjs@1/prism.min.js',
+    prismjs_lineNumber_js: 'https://cdn.jsdelivr.net/npm/prismjs@1/plugins/line-numbers/prism-line-numbers.min.js',
+    prismjs_autoloader: 'https://cdn.jsdelivr.net/npm/prismjs@1/plugins/autoloader/prism-autoloader.min.js',
+  }
+
+  // delete null value
+  const deleteNullValue = obj => {
+    if (!obj) return
+    for (const i in obj) {
+      obj[i] === null && delete obj[i]
+    }
+    return obj
+  }
+
+  const defaultVal = (obj, choose) => {
+    if (obj === 'internal') {
+      if (choose === 'local') return internalSrcLocal
+      else return internalSrcCDN
+    }
+
+    if (obj === 'external') {
+      if (choose === 'local') {
+        let result = {}
+        try {
+          const data = path.join(hexo.plugin_dir,'hexo-butterfly-extjs/plugins.yml')
+          result = hexo.render.renderSync({ path: data, engine: 'yaml'})
+          Object.keys(result).map(key => {
+            result[key] = '/pluginsSrc/' + result[key]
+          })
+        } catch (e) {}
+        return result
+      } else return thirdPartySrcCDN
+    }
+  }
+
+  themeConfig.asset = Object.assign(defaultVal('internal', CDN.internal_provider),
+    defaultVal('external', CDN.third_party_provider), deleteNullValue(CDN.option))
+
+  /**
+   * Capitalize the first letter of comment name
+   */
+
+  let { use } = comments
+
+  if (!use) return
+
+  if (typeof use === 'string') {
+    use = use.split(',')
+  }
+
+  const newArray = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
+
+  themeConfig.comments.use = newArray
+})