Merge branch 'dev'

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.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,82 @@
+name: Bug report
+description: Create a report to help us improve
+title: '[Bug]: '
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        重要：請依照該模板來提交 
+        Please follow the template to create a new issue
+  - type: input
+    id: butterfly-ver
+    attributes:
+      label: 使用的 Butterfly 版本？ | What version of Butterfly are you use?
+      description: 檢視主題的 package.json | Check the theme's package.json
+    validations:
+      required: true
+
+  - type: dropdown
+    id: modify
+    attributes:
+      label: 是否修改过主题文件？ || Has the theme files been modified?
+      options:
+        - 是 (Yes)
+        - 不是 (No)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: browser
+    attributes:
+      label: 使用的瀏覽器？ || What browse are you using?
+      options:
+        - Chrome
+        - Edge
+        - Safari
+        - Opera
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 使用的系統？ || What operating system are you using?
+      options:
+        - Windows
+        - macOS 
+        - Linux
+        - Android
+        - iOS
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: dependencies
+    attributes:
+      label: 依賴插件 | Package dependencies Information
+      description: 在 Hexo 根目錄下執行`npm ls --depth 0` | Run `npm ls --depth 0` in Hexo root directory
+      render: Text
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      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,18 @@
+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 群
+    url: https://jq.qq.com/?_wv=1027&k=KU9105XR
+    about: '群號 1070540070'
+

.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

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

.github/workflows/stale.yml

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

README.md

@@ -1,22 +1,28 @@
+<div align="right">
+<a title="Chinese" href="/README_CN.md">中文</a>
+</div>
+
 # hexo-theme-butterfly
 
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
 ![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)
 
-Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📢 Demo: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+
+📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) || [Chinese](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
-## 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 +46,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,38 +56,38 @@ npm i hexo-theme-butterfly
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
-## Features
+## 🎉 Features
 
 - [x] Card UI Design
 - [X] Support sub-menu
-- [x] Two Column designs
+- [x] Two-column layout
 - [x] Responsive Web Design
 - [x] Dark Mode
 - [x] Pjax
 - [x] Read Mode
 - [x] Conversion between Traditional and Simplified Chinese
 - [X] TOC catalog is available for both computers and mobile phones
-- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
+- [X] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean/mac/mac light), also support customization
 - [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
 - [X] Disable copy/Add a Copyright Notice to the Copied Text
-- [X] Search (Algolia SearchZ/Local Search)
+- [X] Search (Algolia Search/Local Search)
 - [x] Mathjax and Katex
 - [x] Built-in 404 page
 - [x] WordCount
 - [x] Related articles
 - [x] Displays outdated notice for a post
-- [x] Share (AddThis/Sharejs/Addtoany)
+- [x] Share (Sharejs/Addtoany)
-- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk)
 - [x] Multiple Comment System Support
-- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
+- [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)
-- [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)
 - [x] Mouse click effects (Fireworks/Heart/Text)
-- [x] Preloader/Loading Animation
+- [x] Preloader/Loading Animation/pace.js
 - [x] Busuanzi visitor counter
 - [x] Medium Zoom/Fancybox
 - [x] Mermaid
@@ -89,8 +95,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,22 +1,28 @@
+<div align="right">
+  <a title="English" href="/README.md">English</a>
+</div>
+
 # hexo-theme-butterfly
 
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [JerryC](https://jerryc.me/)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📢 預覽: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
+
+📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) || [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
-## 安裝
+## 💻 安裝
 
 ### Git 安裝
 
-> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
 
 在博客根目錄裡安裝穩定版【推薦】
 
@@ -40,7 +46,8 @@ git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/bu
 npm i hexo-theme-butterfly
 ```
 
-## 應用主題
+## ⚙ 應用主題
+
 修改hexo配置文件`_config.yml`，把主題改為`Butterfly`
 
 ```
@@ -49,7 +56,7 @@ theme: butterfly
 
 >如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
-## 特色
+## 🎉 特色
 
 - [x] 卡片化設計
 - [X] 支持二級目錄
@@ -63,24 +70,24 @@ theme: butterfly
 - [X] 內置多種代碼配色（darker/pale night/light/ocean/mac/mac light），可自定義代碼配色
 - [X] 代碼塊顯示代碼語言/關閉或展開代碼塊/代碼複製/代碼自動換行
 - [X] 可關閉文字複製/可開啟內容複製增加版權信息）
-- [X] 兩種搜索（Algolia搜索和本地搜索）
+- [X] 兩種搜索（ Algolia 搜索和本地搜索）
 - [x] Mathjax 和 Katex
 - [x] 內置404頁面
 - [x] 顯示字數統計
 - [x] 顯示相關文章
 - [x] 過期文章提醒
-- [x] 多種分享系統（AddThis/Sharejs/Addtoany）
+- [x] 多種分享系統（Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
-- [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
+- [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
-- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 各種站長驗證
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
 - [x] 多種鼠標點擊特效（煙花/文字/愛心）
-- [x] 內置一種 Preloader 加載動畫
+- [x] 內置一種 Preloader 加載動畫和 pace.js 加載動畫條
 - [x] 不蒜子訪問統計
 - [x] 兩種大圖模式（Medium Zoom/Fancybox）
 - [x] Mermaid 圖表顯示
@@ -88,8 +95,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)
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)

languages/default.yml

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

languages/en.yml

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

languages/zh-CN.yml

@@ -15,7 +15,6 @@ page:
 
 card_post_count: 条评论
 
-sticky: 置顶
 no_title: 无题
 
 post:
@@ -35,16 +34,18 @@ post:
   recommend: 相关推荐
   edit: 编辑
 
-search: 搜索
+search:
-algolia_search:
+  title: 搜索
-  input_placeholder: 搜索文章
+  load_data: 数据库加载中
-  hits_empty: '找不到您查询的内容：${query}'
+  algolia_search:
-  hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
+    input_placeholder: 搜索文章
+    hits_empty: '找不到您查询的内容：${query}'
+    hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
-local_search:
+  local_search:
-  label: 本地搜索
+    input_placeholder: 搜索文章
-  input_placeholder: 搜索文章
+    hits_empty: '找不到您查询的内容：${query}'
-  hits_empty: '找不到您查询的内容：${query}'
+    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -82,6 +83,7 @@ aside:
     link: 链接
     code: 代码
   card_toc: 目录
+  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -90,13 +92,11 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 打赏
+donate: 赞助
 share: 分享
 
 rightside:
   readmode_title: 阅读模式
-  font_plus_title: 放大字体
-  font_minus_title: 缩小字体
   translate_title: 简繁转换
   night_mode_title: 浅色和深色模式转换
   back_to_top: 回到顶部
@@ -104,6 +104,7 @@ rightside:
   scroll_to_comment: 直达评论
   setting: 设置
   aside: 单栏和双栏切换
+  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -112,13 +113,12 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  chs_to_cht: 你已切换为繁体
+  chs_to_cht: 你已切换为繁体中文
-  cht_to_chs: 你已切换为简体
+  cht_to_chs: 你已切换为简体中文
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
 
 loading: 加载中...
+load_more: 加载更多
 
-error404:
+error404: 页面没有找到
-  error_title: 页面没有找到
-  back_button: 回到主页

languages/zh-TW.yml

@@ -15,8 +15,7 @@ page:
 
 card_post_count: 條評論
 
-sticky: 置頂
+no_title: 無標題
-no_title: 無題
 
 post:
   created: 發表於
@@ -35,17 +34,19 @@ post:
   recommend: 相關推薦
   edit: 編輯
 
-search: 搜尋
+search:
-algolia_search:
+  title: 搜尋
-  input_placeholder: 搜尋文章
+  load_data: 資料庫載入中
-  hits_empty: '找不到您查詢的內容：${query}'
+  algolia_search:
-  hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
+    input_placeholder: 搜尋文章
-
+    hits_empty: '找不到您查詢的內容：${query}'
-local_search:
+    hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
-  label: 本地搜尋
-  input_placeholder: 搜尋文章
-  hits_empty: '找不到您查詢的內容：${query}'
 
+  local_search:
+    input_placeholder: 搜尋文章
+    hits_empty: '找不到您查詢的內容：${query}'
+    hits_stats: '共找到 ${hits} 篇文章'
+    
 pagination:
   prev: 上一篇
   next: 下一篇
@@ -65,7 +66,7 @@ aside:
     headline: 網站資訊
     article_name: 文章數目
     runtime:
-      name: 已運行時間
+      name: 已執行時間
       unit: 天
     last_push_date:
       name: 最後更新時間
@@ -80,8 +81,9 @@ aside:
     zero: 沒有評論
     image: 圖片
     link: 連結
-    code: 代碼
+    code: 程式碼
   card_toc: 目錄
+  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -90,35 +92,33 @@ date_suffix:
   day: 天前
   month: 個月前
 
-donate: 打賞
+donate: 贊助
 share: 分享
 
 rightside:
   readmode_title: 閱讀模式
-  font_plus_title: 放大字型
-  font_minus_title: 縮小字型
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
-  back_to_top: 回到頂部
+  back_to_top: 返回頂部
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
   aside: 單欄和雙欄切換
+  chat: 聊天
 
 copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體
+  chs_to_cht: 你已切換為繁體中文
-  cht_to_chs: 你已切換為簡體
+  cht_to_chs: 你已切換為簡體中文
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 
 loading: 載入中...
+load_more: 載入更多
 
-error404:
+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: true})
-
-    if theme.fireworks && theme.fireworks.enable
-      canvas.fireworks
-    
-    if theme.background
-      #web_bg
-
-    #error-wrap
-      .error-content
-        .error-img(style=bg_img)
-        .error-info
-          h1.error_title= '404'
-          .error_subtitle= theme.error_404.subtitle
-          a.button--animated(href=config.root)
-            i.fas.fa-rocket
-            = _p('error404.back_button')
-          
-    include includes/additional-js.pug

layout/archive.pug

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

layout/category.pug

@@ -3,9 +3,9 @@ extends includes/layout.pug
 block content
   if theme.category_ui == 'index'
     include ./includes/mixins/post-ui.pug
-    #recent-posts.recent-posts.category_ui   
+    #recent-posts.recent-posts.category_ui
       +postUI
-      include includes/pagination.pug    
+      include includes/pagination.pug
   else
     include ./includes/mixins/article-sort.pug
     #category

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,60 +1,55 @@
 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.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))
 
   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.enable
-    script(src=url_for(theme.CDN.snackbar))
+    script(src=url_for(theme.asset.snackbar))
 
   if theme.pangu.enable
-    !=partial('includes/third-party/pangu.pug', {}, {cache: true})
+    != partial("includes/third-party/pangu.pug", {}, { cache: true })
-
-  //- search
-  if theme.algolia_search.enable
-    script(src=url_for(theme.CDN.algolia_js))
-  else if theme.local_search.enable
-    script(src=url_for(theme.CDN.local_search))
-
-  if theme.preloader
-    !=partial('includes/loading/loading-js', {}, {cache: true})
 
   .js-pjax
     if needLoadCountJs
-      !=partial('includes/third-party/card-post-count/index', {}, {cache: true})
+      != partial("includes/third-party/card-post-count/index", {}, { cache: true })
-    
+
     if loadSubJs
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug
 
+    include ./third-party/abcjs/index.pug
+
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
-  !=partial('includes/third-party/prismjs', {}, {cache: true})
+  != partial("includes/third-party/prismjs", {}, { cache: true })
 
   if theme.aside.enable && theme.newest_comments.enable
     if theme.pjax.enable
-      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
+      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
     else if (!is_post() && page.aside !== false)
-      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
+      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
 
-  !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
+  != fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-  !=partial('includes/third-party/effect', {}, {cache: true})
+  != partial("includes/third-party/effect", {}, { cache: true })
+
+  != partial("includes/third-party/chat/index", {}, { cache: true })
 
-  !=partial('includes/third-party/chat/index', {}, {cache: true})
-  
   if theme.aplayerInject && theme.aplayerInject.enable
     if theme.pjax.enable || theme.aplayerInject.per_page
       include ./third-party/aplayer.pug
@@ -62,7 +57,9 @@ div
       include ./third-party/aplayer.pug
 
   if theme.pjax.enable
-    !=partial('includes/third-party/pjax', {}, {cache: true})
+    != partial("includes/third-party/pjax", {}, { cache: true })
-    
+
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-    script(async data-pjax src=url_for(theme.CDN.busuanzi))
+    script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
+
+  !=partial('includes/third-party/search/index', {}, {cache: true})

layout/includes/head.pug

@@ -1,29 +1,22 @@
 - var pageTitle
-- if (is_archive()) pageTitle = _p('page.archives')
+- is_archive() ? page.title = findArchivesTitle(page, theme.menu, date) : ''
-- else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
+- 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_current('/404.html', [strict])) pageTitle = _p('error404')
-- else if (is_year()) pageTitle += ': ' + page.year
-- else if (is_current('/404.html', [strict])) pageTitle = _p('error404.error_title')
 - else pageTitle = page.title || config.title || ''
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
-
-- var pageKeywords
-- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
-- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
-- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
-- var 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,viewport-fit=cover")
 title= tabTitle
-if pageKeywords
-  meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
@@ -33,7 +26,7 @@ meta(name="theme-color" content=themeColor)
 include ./head/Open_Graph.pug
 
 !=favicon_tag(theme.favicon || config.favicon)
-link(rel="canonical" href=urlNoIndex())
+link(rel="canonical" href=urlNoIndex(null,config.pretty_urls.trailing_index,config.pretty_urls.trailing_html))
 
 //- 預解析
 !=partial('includes/head/preconnect', {}, {cache: true})
@@ -46,15 +39,14 @@ if (theme.pwa && theme.pwa.enable)
   !=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.fontawesome))
 
 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) media="print" onload="this.media='all'")
-  script(src=url_for(theme.CDN.algolia_search) defer)
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})
@@ -63,15 +55,14 @@ if theme.algolia_search.enable
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font &&　theme.blog_title_font.font_link
+if theme.blog_title_font && theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
-include ./head/noscript.pug
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

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

layout/includes/head/analytics.pug

@@ -16,21 +16,6 @@ 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}"}`)
 

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,14 @@
   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,
+      top_n_per_article: theme.local_search.top_n_per_article,
+      unescape: theme.local_search.unescape,
       languages: {
         // search languages
-        hits_empty: _p("local_search.hits_empty")
+        hits_empty: _p("search.local_search.hits_empty"),
+        hits_stats: _p("search.local_search.hits_stats"),
       }
     })
   }
@@ -74,16 +78,19 @@
   }
 
   let highlight = 'undefined';
-  if ((config.highlight && config.highlight.enable) || (config.prismjs && config.prismjs.enable)) {
+  let syntaxHighlighter = config.syntax_highlighter;
+  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable);
+  if (highlightEnable) {
     highlight = JSON.stringify({
-      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
+      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
       highlightCopy: theme.highlight_copy,
-      highlightLang: theme.highlight_lang
+      highlightLang: theme.highlight_lang,
+      highlightHeightLimit: theme.highlight_height_limit
     })
   }
 
 script.
-  const GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = {
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -100,7 +107,7 @@ script.
       post: !{theme.post_meta.post.date_format === 'relative'}
     },
     runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
-    date_suffix: {
+    dateSuffix: {
       just: '!{_p("date_suffix.just")}',
       min: '!{_p("date_suffix.min")}',
       hour: '!{_p("date_suffix.hour")}',
@@ -110,18 +117,16 @@ script.
     copyright: !{copyright},
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
-    source: {
+    infinitegrid: {
-      jQuery: '!{url_for(theme.CDN.jquery)}',
+      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
-      justifiedGallery: {
+      buttonText: '!{_p("load_more")}'
-        js: '!{url_for(theme.CDN.justifiedGallery_js)}',
-        css: '!{url_for(theme.CDN.justifiedGallery_css)}'
-      },
-      fancybox: {
-        js: '!{url_for(theme.CDN.fancybox)}',
-        css: '!{url_for(theme.CDN.fancybox_css)}'
-      }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
-    isanchor: !{theme.anchor}
+    isAnchor: !{theme.anchor.auto_update || false},
+    percent: {
+      toc: !{theme.toc.scroll_percent},
+      rightside: !{theme.rightside_scroll_percent},
+    },
+    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

layout/includes/head/config_site.pug

@@ -1,19 +1,30 @@
 -
+  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-diff
+script#config-diff.
-  .
+  var GLOBAL_CONFIG_SITE = {
-    var GLOBAL_CONFIG_SITE = { 
+    title: '!{titleVal}',
-      isPost: !{is_post()},
+    isPost: !{is_post()},
-      isHome: !{is_home()},
+    isHome: !{is_home()},
-      isHighlightShrink: !{isHighlightShrink},
+    isHighlightShrink: !{isHighlightShrink},
-      isToc: !{showToc},
+    isToc: !{showToc},
-      postUpdate: '!{full_date(page.updated)}'
+    postUpdate: '!{full_date(page.updated)}'
-    }
+  }

layout/includes/head/noscript.pug

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

layout/includes/head/preconnect.pug

@@ -1,4 +1,20 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
+-
+  const { internal_provider, third_party_provider, custom_format } = theme.CDN
+  const providers = {
+    'jsdelivr': '//cdn.jsdelivr.net',
+    'cdnjs': '//cdnjs.cloudflare.com',
+    'unpkg': '//unpkg.com',
+    'custom': custom_format && custom_format.match(/^((https?:)?(\/\/[^/]+)|([^/]+))(\/|$)/)[1]
+  }
+-
+
+if internal_provider === third_party_provider && internal_provider !== 'local'
+  link(rel="preconnect" href=providers[internal_provider])
+else 
+  if internal_provider !== 'local'
+    link(rel="preconnect" href=providers[internal_provider])
+  if third_party_provider !== 'local'
+  link(rel="preconnect" href=providers[third_party_provider])
 
 if theme.google_analytics
   link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')
@@ -6,12 +22,6 @@ 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")
 
@@ -21,5 +31,5 @@ if theme.microsoft_clarity
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
   link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')
 
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+if !theme.asset.busuanzi && (theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv)
   link(rel="preconnect" href="//busuanzi.ibruce.info")

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

layout/includes/header/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

@@ -1,17 +1,21 @@
 nav#nav
-  span#blog_name
+  span#blog-info
-    a#site-name(href=url_for('/')) #[=config.title]
+    a(href=url_for('/') title=config.title)
+      if theme.nav.logo
+        img.site-icon(src=url_for(theme.nav.logo))
+      if theme.nav.display_title
+        span.site-name=config.title
     
   #menus
-    if (theme.algolia_search.enable || theme.local_search.enable)
+    if (theme.algolia_search.enable || theme.local_search.enable || theme.docsearch.enable)
       #search-button
-        a.site-page.social-icon.search
+        a.site-page.social-icon.search(href="javascript:void(0);")
           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
+      a.site-page(href="javascript:void(0);")
         i.fas.fa-bars.fa-fw
 
 

layout/includes/header/post-info.pug

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

layout/includes/header/social.pug

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

layout/includes/layout.pug

@@ -1,4 +1,5 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
+- page.aside = is_archive() ? theme.aside.display.archive: is_category() ? theme.aside.display.category : is_tag() ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 - var pageType = is_post() ? 'post' : 'page'
 
@@ -7,37 +8,40 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
   head
     include ./head.pug
   body
-    if theme.preloader
+    if theme.preloader.enable
-      !=partial('includes/loading/loading', {}, {cache: true})
+      !=partial('includes/loading/index', {}, {cache: true})
 
     if theme.background
       #web_bg
       
     !=partial('includes/sidebar', {}, {cache: true})
 
-    #body-wrap(class=pageType)
+    if page.type !== '404'
-      include ./header/index.pug
+      #body-wrap(class=pageType)
+        include ./header/index.pug
 
-      main#content-inner.layout(class=hideAside)
+        main#content-inner.layout(class=hideAside)
-        if body
+          if body
-          div!= body
+            div!= body
+          else
+            block content
+            if theme.aside.enable && page.aside !== false
+              include widget/index.pug
+
+        - var footerBg = theme.footer_bg
+        if (footerBg)
+          if (footerBg === true)
+            - var footer_bg = bg_img
+          else
+            - var footer_bg = isImgOrUrl(theme.footer_bg) ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
         else
-          block content
+          - var footer_bg = ''
-          if theme.aside.enable && page.aside !== false
-            include widget/index.pug
 
-      - var footerBg = theme.footer_bg
+        footer#footer(style=footer_bg)
-      if (footerBg)
+          !=partial('includes/footer', {}, {cache: true})
-        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}`
-      else
-        - var footer_bg = ''
 
-      footer#footer(style=footer_bg)
+    else
-        !=partial('includes/footer', {}, {cache: true})
+      include ./404.pug
 
     include ./rightside.pug
-    !=partial('includes/third-party/search/index', {}, {cache: true})
     include ./additional-js.pug

layout/includes/loading/fullpage-loading.pug

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

layout/includes/loading/index.pug

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

layout/includes/loading/loading-js.pug

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

layout/includes/loading/loading.pug

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

layout/includes/loading/pace.pug

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

layout/includes/mixins/article-sort.pug

@@ -11,10 +11,10 @@ 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
+            if article.cover_type === 'img'
-              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)}'`)
+            else
+              div(style=`background: ${article.cover}`)
         .article-sort-item-info
           .article-sort-item-time
             i.far.fa-calendar-alt

layout/includes/mixins/post-ui.pug

@@ -1,33 +1,36 @@
 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)      
+          a(href=url_for(link) title=title)
-            if theme.lazyload.enable
+            if article.cover_type === 'img'
-              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)
+              img.post-bg(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)
+              div.post-bg(style=`background: ${post_cover}`)
       .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)= title
+        a.article-title(href=url_for(link) title=title)
-        .article-meta-wrap
           if (is_home() && (article.top || article.sticky > 0))
-            span.article-meta
+            i.fas.fa-thumbtack.sticky
-              i.fas.fa-thumbtack.sticky
+          = title
-              span.sticky= _p('sticky')
+        .article-meta-wrap
-              span.article-meta__separator |
           if (theme.post_meta.page.date_type)
             span.post-meta-date
-              if (theme.post_meta.page.date_type === 'both')               
+              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,51 +44,65 @@ mixin postUI(posts)
                 time(datetime=date_xml(article[date_type]) title=date_title + ' ' + full_date(article[date_type]))=date(article[date_type], config.date_format)
           if (theme.post_meta.page.categories && article.categories.data.length > 0)
             span.article-meta
-              span.article-meta__separator |
+              span.article-meta-separator |
               i.fas.fa-inbox
               each item, index in article.categories.data
                 a(href=url_for(item.path)).article-meta__categories #[=item.name]
                 if (index < article.categories.data.length - 1)
-                  i.fas.fa-angle-right
+                  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
               each item, index in article.tags.data
                 a(href=url_for(item.path)).article-meta__tags #[=item.name]
                 if (index < article.tags.data.length - 1)
-                  span.article-meta__link #[='•']
+                  span.article-meta-link #[='•']
           
           mixin countBlockInIndex
             - needLoadCountJs = true
             span.article-meta
-              span.article-meta__separator |
+              span.article-meta-separator |
               i.fas.fa-comments
               if block
                 block
               span.article-meta-label= ' ' + _p('card_post_count')
           
-          if theme.comments.card_post_count
+          if theme.comments.card_post_count && theme.comments.use
             case theme.comments.use[0]
               when 'Disqus'
               when 'Disqusjs'
                 +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqus_thread')
+                  a.disqus-count(href=full_url_for(link) + '#post-comment')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
+                  a(href=url_for(link) + '#post-comment')
-                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+                    span.valine-comment-count(data-xid=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
-                    span.waline-comment-count(id=url_for(link))
+                    span.waline-comment-count(data-path=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex
                   a.twikoo-count(href=url_for(link) + '#post-comment')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Facebook Comments'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+              when 'Remark42'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.remark42__counter(data-url=urlNoIndex(article.permalink))
+                      i.fa-solid.fa-spinner.fa-spin
+              when 'Artalk'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.artalk-count(data-page-key=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
 
         //- Display the article introduction on homepage
         case theme.index_post_content.method

layout/includes/page/artitalk.pug

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

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'})
+  !=cloudTags({source: site.tags, orderby: page.orderby || 'random', order: page.order || 1, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})

layout/includes/pagination.pug

@@ -6,36 +6,36 @@
     escape: false
   }
 
-if(!is_post())
+if is_post()
-  nav#pagination
-    div.pagination
-      !=paginator(options)
-else
   - let prev = theme.post_pagination === 1 ? page.prev : page.next
   - let next = theme.post_pagination === 1 ? page.next : page.prev
   nav#pagination.pagination-post
     if(prev)
       - var hasPageNext = next ? 'pull-left' : 'pull-full'
       .prev-post(class=hasPageNext)
-        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
+        a(href=url_for(prev.path) title=prev.title)
-        a(href=url_for(prev.path))
+          if prev.cover_type === 'img'
-          if theme.lazyload.enable
+            img.cover(src=url_for(prev.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
-            img.prev-cover(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')
+            .cover(style=`background: ${prev.cover || 'var(--default-bg-color)'}`)
           .pagination-info
             .label=_p('pagination.prev')
             .prev_info=prev.title
           
     if(next)
       - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
-      - var pagination_cover = next.cover == false ? next.randomcover : next.cover
       .next-post(class=hasPagePrev)
-        a(href=url_for(next.path))
+        a(href=url_for(next.path) title=next.title)
-          if theme.lazyload.enable
+          if next.cover_type === 'img'
-            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')
+            img.cover(src=url_for(next.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')
+            .cover(style=`background: ${next.cover || 'var(--default-bg-color)'}`)
           .pagination-info
             .label=_p('pagination.next')
-            .next_info=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,17 +1,23 @@
 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') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-user.fa-fw
+        = _p('post.copyright.author') + ": "
       span.post-copyright-info
         a(href=authorHref)=author
     .post-copyright__type
-      span.post-copyright-meta= _p('post.copyright.link') + ": "
+      span.post-copyright-meta
+        i.fas.fa-square-arrow-up-right.fa-fw
+        = _p('post.copyright.link') + ": "
       span.post-copyright-info
         a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
-      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-exclamation.fa-fw
+        = _p('post.copyright.copyright_notice') + ": "
       span.post-copyright-info!= info

layout/includes/post/reward.pug

@@ -1,16 +1,13 @@
 .post-reward
-  .reward-button.button--animated
+  .reward-button
     i.fas.fa-qrcode
-    = ' ' + _p('donate')
+    = theme.reward.text || _p('donate')
   .reward-main
     ul.reward-all
       each item in theme.reward.QR_code
         - var clickTo = item.link ? item.link : item.img
         li.reward-item
           a(href=url_for(clickTo) target='_blank')
-            if theme.lazyload.enable
+            img.post-qr-code-img(src=url_for(item.img) alt=item.text)
-              img.post-qr-code-img(data-lazy-src=url_for(item.img) alt=item.text)
-            else
-              img.post-qr-code-img(src=url_for(item.img) alt=item.text)
           .post-qr-code-desc=item.text
 

layout/includes/rightside.pug

@@ -1,38 +1,61 @@
-#rightside
+- const { readmode, translate, darkmode, aside, chat_btn } = theme
-  #rightside-config-hide
+mixin rightsideItem(array)
-    if is_post() && theme.readmode
+  each item in array
-      button#readmode(type="button" title=_p('rightside.readmode_title'))
+    case item
-        i.fas.fa-book-open
+      when 'readmode'
-    if theme.change_font_size
+        if is_post() && readmode
-      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
+          button#readmode(type="button" title=_p('rightside.readmode_title'))
-        i.fas.fa-plus
+            i.fas.fa-book-open
-      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
+      when 'translate'
-        i.fas.fa-minus
+        if translate.enable
-    if theme.translate.enable
+          button#translateLink(type="button" title=_p('rightside.translate_title'))= translate.default
-      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
+      when 'darkmode'
-    if theme.darkmode.enable && theme.darkmode.button
+        if darkmode.enable && darkmode.button
-      button#darkmode(type="button" title=_p('rightside.night_mode_title'))
+          button#darkmode(type="button" title=_p('rightside.night_mode_title'))
-        i.fas.fa-adjust
+            i.fas.fa-adjust
-    if theme.aside.enable && theme.aside.button && page.aside !== false
+      when 'hideAside'
-      button#hide-aside-btn(type="button" title=_p('rightside.aside'))
+        if aside.enable && aside.button && page.aside !== false
-        i.fas.fa-arrows-alt-h
+          button#hide-aside-btn(type="button" title=_p('rightside.aside'))
-  #rightside-config-show
+            i.fas.fa-arrows-alt-h
-    if is_post()
+      when 'toc'
-      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size)
+        if showToc
-        button#rightside_config(type="button" title=_p("rightside.setting"))
+          button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
-          i.fas.fa-cog.fa-spin
+            i.fas.fa-list-ul
-      if showToc
+      when 'chat'
-        button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+        if chat_btn
-          i.fas.fa-list-ul
+          button#chat-btn(type="button" title=_p("rightside.chat"))
-    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size
+            i.fas.fa-sms
-      button#rightside_config(type="button" title=_p("rightside.setting"))
+      when 'comment'
-        i.fas.fa-cog.fa-spin
+        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)
 
-    if theme.chat_btn
-      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
-        i.fas.fa-sms
-    if commentsJsLoad
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.fas.fa-comments
     button#go-up(type="button" title=_p("rightside.back_to_top"))
+      span.scroll-percent
       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
+      a(href=url_for(config.archive_dir) + '/')
-        img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+        .headline= _p('aside.articles') 
-    .site-data
+        .length-num= site.posts.length
-      if site.posts.length
+      a(href=url_for(config.tag_dir) + '/' )
-        .data-item.is-center
+        .headline= _p('aside.tags')
-          .data-item-link
+        .length-num= site.tags.length
-            a(href=url_for(config.archive_dir) + '/')
+      a(href=url_for(config.category_dir) + '/')
-              .headline= _p('aside.articles') 
+        .headline= _p('aside.categories') 
-              .length-num= site.posts.length
+        .length-num= site.categories.length
 
-      if site.tags.length
+    hr.custom-hr
-        .data-item.is-center
+    !=partial('includes/header/menu_item', {}, {cache: true})
-          .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')})

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

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

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

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

layout/includes/third-party/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/card-post-count/artalk.pug

@@ -0,0 +1,35 @@
+- const { server, site } = theme.artalk
+
+script.
+  (() => {
+    const getArtalkCount = async() => {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
+
+        const headerList = {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Origin': window.location.origin
+          },
+          body: new URLSearchParams({
+            'site_name': '!{site}',
+            'type':'page_comment',
+            'page_keys': keyArray
+          })
+        }
+
+        const res = await fetch('!{server}/api/stat', headerList)
+        const result = await res.json()
+
+        keyArray.forEach((key, index) => {
+          eleGroup[index].textContent = result.data[key] || 0
+        })
+      } catch (err) {
+        console.error(err)
+      }
+    }
+
+    window.pjax ? getArtalkCount() : window.addEventListener('load', getArtalkCount)
+  })()

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

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

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

@@ -1,10 +1,13 @@
+- const fbSDKVer = 'v16.0'
+- const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
+
 script.
   (()=>{
     function loadFBComment () {
-      if (typeof FB === 'object') FB.XFBML.parse()
+      if (typeof FB === 'object') FB.XFBML.parse(document.getElementById('recent-posts'))
       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('src','!{fbSDK}')
         ele.setAttribute('async', 'true')
         ele.setAttribute('defer', 'true')
         ele.setAttribute('crossorigin', 'anonymous')

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

@@ -9,4 +9,8 @@ case theme.comments.use[0]
   when 'Waline'
     include ./waline.pug
   when 'Facebook Comments'
-    include ./fb.pug
+    include ./fb.pug
+  when 'Remark42'
+    include ./remark42.pug
+  when 'Artalk'
+    include ./artalk.pug

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

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

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

@@ -18,7 +18,7 @@ script.
           includeReply: false
         }).then(function (res) {
           document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
-            item.innerText = res[index].count
+            item.textContent = res[index].count
           })
         }).catch(function (err) {
           console.log(err)
@@ -28,7 +28,7 @@ script.
         if (typeof twikoo === 'object') {
           runTwikoo()
         } else {
-          getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+          getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
         }
     }
 

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

@@ -6,13 +6,14 @@ script.
           el: '#vcomment',
           appId: '#{theme.valine.appId}',
           appKey: '#{theme.valine.appKey}',
+          serverURLs: '#{theme.valine.serverURLs}'
         }
         
         const valine = new Valine(initData)
       }
 
       if (typeof Valine === 'function') initValine() 
-      else getScript('!{url_for(theme.CDN.valine)}').then(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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,52 +1,44 @@
-script.
+- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
-  function addGitalkSource () {
-    const ele = document.createElement('link')
-    ele.rel = 'stylesheet'
-    ele.href= '!{url_for(theme.CDN.gitalk_css)}'
-    document.getElementsByTagName('head')[0].appendChild(ele)
-  }
 
-  function loadGitalk () {
+script.
-    function initGitalk () {
+  (() => {
-      var gitalk = new Gitalk({
+    const initGitalk = () => {
-        clientID: '!{theme.gitalk.client_id}',
+      const gitalk = new Gitalk(Object.assign({
-        clientSecret: '!{theme.gitalk.client_secret}',
+        clientID: '!{client_id}',
-        repo: '!{theme.gitalk.repo}',
+        clientSecret: '!{client_secret}',
-        owner: '!{theme.gitalk.owner}',
+        repo: '!{repo}',
-        admin: ['!{theme.gitalk.admin}'],
+        owner: '!{owner}',
+        admin: ['!{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(option)}))
+
       gitalk.render('gitalk-container')
     }
 
-    if (typeof Gitalk === 'function') initGitalk()
+    const loadGitalk = async() => {
-    else {
+      if (typeof Gitalk === 'function') initGitalk()
-      addGitalkSource()
+      else {
-      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
+        await getCSS('!{url_for(theme.asset.gitalk_css)}')
+        await getScript('!{url_for(theme.asset.gitalk)}')
+        initGitalk()
+      }
     }
-  }
+    
-  
+    const commentCount = n => {
-  function commentCount(n){
+      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+      if (isCommentCount) {
-    if (isCommentCount) {
+        isCommentCount.textContent= n
-      isCommentCount.innerHTML= n
+      }
     }
-  }
 
-  if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
+    if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
-    else loadGitalk()
+      else loadGitalk()
-  } else {
+    } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadGitalk
-      loadGitalk()
     }
-  }
+  })()
 
 
 

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

@@ -1,5 +1,5 @@
 - let defaultComment = theme.comments.use[0]
-hr
+hr.custom-hr
 #post-comment
   .comment-head
     .comment-headline
@@ -7,9 +7,9 @@ hr
       span= ' ' + _p('comment')
     
     if theme.comments.use.length > 1
-      #comment-switch
+      .comment-switch
         span.first-comment=defaultComment
-        span.switch-btn
+        span#switch-btn
         span.second-comment=theme.comments.use[1]
 
 
@@ -22,7 +22,7 @@ hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqus_thread
+            #disqusjs-wrap
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'
@@ -33,8 +33,14 @@ hr
             #twikoo-wrap
           when 'Waline'
             #waline-wrap
+          when 'Giscus'
+            #giscus-wrap
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         data-numposts= theme.facebook_comments.pageSize || 10
                         data-order-by= theme.facebook_comments.order_by || 'social'
                         data-width="100%")
+          when 'Remark42'
+            #remark42
+          when 'Artalk'
+            #artalk-wrap

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,39 +1,40 @@
-- let option = theme.waline.option ? JSON.stringify(theme.waline.option) : false
+- const { serverURL, option, pageview } = theme.waline
-- let emojiMaps = '""'
+- const { lazyload, count, use } = theme.comments
-if site.data.waline
-  - emojiMaps = JSON.stringify(site.data.waline)
 
 script.
-  function loadWaline () {
+  (() => {
-    function initWaline () {
+    const initWaline = () => {
-      let initData = {
+      const waline = Waline.init(Object.assign({
         el: '#waline-wrap',
-        serverURL: '!{theme.waline.serverURL}',
+        serverURL: '!{serverURL}',
-        avatar: '#{theme.waline.avatar}',
+        pageview: !{lazyload ? false : pageview},
-        path: location.pathname,
+        dark: 'html[data-theme="dark"]',
-        emojiCDN: '#{theme.waline.emojiCDN}',
+        path: window.location.pathname,
-        emojiMaps: !{emojiMaps},
+        comment: !{lazyload ? false : count},
+      }, !{JSON.stringify(option)}))
+
+      const destroyWaline = () => {
+        waline.destroy()
       }
-      
+
-      if (!{Boolean(option)}) {
+      btf.addGlobalFn('pjax', destroyWaline, 'destroyWaline')
-        const otherData = !{option}
+
-        initData = Object.assign(initData, otherData)
-      }
-      
-      const waline = new Waline(initData)
     }
 
-    if (typeof Waline === 'function') initWaline() 
+    const loadWaline = async () => {
-    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+      if (typeof Waline === 'object') initWaline()
-  }
+      else {
-
+        await getCSS('!{url_for(theme.asset.waline_css)}')
-  if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
+        await getScript('!{url_for(theme.asset.waline_js)}')
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+        initWaline()
-    else setTimeout(loadWaline, 0)
+      }
-  } else {
-    function loadOtherComment () {
-      loadWaline()
     }
-  }
+
-  
+    if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+      else setTimeout(loadWaline, 0)
+    } else {
+      window.loadOtherComment = loadWaline
+    }
+  })()
 

layout/includes/third-party/effect.pug

@@ -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,14 +22,14 @@ 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
+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-mobile= `${theme.clickShowText.mobile}`
-    data-text= theme.ClickShowText.text.join(",")
+    data-text= theme.clickShowText.text.join(",")
-    data-fontsize= theme.ClickShowText.fontSize
+    data-fontsize= theme.clickShowText.fontSize
-    data-random= `${theme.ClickShowText.random}`
+    data-random= `${theme.clickShowText.random}`
     async
   )

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

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

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

@@ -1,10 +1,9 @@
-link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
+link(rel="stylesheet" type="text/css" href=url_for(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)
 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: [ ['$','$'], ["\\(","\\)"]],
+        inlineMath: [['$', '$'], ['\\(', '\\)']],
         tags: 'ams'
       },
+      chtml: {
+        scale: 1.1
+      },
       options: {
         renderActions: {
           findScript: [10, doc => {
@@ -28,26 +21,18 @@ script.
               math.end = {node: text, delim: '', n: 0}
               doc.math.push(math)
             }
-          }, ''],
+          }, '']
-          addClass: [200,() => {
-            document.querySelectorAll('mjx-container:not([display=\'true\']').forEach( node => {
-              const target = node.parentNode
-              if (!target.classList.contains('has-jax')) {
-                target.classList.add('mathjax-overflow')
-              }
-            })
-          }, '', false]
         }
       }
     }
     
     const script = document.createElement('script')
-    script.src = '!{theme.CDN.mathjax}'
+    script.src = '!{url_for(theme.asset.mathjax)}'
     script.id = 'MathJax-script'
     script.async = true
     document.head.appendChild(script)
   } else {
     MathJax.startup.document.state(0)
     MathJax.texReset()
-    MathJax.typeset()
+    MathJax.typesetPromise()
   }

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

@@ -1,15 +1,38 @@
 script.
-  if (document.getElementsByClassName('mermaid').length) {
+  (() => {
-    if (window.mermaidJsLoad) mermaid.init()
+    const $mermaid = document.querySelectorAll('#article-container .mermaid-wrap')
-    else {
+    if ($mermaid.length === 0) return
-      getScript('!{theme.CDN.mermaid}').then(() => {
+    const 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($mermaid).forEach((item, index) => {
-        !{theme.pjax.enable} && mermaid.init()
+        const mermaidSrc = item.firstElementChild
+        const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
+        const mermaidID = 'mermaid-' + index
+        const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
+
+        const renderFn = mermaid.render(mermaidID, mermaidDefinition)
+
+        const renderV10 = () => {
+          renderFn.then(({svg}) => {
+            mermaidSrc.insertAdjacentHTML('afterend', svg)
+          })
+        }
+
+        const renderV9 = svg => {
+          mermaidSrc.insertAdjacentHTML('afterend', svg)
+        }
+
+        typeof renderFn === 'string' ? renderV9(renderFn) : renderV10()
       })
     }
-  }
 
+    const loadMermaid = () => {
+      window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
+    }
 
+    btf.addGlobalFn('themeChange', runMermaid, 'mermaid')
+
+    window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
+  })()

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

@@ -0,0 +1,110 @@
+- const { server, site, option } = theme.artalk
+- const avatarCdn = option !== null && option.gravatar && option.gravatar.mirror
+- const avatarDefault = option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)
+
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom && ($dom && ($dom.innerHTML= result))
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getSetting = async () => {
+      try {
+        const res = await fetch('!{server}/api/conf', { method: 'GET' })
+        return await res.json()
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    const headerList = {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Origin': window.location.origin
+      },
+      body: new URLSearchParams({
+        'site_name': '!{site}',
+        'limit': '!{theme.newest_comments.limit}',
+        'type':'latest_comments'
+      })
+    }
+
+    const getComment = async () => {
+      try {
+        const res = await fetch('!{server}/api/stat', headerList)
+        const result = await res.json()
+        const avatarStr = await getSetting()
+        const { mirror, params, default:defaults } = avatarStr.data.frontend_conf.gravatar
+        const avatarCdn = !{avatarCdn} || mirror
+        let avatarDefault = !{avatarDefault} || params || defaults
+        avatarDefault = avatarDefault.startsWith('d=') ? avatarDefault : `d=${avatarDefault}`
+        const artalk = result.data.map(function (e) {
+          return {
+            'avatar': `${avatarCdn}${e.email_encrypted}?${avatarDefault}`,
+            'content': changeContent(e.content_marked),
+            'nick': e.nick,
+            'url': e.page_url,
+            'date': e.date,
+          }
+        })
+        saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
+        generateHtml(artalk)
+      } catch (e) {
+        console.log(e)
+        const $dom = document.querySelector('#card-newest-comments .aside-list')
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
+      }
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('artalk-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

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

@@ -15,7 +15,7 @@ script.
     }
 
     const getComment = () => {
-      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{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 => {
@@ -32,7 +32,7 @@ script.
           generateHtml(disqusArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
@@ -49,7 +49,7 @@ script.
           }
           
           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>`
         }
@@ -58,7 +58,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -15,15 +15,16 @@ script.
     }
 
     const findTrueUrl = (array) => {
-      let url = ''
       Promise.all(array.map(item =>
         fetch(item.url).then(resp => resp.json()).then(data => {
+          let urlArray = data.body ? data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig) : []
+          if (!Array.isArray(urlArray) || urlArray.length === 0) {
+            urlArray = [`${data.html_url}`]
+          }
           if (data.user.login === 'utterances-bot') {
-            url = data.body.match(/https?\:\/\/[^\" ]+/ig).slice(-1)
+            return urlArray.pop()
-            return url[0]
           } else {
-            url = data.body.match(/https?\:\/\/[^\" ]+/i)
+            return urlArray.shift()
-            return url[0]
           }
         })
       )).then(res => {
@@ -40,7 +41,7 @@ script.
     }
 
     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'
         }
@@ -50,7 +51,7 @@ script.
           const githubArray = data.map(item => {
             return {
               'avatar': item.user.avatar_url,
-              'content': changeContent(item.body_html),
+              'content': changeContent(item.body_html || item.body),
               'nick': item.user.login,
               'url': item.issue_url,
               'date': item.updated_at,
@@ -60,7 +61,7 @@ script.
           findTrueUrl(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
@@ -77,7 +78,7 @@ script.
           }
 
           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 datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
@@ -86,7 +87,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -1,12 +1,30 @@
-- let config = theme.newest_comments
+- let { use } = theme.comments
 
-if config.valine
+if use
-  include ./valine.pug
+  - let forum,apiKey,userRepo
-else if config.waline
+  case use[0]
-  include ./waline.pug
+    when 'Valine'
-else if config.github_issues.enable
+      include ./valine.pug
-  include ./github-issues.pug
+    when 'Waline'
-else if config.disqus.enable
+      include ./waline.pug
-  include ./disqus-comment.pug
+    when 'Twikoo'
-else if config.twikoo
+      include ./twikoo-comment.pug
-  include ./twikoo-comment.pug
+    when 'Disqus'
+      - forum = theme.disqus.shortname
+      - apiKey = theme.disqus.apikey
+      include ./disqus-comment.pug
+    when 'Disqusjs'
+      - forum = theme.disqusjs.shortname
+      - apiKey = theme.disqusjs.apikey
+      include ./disqus-comment.pug
+    when 'Gitalk'
+      - let { repo,owner } = theme.gitalk
+      - userRepo = owner + '/' + repo
+      include ./github-issues.pug
+    when 'Utterances'
+      - userRepo = theme.utterances.repo
+      include ./github-issues.pug
+    when 'Remark42'
+      include ./remark42.pug
+    when 'Artalk'
+      include ./artalk.pug

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

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

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

@@ -36,14 +36,14 @@ script.
           generateHtml(twikooArray)
         }).catch(function (err) {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
       }
 
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+        getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
       }
     }
 
@@ -60,7 +60,7 @@ script.
           }
           
           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 datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
@@ -69,7 +69,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -1,6 +1,6 @@
 - let default_avatar = theme.valine.avatar
 
-script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
+script(src=url_for(theme.asset.blueimp_md5))
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
@@ -37,7 +37,7 @@ script.
           }
 
           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 datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
@@ -46,7 +46,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
@@ -79,7 +79,7 @@ script.
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         }) 
     }
 

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

@@ -1,8 +1,8 @@
-- let default_avatar = theme.waline.avatar
+- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
 
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const changeContent = content => {
       if (content === '') return content
 
       content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
@@ -16,13 +16,6 @@ script.
       return content
     }
 
-    const getIcon = (avatar,mail) => {
-      if (avatar) return avatar
-      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
-      let iconUrl = `https://gravatar.loli.net/avatar/${mail + defaultIcon}`
-      return iconUrl
-    }
-
     const generateHtml = array => {
       let result = ''
 
@@ -36,7 +29,7 @@ script.
           }
 
           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 datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
@@ -45,37 +38,31 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getComment = () => {
+    const getComment = async () => {
-      const loadWaline = () => {
+      try {
-        Waline.Widget.RecentComments({
+        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.newest_comments.limit}', { method: 'GET' })
-          el: '#card-newest-comments .aside-list',
+        const result = await res.json()
-          serverURL: '!{theme.waline.serverURL}',
+        const walineArray = result.data.map(e => {
-          count: !{theme.newest_comments.limit}
+          return {
-        }).then(comments => {
+            'content': changeContent(e.comment),
-          const walineArray = comments.map(function (e) {
+            'avatar': e.avatar,
-            return {
+            'nick': e.nick,
-              'content': changeContent(e.comment),
+            'url': e.url + '#' + e.objectId,
-              'avatar': getIcon(e.QQAvatar,e.mail),
+            'date': e.time || e.insertedAt
-              'nick': e.nick,
+          }
-              'url': e.url + '#' + e.objectId,
+        })
-              'date': e.updatedAt,
+        saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
-            }
+        generateHtml(walineArray)
-          })
+      } catch (err) {
-          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+        console.error(err)
-          generateHtml(walineArray)
+        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        }).catch(e => {
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-        }) 
       }
-
-      if (typeof Waline === 'function') loadWaline() 
-      else getScript('!{url_for(theme.CDN.waline)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pangu.pug

@@ -2,7 +2,7 @@ script.
   function panguFn () {
     if (typeof pangu === 'object') pangu.autoSpacingPage()
     else {
-      getScript('!{url_for(theme.CDN.pangu)}')
+      getScript('!{url_for(theme.asset.pangu)}')
         .then(() => {
           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 = ['head > title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
-script.
-  let pjaxSelectors = [
-    'title',
-    '#config-diff',
-    '#body-wrap',
-    '#rightside-config-hide',
-    '#rightside-config-show',
-    '.js-pjax'
-  ]
 
-  if (!{Boolean(theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere'))}) {
+- 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.enable && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
+    - pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+  if choose.includes('Utterances') || choose.includes('Giscus')
+    - pjaxSelectors.unshift('link[rel="canonical"]')
+
+script(src=url_for(theme.asset.pjax))
+script.
+  let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
 
   var pjax = new Pjax({
     elements: '!{pjaxExclude}',
@@ -26,42 +24,13 @@ script.
     scrollRestoration: false
   })
 
-  document.addEventListener('pjax:complete', function () {
-    window.refreshFn()
-
-    document.querySelectorAll('script[data-pjax]').forEach(item => {
-      const newScript = document.createElement('script')
-      const content = item.text || item.textContent || item.innerHTML || ""
-      Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
-      newScript.appendChild(document.createTextNode(content))
-      item.parentNode.replaceChild(newScript, item)
-    })
-
-    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
-
-    typeof chatBtnFn === 'function' && chatBtnFn()
-    typeof panguInit === 'function' && panguInit()
-
-    if (typeof gtag === 'function') {
-      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
-    }
-
-    typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
-
-    // Analytics
-    if (!{theme.tencent_analytics ? true : false}) {
-      MtaH5.pgv()
-    }
-
-    // prismjs
-    typeof Prism === 'object' && Prism.highlightAll()
-
-    typeof preloader === 'object' && preloader.endLoading()
-  })
-
-
   document.addEventListener('pjax:send', function () {
-    typeof preloader === 'object' && preloader.initLoading()
+
+    // removeEventListener
+    btf.removeGlobalFnEvent('pjax')
+    btf.removeGlobalFnEvent('themeChange')
+
+    document.getElementById('rightside').classList.remove('rightside-show')
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -77,10 +46,38 @@ script.
     const $bodyClassList = document.body.classList
     $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
+    typeof disqusjs === 'object' && disqusjs.destroy()
   })
 
-  document.addEventListener('pjax:error', (e) => {
+  document.addEventListener('pjax:complete', function () {
+    window.refreshFn()
+
+    document.querySelectorAll('script[data-pjax]').forEach(item => {
+      const newScript = document.createElement('script')
+      const content = item.text || item.textContent || item.innerHTML || ""
+      Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
+      newScript.appendChild(document.createTextNode(content))
+      item.parentNode.replaceChild(newScript, item)
+    })
+
+    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
+
+    typeof panguInit === 'function' && panguInit()
+
+    // google analytics
+    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()
+
+    // prismjs
+    typeof Prism === 'object' && Prism.highlightAll()
+  })
+
+  document.addEventListener('pjax:error', e => {
     if (e.request.status === 404) {
-      pjax.loadUrl('/404.html')
+      pjax.loadUrl('!{url_for("/404.html")}')
     }
   })

layout/includes/third-party/prismjs.pug

@@ -1,5 +1,5 @@
 if config.prismjs && config.prismjs.enable && !config.prismjs.preprocess
-  script(src=url_for(theme.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))