Merge branch 'dev'

feat(score tag): support RenderAbc options

.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.yml

@@ -7,11 +7,12 @@ body:
     attributes:
       value: |
         重要：請依照該模板來提交 
-        Please follow the template to create a new issue
+        Important: Please follow the template to create a new issue
+
   - type: input
     id: butterfly-ver
     attributes:
-      label: 使用的 Butterfly 版本？ | What version of Butterfly are you use?
+      label: 使用的 Butterfly 版本？ | What version of Butterfly are you using?
       description: 檢視主題的 package.json | Check the theme's package.json
     validations:
       required: true
@@ -19,17 +20,17 @@ body:
   - type: dropdown
     id: modify
     attributes:
-      label: 是否修改过主题文件？ || Has the theme files been modified?
+      label: 是否修改過主題文件？ | Has the theme files been modified?
       options:
         - 是 (Yes)
-        - 不是 (No)
+        - 否 (No)
     validations:
       required: true
 
   - type: dropdown
     id: browser
     attributes:
-      label: 使用的瀏覽器？ || What browse are you using?
+      label: 使用的瀏覽器？ | What browser are you using?
       options:
         - Chrome
         - Edge
@@ -42,7 +43,7 @@ body:
   - type: dropdown
     id: platform
     attributes:
-      label: 使用的系統？ || What operating system are you using?
+      label: 使用的系統？ | What operating system are you using?
       options:
         - Windows
         - macOS 
@@ -53,6 +54,15 @@ body:
     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:
@@ -66,8 +76,8 @@ body:
   - type: input
     id: website
     attributes:
-      label: 出現問題網站 | Website
+      label: 出現問題的網站 | Website with the issue
-      description: 請提供下可復現網站地址 | Please supply a website url which can reproduce problem.
+      description: 請提供可復現問題的網站地址 | Please provide a website URL where the problem can be reproduced.
-      placeholder:
+      placeholder: 請填寫具體的網址，不要填寫 localhost 網站 | Please provide a specific URL, do not use localhost. 
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -12,11 +12,7 @@ contact_links:
     url: https://t.me/bu2fly
     about: 'Official Telegram Group'
 
-  - name: QQ 1群
+  - name: QQ 群
     url: https://jq.qq.com/?_wv=1027&k=KU9105XR
-    about: '群號 1070540070，不要兩個Q群都添加'
+    about: '群號 1070540070'
-
-  - name: QQ 2群
-    url: https://jq.qq.com/?_wv=1027&k=r1nK0DQz
-    about: '群號 978221020，不要兩個Q群都添加'
 

.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+.DS_Store

README.md

@@ -1,9 +1,11 @@
 <div align="right">
-  Language:
+<a title="Chinese" href="/README_CN.md">中文</a>
-  🇺🇸
-  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
 </div>
 
+<div align="center">
+
+<img src="./source/img/butterfly-icon.png" width="150" height="150" />
+
 # hexo-theme-butterfly
 
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
@@ -12,13 +14,15 @@
 ![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/) / [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/)
+
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
+</div>
 
-Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+---
-
-Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
 ## 💻 Installation
 
@@ -61,27 +65,28 @@ npm i hexo-theme-butterfly
 ## 🎉 Features
 
 - [x] Card UI Design
+- [x] Rounded Design/Squared 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), 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/Giscus/Remark42/artalk)
 - [x] Multiple Comment System Support
-- [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)
+- [x] Online Chats (Chatra/Tidio/Crisp)
 - [x] Web analytics
 - [x] Google AdSense
 - [x] Webmaster Verification
@@ -93,9 +98,10 @@ npm i hexo-theme-butterfly
 - [x] Busuanzi visitor counter
 - [x] Medium Zoom/Fancybox
 - [x] Mermaid
+- [x] Chart.js
 - [x] Justified Gallery
 - [x] Lazyload images
-- [x] Instantpage/Pangu/Snackbar notification toast/PWA......
+- [x] Instantpage/Snackbar notification toast/PWA......
 
 ## ✨ Contributors
 
@@ -109,5 +115,3 @@ npm i hexo-theme-butterfly
 ![](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,9 +1,11 @@
 <div align="right">
-  語言:
+  <a title="English" href="/README.md">English</a>
-  中文
-  <a title="English" href="/README.md">英文</a>
 </div>
 
+<div align="center">
+
+<img src="./source/img/butterfly-icon.png" width="150" height="150" />
+
 # hexo-theme-butterfly
 
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
@@ -12,13 +14,15 @@
 ![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/) / [CrazyWong](https://blog.crazywong.com/)
+
+📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) / [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
+
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
+</div>
 
-文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+---
-
-一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
 ## 💻 安裝
 
@@ -61,6 +65,7 @@ theme: butterfly
 ## 🎉 特色
 
 - [x] 卡片化設計
+- [x] 圓角化設計/直角化設計
 - [X] 支持二級目錄
 - [x] 雙欄設計
 - [x] 響應式主題
@@ -69,22 +74,22 @@ theme: butterfly
 - [x] 文章閲讀模式
 - [x] 簡體和繁體轉換
 - [X] 電腦和手機都可查看TOC目錄
-- [X] 內置多種代碼配色（darker/pale night/light/ocean/mac/mac light），可自定義代碼配色
+- [X] 內置多種代碼配色（darker/pale night/light/ocean），可自定義代碼配色
 - [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/Giscus/Remark42/artalk）
 - [x] 支持雙評論部署
-- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Crisp/messenger）
+- [x] 多種在線聊天（Chatra/Tidio/Crisp）
 - [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
-- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 各種站長驗證
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
@@ -93,9 +98,10 @@ theme: butterfly
 - [x] 不蒜子訪問統計
 - [x] 兩種大圖模式（Medium Zoom/Fancybox）
 - [x] Mermaid 圖表顯示
+- [x] Chart.js 圖表顯示
 - [x] 照片牆
 - [x] 圖片懶加載
-- [x] Instantpage/Pangu/Snackbar彈窗/PWA......
+- [x] Instantpage/Snackbar彈窗/PWA......
 
 ## ✨ 貢獻者
 
@@ -109,5 +115,3 @@ theme: butterfly
 ![](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)

languages/default.yml

@@ -3,55 +3,52 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
+  success: Copy Successful
-  error: Copy error
+  error: Copy Failed
-  noSupport: The browser does not support
+  noSupport: Browser Not Supported
 
 page:
-  articles: Articles
+  articles: All Articles
   tag: Tag
   category: Category
   archives: Archives
 
 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
     link: Link
     copyright_notice: Copyright Notice
-    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
+    copyright_content: 'All articles on this blog are licensed under <a href="%s">%s</a> unless otherwise stated.'
   recommend: Related Articles
-  edit: Edited on
+  edit: Edit
 
 search:
   title: Search
-  load_data: Loading the Database
+  load_data: Loading Database
+  input_placeholder: Search for Posts
   algolia_search:
-    input_placeholder: Search for Posts
+    hits_empty: 'No results found for: ${query}'
-    hits_empty: "We didn't find any results for the search: ${query}."
     hits_stats: '${hits} results found in ${time} ms'
-
   local_search:
-    input_placeholder: Search for Posts
+    hits_empty: 'No results found for: ${query}'
-    hits_empty: "We didn't find any results for the search: ${query}"
+    hits_stats: '${hits} articles found'
-    hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
+  prev: Previous
-  next: Next Post
+  next: Next
 
-comment: Comment
+comment: Comments
 
 aside:
   articles: Articles
@@ -61,63 +58,64 @@ aside:
   card_categories: Categories
   card_tags: Tags
   card_archives: Archives
-  card_recent_post: Recent Post
+  card_recent_post: Recent Posts
   card_webinfo:
-    headline: Info
+    headline: Website Info
-    article_name: Article
+    article_name: Article Count
     runtime:
-      name: Run time
+      name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
-    site_wordcount: Total Count
+    site_wordcount: Total Word Count
-    site_uv_name: UV
+    site_uv_name: Unique Visitors
-    site_pv_name: PV
+    site_pv_name: Page Views
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
-    loading_text: loading...
+    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
+    image: Image
-    link: link
+    link: Link
-    code: code
+    code: Code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Post 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
+  readmode_title: Reading Mode
-  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  translate_title: Toggle Between Traditional and Simplified Chinese
-  night_mode_title: Toggle Between Light And Dark Mode
+  night_mode_title: Toggle Between Light and Dark Mode
-  back_to_top: Back To Top
+  back_to_top: Back to Top
-  toc: Table Of Contents
+  toc: Table of Contents
-  scroll_to_comment: Scroll To Comments
+  scroll_to_comment: Scroll to Comments
-  setting: Setting
+  setting: Settings
-  aside: Toggle between single-column and double-column
+  aside: Toggle Between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
   author: Author
   link: Link
   source: Source
-  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
+  info: Copyright belongs to the author. For commercial use, please contact the author for authorization. For non-commercial use, 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: Page not found
+error404: Page Not Found

languages/en.yml

@@ -3,55 +3,52 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
+  success: Copy Successful
-  error: Copy error
+  error: Copy Failed
-  noSupport: The browser does not support
+  noSupport: Browser Not Supported
 
 page:
-  articles: Articles
+  articles: All Articles
   tag: Tag
   category: Category
   archives: Archives
 
 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
     link: Link
     copyright_notice: Copyright Notice
-    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
+    copyright_content: 'All articles on this blog are licensed under <a href="%s">%s</a> unless otherwise stated.'
   recommend: Related Articles
-  edit: Edited on
+  edit: Edit
 
 search:
   title: Search
-  load_data: Loading the Database
+  load_data: Loading Database
+  input_placeholder: Search for Posts
   algolia_search:
-    input_placeholder: Search for Posts
+    hits_empty: 'No results found for: ${query}'
-    hits_empty: "We didn't find any results for the search: ${query}."
     hits_stats: '${hits} results found in ${time} ms'
-
   local_search:
-    input_placeholder: Search for Posts
+    hits_empty: 'No results found for: ${query}'
-    hits_empty: "We didn't find any results for the search: ${query}"
+    hits_stats: '${hits} articles found'
-    hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
+  prev: Previous
-  next: Next Post
+  next: Next
 
-comment: Comment
+comment: Comments
 
 aside:
   articles: Articles
@@ -61,63 +58,64 @@ aside:
   card_categories: Categories
   card_tags: Tags
   card_archives: Archives
-  card_recent_post: Recent Post
+  card_recent_post: Recent Posts
   card_webinfo:
-    headline: Info
+    headline: Website Info
-    article_name: Article
+    article_name: Article Count
     runtime:
-      name: Run time
+      name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
-    site_wordcount: Total Count
+    site_wordcount: Total Word Count
-    site_uv_name: UV
+    site_uv_name: Unique Visitors
-    site_pv_name: PV
+    site_pv_name: Page Views
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
-    loading_text: loading...
+    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
+    image: Image
-    link: link
+    link: Link
-    code: code
+    code: Code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Post 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
+  readmode_title: Reading Mode
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
+  translate_title: Toggle Between Traditional and Simplified Chinese
-  night_mode_title: Switch Between Light And Dark Mode
+  night_mode_title: Toggle Between Light and Dark Mode
-  back_to_top: Back To Top
+  back_to_top: Back to Top
-  toc: Table Of Contents
+  toc: Table of Contents
-  scroll_to_comment: Scroll To Comments
+  scroll_to_comment: Scroll to Comments
-  setting: Setting
+  setting: Settings
-  aside: Toggle between single-column and double-column
+  aside: Toggle Between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
   author: Author
   link: Link
   source: Source
-  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
+  info: Copyright belongs to the author. For commercial use, please contact the author for authorization. For non-commercial use, 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: Page not found
+error404: Page Not Found

languages/ja.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: フレームワーク
+  theme: テーマ
+
+copy:
+  success: コピー成功
+  error: コピー失敗
+  noSupport: ブラウザが対応していません
+
+page:
+  articles: 記事一覧
+  tag: タグ
+  category: カテゴリ
+  archives: アーカイブ
+
+card_post_count: コメント数
+
+no_title: タイトルなし
+
+post:
+  created: 作成日
+  updated: 更新日
+  wordcount: 総文字数
+  min2read: 読む時間
+  min2read_unit: 分
+  page_pv: 閲覧数
+  comments: コメント数
+  copyright:
+    author: 著者
+    link: リンク
+    copyright_notice: 著作権表示
+    copyright_content: 'このブログのすべての記事は、<a href="%s">%s</a> ライセンスの下で提供されており、特に明記されていない限り、すべての権利を留保します。転載時には出典を明記してください: <a href="%s">%s</a>。'
+  recommend: 関連記事
+  edit: 編集
+
+search:
+  title: 検索
+  load_data: データベースを読み込んでいます
+  input_placeholder: 記事を検索
+  algolia_search:
+    hits_empty: '${query} の検索結果が見つかりませんでした。'
+    hits_stats: '${hits} 件の結果が ${time}ms で見つかりました'
+  local_search:
+    hits_empty: '${query} の検索結果が見つかりませんでした。'
+    hits_stats: '${hits} 件の記事が見つかりました'
+
+pagination:
+  prev: 前へ
+  next: 次へ
+
+comment: コメント
+
+aside:
+  articles: 記事
+  tags: タグ
+  categories: カテゴリ
+  card_announcement: お知らせ
+  card_categories: カテゴリ
+  card_tags: タグ
+  card_archives: アーカイブ
+  card_recent_post: 最近の記事
+  card_webinfo:
+    headline: サイト情報
+    article_name: 記事数
+    runtime:
+      name: 稼働時間
+      unit: 日
+    last_push_date:
+      name: 最終更新日
+    site_wordcount: 総文字数
+    site_uv_name: ユーザー数
+    site_pv_name: ページビュー数
+  more_button: もっと見る
+  card_newest_comments:
+    headline: 最新コメント
+    loading_text: ローディング中...
+    error: コメントを取得できませんでした。設定を確認してください。
+    zero: コメントがありません
+    image: 画像
+    link: リンク
+    code: コード
+  card_toc: 目次
+  card_post_series: シリーズ記事
+
+date_suffix:
+  just: たった今
+  min: 分前
+  hour: 時間前
+  day: 日前
+  month: ヶ月前
+
+donate: 寄付
+share: 共有
+
+rightside:
+  readmode_title: 読書モード
+  translate_title: 簡体字と繁体字の切り替え
+  night_mode_title: ライトモード/ダークモード切り替え
+  back_to_top: トップに戻る
+  toc: 目次
+  scroll_to_comment: コメントへ移動
+  setting: 設定
+  aside: シングルカラムとダブルカラムの切り替え
+  chat: チャット
+
+copy_copyright:
+  author: 著者
+  link: リンク
+  source: ソース
+  info: 著作権は著者に帰属します。商業的利用の場合は著者に連絡して許可を得てください。非商業的利用の場合は出典を明記してください。
+
+Snackbar:
+  chs_to_cht: 繁体字に切り替えました
+  cht_to_chs: 簡体字に切り替えました
+  day_to_night: ダークモードに切り替えました
+  night_to_day: ライトモードに切り替えました
+
+loading: ローディング中...
+load_more: もっと見る
+
+error404: ページが見つかりません

languages/ko.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: 프레임워크
+  theme: 테마
+
+copy:
+  success: 복사 성공
+  error: 복사 실패
+  noSupport: 브라우저가 지원되지 않음
+
+page:
+  articles: 모든 글
+  tag: 태그
+  category: 카테고리
+  archives: 아카이브
+
+card_post_count: 댓글 수
+
+no_title: 제목 없음
+
+post:
+  created: 작성일
+  updated: 수정일
+  wordcount: 총 글자 수
+  min2read: 읽기 시간
+  min2read_unit: 분
+  page_pv: 조회수
+  comments: 댓글
+  copyright:
+    author: 작성자
+    link: 링크
+    copyright_notice: 저작권 고지
+    copyright_content: '이 블로그의 모든 글은 <a href="%s">%s</a> 라이선스를 따르며, 별도로 명시되지 않는 한 모든 권리를 보유합니다. 재배포 시 출처를 명시해 주세요: <a href="%s">%s</a>.'
+  recommend: 관련 글
+  edit: 편집
+
+search:
+  title: 검색
+  load_data: 데이터베이스 로드 중
+  input_placeholder: 글 검색
+  algolia_search:
+    hits_empty: '${query}에 대한 결과를 찾을 수 없습니다.'
+    hits_stats: '${hits}개의 결과를 ${time}ms 만에 찾음'
+  local_search:
+    hits_empty: '${query}에 대한 결과를 찾을 수 없습니다.'
+    hits_stats: '${hits}개의 글을 찾음'
+
+pagination:
+  prev: 이전
+  next: 다음
+
+comment: 댓글
+
+aside:
+  articles: 글
+  tags: 태그
+  categories: 카테고리
+  card_announcement: 공지
+  card_categories: 카테고리
+  card_tags: 태그
+  card_archives: 아카이브
+  card_recent_post: 최근 글
+  card_webinfo:
+    headline: 사이트 정보
+    article_name: 글 수
+    runtime:
+      name: 운영 시간
+      unit: 일
+    last_push_date:
+      name: 마지막 업데이트
+    site_wordcount: 총 글자 수
+    site_uv_name: 방문자 수
+    site_pv_name: 총 조회수
+  more_button: 더 보기
+  card_newest_comments:
+    headline: 최신 댓글
+    loading_text: 로딩 중...
+    error: 댓글을 가져올 수 없습니다. 설정을 확인해 주세요.
+    zero: 댓글 없음
+    image: 이미지
+    link: 링크
+    code: 코드
+  card_toc: 목차
+  card_post_series: 시리즈 글
+
+date_suffix:
+  just: 방금
+  min: 분 전
+  hour: 시간 전
+  day: 일 전
+  month: 달 전
+
+donate: 후원
+share: 공유
+
+rightside:
+  readmode_title: 읽기 모드
+  translate_title: 번체와 간체 전환
+  night_mode_title: 라이트/다크 모드 전환
+  back_to_top: 맨 위로
+  toc: 목차
+  scroll_to_comment: 댓글로 이동
+  setting: 설정
+  aside: 단일/이중 열 전환
+  chat: 채팅
+
+copy_copyright:
+  author: 작성자
+  link: 링크
+  source: 출처
+  info: 저작권은 작성자에게 있습니다. 상업적 사용을 위해서는 작성자의 허가를 받아야 하며, 비상업적 사용 시에는 출처를 명시해 주세요.
+
+Snackbar:
+  chs_to_cht: 번체로 전환되었습니다.
+  cht_to_chs: 간체로 전환되었습니다.
+  day_to_night: 다크 모드로 전환되었습니다.
+  night_to_day: 라이트 모드로 전환되었습니다.
+
+loading: 로딩 중...
+load_more: 더 보기
+
+error404: 페이지를 찾을 수 없습니다.

languages/zh-CN.yml

@@ -4,48 +4,45 @@ footer:
 
 copy:
   success: 复制成功
-  error: 复制错误
+  error: 复制失败
   noSupport: 浏览器不支持
 
 page:
-  articles: 文章总览
+  articles: 全部文章
   tag: 标签
   category: 分类
   archives: 归档
 
 card_post_count: 条评论
 
-sticky: 置顶
+no_title: 无标题
-no_title: 无题
 
 post:
   created: 发表于
   updated: 更新于
-  wordcount: 字数总计
+  wordcount: 总字数
   min2read: 阅读时长
   min2read_unit: 分钟
-  page_pv: 阅读量
+  page_pv: 浏览量
   comments: 评论数
   copyright:
     author: 文章作者
     link: 文章链接
     copyright_notice: 版权声明
     copyright_content: '本博客所有文章除特别声明外，均采用
-      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
+      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来源 <a href="%s" target="_blank">%s</a>！'
   recommend: 相关推荐
   edit: 编辑
 
 search:
   title: 搜索
-  load_data: 数据库加载中
+  load_data: 数据加载中
+  input_placeholder: 搜索文章
   algolia_search:
-    input_placeholder: 搜索文章
+    hits_empty: '未找到符合您查询的内容：${query}'
-    hits_empty: '找不到您查询的内容：${query}'
+    hits_stats: '找到 ${hits} 条结果，耗时 ${time} 毫秒'
-    hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
-
   local_search:
-    input_placeholder: 搜索文章
+    hits_empty: '未找到符合您查询的内容：${query}'
-    hits_empty: '找不到您查询的内容：${query}'
     hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
@@ -64,26 +61,27 @@ aside:
   card_archives: 归档
   card_recent_post: 最新文章
   card_webinfo:
-    headline: 网站资讯
+    headline: 网站信息
     article_name: 文章数目
     runtime:
-      name: 已运行时间
+      name: 运行时间
       unit: 天
     last_push_date:
       name: 最后更新时间
     site_wordcount: 本站总字数
     site_uv_name: 本站访客数
-    site_pv_name: 本站总访问量
+    site_pv_name: 本站总浏览量
   more_button: 查看更多
   card_newest_comments:
     headline: 最新评论
-    loading_text: 正在加载中...
+    loading_text: 加载中...
     error: 无法获取评论，请确认相关配置是否正确
-    zero: 没有评论
+    zero: 暂无评论
     image: 图片
     link: 链接
     code: 代码
   card_toc: 目录
+  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -92,16 +90,16 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 打赏
+donate: 赞助
 share: 分享
 
 rightside:
   readmode_title: 阅读模式
   translate_title: 简繁转换
-  night_mode_title: 浅色和深色模式转换
+  night_mode_title: 日间和夜间模式切换
   back_to_top: 回到顶部
   toc: 目录
-  scroll_to_comment: 直达评论
+  scroll_to_comment: 前往评论
   setting: 设置
   aside: 单栏和双栏切换
   chat: 聊天
@@ -113,12 +111,12 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  chs_to_cht: 你已切换为繁体
+  chs_to_cht: 已切换为繁体中文
-  cht_to_chs: 你已切换为简体
+  cht_to_chs: 已切换为简体中文
-  day_to_night: 你已切换为深色模式
+  day_to_night: 已切换为深色模式
-  night_to_day: 你已切换为浅色模式
+  night_to_day: 已切换为浅色模式
 
 loading: 加载中...
 load_more: 加载更多
 
-error404: 页面没有找到
+error404: 页面未找到

languages/zh-HK.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: 框架
+  theme: 主題
+
+copy:
+  success: 複製成功
+  error: 複製失敗
+  noSupport: 瀏覽器不支援
+
+page:
+  articles: 全部文章
+  tag: 標籤
+  category: 分類
+  archives: 歸檔
+
+card_post_count: 條評論
+
+no_title: 無標題
+
+post:
+  created: 發表於
+  updated: 更新於
+  wordcount: 字數統計
+  min2read: 閱讀時間
+  min2read_unit: 分鐘
+  page_pv: 瀏覽量
+  comments: 評論數
+  copyright:
+    author: 文章作者
+    link: 文章連結
+    copyright_notice: 版權聲明
+    copyright_content: '除特別聲明外，本博客所有文章均採用<a href="%s">%s</a> 授權協議。轉載請註明出處：<a href="%s">%s</a>。'
+  recommend: 相關文章
+  edit: 編輯
+
+search:
+  title: 搜尋
+  load_data: 正在加載數據庫
+  input_placeholder: 搜尋文章
+  algolia_search:
+    hits_empty: '未找到相關內容：${query}'
+    hits_stats: '找到 ${hits} 條結果，耗時 ${time} 毫秒'
+  local_search:
+    hits_empty: '未找到相關內容：${query}'
+    hits_stats: '找到 ${hits} 篇文章'
+
+pagination:
+  prev: 上一頁
+  next: 下一頁
+
+comment: 評論
+
+aside:
+  articles: 文章
+  tags: 標籤
+  categories: 分類
+  card_announcement: 公告
+  card_categories: 分類
+  card_tags: 標籤
+  card_archives: 歸檔
+  card_recent_post: 最新文章
+  card_webinfo:
+    headline: 網站資訊
+    article_name: 文章數目
+    runtime:
+      name: 運行時間
+      unit: 天
+    last_push_date:
+      name: 最後更新時間
+    site_wordcount: 總字數
+    site_uv_name: 訪客數
+    site_pv_name: 總瀏覽量
+  more_button: 查看更多
+  card_newest_comments:
+    headline: 最新評論
+    loading_text: 正在加載...
+    error: 無法取得評論，請確認配置是否正確
+    zero: 暫無評論
+    image: 圖片
+    link: 連結
+    code: 代碼
+  card_toc: 目錄
+  card_post_series: 系列文章
+
+date_suffix:
+  just: 剛剛
+  min: 分鐘前
+  hour: 小時前
+  day: 天前
+  month: 個月前
+
+donate: 贊助
+share: 分享
+
+rightside:
+  readmode_title: 閱讀模式
+  translate_title: 簡繁轉換
+  night_mode_title: 切換日夜模式
+  back_to_top: 回到頂部
+  toc: 目錄
+  scroll_to_comment: 前往評論
+  setting: 設定
+  aside: 單欄與雙欄切換
+  chat: 聊天
+
+copy_copyright:
+  author: 作者
+  link: 連結
+  source: 來源
+  info: 版權屬於作者所有。商業用途請聯絡作者獲得授權，非商業用途請註明出處。
+
+Snackbar:
+  chs_to_cht: 已切換為繁體中文
+  cht_to_chs: 已切換為簡體中文
+  day_to_night: 已切換為深色模式
+  night_to_day: 已切換為淺色模式
+
+loading: 正在加載...
+load_more: 加載更多
+
+error404: 未找到頁面

languages/zh-TW.yml

@@ -4,48 +4,44 @@ footer:
 
 copy:
   success: 複製成功
-  error: 複製錯誤
+  error: 複製失敗
   noSupport: 瀏覽器不支援
 
 page:
-  articles: 文章總覽
+  articles: 所有文章
   tag: 標籤
   category: 分類
   archives: 歸檔
 
-card_post_count: 條評論
+card_post_count: 則評論
 
-sticky: 置頂
+no_title: 無標題
-no_title: 無題
 
 post:
   created: 發表於
   updated: 更新於
-  wordcount: 字數總計
+  wordcount: 總字數
-  min2read: 閱讀時長
+  min2read: 閱讀時間
   min2read_unit: 分鐘
-  page_pv: 閱讀量
+  page_pv: 瀏覽量
   comments: 評論數
   copyright:
     author: 文章作者
     link: 文章連結
     copyright_notice: 版權聲明
-    copyright_content: '本部落格所有文章除特別聲明外，均採用
+    copyright_content: '本部落格所有文章除特別聲明外，均採用<a href="%s" target="_blank">%s</a> 授權協議。轉載請註明來源 <a href="%s" target="_blank">%s</a>！'
-      <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
   recommend: 相關推薦
   edit: 編輯
 
 search:
   title: 搜尋
-  load_data: 資料庫載入中
+  load_data: 資料載入中
+  input_placeholder: 搜尋文章
   algolia_search:
-    input_placeholder: 搜尋文章
+    hits_empty: '找不到符合您查詢的內容：${query}'
-    hits_empty: '找不到您查詢的內容：${query}'
+    hits_stats: '找到 ${hits} 筆結果，耗時 ${time} 毫秒'
-    hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
-
   local_search:
-    input_placeholder: 搜尋文章
+    hits_empty: '找不到符合您查詢的內容：${query}'
-    hits_empty: '找不到您查詢的內容：${query}'
     hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
@@ -65,25 +61,26 @@ aside:
   card_recent_post: 最新文章
   card_webinfo:
     headline: 網站資訊
-    article_name: 文章數目
+    article_name: 文章數量
     runtime:
-      name: 已執行時間
+      name: 運行時間
       unit: 天
     last_push_date:
       name: 最後更新時間
-    site_wordcount: 本站總字數
+    site_wordcount: 總字數
-    site_uv_name: 本站訪客數
+    site_uv_name: 訪客數
-    site_pv_name: 本站總訪問量
+    site_pv_name: 總瀏覽量
   more_button: 檢視更多
   card_newest_comments:
     headline: 最新評論
-    loading_text: 正在載入中...
+    loading_text: 載入中...
     error: 無法獲取評論，請確認相關配置是否正確
-    zero: 沒有評論
+    zero: 尚無評論
     image: 圖片
     link: 連結
     code: 程式碼
   card_toc: 目錄
+  card_post_series: 系列文章
 
 date_suffix:
   just: 剛剛
@@ -92,16 +89,16 @@ date_suffix:
   day: 天前
   month: 個月前
 
-donate: 打賞
+donate: 贊助
 share: 分享
 
 rightside:
   readmode_title: 閱讀模式
-  translate_title: 簡繁轉換
+  translate_title: 繁簡轉換
-  night_mode_title: 淺色和深色模式轉換
+  night_mode_title: 日夜模式切換
-  back_to_top: 回到頂部
+  back_to_top: 回到頂端
   toc: 目錄
-  scroll_to_comment: 直達評論
+  scroll_to_comment: 前往評論
   setting: 設定
   aside: 單欄和雙欄切換
   chat: 聊天
@@ -110,15 +107,15 @@ copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。如需商業轉載，請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體
+  chs_to_cht: 已切換為繁體中文
-  cht_to_chs: 你已切換為簡體
+  cht_to_chs: 已切換為簡體中文
-  day_to_night: 你已切換為深色模式
+  day_to_night: 已切換為深色模式
-  night_to_day: 你已切換為淺色模式
+  night_to_day: 已切換為淺色模式
 
 loading: 載入中...
 load_more: 載入更多
 
-error404: 頁面沒有找到
+error404: 找不到頁面

layout/archive.pug

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

layout/category.pug

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

layout/includes/404.pug

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

layout/includes/additional-js.pug

@@ -5,23 +5,18 @@ div
   if theme.translate.enable
     script(src=url_for(theme.asset.translate))
 
-  if theme.medium_zoom
+  if theme.lightbox
-    script(src=url_for(theme.asset.medium_zoom))
+    script(src=url_for(theme.asset[theme.lightbox]))
-  else if theme.fancybox
-    script(src=url_for(theme.asset.fancybox))
 
   if theme.instantpage
     script(src=url_for(theme.asset.instantpage), type='module')
 
-  if theme.lazyload.enable
+  if theme.lazyload.enable && !theme.lazyload.native
     script(src=url_for(theme.asset.lazyload))
 
   if theme.snackbar.enable
     script(src=url_for(theme.asset.snackbar))
 
-  if theme.pangu.enable
-    != partial("includes/third-party/pangu.pug", {}, { cache: true })
-
   .js-pjax
     if needLoadCountJs
       != partial("includes/third-party/card-post-count/index", {}, { cache: true })
@@ -30,7 +25,6 @@ div
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug
-
     include ./third-party/abcjs/index.pug
 
     if commentsJsLoad
@@ -38,28 +32,26 @@ div
 
   != partial("includes/third-party/prismjs", {}, { cache: true })
 
-  if theme.aside.enable && theme.newest_comments.enable
+  if theme.aside.enable && theme.aside.card_newest_comments.enable
-    if theme.pjax.enable
+    if theme.pjax.enable || (globalPageType !== 'post' && page.aside !== false)
-      != 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 })
 
   != fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
   != partial("includes/third-party/effect", {}, { cache: true })
-
   != partial("includes/third-party/chat/index", {}, { cache: true })
 
   if theme.aplayerInject && theme.aplayerInject.enable
-    if theme.pjax.enable || theme.aplayerInject.per_page
+    if theme.pjax.enable || theme.aplayerInject.per_page || page.aplayer
-      include ./third-party/aplayer.pug
-    else if page.aplayer
       include ./third-party/aplayer.pug
 
   if theme.pjax.enable
     != partial("includes/third-party/pjax", {}, { cache: true })
 
+  if theme.umami_analytics.enable
+    != partial("includes/third-party/umami_analytics", {}, { cache: true })
+
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
     script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
 
-  !=partial('includes/third-party/search/index', {}, {cache: true})
+  != partial('includes/third-party/search/index', {}, { cache: true })

layout/includes/footer.pug

@@ -1,17 +1,19 @@
 #footer-wrap
   if theme.footer.owner.enable
-    - var now = new Date()
+    - const currentYear = new Date().getFullYear()
-    - var nowYear = now.getFullYear()
+    - const sinceYear = theme.footer.owner.since
-    if theme.footer.owner.since && theme.footer.owner.since != nowYear
+    .copyright
-      .copyright!= `©${theme.footer.owner.since} - ${nowYear} By ${config.author}`
+      if sinceYear && sinceYear != currentYear
+        != `©${sinceYear} - ${currentYear} By ${config.author}`
       else
-      .copyright!= `©${nowYear} By ${config.author}`
+        != `©${currentYear} By ${config.author}`
   if theme.footer.copyright
+    - const v = getVersion()
     .framework-info
       span= _p('footer.framework') + ' '
-      a(href='https://hexo.io')= 'Hexo'
+      a(href='https://hexo.io')= `Hexo ${v.hexo}`
       span.footer-separator |
       span= _p('footer.theme') + ' '
-      a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly'
+      a(href='https://github.com/jerryc127/hexo-theme-butterfly')= `Butterfly ${v.theme}`
   if theme.footer.custom_text
-    .footer_custom_text!=`${theme.footer.custom_text}`
+    .footer_custom_text!= theme.footer.custom_text

layout/includes/head.pug

@@ -1,12 +1,18 @@
 - var pageTitle
-- is_archive() ? page.title = findArchivesTitle(page, theme.menu, date) : ''
+- globalPageType === 'archive' ? page.title = findArchivesTitle(page, theme.menu, date) : ''
-- if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
+case globalPageType
-- else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
+  when 'tag'
-- else if (is_current('/404.html', [strict])) pageTitle = _p('error404')
+    - pageTitle = _p('page.tag') + ': ' + page.tag
-- else pageTitle = page.title || config.title || ''
+  when 'category'
+    - pageTitle = _p('page.category') + ': ' + page.category
+  when '404'
+    - pageTitle = _p('error404')
+  default
+    - pageTitle = page.title || config.title || ''
+
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
-- var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
+- var tabTitle = globalPageType === 'home' || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
 - var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#ffffff'
@@ -25,6 +31,9 @@ meta(name="theme-color" content=themeColor)
 //- Open_Graph
 include ./head/Open_Graph.pug
 
+//- Structured Data
+include ./head/structured_data.pug
+
 !=favicon_tag(theme.favicon || config.favicon)
 link(rel="canonical" href=urlNoIndex(null,config.pretty_urls.trailing_index,config.pretty_urls.trailing_html))
 
@@ -40,14 +49,16 @@ if (theme.pwa && theme.pwa.enable)
 
 //- main css
 link(rel='stylesheet', href=url_for(theme.asset.main_css))
-link(rel='stylesheet', href=url_for(theme.asset.fontawesome) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.asset.fontawesome))
 
 if (theme.snackbar && theme.snackbar.enable)
   link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")
 
-if theme.fancybox
+if theme.lightbox === 'fancybox'
   link(rel='stylesheet' href=url_for(theme.asset.fancybox_css) media="print" onload="this.media='all'")
 
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
+
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})
 
@@ -55,15 +66,12 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font &&　theme.blog_title_font.font_link
+if theme.blog_title_font && theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
-include ./head/noscript.pug
-
-!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
 !=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

@@ -2,7 +2,7 @@ if theme.Open_Graph_meta.enable
   -
     const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
     let ogOption = Object.assign({
-      type: is_post() ? 'article' : 'website',
+      type: globalPageType === 'post' ? 'article' : 'website',
       image: coverVal ? full_url_for(coverVal) : '',
       fb_admins: theme.facebook_comments.user_id || '',
       fb_app_id: theme.facebook_comments.app_id || '',
@@ -10,5 +10,7 @@ if theme.Open_Graph_meta.enable
   -
   != open_graph(ogOption)
 else
-  meta(name="description" content=page_description())
+  - const description = page.description || page.content || page.title || config.description
+  if description
+    meta(name="description" content=truncate(description, 150))
 

layout/includes/head/analytics.pug

@@ -7,14 +7,20 @@ if theme.baidu_analytics
       var s = document.getElementsByTagName("script")[0];
       s.parentNode.insertBefore(hm, s);
     })();
+    btf.addGlobalFn('pjaxComplete', () => {
+      _hmt.push(['_trackPageview',window.location.pathname])
+    }, 'baidu_analytics')
 
 if theme.google_analytics
   script(async src=`https://www.googletagmanager.com/gtag/js?id=${theme.google_analytics}`)
   script.
-    window.dataLayer = window.dataLayer || [];
+    window.dataLayer = window.dataLayer || []
-    function gtag(){dataLayer.push(arguments);}
+    function gtag(){dataLayer.push(arguments)}
-    gtag('js', new Date());
+    gtag('js', new Date())
-    gtag('config', '!{theme.google_analytics}');
+    gtag('config', '!{theme.google_analytics}')
+    btf.addGlobalFn('pjaxComplete', () => {
+      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname})
+    }, 'google_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

@@ -1,28 +1,30 @@
 -
-  let algolia = 'undefined';
+  let algolia = 'undefined'
-  let env = process.env;
+  if (theme.search.use === 'algolia_search') {
-  if (theme.algolia_search.enable) {
+    const { ALGOLIA_APP_ID, ALGOLIA_API_KEY, ALGOLIA_INDEX_NAME } = process.env
+    const { appId, applicationID, apiKey, indexName } = config.algolia
     algolia = JSON.stringify({
-      appId: env.ALGOLIA_APP_ID || config.algolia.appId || config.algolia.applicationID,
+      appId: ALGOLIA_APP_ID || appId || applicationID,
-      apiKey: env.ALGOLIA_API_KEY || config.algolia.apiKey,
+      apiKey: ALGOLIA_API_KEY || apiKey,
-      indexName: env.ALGOLIA_INDEX_NAME || config.algolia.indexName,
+      indexName: ALGOLIA_INDEX_NAME || indexName,
-      hits: theme.algolia_search.hits,
+      hitsPerPage: theme.search.algolia_search.hitsPerPage,
       // search languages
       languages: {
-        input_placeholder: _p("search.algolia_search.input_placeholder"),
+        input_placeholder: theme.search.placeholder || _p("search.input_placeholder"),
         hits_empty: _p("search.algolia_search.hits_empty"),
         hits_stats: _p("search.algolia_search.hits_stats"),
       }
     })
   }
 
-  let localSearch = 'undefined';
+  let localSearch = 'undefined'
-  if (theme.local_search && theme.local_search.enable) {
+  if (theme.search.use === 'local_search') {
+    const { CDN, preload, top_n_per_article, unescape } = theme.search.local_search
     localSearch = JSON.stringify({
-      path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
+      path: CDN || config.root + config.search.path,
-      preload: theme.local_search.preload,
+      preload,
-      top_n_per_article: theme.local_search.top_n_per_article,
+      top_n_per_article,
-      unescape: theme.local_search.unescape,
+      unescape,
       languages: {
         // search languages
         hits_empty: _p("search.local_search.hits_empty"),
@@ -31,7 +33,7 @@
     })
   }
 
-  let translate = 'undefined';
+  let translate = 'undefined'
   if (theme.translate && theme.translate.enable){
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
@@ -41,7 +43,7 @@
     })
   }
 
-  let copyright = 'undefined';
+  let copyright = 'undefined'
   if (theme.copy.enable && theme.copy.copyright.enable){
     copyright = JSON.stringify({
       limitCount: theme.copy.copyright.limit_count,
@@ -54,7 +56,7 @@
     })
   }
 
-  let Snackbar = 'undefined';
+  let Snackbar = 'undefined'
   if (theme.snackbar && theme.snackbar.enable) {
     Snackbar = JSON.stringify({
       chs_to_cht: _p("Snackbar.chs_to_cht"),
@@ -67,23 +69,18 @@
     })
   }
 
-  let noticeOutdate = 'undefined';
+  let highlight = 'undefined'
-  if (theme.noticeOutdate && theme.noticeOutdate.enable) {
+  let syntaxHighlighter = config.syntax_highlighter
-    noticeOutdate = JSON.stringify({
+  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable)
-      limitDay: theme.noticeOutdate.limit_day,
+  if (highlightEnable) {
-      position: theme.noticeOutdate.position,
+    const { copy, language, height_limit, fullpage, macStyle } = theme.code_blocks
-      messagePrev: theme.noticeOutdate.message_prev,
-      messageNext: theme.noticeOutdate.message_next,
-    })
-  }
-
-  let highlight = 'undefined';
-  if ((config.highlight && config.highlight.enable) || (config.prismjs && config.prismjs.enable)) {
     highlight = JSON.stringify({
-      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
+      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
-      highlightCopy: theme.highlight_copy,
+      highlightCopy: copy,
-      highlightLang: theme.highlight_lang,
+      highlightLang: language,
-      highlightHeightLimit: theme.highlight_height_limit
+      highlightHeightLimit: height_limit,
+      highlightFullpage: fullpage,
+      highlightMacStyle: macStyle
     })
   }
 
@@ -93,7 +90,6 @@ script.
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},
-    noticeOutdate: !{noticeOutdate},
     highlight: !{highlight},
     copy: {
       success: '!{_p("copy.success")}',
@@ -104,7 +100,7 @@ script.
       homepage: !{theme.post_meta.page.date_format === 'relative'},
       post: !{theme.post_meta.post.date_format === 'relative'}
     },
-    runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
+    runtime: '!{theme.aside.card_webinfo.runtime_date ? _p("aside.card_webinfo.runtime.unit") : ""}',
     dateSuffix: {
       just: '!{_p("date_suffix.just")}',
       min: '!{_p("date_suffix.min")}',
@@ -113,19 +109,18 @@ script.
       month: '!{_p("date_suffix.month")}'
     },
     copyright: !{copyright},
-    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
+    lightbox: '!{ theme.lightbox || 'null' }',
     Snackbar: !{Snackbar},
-    source: {
+    infinitegrid: {
-      justifiedGallery: {
+      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
-        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
+      buttonText: '!{_p("load_more")}'
-        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
-      }
     },
     isPhotoFigcaption: !{theme.photofigcaption},
-    islazyload: !{theme.lazyload.enable},
+    islazyloadPlugin: !{theme.lazyload.enable && !theme.lazyload.native},
     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

@@ -2,29 +2,24 @@
   const titleVal = pageTitle.replace(/'/ig,"\\'")
 
   let isHighlightShrink
-  if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined'
+  if (theme.code_blocks.shrink == 'none') isHighlightShrink = 'undefined'
-  else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink
+  else if (typeof page.highlight_shrink == 'boolean') isHighlightShrink = page.highlight_shrink
-  else isHighlightShrink = theme.highlight_shrink
+  else isHighlightShrink = theme.code_blocks.shrink
 
   var showToc = false
   if (theme.aside.enable && page.aside !== false) {
     let tocEnable = false
-    if (is_post()) {
+    if (globalPageType === 'post' && theme.toc.post) tocEnable = true
-      if (theme.toc.post) tocEnable = true
+    else if (globalPageType === 'page' && theme.toc.page) tocEnable = true
-    } else if (is_page()) {
+    const pageToc = typeof page.toc === 'boolean' ? page.toc : tocEnable
-      if (theme.toc.page) tocEnable = true
+    showToc = pageToc && (toc(page.content) !== '' || page.encrypt === true)
-    }
-    const pageToc = page.toc === true || page.toc === false ? page.toc : tocEnable
-    showToc = pageToc && (toc(page.content) !== '' || page.encrypt == true )
   }
 -
 
 script#config-diff.
   var GLOBAL_CONFIG_SITE = {
     title: '!{titleVal}',
-    isPost: !{is_post()},
-    isHome: !{is_home()},
     isHighlightShrink: !{isHighlightShrink},
     isToc: !{showToc},
-    postUpdate: '!{full_date(page.updated)}'
+    pageType: '!{page.type == 'shuoshuo' ? 'shuoshuo' : globalPageType}'
   }

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='')

layout/includes/head/pwa.pug

@@ -1,11 +1,13 @@
-link(rel="manifest" href=url_for(theme.pwa.manifest))
+- const { manifest, theme_color, apple_touch_icon, favicon_32_32, favicon_16_16, mask_icon } = theme.pwa
-if(theme.pwa.theme_color) 
+
-  meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
+link(rel="manifest" href=url_for(manifest))
-if(theme.pwa.apple_touch_icon) 
+if theme_color
-  link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
+  meta(name="msapplication-TileColor" content=theme_color)
-if(theme.pwa.favicon_32_32) 
+if apple_touch_icon
-  link(rel="icon" type="image/png" sizes="32x32" href=url_for(theme.pwa.favicon_32_32))
+  link(rel="apple-touch-icon" sizes="180x180" href=url_for(apple_touch_icon))
-if(theme.pwa.favicon_16_16)
+if favicon_32_32
-  link(rel="icon" type="image/png" sizes="16x16" href=url_for(theme.pwa.favicon_16_16))
+  link(rel="icon" type="image/png" sizes="32x32" href=url_for(favicon_32_32))
-if(theme.pwa.mask_icon)
+if favicon_16_16
-  link(rel="mask-icon" href=url_for(theme.pwa.mask_icon) color="#5bbad5")
+  link(rel="icon" type="image/png" sizes="16x16" href=url_for(favicon_16_16))
+if mask_icon
+  link(rel="mask-icon" href=url_for(mask_icon) color="#5bbad5")

layout/includes/head/structured_data.pug

@@ -0,0 +1,34 @@
+if theme.structured_data && page.layout === 'post'
+  -
+    // use json-ld to add structured data
+
+    const title = page.title
+    const url = page.permalink
+    const imageVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
+    const image = imageVal ? full_url_for(imageVal) : ''
+    const datePublished = page.date.toISOString()
+    const dateModified = (page.updated || page.date).toISOString()
+    const author = page.copyright_author || config.author
+    const authorHrefVal = page.copyright_author_href || theme.post_copyright.author_href || site.url;
+    const authorHref = full_url_for(authorHrefVal);
+
+    const jsonLd = {
+      "@context": "https://schema.org",
+      "@type": "BlogPosting",
+      "headline": title,
+      "url": url,
+      "image": image,
+      "datePublished": datePublished,
+      "dateModified": dateModified,
+      "author": [{
+        "@type": "Person",
+        "name": author,
+        "url": authorHref
+      }]
+    };
+
+    jsonLdScript = JSON.stringify(jsonLd, null, 2);
+  -
+
+  script(type="application/ld+json").
+    !{jsonLdScript}

layout/includes/header/index.pug

@@ -1,52 +1,52 @@
+-
+  const returnTopImg = img => img !== false ? img || theme.default_top_img : false
+  const isFixedClass = theme.nav.fixed ? ' fixed' : ''
+  var top_img = false
+  let headerClassName = 'not-top-img'
+  var bg_img = ''
+
 if !theme.disable_top_img && page.top_img !== false
-  if is_post()
+  case globalPageType
-    - var top_img = page.top_img || page.cover || theme.default_top_img
+    when 'post'
-  else if is_page()
+      - top_img = page.top_img || page.cover || theme.default_top_img
-    - var top_img = page.top_img || theme.default_top_img
+    when 'page'
-  else if is_tag()
+      - top_img = page.top_img || theme.default_top_img
-    - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag] 
+    when 'tag'
-    - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
+      - top_img = theme.tag_per_img && theme.tag_per_img[page.tag] || returnTopImg(theme.tag_img)
-  else if is_category()
+    when 'category'
-    - var top_img = theme.category_per_img && theme.category_per_img[page.category]
+      - top_img = theme.category_per_img && theme.category_per_img[page.category] || returnTopImg(theme.category_img)
-    - top_img = top_img ? top_img : (theme.category_img !== false ? theme.category_img || theme.default_top_img : false)
+    when 'home'
-  else if is_home()
+      - top_img = returnTopImg(theme.index_img)
-    - var top_img = theme.index_img !== false ? theme.index_img || theme.default_top_img : false
+    when 'archive'
-  else if is_archive()
+      - top_img = returnTopImg(theme.archive_img)
-    - var top_img = theme.archive_img !== false ? theme.archive_img || theme.default_top_img : false
+    default
-  else
+      - top_img = page.top_img || theme.default_top_img
-    - var top_img = page.top_img || theme.default_top_img
 
   if top_img !== false
-    - var imgSource = top_img && isImgOrUrl(top_img) ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
+    - bg_img = getBgPath(top_img)
-    - var bg_img = top_img ? imgSource : ''
+    - headerClassName = globalPageType === 'home' ? 'full_page' : globalPageType === 'post' ? 'post-bg' : 'not-home-page'
-    - 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
-    - var isHomeClass = 'not-top-img'
-else
-  - var top_img = false
-  - var isHomeClass = 'not-top-img'
 
-- const isFixedClass = theme.nav.fixed ? ' fixed' : ''
+header#page-header(class=`${headerClassName + isFixedClass}` style=bg_img)
-
+  include ./nav.pug
-header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
-  !=partial('includes/header/nav', {}, {cache: true})
   if top_img !== false
-    if is_post()
+    if globalPageType === 'post'
       include ./post-info.pug
-    else if is_home() 
+    else if globalPageType === 'home'
       #site-info
-        h1#site-title=site_title
+        h1#site-title=config.title
         if theme.subtitle.enable
           - var loadSubJs = true
           #site-subtitle
             span#subtitle
-        if(theme.social)
+        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
       #page-site-info
-        h1#site-title=site_title
+        h1#site-title=page.title || page.tag || page.category
+  else
+    //- improve seo
+    if globalPageType !== 'post'
+      h1.title-seo=page.title || page.tag || page.category || config.title

layout/includes/header/menu_item.pug

@@ -3,25 +3,25 @@ if theme.menu
     each value, label in theme.menu
       if typeof value !== 'object'
         .menus_item
-          - const valueArray = value.split('||')
+          - const [link, icon] = value.split('||').map(part => trim(part))
-          a.site-page(href=url_for(trim(valueArray[0])))
+          a.site-page(href=url_for(link))
-            if valueArray[1]
+            if icon
-              i.fa-fw(class=trim(valueArray[1]))
+              i.fa-fw(class=icon)
-            span=' '+label
+            span= ' ' + label
       else
         .menus_item
-          - const labelArray = label.split('||')
+          - const [groupLabel, groupIcon, groupClass] = label.split('||').map(part => trim(part))
-          - const hideClass = labelArray[2] && trim(labelArray[2]) === 'hide' ? 'hide' : ''
+          - const hideClass = groupClass === 'hide' ? 'hide' : ''
-          a.site-page.group(class=`${hideClass}` href='javascript:void(0);')
+          span.site-page.group(class=hideClass)
-            if labelArray[1]
+            if groupIcon
-              i.fa-fw(class=trim(labelArray[1]))
+              i.fa-fw(class=groupIcon)
-            span=' '+ trim(labelArray[0])
+            span= ' ' + groupLabel
             i.fas.fa-chevron-down
           ul.menus_item_child
-            each val,lab in value 
+            each val, lab in value
-              - const valArray = val.split('||')
+              - const [childLink, childIcon] = val.split('||').map(part => trim(part))
               li
-                a.site-page.child(href=url_for(trim(valArray[0])))
+                a.site-page.child(href=url_for(childLink))
-                  if valArray[1]
+                  if childIcon
-                    i.fa-fw(class=trim(valArray[1]))
+                    i.fa-fw(class=childIcon)
-                  span=' '+ lab
+                  span= ' ' + lab

layout/includes/header/nav.pug

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

layout/includes/header/post-info.pug

@@ -7,38 +7,37 @@
 
   #post-meta
     .meta-firstline
-      if (theme.post_meta.post.date_type)
+      if theme.post_meta.post.date_type
         span.post-meta-date
-          if (theme.post_meta.post.date_type === 'both')
+          if theme.post_meta.post.date_type === 'both'
             i.far.fa-calendar-alt.fa-fw.post-meta-icon
             span.post-meta-label= _p('post.created')
-            time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format)
+            time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))= date(page.date, config.date_format)
             span.post-meta-separator |
             i.fas.fa-history.fa-fw.post-meta-icon
             span.post-meta-label= _p('post.updated')
-            time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format)
+            time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))= date(page.updated, config.date_format)
           else
             - let data_type_update = theme.post_meta.post.date_type === 'updated'
             - let date_type = data_type_update ? 'updated' : 'date'
-            - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt'
+            - let date_icon = data_type_update ? 'fas fa-history' : 'far fa-calendar-alt'
             - 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= date_title
-            time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format)
+            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)
+      if theme.post_meta.post.categories && page.categories.data.length > 0
         span.post-meta-categories
-          if (theme.post_meta.post.date_type)
+          if theme.post_meta.post.date_type
             span.post-meta-separator |
-
           each item, index in page.categories.data
             i.fas.fa-inbox.fa-fw.post-meta-icon
             a(href=url_for(item.path)).post-meta-categories #[=item.name]
-            if (index < page.categories.data.length - 1)
+            if index < page.categories.data.length - 1
               i.fas.fa-angle-right.post-meta-separator
 
     .meta-secondline
       - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
-      if (postWordcount)
+      if postWordcount
         span.post-meta-separator |
         span.post-meta-wordcount
           if theme.wordcount.post_wordcount
@@ -53,40 +52,46 @@
             span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
 
       //- for pv and count
-      mixin pvBlock(parent_id,parent_class,parent_title)
+      mixin pvBlock(parent_id, parent_class, parent_title)
         span.post-meta-separator |
-        span(class=parent_class id=parent_id data-flag-title=page.title)
+        span(class=parent_class id=parent_id data-flag-title=parent_title)
           i.far.fa-eye.fa-fw.post-meta-icon
-          span.post-meta-label=_p('post.page_pv') + ':'
+          span.post-meta-label= _p('post.page_pv') + ':'
           if block
             block
 
-      - const commentUse = comments.use
+      mixin otherPV()
+        if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
+          +pvBlock('', '', '')
+            span#umamiPV(data-path=url_for(page.path))
+              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
+
+      - const commentUse = comments.use && comments.use[0]
       if page.comments !== false && commentUse && !comments.lazyload
-        if commentUse[0] === 'Valine' && theme.valine.visitor
+        if commentUse === 'Valine' && theme.valine.visitor
-          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+          +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
+        else if commentUse === 'Waline' && theme.waline.pageview
-          +pvBlock('','','')
+          +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
+        else if commentUse === 'Twikoo' && theme.twikoo.visitor
-          +pvBlock('','','')
+          +pvBlock('', '', '')
             span#twikoo_visitors
               i.fa-solid.fa-spinner.fa-spin
-        else if commentUse[0] === 'Artalk' && theme.artalk.visitor
+        else if commentUse === 'Artalk' && theme.artalk.visitor
-          +pvBlock('','','')
+          +pvBlock('', '', '')
             span#ArtalkPV
               i.fa-solid.fa-spinner.fa-spin
-        else if theme.busuanzi.page_pv
+        else
-          +pvBlock('','post-meta-pv-cv','')
+          +otherPV()
-            span#busuanzi_value_page_pv
+      else
-              i.fa-solid.fa-spinner.fa-spin
+        +otherPV()
-      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]
@@ -102,13 +107,11 @@
         case whichCount
           when 'Disqus'
             +countBlock
-              span.disqus-comment-count
+              a.disqus-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 'Disqusjs'
             +countBlock
-              a(href=full_url_for(page.path) + '#disqusjs')
+              a.disqusjs-comment-count(href=full_url_for(page.path) + '#post-comment')
-                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
                 i.fa-solid.fa-spinner.fa-spin
           when 'Valine'
             +countBlock
@@ -142,5 +145,5 @@
           when 'Artalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.artalk-count
+                span#ArtalkCount
                   i.fa-solid.fa-spinner.fa-spin

layout/includes/header/social.pug

@@ -1,4 +1,8 @@
 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]))
+    const [link, title, color] = url.split('||').map(i => trim(i))
-    i(class=icon style=url.split('||')[2] === undefined ? '' : `color: ${trim(url.split('||')[2]).replace(/[\'\"]/g, '')};`)
+    const href = url_for(link)
+    const iconStyle = color ? `color: ${color.replace(/[\'\"]/g, '')};` : ''
+    const iconTitle = title || ''
+  a.social-icon(href=href target="_blank" title=iconTitle)
+    i(class=icon style=iconStyle)

layout/includes/layout.pug

@@ -1,22 +1,22 @@
+- var globalPageType = getPageType(page, is_home)
 - 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
+- page.aside = globalPageType === 'archive' ? theme.aside.display.archive: globalPageType === 'category' ? theme.aside.display.category : globalPageType === 'tag' ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
-- var pageType = is_post() ? 'post' : 'page'
+- var pageType = globalPageType === 'post' ? 'post' : 'page'
+- pageType = page.type ? pageType + ' type-' + page.type : pageType
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
   head
     include ./head.pug
   body
-    if theme.preloader.enable
     !=partial('includes/loading/index', {}, {cache: true})
 
     if theme.background
-      #web_bg
+      #web_bg(style=getBgPath(theme.background))
 
     !=partial('includes/sidebar', {}, {cache: true})
 
-    if page.type !== '404'
     #body-wrap(class=pageType)
       include ./header/index.pug
 
@@ -28,20 +28,10 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
           if theme.aside.enable && page.aside !== false
             include widget/index.pug
 
-        - var footerBg = theme.footer_bg
+      - const footerBg = theme.footer_img
-        if (footerBg)
+      - const footer_bg = footerBg ? footerBg === true ? bg_img : getBgPath(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
-          - var footer_bg = ''
-
       footer#footer(style=footer_bg)
         !=partial('includes/footer', {}, {cache: true})
 
-    else
-      include ./404.pug
-
     include ./rightside.pug
     include ./additional-js.pug

layout/includes/loading/fullpage-loading.pug

@@ -9,21 +9,25 @@
     .loading-word= _p('loading')
 
 script.
+  (()=>{
+    const $loadingBox = document.getElementById('loading-box')
+    const $body = document.body
     const preloader = {
       endLoading: () => {
-      document.body.style.overflow = '';
+        $body.style.overflow = ''
-      document.getElementById('loading-box').classList.add("loaded")
+        $loadingBox.classList.add('loaded')
       },
       initLoading: () => {
-      document.body.style.overflow = 'hidden';
+        $body.style.overflow = 'hidden'
-      document.getElementById('loading-box').classList.remove("loaded")
+        $loadingBox.classList.remove('loaded')
       }
     }
 
     preloader.initLoading()
-  window.addEventListener('load',()=> { preloader.endLoading() })
+    window.addEventListener('load', preloader.endLoading)
 
     if (!{theme.pjax && theme.pjax.enable}) {
-    document.addEventListener('pjax:send', () => { preloader.initLoading() })
+      btf.addGlobalFn('pjaxSend', preloader.initLoading, 'preloader_init')
-    document.addEventListener('pjax:complete', () => { preloader.endLoading() })
+      btf.addGlobalFn('pjaxComplete', preloader.endLoading, 'preloader_end')
     }
+  })()

layout/includes/loading/index.pug

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

layout/includes/loading/pace.pug

@@ -3,9 +3,10 @@ script.
     restartOnPushState: false
   }
 
-  document.addEventListener('pjax:send', () => {
+  btf.addGlobalFn('pjaxSend', () => {
     Pace.restart()
-  })
+  }, '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

@@ -1,14 +1,14 @@
 mixin articleSort(posts)
   .article-sort
-    - var year
+    - let year
-    - posts.each(function (article) {
+    - posts.forEach(article => {
-      - let tempYear = date(article.date, 'YYYY')
+      - const tempYear = date(article.date, 'YYYY')
-      - let no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
+      - const noCoverClass = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
-      - let title = article.title || _p('no_title')
+      - const title = article.title || _p('no_title')
       if tempYear !== year
         - year = tempYear
         .article-sort-item.year= year
-      .article-sort-item(class=no_cover)
+      .article-sort-item(class=noCoverClass)
         if article.cover && theme.cover.archives_enable
           a.article-sort-item-img(href=url_for(article.path) title=title)
             if article.cover_type === 'img'

layout/includes/mixins/indexPostUI.pug

@@ -0,0 +1,116 @@
+mixin indexPostUI()
+  - const indexLayout = theme.index_layout
+  - const masonryLayoutClass = (indexLayout === 6 || indexLayout === 7) ? 'masonry' : ''
+  #recent-posts.recent-posts.nc(class=masonryLayoutClass)
+    .recent-post-items
+      each article, index in page.posts.data
+        .recent-post-item
+          - const link = article.link || article.path
+          - const title = article.title || _p('no_title')
+          - const leftOrRight = indexLayout === 3 ? (index % 2 === 0 ? 'left' : 'right') : (indexLayout === 2 ? 'right' : '')
+          - const post_cover = article.cover
+          - const no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
+
+          if post_cover && theme.cover.index_enable
+            .post_cover(class=leftOrRight)
+              a(href=url_for(link) title=title)
+                if article.cover_type === 'img'
+                  img.post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+                else
+                  div.post-bg(style=`background: ${post_cover}`)
+          .recent-post-info(class=no_cover)
+            a.article-title(href=url_for(link) title=title)
+              if globalPageType === 'home' && (article.top || article.sticky > 0)
+                i.fas.fa-thumbtack.sticky
+              = title
+            .article-meta-wrap
+              if theme.post_meta.page.date_type
+                span.post-meta-date
+                  if theme.post_meta.page.date_type === 'both'
+                    i.far.fa-calendar-alt
+                    span.article-meta-label=_p('post.created')
+                    time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
+                    span.article-meta-separator |
+                    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)
+                  else
+                    - const data_type_updated = theme.post_meta.page.date_type === 'updated'
+                    - const date_type = data_type_updated ? 'updated' : 'date'
+                    - const date_icon = data_type_updated ? 'fas fa-history' : 'far fa-calendar-alt'
+                    - const date_title = data_type_updated ? _p('post.updated') : _p('post.created')
+                    i(class=date_icon)
+                    span.article-meta-label= date_title
+                    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 |
+                  each item, index in article.categories.data
+                    i.fas.fa-inbox
+                    a(href=url_for(item.path)).article-meta__categories #[=item.name]
+                    if index < article.categories.data.length - 1
+                      i.fas.fa-angle-right.article-meta-link
+              if theme.post_meta.page.tags && article.tags.length > 0
+                span.article-meta.tags
+                  span.article-meta-separator |
+                  each item, index in article.tags.data
+                    i.fas.fa-tag
+                    a(href=url_for(item.path)).article-meta__tags #[=item.name]
+                    if index < article.tags.data.length - 1
+                      span.article-meta-link #[='•']
+
+              mixin countBlockInIndex
+                - needLoadCountJs = true
+                span.article-meta
+                  span.article-meta-separator |
+                  i.fas.fa-comments
+                  if block
+                    block
+                  span.article-meta-label= ' ' + _p('card_post_count')
+
+              if theme.comments.card_post_count && theme.comments.use
+                case theme.comments.use[0]
+                  when 'Disqus'
+                  when 'Disqusjs'
+                    +countBlockInIndex
+                      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')
+                        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(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
+            - const content = postDesc(article)
+            if content
+              .content!=content
+
+        if theme.ad && theme.ad.index
+          if (index + 1) % 3 === 0
+            .recent-post-item.ads-wrap!= theme.ad.index
+
+    include ../pagination.pug

layout/includes/mixins/post-ui.pug

@@ -1,135 +0,0 @@
-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')
-        const position = theme.cover.position
-        let leftOrRight = position === 'both'
-          ? index%2 == 0 ? 'left' : 'right'
-          : position === 'left' ? 'left' : 'right'
-        let post_cover = article.cover
-        let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
-      -
-      if post_cover && theme.cover.index_enable
-        .post_cover(class=leftOrRight)
-          a(href=url_for(link) title=title)
-            if article.cover_type === 'img'
-              img.post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-            else
-              div.post-bg(style=`background: ${post_cover}`)
-      .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)= title
-        .article-meta-wrap
-          if (is_home() && (article.top || article.sticky > 0))
-            span.article-meta
-              i.fas.fa-thumbtack.sticky
-              span.sticky= _p('sticky')
-              span.article-meta-separator |
-          if (theme.post_meta.page.date_type)
-            span.post-meta-date
-              if (theme.post_meta.page.date_type === 'both')
-                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 |
-                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)
-              else
-                - let data_type_updated = theme.post_meta.page.date_type === 'updated'
-                - let date_type = data_type_updated ? 'updated' : 'date'
-                - let date_icon = data_type_updated ? 'fas fa-history' :'far fa-calendar-alt'
-                - let date_title = data_type_updated ? _p('post.updated') : _p('post.created')
-                i(class=date_icon)
-                span.article-meta-label=date_title
-                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 |
-              i.fas.fa-inbox
-              each item, index in article.categories.data
-                a(href=url_for(item.path)).article-meta__categories #[=item.name]
-                if (index < article.categories.data.length - 1)
-                  i.fas.fa-angle-right.article-meta-link
-          if (theme.post_meta.page.tags && article.tags.data.length > 0)
-            span.article-meta.tags
-              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 #[='•']
-          
-          mixin countBlockInIndex
-            - needLoadCountJs = true
-            span.article-meta
-              span.article-meta-separator |
-              i.fas.fa-comments
-              if block
-                block
-              span.article-meta-label= ' ' + _p('card_post_count')
-          
-          if theme.comments.card_post_count
-            case theme.comments.use[0]
-              when 'Disqus'
-                +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqus_thread')
-                    i.fa-solid.fa-spinner.fa-spin
-              when 'Disqusjs'
-                +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqusjs')
-                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
-                      i.fa-solid.fa-spinner.fa-spin
-              when 'Valine'
-                +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment')
-                    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))
-                      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
-          when false
-            - break
-          when 1
-            .content!= article.description
-          when 2
-            if article.description
-              .content!= article.description
-            else
-              - const content = strip_html(article.content)
-              - let expert = content.substring(0, theme.index_post_content.length) 
-              - content.length > theme.index_post_content.length ? expert += ' ...' : ''
-              .content!= expert
-          default
-            - const content = strip_html(article.content)
-            - let expert = content.substring(0, theme.index_post_content.length) 
-            - content.length > theme.index_post_content.length ? expert += ' ...' : ''
-            .content!= expert
-
-    if theme.ad && theme.ad.index
-      if (index + 1) % 3 == 0
-        .recent-post-item.ads-wrap!=theme.ad.index

layout/includes/page/404.pug

@@ -0,0 +1,8 @@
+- var top_img_404 = theme.error_404.background || theme.default_top_img
+
+.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/page/default-page.pug

@@ -1,2 +1,2 @@
-#article-container
+#article-container.container
   != page.content

layout/includes/page/flink.pug

@@ -1,7 +1,10 @@
-#article-container
+#article-container.container
   .flink
-    - let pageContent = page.content
+    - let { content, random, flink_url } = page
-    if page.flink_url
+    - let pageContent = content
+
+    if flink_url || random
+      - const linkData = flink_url ? false : site.data.link || false
       script.
         (()=>{
           const replaceSymbol = (str) => {
@@ -9,9 +12,7 @@
           }
 
           let result = ""
-          fetch("!{url_for(page.flink_url)}")
+          const add = (str) => {
-            .then(response => response.json())
-            .then(str => {
             for(let i = 0; i < str.length; i++){
               const replaceClassName = replaceSymbol(str[i].class_name)
               const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
@@ -19,6 +20,9 @@
 
               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">
@@ -37,7 +41,16 @@
 
             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
@@ -67,4 +80,3 @@
 
         - pageContent = result + pageContent
     != pageContent
-

layout/includes/page/shuoshuo.pug

@@ -0,0 +1,188 @@
+//- - author:
+//-   avatar:
+//-   date:
+//-   content:
+//-   tags:
+//-     - tag1
+//-     - tag2
+
+- page.toc = false
+
+#article-container
+  if page.comments !== false && theme.comments.use
+    - commentsJsLoad = true
+
+    script.
+      (() => {
+        const commentDiv = `!{partial('includes/third-party/comments/index', {}, {cache: true})}`
+
+        const runDestroy = (shuoshuoComment) => {
+          if (!shuoshuoComment) return
+
+          for (const [key, fn] of Object.entries(shuoshuoComment)) {
+            if (key.startsWith('destroy')) fn()
+          }
+        }
+
+        window.addCommentToShuoshuo = e => {
+          const btn = e.target.closest('.shuoshuo-comment-btn')
+          if (!btn) return
+
+          const ele = btn.closest('.container').nextElementSibling
+          const { shuoshuoComment } = window
+          const isInclude = ele.classList.contains('no-comment')
+          runDestroy(shuoshuoComment)
+          if (isInclude) {
+            ele.classList.remove('no-comment')
+            ele.innerHTML = commentDiv
+            const key = `${location.pathname.replace(/\/$/, '')}?key=${ele.getAttribute('data-key')}`
+            btf.switchComments(ele, key)
+            shuoshuoComment.loadComment && shuoshuoComment.loadComment(ele, key)
+          }
+        }
+      })()
+
+  if page.shuoshuo_url
+    script.
+      (() => {
+        const limitConfig = !{ JSON.stringify(page.limit || {}) }
+
+        const sortDataByDate = data => data.sort((a, b) => new Date(b.date) - new Date(a.date))
+
+        const filterDataByLimit = (data, limit) => {
+          if (!limit || !limit.type) return data
+          if (limit.type === 'num') return data.slice(0, limit.value)
+          if (limit.type === 'date') {
+            const limitDate = new Date(limit.value)
+            return data.filter(item => new Date(item.date) >= limitDate)
+          }
+          return data
+        };
+
+        const formatToTimeZone = (date) => {
+          const fullDate = date.length === 10 ? `${date} 00:00:00` : date
+          const visitorTimeZone = '#{config.timezone}' || Intl.DateTimeFormat().resolvedOptions().timeZone
+          const options = {
+            timeZone: visitorTimeZone,
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+            hour12: false
+          }
+          const [day, month, year, hour, minute, second] = new Intl.DateTimeFormat('en-GB', options)
+            .format(new Date(fullDate))
+            .match(/\d+/g)
+          return `${year}-${month}-${day} ${hour}:${minute}:${second}`
+        }
+
+        const loadShuoshuo = async () => {
+          try {
+            const response = await fetch('!{url_for(page.shuoshuo_url)}')
+            let data = await response.json()
+
+            data = filterDataByLimit(sortDataByDate(data), limitConfig)
+
+            const container = document.getElementById('article-container')
+            let start = 0
+
+            const renderData = (dataSlice) => {
+              const content = dataSlice.map(item => {
+                const formattedDate = formatToTimeZone(item.date)
+                const tags = item.tags && item.tags.map(tag => `<span class="shuoshuo-tag">${tag}</span>`).join('') || ''
+                const commentButton = item.key && !{commentsJsLoad}
+                  ? `<div class="shuoshuo-comment-btn" onclick="addCommentToShuoshuo(event)">
+                      <i class="fa-solid fa-comments"></i>
+                    </div>`
+                  : ''
+                const commentContainer = item.key
+                  ? `<div class="shuoshuo-comment no-comment" data-key="${item.key}"></div>`
+                  : ''
+
+                return `
+                  <div class="shuoshuo-item">
+                    <div class="container">
+                      <div class="shuoshuo-item-header">
+                        <div class="shuoshuo-avatar">
+                          <img class="no-lightbox" src="${item.avatar || '!{url_for(theme.avatar.img)}'}">
+                        </div>
+                        <div class="shuoshuo-info">
+                          <div class="shuoshuo-author">${item.author || '!{config.author}'}</div>
+                          <time class="shuoshuo-date" title="${formattedDate}">
+                            ${btf.diffDate(formattedDate, true)}
+                          </time>
+                        </div>
+                      </div>
+                      <div class="shuoshuo-content">${item.content}</div>
+                      <div class="shuoshuo-footer ${tags ? 'flex-between' : 'flex-end'}">
+                        ${tags ? `<div class="shuoshuo-tags">${tags}</div>` : ''}
+                        ${commentButton}
+                      </div>
+                    </div>
+                    ${commentContainer}
+                  </div>`
+              }).join('')
+
+              container.insertAdjacentHTML('beforeend', content)
+
+              window.lazyLoadInstance.update()
+              btf.loadLightbox(document.querySelectorAll('#article-container img:not(.no-lightbox)'))
+            }
+
+            const handleIntersection = (entries) => {
+              if (!entries[0].isIntersecting) return
+              observer.unobserve(entries[0].target)
+
+              const slice = data.slice(start, start + 10)
+              renderData(slice)
+              start += 10
+
+              if (start < data.length) {
+                setTimeout(() => observer.observe(container.lastElementChild), 100)
+              } else {
+                observer.disconnect()
+              }
+            };
+
+            const observer = new IntersectionObserver(handleIntersection, {
+              root: null,
+              rootMargin: '0px',
+              threshold: 1.0
+            })
+
+            renderData(data.slice(start, 10))
+            start += 10
+
+            if (container.lastElementChild) observer.observe(container.lastElementChild)
+          } catch (error) {
+            console.error(error)
+          }
+        };
+
+        window.pjax ? loadShuoshuo() : window.addEventListener('load', loadShuoshuo)
+      })()
+  else
+    if site.data.shuoshuo
+      each i in shuoshuoFN(site.data.shuoshuo, page)
+        .shuoshuo-item
+          .container
+            .shuoshuo-item-header
+              .shuoshuo-avatar
+                img.no-lightbox(src=i.avatar || url_for(theme.avatar.img))
+              .shuoshuo-info
+                .shuoshuo-author=i.author || config.author
+                time.shuoshuo-date(title=i.date)=i.date
+            .shuoshuo-content
+              !=markdown(i.content)
+            .shuoshuo-footer(class=i.tags && i.tags.length ? 'flex-between' : 'flex-end')
+              if i.tags
+                .shuoshuo-tags
+                  each tag in i.tags
+                    span.shuoshuo-tag=tag
+              if i.key && commentsJsLoad
+                .shuoshuo-comment-btn(onclick='addCommentToShuoshuo(event)')
+                  i.fa-solid.fa-comments
+          if i.key && commentsJsLoad
+            .shuoshuo-comment.no-comment(data-key=i.key)

layout/includes/page/tags.pug

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

layout/includes/pagination.pug

@@ -6,36 +6,32 @@
     escape: false
   }
 
-if is_post()
+if globalPageType === 'post'
-  - let prev = theme.post_pagination === 1 ? page.prev : page.next
+  - let paginationOrder = theme.post_pagination === 1 ? { prev: page.prev, next: page.next } : { prev: page.next, next: page.prev }
-  - 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)
-        a(href=url_for(prev.path) title=prev.title)
-          if prev.cover_type === 'img'
-            img.cover(src=url_for(prev.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
-          else
-            .cover(style=`background: ${prev.cover || 'var(--default-bg-color)'}`)
-          .pagination-info
-            .label=_p('pagination.prev')
-            .prev_info=prev.title
 
-    if(next)
+  nav#pagination.pagination-post
-      - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
+    each direction, key in paginationOrder
-      .next-post(class=hasPagePrev)
+      if direction
-        a(href=url_for(next.path) title=next.title)
+        - const getPostDesc = direction.postDesc || postDesc(direction)
-          if next.cover_type === 'img'
+        - let className = key === 'prev' ? (paginationOrder.next ? '' : 'full-width') : (paginationOrder.prev ? '' : 'full-width')
-            img.cover(src=url_for(next.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
+        - className = getPostDesc ? className : className + ' no-desc'
+
+        a.pagination-related(class=className href=url_for(direction.path) title=direction.title)
+          if direction.cover_type === 'img'
+            img.cover(src=url_for(direction.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt=`cover of ${key === 'prev' ? 'previous' : 'next'} post`)
           else
-            .cover(style=`background: ${next.cover || 'var(--default-bg-color)'}`)
+            .cover(style=`background: ${direction.cover || 'var(--default-bg-color)'}`)
-          .pagination-info
+
-            .label=_p('pagination.next')
+          .info(class=key === 'prev' ? '' : 'text-right')
-            .next_info=next.title
+            .info-1
+              .info-item-1=_p(`pagination.${key}`)
+              .info-item-2!=direction.title
+            if getPostDesc
+              .info-2
+                .info-item-1!=getPostDesc
 else
   nav#pagination
     .pagination
-      if is_home()
+      if globalPageType === 'home'
         - options.format = 'page/%d/#content-inner'
       !=paginator(options)

layout/includes/post/outdate-notice.pug

@@ -0,0 +1,8 @@
+- const { limit_day, message_prev, message_next, position} = theme.noticeOutdate
+- const notice_data = { limitDay: limit_day, messagePrev: message_prev, messageNext: message_next, postUpdate: full_date(page.updated)}
+if position === 'top'
+  #post-outdate-notice(data=notice_data hidden)
+  !=page.content
+else
+  !=page.content
+  #post-outdate-notice(data=notice_data hidden)

layout/includes/post/post-copyright.pug

@@ -1,17 +1,23 @@
 if theme.post_copyright.enable && page.copyright !== false
-  - let author = page.copyright_author || config.author
+  - const author = page.copyright_author || config.author
-  - let authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
+  - const authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
-  - let url = page.copyright_url || page.permalink
+  - const url = page.copyright_url || page.permalink
-  - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
+  - const 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
+        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,13 +1,12 @@
 .post-reward
   .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
+        - const clickTo = item.link || item.img
         li.reward-item
           a(href=url_for(clickTo) target='_blank')
             img.post-qr-code-img(src=url_for(item.img) alt=item.text)
           .post-qr-code-desc=item.text
-

layout/includes/rightside.pug

@@ -1,9 +1,9 @@
-- const { readmode, translate, darkmode, aside, chat_btn } = theme
+- const { readmode, translate, darkmode, aside, chat } = theme
 mixin rightsideItem(array)
   each item in array
     case item
       when 'readmode'
-        if is_post() && readmode
+        if globalPageType === 'post' && readmode
           button#readmode(type="button" title=_p('rightside.readmode_title'))
             i.fas.fa-book-open
       when 'translate'
@@ -22,9 +22,9 @@ mixin rightsideItem(array)
           button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
             i.fas.fa-list-ul
       when 'chat'
-        if chat_btn
+        if chat.rightside_button && chat.use
-          button#chat_btn(type="button" title=_p("rightside.chat"))
+          button#chat-btn(type="button" title=_p("rightside.chat") style="display:none")
-            i.fas.fa-sms
+            i.fas.fa-message
       when 'comment'
         if commentsJsLoad
           a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
@@ -42,15 +42,15 @@ mixin rightsideItem(array)
   #rightside-config-show
     if enable
       if hide
-        button#rightside_config(type="button" title=_p("rightside.setting"))
+        button#rightside-config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
     else
-      if is_post()
+      if globalPageType === 'post'
         if (readmode || translate.enable || (darkmode.enable && darkmode.button))
-          button#rightside_config(type="button" title=_p("rightside.setting"))
+          button#rightside-config(type="button" title=_p("rightside.setting"))
             i.fas.fa-cog.fa-spin
       else if translate.enable || (darkmode.enable && darkmode.button)
-        button#rightside_config(type="button" title=_p("rightside.setting"))
+        button#rightside-config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog.fa-spin
 
     if showArray

layout/includes/sidebar.pug

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

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

@@ -1,15 +1,46 @@
 script.
-  (() => {
+  (function() {
-    function abcjsInit() {
+    const abcjsInit = function() {
-      function abcjsFn() {
+      const abcjsFn = function() {
-        for (let abcContainer of document.getElementsByClassName("abc-music-sheet")) {
+        setTimeout(function() {
-          ABCJS.renderAbc(abcContainer, abcContainer.innerHTML, {responsive: 'resize'})
+          const sheets = document.querySelectorAll(".abc-music-sheet")
+          for (let i = 0; i < sheets.length; i++) {
+            const ele = sheets[i]
+            if (ele.children.length > 0) continue
+
+            // Parse parameters from data-params attribute
+            let params = {}
+            const dp = ele.getAttribute("data-params")
+            if (dp) {
+              try {
+                params = JSON.parse(dp)
+              } catch (e) {
+                console.error("Failed to parse data-params:", e)
               }
             }
 
-      typeof ABCJS === 'object' ? abcjsFn()
+            // Merge parsed parameters with the responsive option
-        : getScript('!{url_for(theme.asset.abcjs_basic_js)}').then(abcjsFn)
+            // Ensures params content appears before responsive
+            const options = { ...params, responsive: "resize" }
+
+            // Render the music score using ABCJS.renderAbc
+            ABCJS.renderAbc(ele, ele.innerHTML, options)
+          }
+        }, 100)
       }
 
-    window.pjax ? abcjsInit() : document.addEventListener('DOMContentLoaded', abcjsInit)
+      if (typeof ABCJS === "object") {
+        abcjsFn()
+      } else {
+        btf.getScript("!{url_for(theme.asset.abcjs_basic_js)}").then(abcjsFn)
+      }
+    }
+
+    if (window.pjax) {
+      abcjsInit()
+    } else {
+      window.addEventListener("load", abcjsInit)
+    }
+
+    btf.addGlobalFn("encrypt", abcjsInit, "abcjs")
   })()

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

@@ -1,6 +1,3 @@
 if theme.abcjs.enable
-  if theme.abcjs.per_page
+  if theme.abcjs.per_page && (['post','page'].includes(globalPageType)) || page.abcjs
-    if is_post() || is_page()
-      include ./abcjs.pug
-  else if page.abcjs
     include ./abcjs.pug

layout/includes/third-party/aplayer.pug

@@ -1,3 +1,23 @@
 link(rel='stylesheet' href=url_for(theme.asset.aplayer_css) media="print" onload="this.media='all'")
 script(src=url_for(theme.asset.aplayer_js))
 script(src=url_for(theme.asset.meting_js))
+if theme.pjax.enable
+  script.
+    (() => {
+      const destroyAplayer = () => {
+        if (window.aplayers) {
+          for (let i = 0; i < window.aplayers.length; i++) {
+            if (!window.aplayers[i].options.fixed) {
+              window.aplayers[i].destroy()
+            }
+          }
+        }
+      }
+
+      const runMetingJS = () => {
+        typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
+      }
+
+      btf.addGlobalFn('pjaxSend', destroyAplayer, 'destroyAplayer')
+      btf.addGlobalFn('pjaxComplete', loadMeting, 'runMetingJS')
+    })()

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

@@ -2,19 +2,30 @@
 
 script.
   (() => {
-    const getArtalkCount = () => {
+    const getArtalkCount = async() => {
-      const runWidget = () => {
+      try {
-        Artalk.LoadCountWidget({
+        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
-          server: '!{server}',
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
-          site: '!{site}',
+
-          countEl: '.artalk-count'
+        const headerList = {
+          method: 'GET',
+        }
+
+        const searchParams = new URLSearchParams({
+          'site_name': '!{site}',
+          'page_keys': keyArray
         })
-      }
 
-      if (typeof Artalk === 'function') runWidget()
+        const res = await fetch(`!{server}/api/v2/stats/page_comment?${searchParams}`, headerList)
-      else getScript('!{theme.asset.artalk_js}').then(runWidget)
+        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,5 +1,5 @@
-- const fbSDKVer = 'v16.0'
+- const fbSDKVer = 'v20.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}`
+- const fbSDK = `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.
   (()=>{

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

@@ -18,7 +18,7 @@ script.
           includeReply: false
         }).then(function (res) {
           document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
-            item.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('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+          btf.getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
         }
     }
 

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

@@ -13,7 +13,7 @@ script.
       }
 
       if (typeof Valine === 'function') initValine() 
-      else getScript('!{url_for(theme.asset.valine)}').then(initValine)
+      else btf.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: null,
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-path'))
-          serverURL: '!{theme.waline.serverURL}',
-          comment: true
-        }
-        const waline = Waline.init(initData)
-      }
 
-      if (typeof Waline === 'object') initWaline() 
+        const res = await fetch(`!{serverURL}/api/comment?type=count&url=${keyArray}`, { method: 'GET' })
-      else getScript('!{url_for(theme.asset.waline_js)}').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,38 @@
 //- https://chatra.io/help/api/
 script.
-  (function(d, w, c) {
+  (() => {
-      w.ChatraID = '#{theme.chatra.id}';
+    window.ChatraID = '#{theme.chatra.id}'
-      var s = d.createElement('script');
+    window.Chatra = window.Chatra || function() {
-      w[c] = w[c] || function() {
+      (window.Chatra.q = window.Chatra.q || []).push(arguments)
-          (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}) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        Chatra('openChat')
-      });
     }
-    chatBtnFn()
+
-  } else {
+    btf.getScript('https://call.chatra.io/chatra.js').then(() => {
-    if (!{theme.chat_hide_show}) {
+      const isChatBtn = !{theme.chat.rightside_button}
-      function chatBtnHide () {
+      const isChatHideShow = !{theme.chat.button_hide_show}
+
+      if (isChatBtn) {
+        const close = () => {
+          Chatra('minimizeWidget')
           Chatra('hide')
         }
-      function chatBtnShow () {
+
+        const open = () => {
+          Chatra('openChat', true)
           Chatra('show')
         }
+
+        window.ChatraSetup = { startHidden: true }
+      
+        window.chatBtnFn = () => document.getElementById('chatra').classList.contains('chatra--expanded') ? close() : open()
+
+        document.getElementById('chat-btn').style.display = 'block'
+      } else if (isChatHideShow) {
+        window.chatBtn = {
+          hide: () => Chatra('hide'),
+          show: () => Chatra('show')
         }
       }
+    })
+  })()
 
 

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

@@ -1,36 +1,32 @@
 script.
-  window.$crisp = [];
+  (() => {
-  window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
+    window.$crisp = ['safe', true]
-  (function () {
+    window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}"
-    d = document;
-    s = d.createElement("script");
-    s.src = "https://client.crisp.chat/l.js";
-    s.async = 1;
-    d.getElementsByTagName("head")[0].appendChild(s);
-  })();
-  $crisp.push(["safe", true])
 
-  if (!{theme.chat_btn}) {
+    btf.getScript('https://client.crisp.chat/l.js').then(() => {
-    $crisp.push(["do", "chat:hide"])
+      const isChatBtn = !{theme.chat.rightside_button}
-    $crisp.push(["on", "chat:closed", function() {
+      const isChatHideShow = !{theme.chat.button_hide_show}
-      $crisp.push(["do", "chat:hide"])
+
-    }])
+      if (isChatBtn) {
-    var chatBtnFn = () => {
+        const open = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
           $crisp.push(["do", "chat:show"])
           $crisp.push(["do", "chat:open"])
+        }
 
-      });
+        const close = () => $crisp.push(["do", "chat:hide"])
-    }
+
-    chatBtnFn()
+        close()
-  } else {
+
-    if (!{theme.chat_hide_show}) {
+        $crisp.push(["on", "chat:closed", close])
-      function chatBtnHide () {
+
-        $crisp.push(["do", "chat:hide"])
+        window.chatBtnFn = () => $crisp.is("chat:visible") ? close() : open()
-      }
+
-      function chatBtnShow () {
+        document.getElementById('chat-btn').style.display = 'block'
-        $crisp.push(["do", "chat:show"])
+      } 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 +0,0 @@
-//- 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")
-
-script.
-  var isChatBtn = !{theme.chat_btn}
-  daovoice('init', {
-    app_id: '!{theme.daovoice.app_id}',},{
-    launcher: { 
-       disableLauncherIcon: isChatBtn // 悬浮 ICON 是否显示
-    },
-  });
-  daovoice('update');
-
-  if (isChatBtn) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        daovoice('show')
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        daovoice('update', {},{
-          launcher: { 
-          disableLauncherIcon: true // 悬浮 ICON 是否显示
-          },
-        });
-      }
-      function chatBtnShow () {
-        daovoice('update', {},{
-          launcher: { 
-          disableLauncherIcon: false // 悬浮 ICON 是否显示
-          },
-        });
-      }
-    }
-  }

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

@@ -1,10 +1,7 @@
-if theme.chatra && theme.chatra.enable
+case theme.chat.use
+  when 'chatra'
     include ./chatra.pug
-else if theme.tidio && theme.tidio.enable
+  when 'tidio'
     include ./tidio.pug
-else if theme.daovoice && theme.daovoice.enable
+  when 'crisp'
-  include ./daovoice.pug
-else if theme.crisp && theme.crisp.enable
     include ./crisp.pug
-else if theme.messenger && theme.messenger.enable
-  include ./messenger.pug

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

@@ -1,42 +0,0 @@
-- let { pageID, lang } = theme.messenger
-- lang = theme.comments.use && theme.comments.use.includes('Facebook Comments') ? theme.facebook_comments.lang : lang
-
-#fb-customer-chat.fb-customerchat(page_id=pageID attribution='biz_inbox')
-
-script.
-  document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
-
-  window.fbAsyncInit = function() {
-    FB.init({
-      xfbml: true,
-      version: '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'));
-
-  if (!{theme.chat_btn}) {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
-        FB.CustomerChat.show();
-      });
-    }
-    chatBtnFn()
-  } else {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
-        FB.CustomerChat.hide()
-      }
-      function chatBtnShow () {
-        FB.CustomerChat.show(false)
-      }
-    }
-  }
-

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

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

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

@@ -1,38 +1,73 @@
 - const { server, site, option } = theme.artalk
+- const { use, lazyload } = theme.comments
 
 script.
-  function loadArtalk () {
+  (() => {
-    function initArtalk () {
+    let artalkItem = null
-      window.artalkItem = new Artalk(Object.assign({
+    const option = !{JSON.stringify(option)}
-        el: '#artalk-wrap',
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
+
+    const destroyArtalk = () => {
+      if (artalkItem) {
+        artalkItem.destroy()
+        artalkItem = null
+      }
+    }
+
+    const artalkChangeMode = theme => artalkItem && artalkItem.setDarkMode(theme === 'dark')
+
+    const initArtalk = (el = document, pageKey = location.pathname) => {
+      artalkItem = Artalk.init({
+        el: el.querySelector('#artalk-wrap'),
         server: '!{server}',
         site: '!{site}',
-        pageKey: location.pathname,
         darkMode: document.documentElement.getAttribute('data-theme') === 'dark',
-        countEl: '.artalk-count'
+        ...option,
-      },!{JSON.stringify(option)}))
+        pageKey: isShuoshuo ? pageKey : (option && option.pageKey) || pageKey
-    }
-
-    if (typeof window.artalkItem === 'object') setTimeout(()=>{initArtalk()},200)
-    else {
-      getCSS('!{theme.asset.artalk_css}')
-      typeof Artalk !== 'function' ? getScript('!{theme.asset.artalk_js}').then(initArtalk)
-                                  : setTimeout(()=>{initArtalk()},200)
-    }
-  }
-
-  document.getElementById('darkmode').addEventListener('click',()=> {
-    if (typeof window.artalkItem !== 'object') return
-    let isDark = document.documentElement.getAttribute('data-theme') === 'dark'
-    window.artalkItem.setDarkMode(!isDark)
       })
 
+      if (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])'))
+        })
+      })
 
-  if ('!{theme.comments.use[0]}' === 'Artalk' || !!{theme.comments.lazyload}) {
+      if (isShuoshuo) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+        window.shuoshuoComment.destroyArtalk = () => {
-    else loadArtalk()
+          destroyArtalk()
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
+
+      btf.addGlobalFn('pjaxSendOnce', destroyArtalk, 'destroyArtalk')
+      btf.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
+    }
+
+    const loadArtalk = async (el, pageKey) => {
+      if (typeof Artalk === 'object') initArtalk(el, pageKey)
+      else {
+        await btf.getCSS('!{theme.asset.artalk_css}')
+        await btf.getScript('!{theme.asset.artalk_js}')
+        initArtalk(el, pageKey)
+      }
+    }
+
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Artalk'
+        ? window.shuoshuoComment = { loadComment: loadArtalk }
+        : window.loadOtherComment = loadArtalk
+      return
+    }
+
+    if ('!{use[0]}' === 'Artalk' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('artalk-wrap'), loadArtalk)
+      else setTimeout(loadArtalk, 100)
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadArtalk
-      loadArtalk()
-    }
     }
+  })()

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

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

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

@@ -1,57 +1,87 @@
-- let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+- let disqusjsPageTitle = page.title && page.title.replace(/'/ig,"\\'")
+- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  function loadDisqusjs () {
+  (() => {
-    function initDisqusjs () {
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'== 'shuoshuo'
-      window.disqusjs = null
+    const dqOption = !{JSON.stringify(dqOption)}
-      disqusjs = new DisqusJS(Object.assign({
-        shortname: '!{theme.disqusjs.shortname}',
-        identifier: '!{ url_for(page.path) }',
-        url: '!{ page.permalink }',
-        title: '!{ disqusjsPageTitle }',
-        apikey: '!{theme.disqusjs.apikey}',
-      },!{JSON.stringify(theme.disqusjs.option)}))
 
-      disqusjs.render(document.getElementById('disqusjs'))
+    const destroyDisqusjs = () => {
-    }
-
-    const themeChange = () => {
-      const ele = document.getElementById('disqus_thread')
-      if(!ele) return
       disqusjs.destroy()
-      initDisqusjs()
+      window.disqusjs = null
     }
 
+    const themeChange = (el, path) => {
+      destroyDisqusjs()
+      initDisqusjs(el, path)
+    }
 
-    document.getElementById('darkmode').addEventListener('click', themeChange)
+    const initDisqusjs = (el = document, path) => {
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyDisqusjs = () => {
+          destroyDisqusjs()
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
 
-    if (window.disqusJsLoad) initDisqusjs()
+      disqusjs = new DisqusJS({
+        shortname: '!{dqShortname}',
+        title: '!{ disqusjsPageTitle }',
+        apikey: '!{dqApikey}',
+        ...dqOption,
+        identifier: isShuoshuo ? path : (dqOption && dqOption.identifier) || '!{ url_for(page.path) }',
+        url: isShuoshuo ? location.origin + path : (dqOption && dqOption.url) || '!{ page.permalink }'
+      })
+
+      disqusjs.render(el.querySelector('#disqusjs-wrap'))
+
+      btf.addGlobalFn('themeChange', () => themeChange(el, path), 'disqusjs')
+    }
+
+    const loadDisqusjs = async(el, path) => {
+      if (window.disqusJsLoad) initDisqusjs(el, path)
       else {
-      getCSS('!{url_for(theme.asset.disqusjs_css)}')
+        await btf.getCSS('!{url_for(theme.asset.disqusjs_css)}')
-      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
+        await btf.getScript('!{url_for(theme.asset.disqusjs)}')
+        initDisqusjs(el, path)
         window.disqusJsLoad = true
       }
     }
 
+    const getCount = async() => {
+      try {
+        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
+        if (!eleGroup) return
+        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+
+        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{dqShortname}&api_key=!{dqApikey}&thread:link=${cleanedLinks}`,{
+          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 (isShuoshuo) {
+      '!{theme.comments.use[0]}' === 'Disqusjs'
+        ? window.shuoshuoComment = { loadComment: loadDisqusjs }
+        : window.loadOtherComment = loadDisqusjs
+      return
+    }
+
     if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs-wrap'), loadDisqusjs)
-    else loadDisqusjs()
-  }
       else {
-    function loadOtherComment () {
         loadDisqusjs()
+        !{ theme.comments.count ? `GLOBAL_CONFIG_SITE.pageType === 'post' && getCount()` : '' }
       }
-  }
-
-
-if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
-  script.
-    if (window.DISQUSWIDGETS === undefined) {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
     } else {
-      DISQUSWIDGETS.getCount({reset: true});
+      window.loadOtherComment = loadDisqusjs
     }
-
+  })()

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

@@ -1,18 +1,30 @@
-- const fbSDKVer = 'v16.0'
+- const fbSDKVer = 'v20.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}`
+- const fbSDK = `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.
-  function loadFBComment () {
+  (()=>{
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'== 'shuoshuo'
+
+    const loadFBComment = (el = document, path) => {
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyFB = () => {
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
+
       document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
       const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-    const $fbComment = document.getElementsByClassName('fb-comments')[0]
+      const $fbComment = el.getElementsByClassName('fb-comments')[0]
       $fbComment.setAttribute('data-colorscheme',themeNow)
-    $fbComment.setAttribute('data-href', '!{urlNoIndex(page.permalink)}')
+      $fbComment.setAttribute('data-href', isShuoshuo ? '!{urlNoIndex(page.permalink)}' + '#' + path : '!{urlNoIndex(page.permalink)}')
 
       if (typeof FB === 'object') {
         FB.XFBML.parse(document.getElementsByClassName('post-meta-commentcount')[0])
-      FB.XFBML.parse(document.getElementById('post-comment'))
+        FB.XFBML.parse(el.querySelector('#post-comment'))
       }
       else {
         let ele = document.createElement('script')
@@ -25,12 +37,28 @@ script.
       }
     }
 
+    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 (isShuoshuo) {
+      '!{theme.comments.use[0]}' === 'Facebook Comments'
+        ? window.shuoshuoComment = { loadComment: loadFBComment }
+        : window.loadOtherComment = loadFBComment
+      return
+    }
+
     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 {
-    function loadOtherComment () {
+      window.loadOtherComment = loadFBComment
-      loadFBComment()
-    }
     }
+  })()
 

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

@@ -1,51 +1,82 @@
-- const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
+- const { use, lazyload } = theme.comments
-- const giscusUrl = theme.asset.giscus || 'https://giscus.app/client.js'
+- const { repo, repo_id, category_id, light_theme, dark_theme, js, option } = theme.giscus
+- const giscusUrl = js || 'https://giscus.app/client.js'
 - const giscusOriginUrl = new URL(giscusUrl).origin
 
 script.
-  function getGiscusTheme () {
+  (() => {
-    return document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
+    const option = !{JSON.stringify(option)}
+
+    const getGiscusTheme = theme => theme === 'dark' ? '!{dark_theme}' : '!{light_theme}'
+
+    const createScriptElement = config => {
+      const ele = document.createElement('script')
+      Object.entries(config).forEach(([key, value]) => {
+        ele.setAttribute(key, value)
+      })
+      return ele
     }
 
-  function loadGiscus () {
+    const loadGiscus = (el = document, key) => {
-    const config = Object.assign({
+      const mappingConfig = isShuoshuo
+        ? { 'data-mapping': 'specific', 'data-term': key }
+        : { 'data-mapping': (option && option['data-mapping']) || 'pathname' }
+
+      const giscusConfig = {
         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-theme': getGiscusTheme(),
         'data-reactions-enabled': '1',
         crossorigin: 'anonymous',
-      async: true
+        async: true,
-    },!{JSON.stringify(option)})
+        ...option,
-
+        ...mappingConfig
-    let ele = document.createElement('script')
-    for (let key in config) {
-      ele.setAttribute(key, config[key])
-    }
-    document.getElementById('giscus-wrap').insertAdjacentElement('afterbegin',ele)
       }
 
-  function changeGiscusTheme () {
+      const scriptElement = createScriptElement(giscusConfig)
-    function sendMessage(message) {
+
-      const iframe = document.querySelector('iframe.giscus-frame')
+      el.querySelector('#giscus-wrap').appendChild(scriptElement)
-      if (!iframe) return
+
-      iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyGiscus = () => {
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
     }
 
-    sendMessage({
+    const changeGiscusTheme = theme => {
+      const iframe = document.querySelector('#giscus-wrap iframe')
+      if (iframe) {
+        const message = {
+          giscus: {
             setConfig: {
-        theme: getGiscusTheme()
+              theme: getGiscusTheme(theme)
+            }
+          }
+        }
+        iframe.contentWindow.postMessage(message, '!{giscusOriginUrl}')
       }
-    });
     }
 
-  if ('!{theme.comments.use[0]}' === 'Giscus' || !!{theme.comments.lazyload}) {
+    btf.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
+
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Giscus'
+        ? window.shuoshuoComment = { loadComment: loadGiscus }
+        : window.loadOtherComment = loadGiscus
+      return
+    }
+
+    if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('giscus-wrap'), loadGiscus)
       else loadGiscus()
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadGiscus
-      loadGiscus()
-    }
     }
+  })()

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

@@ -1,41 +1,64 @@
+- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
+
 script.
-  function loadGitalk () {
+  (() => {
-    function initGitalk () {
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-      var gitalk = new Gitalk(Object.assign({
+    const option = !{JSON.stringify(option)}
-        clientID: '!{theme.gitalk.client_id}',
+
-        clientSecret: '!{theme.gitalk.client_secret}',
+    const commentCount = n => {
-        repo: '!{theme.gitalk.repo}',
+      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
-        owner: '!{theme.gitalk.owner}',
+      if (isCommentCount) {
-        admin: ['!{theme.gitalk.admin}'],
+        isCommentCount.textContent= n
-        id: '!{md5(page.path)}',
+      }
-        updateCountCallback: commentCount
+    }
-      },!{JSON.stringify(theme.gitalk.option)}))
+
+    const initGitalk = (el, path) => {
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyGitalk = () => {
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
+
+      const gitalk = new Gitalk({
+        clientID: '!{client_id}',
+        clientSecret: '!{client_secret}',
+        repo: '!{repo}',
+        owner: '!{owner}',
+        admin: ['!{admin}'],
+        updateCountCallback: commentCount,
+        ...option,
+        id: isShuoshuo ? path : (option && option.id) || '!{md5(page.path)}'
+      })
 
       gitalk.render('gitalk-container')
     }
 
-    if (typeof Gitalk === 'function') initGitalk()
+    const loadGitalk = async(el, path) => {
+      if (typeof Gitalk === 'function') initGitalk(el, path)
       else {
-      getCSS('!{url_for(theme.asset.gitalk_css)}')
+        await btf.getCSS('!{url_for(theme.asset.gitalk_css)}')
-      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
+        await btf.getScript('!{url_for(theme.asset.gitalk)}')
+        initGitalk(el, path)
       }
     }
 
-  function commentCount(n){
+    if (isShuoshuo) {
-    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+      '!{theme.comments.use[0]}' === 'Gitalk'
-    if (isCommentCount) {
+        ? window.shuoshuoComment = { loadComment: loadGitalk }
-      isCommentCount.innerHTML= n
+        : window.loadOtherComment = loadGitalk
-    }
+      return
     }
 
     if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
       if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
       else loadGitalk()
     } 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'
-            #disqusjs
+            #disqusjs-wrap
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'

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

@@ -1,8 +1,24 @@
+- const { use, lazyload } = theme.comments
+
 script.
-  function loadLivere () {
+  (() => {
-    if (typeof LivereTower === 'object') {
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-      window.LivereTower.init()
+
+    const loadLivere = (el, path) => {
+      window.livereOptions = {
+        refer: path || location.pathname
       }
+
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyLivere = () => {
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
+
+      if (typeof LivereTower === 'object') window.LivereTower.init()
       else {
         (function(d, s) {
             var j, e = d.getElementsByTagName(s)[0];
@@ -15,12 +31,17 @@ script.
       }
     }
 
-  if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
+    if (isShuoshuo) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
+      '!{use[0]}' === 'Livere'
+        ? window.shuoshuoComment = { loadComment: loadLivere }
+        : window.loadOtherComment = loadLivere
+      return
+    }
+  
+    if ('!{use[0]}' === 'Livere' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
       else loadLivere()
+    } else {
+      window.loadOtherComment = loadLivere
     }
-  else {
+  })()
-    function loadOtherComment () {
-      loadLivere()
-    }
-  }

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

@@ -1,67 +1,78 @@
 - const { host, siteId, option } = theme.remark42
+
 script.
-  var remark_config = Object.assign({
+  (() => {
-    host: '!{host}',
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-    site_id: '!{siteId}',
+    const option = !{JSON.stringify(option)}
-    components: ['embed'],
-    theme: document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-  },!{JSON.stringify(option)})
 
-  function addRemark42(){
+    const loadScript = src => {
-    for (let i = 0; i < remark_config.components.length; i++) {
+      const script = document.createElement('script')
-      const s = document.createElement('script')
+      script.src = src
-      s.src = remark_config.host + '/web/' + remark_config.components[i] + '.js'
+      script.defer = true
-      s.defer = true
+      document.head.appendChild(script)
-      document.head.appendChild(s)
-    }
     }
 
-  function initRemark42() {
+    const addRemark42 = () => loadScript('!{host}/web/embed.js')
+
+    const getCount = () => document.querySelector('.remark42__counter') && loadScript('!{host}/web/count.js')
+
+    const destroyRemark42 = () => window.remark42Instance && window.remark42Instance.destroy()
+
+    const initRemark42 = remark_config => {
       if (window.REMARK42) {
-      if (this.remark42Instance) {
+        destroyRemark42()
-        this.remark42Instance.destroy()
+        window.remark42Instance = window.REMARK42.createInstance({
-      }
-
-      this.remark42Instance = window.REMARK42.createInstance({
           ...remark_config
         })
       }
     }
 
-  function getCount () {
+    const loadRemark42 = (el, path) => {
-    const ele = document.querySelector('.remark42__counter')
+      if (isShuoshuo) {
-    if (ele) {
+        window.shuoshuoComment.destroyRemark42 = () => {
-      const s = document.createElement('script')
+          destroyRemark42()
-      s.src = remark_config.host + '/web/counter.js'
+          if (el.children.length) {
-      s.defer = true
+            el.innerHTML = ''
-      document.head.appendChild(s)
+            el.classList.add('no-comment')
+          }
         }
       }
 
-  function loadRemark42 () {
+      window.remark_config = {
+        host: '!{host}',
+        site_id: '!{siteId}',
+        theme: document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light',
+        ...option,
+        url: isShuoshuo ? window.location.origin + path : (option && option.url) || window.location.origin + window.location.pathname
+      }
+
       if (window.REMARK42) {
-      this.initRemark42()
+        initRemark42(remark_config)
         getCount()
       } else {
         addRemark42()
         window.addEventListener('REMARK42::ready', () => {
-        this.initRemark42()
+          initRemark42(remark_config)
           getCount()
         })
       }
     }
 
-  document.getElementById('darkmode').addEventListener('click',()=>{
+    const remarkChangeMode = theme => window.REMARK42 && window.REMARK42.changeTheme(theme)
-    if (!window.REMARK42) return
+
-    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
+    btf.addGlobalFn('themeChange', remarkChangeMode, 'remark42')
-    window.REMARK42.changeTheme(theme)
+
-  })
+    if (isShuoshuo) {
+      '!{theme.comments.use[0]}' === 'Remark42'
+        ? window.shuoshuoComment = { loadComment: loadRemark42 }
+        : window.loadOtherComment = loadRemark42
+      return
+    }
     
     if ('!{theme.comments.use[0]}' === 'Remark42' || !!{theme.comments.lazyload}) {
       if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('remark42'), loadRemark42)
       else loadRemark42()
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadRemark42
-      loadRemark42()
-    }
     }
+  })()

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

@@ -2,17 +2,9 @@
 - const { use, lazyload, count } = theme.comments
 
 script.
-  (()=>{
+  (() => {
-    const init = () => {
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-      twikoo.init(Object.assign({
+    const option = !{JSON.stringify(option)}
-        el: '#twikoo-wrap',
-        envId: '!{envId}',
-        region: '!{region}',
-        onCommentLoaded: function () {
-          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
-        }
-      }, !{JSON.stringify(option)}))
-    }
 
     const getCount = () => {
       const countELement = document.getElementById('twikoo-count')
@@ -22,32 +14,51 @@ script.
         region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
-      }).then(function (res) {
+      }).then(res => {
-        countELement.innerText = res[0].count
+        countELement.textContent = res[0].count
-      }).catch(function (err) {
+      }).catch(err => {
-        console.error(err);
+        console.error(err)
-      });
+      })
     }
 
-    const runFn = () => {
+    const init = (el = document, path = location.pathname) => {
-      init()
+      twikoo.init({
-      !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
+        el: el.querySelector('#twikoo-wrap'),
+        envId: '!{envId}',
+        region: '!{region}',
+        onCommentLoaded: () => {
+          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
+        },
+        ...option,
+        path: isShuoshuo ? path : (option && option.path) || path
+      })
+
+      !{count ? `GLOBAL_CONFIG_SITE.pageType === 'post' && getCount()` : ''}
+
+      isShuoshuo && (window.shuoshuoComment.destroyTwikoo = () => {
+        if (el.children.length) {
+          el.innerHTML = ''
+          el.classList.add('no-comment')
+        }
+      })
     }
 
-    const loadTwikoo = () => {
+    const loadTwikoo = (el, path) => {
-      if (typeof twikoo === 'object') {
+      if (typeof twikoo === 'object') setTimeout(() => init(el, path), 0)
-        setTimeout(runFn,0)
+      else btf.getScript('!{url_for(theme.asset.twikoo)}').then(() => init(el, path))
+    }
+
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Twikoo'
+        ? window.shuoshuoComment = { loadComment: loadTwikoo }
+        : window.loadOtherComment = loadTwikoo
       return
     }
-      getScript('!{url_for(theme.asset.twikoo)}').then(runFn)
-    }
 
     if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {
       if (!{lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
       else loadTwikoo()
     } else {
-      window.loadOtherComment = () => {
+      window.loadOtherComment = loadTwikoo
-        loadTwikoo()
-      }
     }
   })()

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

@@ -1,34 +1,63 @@
+- const { use, lazyload } = theme.comments
+- const { repo, issue_term, light_theme, dark_theme, js, option } = theme.utterances
+- const utterancesUrl = js || 'https://utteranc.es/client.js'
+- const utterancesOriginUrl = new URL(utterancesUrl).origin
+
 script.
-  function loadUtterances () {
+  (() => {
-    let ele = document.createElement('script')
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-    ele.setAttribute('id', 'utterances_comment')
+    const option = !{JSON.stringify(option)}
-    ele.setAttribute('src', 'https://utteranc.es/client.js')
+    const getUtterancesTheme = theme => theme === 'dark' ? '#{dark_theme}' : '#{light_theme}'
-    ele.setAttribute('repo', '!{theme.utterances.repo}')
+
-    ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
+    const loadUtterances = (el = document, key) => {
-    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
+      if (isShuoshuo) {
-    ele.setAttribute('theme', nowTheme)
+        window.shuoshuoComment.destroyUtterances = () => {
-    ele.setAttribute('crossorigin', 'anonymous')
+          if (el.children.length) {
-    ele.setAttribute('async', 'true')
+            el.innerHTML = ''
-    document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
+            el.classList.add('no-comment')
+          }
+        }
       }
 
-  function utterancesTheme () {
+      const config = {
-    const iframe = document.querySelector('.utterances-frame')
+        src: '!{utterancesUrl}',
+        repo: '!{repo}',
+        theme: getUtterancesTheme(document.documentElement.getAttribute('data-theme')),
+        crossorigin: 'anonymous',
+        async: true,
+        ...option,
+        'issue-term': isShuoshuo ? key : (option && option['issue-term']) || '!{issue_term}'
+      }
+
+      const ele = document.createElement('script')
+      Object.entries(config).forEach(([key, value]) => ele.setAttribute(key, value))
+      el.querySelector('#utterances-wrap').appendChild(ele)
+    }
+
+    const changeUtterancesTheme = theme => {
+      const iframe = document.querySelector('#utterances-wrap iframe')
       if (iframe) {
-      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
         const message = {
           type: 'set-theme',
-        theme: theme
+          theme: getUtterancesTheme(theme)
         };
-      iframe.contentWindow.postMessage(message, 'https://utteranc.es');
+        iframe.contentWindow.postMessage(message, '!{utterancesOriginUrl}')
       }
     }
 
-  if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
+    btf.addGlobalFn('themeChange', changeUtterancesTheme, 'utterances')
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Utterances'
+        ? window.shuoshuoComment = { loadComment: loadUtterances }
+        : window.loadOtherComment = loadUtterances
+      return
+    }
+    
+    if ('!{use[0]}' === 'Utterances' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
       else loadUtterances()
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadUtterances
-      loadUtterances()
-    }
     }
+  })()

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

@@ -1,33 +1,60 @@
+- 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 isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-      const valine = new Valine(Object.assign({
+    const option = !{JSON.stringify(option)}
+
+    const initValine = (el, path) => {
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyValine = () => {
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
+
+      const valineConfig = {
         el: '#vcomment',
-        appId: '#{theme.valine.appId}',
+        appId: '#{appId}',
-        appKey: '#{theme.valine.appKey}',
+        appKey: '#{appKey}',
-        avatar: '#{theme.valine.avatar}',
+        avatar: '#{avatar}',
-        serverURLs: '#{theme.valine.serverURLs}',
+        serverURLs: '#{serverURLs}',
         emojiMaps: !{emojiMaps},
-        path: window.location.pathname,
+        visitor: #{visitor},
-        visitor: #{theme.valine.visitor}
+        ...option,
-      }, !{JSON.stringify(theme.valine.option)}))
+        path: isShuoshuo ? path : (option && option.path) || window.location.pathname
       }
 
-    if (typeof Valine === 'function') initValine() 
+      new Valine(valineConfig)
-    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
     }
 
-  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
+    const loadValine = async (el, path) => {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
+      if (typeof Valine === 'function') {
+        initValine(el, path)
+      } else {
+        await btf.getScript('!{url_for(theme.asset.valine)}')
+        initValine(el, path)
+      }
+    }
+
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Valine'
+        ? window.shuoshuoComment = { loadComment: loadValine }
+        : window.loadOtherComment = loadValine
+      return
+    }
+
+    if ('!{use[0]}' === 'Valine' || !!{lazyload}) {
+      if (!{lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
       else setTimeout(loadValine, 0)
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadValine
-      loadValine()
     }
-  }
+  })()
-  
-

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

@@ -2,37 +2,60 @@
 - const { lazyload, count, use } = theme.comments
 
 script.
-  function loadWaline () {
+  (() => {
-    function initWaline () {
+    let initFn = window.walineFn || null
-      const waline = Waline.init(Object.assign({
+    const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-        el: '#waline-wrap',
+    const option = !{JSON.stringify(option)}
+
+    const destroyWaline = ele => ele.destroy()
+
+    const initWaline = (Fn, el = document, path = window.location.pathname) => {
+      const waline = Fn({
+        el: el.querySelector('#waline-wrap'),
         serverURL: '!{serverURL}',
         pageview: !{lazyload ? false : pageview},
         dark: 'html[data-theme="dark"]',
-        path: window.location.pathname,
         comment: !{lazyload ? false : count},
-      }, !{JSON.stringify(option)}))
+        ...option,
+        path: isShuoshuo ? path : (option && option.path) || path
+      })
+
+      if (isShuoshuo) {
+        window.shuoshuoComment.destroyWaline = () => {
+          destroyWaline(waline)
+          if (el.children.length) {
+            el.innerHTML = ''
+            el.classList.add('no-comment')
+          }
+        }
+      }
     }
 
-    const walineCSSLoad = document.getElementById('waline-css')
+    const loadWaline = (el, path) => {
-
+      if (initFn) initWaline(initFn, el, path)
-    if (typeof Waline === 'object') {
-      walineCSSLoad ? initWaline() : getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(initWaline)
-    }
       else {
-      getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(() => {
+        btf.getCSS('!{url_for(theme.asset.waline_css)}')
-        getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+          .then(() => import('!{url_for(theme.asset.waline_js)}'))
+          .then(({ init }) => {
+            initFn = init || Waline.init
+            initWaline(initFn, el, path)
+            window.walineFn = initFn
           })
       }
     }
 
+    if (isShuoshuo) {
+      '!{use[0]}' === 'Waline'
+        ? window.shuoshuoComment = { loadComment: loadWaline } 
+        : window.loadOtherComment = loadWaline
+      return
+    }
+
     if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
       if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
       else setTimeout(loadWaline, 0)
     } else {
-    function loadOtherComment () {
+      window.loadOtherComment = loadWaline
-      loadWaline()
-    }
     }
-  
+  })()
 

layout/includes/third-party/effect.pug

@@ -24,12 +24,12 @@ if theme.activate_power_mode.enable
 if theme.click_heart && theme.click_heart.enable
   script#click-heart(src=url_for(theme.asset.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
-if theme.ClickShowText && theme.ClickShowText.enable
+if theme.clickShowText && theme.clickShowText.enable
   script#click-show-text(
-    src= url_for(theme.asset.ClickShowText)
+    src= url_for(theme.asset.clickShowText)
-    data-mobile= `${theme.ClickShowText.mobile}`
+    data-mobile= `${theme.clickShowText.mobile}`
-    data-text= theme.ClickShowText.text.join(",")
+    data-text= theme.clickShowText.text.join(",")
-    data-fontsize= theme.ClickShowText.fontSize
+    data-fontsize= theme.clickShowText.fontSize
-    data-random= `${theme.ClickShowText.random}`
+    data-random= `${theme.clickShowText.random}`
     async
   )

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

@@ -0,0 +1,91 @@
+- const { fontColor, borderColor, scale_ticks_backdropColor } = theme.chartjs
+
+script.
+  (() => {
+    const applyThemeDefaultsConfig = theme => {
+      if (theme === 'dark-mode') {
+        Chart.defaults.color = "!{fontColor.dark}"
+        Chart.defaults.borderColor = "!{borderColor.dark}"
+        Chart.defaults.scale.ticks.backdropColor = "!{scale_ticks_backdropColor.dark}"
+      } else {
+        Chart.defaults.color = "!{fontColor.light}"
+        Chart.defaults.borderColor = "!{borderColor.light}"
+        Chart.defaults.scale.ticks.backdropColor = "!{scale_ticks_backdropColor.light}"
+      }
+    }
+
+    // Recursively traverse the config object and automatically apply theme-specific color schemes
+    const applyThemeConfig = (obj, theme) => {
+      if (typeof obj !== 'object' || obj === null) return
+
+      Object.keys(obj).forEach(key => {
+        const value = obj[key]
+        // If the property is an object and has theme-specific options, apply them
+        if (typeof value === 'object' && value !== null) {
+          if (value[theme]) {
+            obj[key] = value[theme] // Apply the value for the current theme
+          } else {
+            // Recursively process child objects
+            applyThemeConfig(value, theme)
+          }
+        }
+      })
+    }
+
+    const runChartJS = ele => {
+      window.loadChartJS = true
+
+      Array.from(ele).forEach((item, index) => {
+        const chartSrc = item.firstElementChild
+        const chartID = item.getAttribute('data-chartjs-id') || ('chartjs-' + index) // Use custom ID or default ID
+        const width = item.getAttribute('data-width')
+        const existingCanvas = document.getElementById(chartID)
+
+        // If a canvas already exists, remove it to avoid rendering duplicates
+        if (existingCanvas) {
+            existingCanvas.parentNode.remove()
+        }
+
+        const chartDefinition = chartSrc.textContent
+        const canvas = document.createElement('canvas')
+        canvas.id = chartID
+
+        const div = document.createElement('div')
+        div.className = 'chartjs-wrap'
+
+        if (width) {
+          div.style.width = width
+        }
+
+        div.appendChild(canvas)
+        chartSrc.insertAdjacentElement('afterend', div)
+
+        const ctx = document.getElementById(chartID).getContext('2d')
+
+        const config = JSON.parse(chartDefinition)
+
+        const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark-mode' : 'light-mode'
+
+        // Set default styles (initial setup)
+        applyThemeDefaultsConfig(theme)
+
+        // Automatically traverse the config and apply dual-mode color schemes
+        applyThemeConfig(config, theme)
+
+        new Chart(ctx, config)
+      })
+    }
+
+    const loadChartJS = () => {
+      const chartJSEle = document.querySelectorAll('#article-container .chartjs-container')
+      if (chartJSEle.length === 0) return
+
+      window.loadChartJS ? runChartJS(chartJSEle) : btf.getScript('!{url_for(theme.asset.chartjs)}').then(() => runChartJS(chartJSEle))
+    }
+
+    // Listen for theme change events
+    btf.addGlobalFn('themeChange', loadChartJS, 'chartjs')
+    btf.addGlobalFn('encrypt', loadChartJS, 'chartjs')
+
+    window.pjax ? loadChartJS() : document.addEventListener('DOMContentLoaded', loadChartJS)
+  })()

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

@@ -1,18 +1,14 @@
-if theme.mathjax && theme.mathjax.enable
+case theme.math.use
-  if theme.mathjax.per_page
+  when 'mathjax'
-    if is_post() || is_page()
+    if (theme.math.per_page && (['post','page'].includes(globalPageType))) || page.mathjax
-      include ./mathjax.pug
-  else
-    if page.mathjax
       include ./mathjax.pug
 
-if theme.katex && theme.katex.enable
+  when 'katex'
-  if theme.katex.per_page
+    if (theme.math.per_page && (['post','page'].includes(globalPageType))) || page.katex
-    if is_post() || is_page()
-      include ./katex.pug
-  else
-    if page.katex
       include ./katex.pug
 
 if theme.mermaid.enable
   include ./mermaid.pug
+
+if theme.chartjs.enable
+  include ./chartjs.pug

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

@@ -1,9 +1,16 @@
-link(rel="stylesheet" type="text/css" href=url_for(theme.asset.katex))
-script(src=url_for(theme.asset.katex_copytex))
 script.
-  (() => {
+  (async () => {
-    document.querySelectorAll('#article-container span.katex-display').forEach(item => {
+    const showKatex = () => {
-      btf.wrap(item, 'div', { class: 'katex-wrap'})
+      document.querySelectorAll('#article-container .katex').forEach(el => el.classList.add('katex-show'))
-    })
+    }
-  })()
 
+    if (!window.katex_js_css) {
+      window.katex_js_css = true
+      await btf.getCSS('!{url_for(theme.asset.katex)}')
+      if (!{theme.math.katex.copy_tex}) {
+        await btf.getScript('!{url_for(theme.asset.katex_copytex)}')
+      }
+    }
+
+    showKatex()
+  })()

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

@@ -1,15 +1,19 @@
 //- Mathjax 3
+- const { tags, enableMenu } = theme.math.mathjax
 script.
+  (() => {
+    const loadMathjax = () => {
       if (!window.MathJax) {
         window.MathJax = {
           tex: {
-        inlineMath: [ ['$','$'], ["\\(","\\)"]],
+            inlineMath: [['$', '$'], ['\\(', '\\)']],
-        tags: 'ams'
+            tags: '!{tags}',
           },
           chtml: {
             scale: 1.1
           },
           options: {
+            enableMenu: !{enableMenu},
             renderActions: {
               findScript: [10, doc => {
                 for (const node of document.querySelectorAll('script[type^="math/tex"]')) {
@@ -21,16 +25,7 @@ script.
                   math.end = {node: text, delim: '', n: 0}
                   doc.math.push(math)
                 }
-          }, ''],
+              }, '']
-          insertScript: [200, () => {
-            document.querySelectorAll('mjx-container').forEach(node => {
-              if (node.hasAttribute('display')) {
-                btf.wrap(node, 'div', { class: 'mathjax-overflow' })
-              } else {
-                btf.wrap(node, 'span', { class: 'mathjax-overflow' })
-              }
-            });
-          }, '', false]
             }
           }
         }
@@ -45,3 +40,8 @@ script.
         MathJax.texReset()
         MathJax.typesetPromise()
       }
+    }
+
+    btf.addGlobalFn('encrypt', loadMathjax, 'mathjax')
+    window.pjax ? loadMathjax() : window.addEventListener('load', loadMathjax)
+  })()

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

@@ -1,26 +1,51 @@
 script.
   (() => {
-    const $mermaidWrap = document.querySelectorAll('#article-container .mermaid-wrap')
+    const runMermaid = ele => {
-    if ($mermaidWrap.length) {
-      window.runMermaid = () => {
       window.loadMermaid = true
       const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{theme.mermaid.theme.dark}' : '!{theme.mermaid.theme.light}'
 
-        Array.from($mermaidWrap).forEach((item, index) => {
+      ele.forEach((item, index) => {
         const mermaidSrc = item.firstElementChild
-          const mermaidThemeConfig = '%%{init:{ \'theme\':\'' + theme + '\'}}%%\n'
+        const mermaidThemeConfig = `%%{init:{ 'theme':'${theme}'}}%%\n`
-          const mermaidID = 'mermaid-' + index
+        const mermaidID = `mermaid-${index}`
         const mermaidDefinition = mermaidThemeConfig + mermaidSrc.textContent
-          mermaid.mermaidAPI.render(mermaidID, mermaidDefinition, (svgCode) => {
+
-            mermaidSrc.insertAdjacentHTML('afterend', svgCode)
+        const renderFn = mermaid.render(mermaidID, mermaidDefinition)
+        const renderMermaid = svg => {
+          mermaidSrc.insertAdjacentHTML('afterend', svg)
+        }
+
+        // mermaid v9 and v10 compatibility
+        typeof renderFn === 'string' ? renderMermaid(renderFn) : renderFn.then(({ svg }) => renderMermaid(svg))
       })
+    }
+
+    const codeToMermaid = () => {
+      const codeMermaidEle = document.querySelectorAll('pre > code.mermaid')
+      if (codeMermaidEle.length === 0) return
+
+      codeMermaidEle.forEach(ele => {
+        const preEle = document.createElement('pre')
+        preEle.className = 'mermaid-src'
+        preEle.hidden = true
+        preEle.textContent = ele.textContent
+        const newEle = document.createElement('div')
+        newEle.className = 'mermaid-wrap'
+        newEle.appendChild(preEle)
+        ele.parentNode.replaceWith(newEle)
       })
     }
 
     const loadMermaid = () => {
-        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
+      if (!{theme.mermaid.code_write}) codeToMermaid()
+      const $mermaid = document.querySelectorAll('#article-container .mermaid-wrap')
+      if ($mermaid.length === 0) return
+
+      const runMermaidFn = () => runMermaid($mermaid)
+      btf.addGlobalFn('themeChange', runMermaidFn, 'mermaid')
+      window.loadMermaid ? runMermaidFn() : btf.getScript('!{url_for(theme.asset.mermaid)}').then(runMermaidFn)
     }
 
+    btf.addGlobalFn('encrypt', loadMermaid, 'mermaid')
     window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)
-    }
   })()

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

@@ -1,89 +1,67 @@
 - const { server, site, option } = theme.artalk
-- const avatarCdn = option !== null && option.gravatar ? option.gravatar.mirror : 'https://sdn.geekzu.org/avatar/'
+- const avatarCdn = (option !== null && option.gravatar && option.gravatar.mirror) || ''
-- const avatarDefault = option !== null && option.gravatar ? option.gravatar.default : 'mp'
+- const avatarDefault = (option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)) || ''
+
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
 
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'artalk-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
 
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+    const getAvatarValue = async () => {
-      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      const predefinedAvatarCdn = '!{avatarCdn}'
-      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      const predefinedAvatarDefault = '!{avatarDefault}'
-      content = content.replace(/<[^>]+>/g,"") // remove html tag
 
-      if (content.length > 150) {
+      const avatarDefaultFormat = e => e.startsWith('d=') ? e : `d=${e}`
-        content = content.substring(0,150) + '...'
+
-      }
+      if (predefinedAvatarCdn && predefinedAvatarDefault) {
-      return content
+        return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
       }
 
-    const generateHtml = array => {
+      try {
-      let result = ''
+        const res = await fetch('!{server}/api/v2/conf')
-
+        const result = await res.json()
-      if (array.length) {
+        const { mirror, params, default: defaults } = result.frontend_conf.gravatar
-        for (let i = 0; i < array.length; i++) {
+        const avatarCdn = predefinedAvatarCdn || mirror
-          result += '<div class=\'aside-list-item\'>'
+        let avatarDefault = avatarDefaultFormat(predefinedAvatarDefault || params || defaults)
-
+        return { avatarCdn, avatarDefault}
-          if (!{theme.newest_comments.avatar}) {
+      } catch (e) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+        console.error(e)
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+        return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const headerList = {
-      method: 'POST',
-      headers: {
-        'Origin': window.location.origin
       }
     }
 
-    const getComment = () => {
+    const searchParams = new URLSearchParams({
-      fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}&site_name=!{site}', headerList)
+      'site_name': '!{site}',
-        .then(response => response.json())
+      'limit': '!{newestCommentsLimit * 2}', // Fetch more comments to filter pending comments
-        .then(d => {
+    })
-          const artalk = d.data.map(function (e) {
+
+    const getComment = async (ele) => {
+      try {
+        const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`)
+        const result = await res.json()
+        const { avatarCdn, avatarDefault } = await getAvatarValue()
+        const artalk = result.data
+          .filter(e => !e.is_pending) // Filter pending comments
+          .slice(0, !{newestCommentsLimit}) // Limit the number of comments
+          .map(e => {
+            const avatar = avatarCdn && e.email_encrypted ? `${avatarCdn}${e.email_encrypted}?${avatarDefault}` : ''
             return {
-              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
+              'avatar': avatar,
               '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))
+        btf.saveToLocal.set(keyName, JSON.stringify(artalk), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(artalk)
+        generateHtml(artalk, ele)
-        }).catch(e => {
+      } catch (e) {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+        console.log(e)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        ele.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()
+    run(keyName, getComment)
-    document.addEventListener('pjax:complete', newestCommentInit)
   })

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

@@ -0,0 +1,61 @@
+script.
+  window.newestComments = {
+    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(/<code>.*?<\/code>/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
+    },
+
+    generateHtml: (array, ele) => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class="aside-list-item">'
+
+          if (!{theme.aside.card_newest_comments.avatar} && array[i].avatar) {
+            const imgAttr = '!{theme.lazyload.enable && !theme.lazyload.native ? "data-lazy-src" : "src"}'
+            const lazyloadNative = '!{theme.lazyload.enable && theme.lazyload.native ? "loading=\"lazy\"" : ""}'
+            result += `<a href="${array[i].url}" class="thumbnail"><img ${imgAttr}="${array[i].avatar}" alt="${array[i].nick}" ${lazyloadNative}></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")}'
+      }
+
+      ele.innerHTML = result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh(ele)
+    },
+
+    newestCommentInit: (name, getComment) => {
+      const $dom = document.querySelector('#card-newest-comments .aside-list')
+      if ($dom) {
+        const data = btf.saveToLocal.get(name)
+        if (data) {
+          newestComments.generateHtml(JSON.parse(data), $dom)
+        } else {
+          getComment($dom)
+        }
+      }
+    },
+
+    run: (name, getComment) => {
+      newestComments.newestCommentInit(name, getComment)
+      btf.addGlobalFn('pjaxComplete', () => newestComments.newestCommentInit(name, getComment), name)
+    }
+  }

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

@@ -1,21 +1,12 @@
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'disqus-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
 
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+    const getComment = ele => {
-      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{forum}&related=thread&limit=!{newestCommentsLimit}&api_key=!{apiKey}')
-      content = content.replace(/<code>.*?<\/code>/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 getComment = () => {
-      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 => {
@@ -28,54 +19,15 @@ script.
             }
           })
 
-          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), !{theme.newest_comments.storage}/(60*24))
+          btf.saveToLocal.set(keyName, JSON.stringify(disqusArray), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(disqusArray)
+          generateHtml(disqusArray, ele)
         }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          console.error(e)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          ele.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
-    const generateHtml = array => {
+    run(keyName, getComment)
-      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> / ${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('disqus-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
   })
 
 

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

@@ -1,23 +1,17 @@
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'github-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
 
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+    const findTrueUrl = (array, ele) => {
-      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 findTrueUrl = (array) => {
       Promise.all(array.map(item =>
         fetch(item.url).then(resp => resp.json()).then(data => {
-          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
+          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') {
             return urlArray.pop()
           } else {
@@ -32,13 +26,13 @@ script.
             }
           })
 
-          saveToLocal.set('github-newest-comments', JSON.stringify(array), !{theme.newest_comments.storage}/(60*24))
+          btf.saveToLocal.set(keyName, JSON.stringify(array), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(array)
+          generateHtml(array, ele)
       });
     }
 
-    const getComment = () => {
+    const getComment = ele => {
-      fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1',{
+      fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{newestCommentsLimit}&page=1',{
         "headers": {
           Accept: 'application/vnd.github.v3.html+json'
         }
@@ -48,60 +42,19 @@ 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,
+              'date': item.updated_at
-              'githubUrl': item.html_url
             }
           })
-          findTrueUrl(githubArray)
+          findTrueUrl(githubArray, ele)
         }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          console.error(e)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          ele.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
-
+    run(keyName, getComment)
-    const generateHtml = array => {
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('github-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
   })
 
 

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

@@ -1,7 +1,11 @@
 - let { use } = theme.comments
 
 if use
-  - let forum,apiKey,userRepo
+  -
+    let forum,apiKey,userRepo
+    let { limit:newestCommentsLimit } = theme.aside.card_newest_comments
+    if (newestCommentsLimit > 10 || newestCommentsLimit < 1) newestCommentsLimit = 6
+
   case use[0]
     when 'Valine'
       include ./valine.pug

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

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

@@ -1,27 +1,18 @@
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'twikoo-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
 
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+    const getComment = ele => {
-      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 getComment = () => {
       const runTwikoo = () => {
         twikoo.getRecentComments({
           envId: '!{theme.twikoo.envId}',
           region: '!{theme.twikoo.region}',
-          pageSize: !{theme.newest_comments.limit},
+          pageSize: !{newestCommentsLimit},
           includeReply: true
-        }).then(function (res) {
+        }).then(res => {
           const twikooArray = res.map(e => {
             return {
               'content': changeContent(e.comment),
@@ -32,61 +23,22 @@ script.
             }
           })
 
-          saveToLocal.set('twikoo-newest-comments', JSON.stringify(twikooArray), !{theme.newest_comments.storage}/(60*24))
+          btf.saveToLocal.set(keyName, JSON.stringify(twikooArray), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(twikooArray)
+          generateHtml(twikooArray, ele)
-        }).catch(function (err) {
+        }).catch(err => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          console.error(err)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          ele.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
       }
 
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+        btf.getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
       }
     }
 
-    const generateHtml = array => {
+    run(keyName, getComment)
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-          
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('twikoo-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
   })
 
 

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

@@ -1,21 +1,12 @@
 - let default_avatar = theme.valine.avatar
 
 script(src=url_for(theme.asset.blueimp_md5))
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'valine-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
-
-      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 getIcon = (icon, mail) => {
       if (icon) return icon
@@ -24,34 +15,7 @@ script.
       return iconUrl
     }
 
-    const generateHtml = array => {
+    const getComment = ele => {
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const getComment = () => {
       const serverURL = '!{theme.valine.serverURLs || `https://${theme.valine.appId.substring(0,8)}.api.lncldglobal.com` }'
 
       var settings = {
@@ -63,10 +27,10 @@ script.
         },
       }
 
-      fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,settings)
+      fetch(`${serverURL}/1.1/classes/Comment?limit=!{newestCommentsLimit}&order=-createdAt`,settings)
         .then(response => response.json())
         .then(data => {
-          const valineArray = data.results.map(function (e) {
+          const valineArray = data.results.map(e => {
             return {
               'avatar': getIcon(e.QQAvatar, e.mail),
               'content': changeContent(e.comment),
@@ -75,25 +39,13 @@ script.
               'date': e.updatedAt,
             }
           })
-          saveToLocal.set('valine-newest-comments', JSON.stringify(valineArray), !{theme.newest_comments.storage}/(60*24))
+          btf.saveToLocal.set(keyName, JSON.stringify(valineArray), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(valineArray)
+          generateHtml(valineArray, ele)
         }).catch(e => {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          console.error(e)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          ele.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
-    const newestCommentInit = () => {
+    run(keyName, getComment)
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('valine-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
   })

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

@@ -1,84 +1,32 @@
+- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
+
+!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const keyName = 'waline-newest-comments'
-      if (content === '') return content
+    const { changeContent, generateHtml, run } = window.newestComments
 
-      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+    const getComment = async (ele) => {
-      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      try {
-      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{newestCommentsLimit}')
-      content = content.replace(/<[^>]+>/g,"") // remove html tag
+        const result = await res.json()
-
+        const walineArray = result.data.map(e => {
-      if (content.length > 150) {
-        content = content.substring(0,150) + '...'
-      }
-      return content
-    }
-
-    const generateHtml = array => {
-      let result = ''
-
-      if (array.length) {
-        for (let i = 0; i < array.length; i++) {
-          result += '<div class=\'aside-list-item\'>'
-
-          if (!{theme.newest_comments.avatar}) {
-            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-          }
-
-          result += `<div class='content'>
-          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
-          </div></div>`
-        }
-      } else {
-        result += '!{_p("aside.card_newest_comments.zero")}'
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.lazyLoadInstance && window.lazyLoadInstance.update()
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const getComment = () => {
-      const loadWaline = () => {
-        Waline.RecentComments({
-          serverURL: '!{theme.waline.serverURL}',
-          count: !{theme.newest_comments.limit}
-        }).then(({comments}) => {
-          const walineArray = comments.map(e => {
           return {
             'content': changeContent(e.comment),
             'avatar': e.avatar,
             'nick': e.nick,
             'url': e.url + '#' + e.objectId,
-              'date': e.insertedAt,
+            'date': e.time || e.insertedAt
           }
         })
-          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+        btf.saveToLocal.set(keyName, JSON.stringify(walineArray), !{theme.aside.card_newest_comments.storage}/(60*24))
-          generateHtml(walineArray)
+        generateHtml(walineArray, ele)
-        }).catch(e => {
+      } catch (err) {
-          const $dom = document.querySelector('#card-newest-comments .aside-list')
+        console.error(err)
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        ele.textContent= "!{_p('aside.card_newest_comments.error')}"
-        }) 
-      }
-
-      if (typeof Waline === 'object') loadWaline()
-      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('waline-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getComment()
-        }
       }
     }
 
-    newestCommentInit()
+    run(keyName, getComment)
-    document.addEventListener('pjax:complete', newestCommentInit)
   })

layout/includes/third-party/pangu.pug

@@ -1,20 +0,0 @@
-script.
-  function panguFn () {
-    if (typeof pangu === 'object') pangu.autoSpacingPage()
-    else {
-      getScript('!{url_for(theme.asset.pangu)}')
-        .then(() => {
-          pangu.autoSpacingPage()
-        })
-    }
-  }
-
-  function panguInit () {
-    if (!{theme.pangu.field === 'post'}){
-      GLOBAL_CONFIG_SITE.isPost && panguFn()
-    } else {
-      panguFn()
-    }
-  }
-
-  document.addEventListener('DOMContentLoaded', panguInit)

layout/includes/third-party/pjax.pug

@@ -1,22 +1,25 @@
 - var pjaxExclude = 'a:not([target="_blank"])'
 if theme.pjax.exclude
   each val in theme.pjax.exclude
-    - pjaxExclude = pjaxExclude + `:not([href="${val}"])`
+    - pjaxExclude += `:not([href="${val}"])`
 
-- let pjaxSelectors = ['head > title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
+- let pjaxSelectors = ['head > title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax']
 
 - let choose = theme.comments.use
 if choose
-  if theme.Open_Graph_meta.enable && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
+  if 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"]')
+    if theme.Open_Graph_meta.enable
+      - pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]', 'meta[property="og:description"]')
+    else
+      - pjaxSelectors.unshift('meta[name="description"]')
 
 script(src=url_for(theme.asset.pjax))
 script.
-  let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
+  (() => {
+    const pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
 
-  var pjax = new Pjax({
+    window.pjax = new Pjax({
       elements: '!{pjaxExclude}',
       selectors: pjaxSelectors,
       cacheBust: false,
@@ -24,34 +27,25 @@ script.
       scrollRestoration: false
     })
 
-  document.addEventListener('pjax:send', function () {
+    const triggerPjaxFn = (val) => {
-
+      if (!val) return
-    // removeEventListener scroll 
+      Object.values(val).forEach(fn => fn())
-    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
-    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
-
-    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
-    
-    if (window.aplayers) {
-      for (let i = 0; i < window.aplayers.length; i++) {
-        if (!window.aplayers[i].options.fixed) {
-          window.aplayers[i].destroy()
-        }
-      }
     }
 
-    typeof typed === 'object' && typed.destroy()
+    document.addEventListener('pjax:send', () => {
+      // removeEventListener
+      btf.removeGlobalFnEvent('pjaxSendOnce')
+      btf.removeGlobalFnEvent('themeChange')
 
-    //reset readmode
+      // reset readmode
       const $bodyClassList = document.body.classList
-    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
+      if ($bodyClassList.contains('read-mode')) $bodyClassList.remove('read-mode')
 
-    typeof disqusjs === 'object' && disqusjs.destroy()
+      triggerPjaxFn(window.globalFn.pjaxSend)
     })
 
-  document.addEventListener('pjax:complete', function () {
+    document.addEventListener('pjax:complete', () => {
-    window.refreshFn()
+      btf.removeGlobalFnEvent('pjaxCompleteOnce')
-
       document.querySelectorAll('script[data-pjax]').forEach(item => {
         const newScript = document.createElement('script')
         const content = item.text || item.textContent || item.innerHTML || ""
@@ -60,25 +54,15 @@ script.
         item.parentNode.replaceChild(newScript, item)
       })
 
-    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
+      triggerPjaxFn(window.globalFn.pjaxComplete)
-
-    typeof chatBtnFn === 'function' && chatBtnFn()
-    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) => {
+    document.addEventListener('pjax:error', e => {
       if (e.request.status === 404) {
-      pjax.loadUrl('/404.html')
+        const usePjax = !{theme.pjax && theme.pjax.enable}
+        !{theme.error_404 && theme.error_404.enable} 
+          ? (usePjax ? pjax.loadUrl('!{url_for("/404.html")}') : window.location.href = '!{url_for("/404.html")}')
+          : window.location.href = e.request.responseURL
       }
     })
+  })()

layout/includes/third-party/prismjs.pug

@@ -1,5 +1,23 @@
-if config.prismjs && config.prismjs.enable && !config.prismjs.preprocess
+- const { prismjs_js, prismjs_autoloader, prismjs_lineNumber_js } = theme.asset
-  script(src=url_for(theme.asset.prismjs_js))
+- const { prismjs, syntax_highlighter } = config
-  script(src=url_for(theme.asset.prismjs_autoloader))
+- const { enable, preprocess, line_number } = prismjs
-  if config.prismjs.line_number
+
-    script(src=url_for(theme.asset.prismjs_lineNumber_js))
+if (syntax_highlighter === 'prismjs' || enable) && !preprocess
+  script.
+    (() => {
+      window.Prism = window.Prism || {}
+      window.Prism.manual = true
+
+      const highlightAll = () => {
+        window.Prism.highlightAll()
+      }
+
+      window.addEventListener('load', highlightAll)
+      btf.addGlobalFn('pjaxComplete', highlightAll, 'prismjs')
+      btf.addGlobalFn('encrypt', highlightAll, 'prismjs')
+    })()
+
+  script(src=url_for(prismjs_js))
+  script(src=url_for(prismjs_autoloader))
+  if (line_number)
+    script(src=url_for(prismjs_lineNumber_js))

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

@@ -1,4 +1,4 @@
-- const { appId, apiKey, indexName, option } = theme.docsearch
+- const { placeholder, docsearch: { appId, apiKey, indexName, option } } = theme.search
 
 .docsearch-wrap
   #docsearch(style="display:none")
@@ -11,13 +11,15 @@
         apiKey: '!{apiKey}',
         indexName: '!{indexName}',
         container: '#docsearch',
+        placeholder: '!{ placeholder || _p("search.input_placeholder")}',
       }, !{JSON.stringify(option)}))
 
+      const handleClick = () => {
+        document.querySelector('.DocSearch-Button').click()
+      }
 
       const searchClickFn = () => {
-        document.querySelector('#search-button > .search').addEventListener('click', () => {
+        btf.addEventListenerPjax(document.querySelector('#search-button > .search'), 'click', handleClick)
-          document.querySelector('.DocSearch-Button').click()
-        })
       }
 
       searchClickFn()

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

@@ -1,6 +1,7 @@
-if theme.algolia_search.enable
+case theme.search.use
+  when 'algolia_search'
     include ./algolia.pug
-else if theme.local_search.enable
+  when 'local_search'
     include ./local-search.pug
-else if theme.docsearch.enable
+  when 'docsearch'
     include ./docsearch.pug

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

@@ -6,16 +6,16 @@
       button.search-close-button
         i.fas.fa-times
 
-    #loading-database.is-center
+    #loading-database.text-center
       i.fas.fa-spinner.fa-pulse
       span= '  ' + _p("search.load_data")
 
     .search-wrap
       #local-search-input
         .local-search-box
-          input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
+          input(placeholder=theme.search.placeholder || _p("search.input_placeholder") type="text").local-search-box--input
       hr
-      #local-search-results.no-result
+      #local-search-results
       #local-search-stats-wrap
   #search-mask