Merge branch 'dev'

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -53,6 +53,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:

.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群都添加'
 

README.md

@@ -1,7 +1,5 @@
 <div align="right">
-  Language:
+<a title="Chinese" href="/README_CN.md">中文</a>
-  🇺🇸
-  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
 </div>
 
 # hexo-theme-butterfly
@@ -14,9 +12,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [CrazyWong](https://crazywong.com/)
+📢 Demo: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
 
-Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) || [Chinese](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
@@ -62,23 +60,23 @@ npm i hexo-theme-butterfly
 
 - [x] Card UI Design
 - [X] Support sub-menu
-- [x] Two Column designs
+- [x] Two-column layout
 - [x] Responsive Web Design
 - [x] Dark Mode
 - [x] Pjax
 - [x] Read Mode
 - [x] Conversion between Traditional and Simplified Chinese
 - [X] TOC catalog is available for both computers and mobile phones
-- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
+- [X] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean/mac/mac light), also support customization
 - [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
 - [X] Disable copy/Add a Copyright Notice to the Copied Text
-- [X] Search (Algolia SearchZ/Local Search)
+- [X] Search (Algolia Search/Local Search)
 - [x] Mathjax and Katex
 - [x] Built-in 404 page
 - [x] WordCount
 - [x] Related articles
 - [x] Displays outdated notice for a post
-- [x] Share (AddThis/Sharejs/Addtoany)
+- [x] Share (Sharejs/Addtoany)
 - [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Crisp/messenger)

README_CN.md

@@ -1,7 +1,5 @@
 <div align="right">
-  語言:
+  <a title="English" href="/README.md">English</a>
-  中文
-  <a title="English" href="/README.md">英文</a>
 </div>
 
 # hexo-theme-butterfly
@@ -14,9 +12,9 @@
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [CrazyWong](https://crazywong.com/)
+📢 預覽: [Butterfly](https://butterfly.js.org/) || [CrazyWong](https://blog.crazywong.com/)
 
-文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
+📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) || [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
@@ -78,13 +76,13 @@ theme: butterfly
 - [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] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
-- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 各種站長驗證
 - [x] 修改網站配色
 - [x] 打字特效 activate_power_mode
 - [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）

_config.yml

@@ -125,11 +125,10 @@ index_post_content:
 
 # anchor
 anchor:
-  button:
+  # when you scroll, the URL will update according to header id.
-    enable: false
+  auto_update: false
-    always_show: false
+  # Click the headline to scroll and update the anchor
-    icon: # the unicode value of Font Awesome icon, such as '\3423'
+  click_to_scroll: false
-  auto_update: false # when you scroll in post, the URL will update according to header id.
 
 # figcaption (圖片描述文字)
 photofigcaption: false
@@ -164,6 +163,7 @@ post_copyright:
 # Sponsor/reward
 reward:
   enable: false
+  text:
   QR_code:
     # - img: /img/wechat.jpg
     #   link:
@@ -264,6 +264,11 @@ aside:
     post_count: true
     last_push_date: true
     sort_order: # Don't modify the setting unless you know how it works
+  card_post_series:
+    enable: true
+    series_title: false # The title shows the series name
+    orderBy: 'date' # Order by title or date
+    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
 
 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -381,12 +386,6 @@ docsearch:
 # Share System (分享)
 # --------------------------------------
 
-# AddThis
-# https://www.addthis.com/
-addThis:
-  enable: false
-  pubid:
-
 # Share.js
 # https://github.com/overtrue/share.js
 sharejs:
@@ -637,6 +636,9 @@ index_top_img_height:
 category_ui: # 留空或 index
 tag_ui: # 留空或 index
 
+# Stretches the lines so that each line has equal width（文字向兩側對齊，對最後一行無效）
+text_align_justify: false
+
 # Website Background (設置網站背景)
 # can set it to color or image (可設置圖片 或者 顔色)
 # The formal of image: url(http://xxxxxx.com/xxx.jpg)
@@ -645,8 +647,13 @@ background:
 # Footer Background
 footer_bg: false
 
+# Add mask to header or footer (为 header 或 footer 添加黑色半透遮罩)
+mask:
+  header: true
+  footer: true
+
 # the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
-rightside-bottom:
+rightside_bottom:
 
 # Enter transitions (開啓網頁進入效果)
 enter_transitions: true
@@ -699,7 +706,7 @@ click_heart:
   mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
-ClickShowText:
+clickShowText:
   enable: false
   text:
     # - I
@@ -791,6 +798,13 @@ fancybox: true
 # Tag Plugins settings (標籤外掛)
 # --------------------------------------
 
+# series (系列文章)
+series:
+  enable: true
+  orderBy: 'title' # Order by title or date
+  order: 1 # Sort of order. 1, asc for ascending; -1, desc for descending
+  number: true
+
 # abcjs (樂譜渲染)
 # See https://github.com/paulrosen/abcjs
 abcjs:
@@ -916,66 +930,65 @@ CDN:
   third_party_provider: jsdelivr
 
   # Add version number to url, true or false
-  version: false
+  version: true
 
   # Custom format
   # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
   custom_format:
 
   option:
-    # main_css:
+    # abcjs_basic_js:
-    # main:
+    # activate_power_mode:
-    # utils:
-    # translate:
-    # local_search:
     # algolia_js:
     # algolia_search:
-    # instantsearch:
-    # docsearch_js:
-    # docsearch_css:
-    # pjax:
-    # gitalk:
-    # gitalk_css:
-    # blueimp_md5:
-    # valine:
-    # disqusjs:
-    # disqusjs_css:
-    # twikoo:
-    # waline_js:
-    # waline_css:
-    # giscus:
-    # sharejs:
-    # sharejs_css:
-    # mathjax:
-    # katex:
-    # katex_copytex:
-    # mermaid:
-    # canvas_ribbon:
-    # canvas_fluttering_ribbon:
-    # canvas_nest:
-    # lazyload:
-    # instantpage:
-    # typed:
-    # pangu:
-    # fancybox_css:
-    # fancybox:
-    # medium_zoom:
-    # snackbar_css:
-    # snackbar:
-    # activate_power_mode:
-    # fireworks:
-    # click_heart:
-    # ClickShowText:
-    # fontawesome:
-    # flickr_justified_gallery_js:
-    # flickr_justified_gallery_css:
     # aplayer_css:
     # aplayer_js:
+    # artalk_css:
+    # artalk_js:
+    # blueimp_md5:
+    # busuanzi:
+    # canvas_fluttering_ribbon:
+    # canvas_nest:
+    # canvas_ribbon:
+    # click_heart:
+    # clickShowText:
+    # disqusjs:
+    # disqusjs_css:
+    # docsearch_css:
+    # docsearch_js:
+    # egjs_infinitegrid:
+    # fancybox:
+    # fancybox_css:
+    # fireworks:
+    # fontawesome:
+    # gitalk:
+    # gitalk_css:
+    # giscus:
+    # instantpage:
+    # instantsearch:
+    # katex:
+    # katex_copytex:
+    # lazyload:
+    # local_search:
+    # main:
+    # main_css:
+    # mathjax:
+    # medium_zoom:
+    # mermaid:
     # meting_js:
+    # pangu:
+    # prismjs_autoloader:
     # prismjs_js:
     # prismjs_lineNumber_js:
-    # prismjs_autoloader:
+    # pjax:
-    # artalk_js:
+    # sharejs:
-    # artalk_css:
+    # sharejs_css:
-    # busuanzi:
+    # snackbar:
-    # abcjs_basic_js:
+    # snackbar_css:
+    # translate:
+    # twikoo:
+    # typed:
+    # utils:
+    # valine:
+    # waline_css:
+    # waline_js:

languages/default.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
+  success: Copy Successful
-  error: Copy error
+  error: Copy Error
-  noSupport: The browser does not support
+  noSupport: Browser Not Supported
 
 page:
   articles: Articles
@@ -15,16 +15,15 @@ page:
 
 card_post_count: comments
 
-sticky: Sticky
+no_title: Untitled
-no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
+  wordcount: Word Count
-  min2read: Reading time
+  min2read: Reading Time
-  min2read_unit: min
+  min2read_unit: mins
-  page_pv: Post View
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
@@ -48,8 +47,8 @@ search:
     hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
+  prev: Previous
-  next: Next Post
+  next: Next
 
 comment: Comment
 
@@ -69,29 +68,30 @@ aside:
       name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
     loading_text: loading...
-    error: Unable to get the data, please make sure the settings are correct.
+    error: Unable to retrieve comments, please check the configuration
-    zero: No Comment
+    zero: No comments
     image: image
     link: link
     code: code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Series
 
 date_suffix:
-  just: Just
+  just: Just now
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Donate
+donate: Sponsor
 share: Share
 
 rightside:
@@ -102,7 +102,7 @@ rightside:
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between single-column and double-column
+  aside: Toggle between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
@@ -112,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: Traditional Chinese Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
-  cht_to_chs: Simplified Chinese Activated Manually
+  cht_to_chs: You have switched to Simplified Chinese
-  day_to_night: Dark Mode Activated Manually
+  day_to_night: You have switched to Dark Mode
-  night_to_day: Light Mode Activated Manually
+  night_to_day: You have switched to Light Mode
 
 loading: Loading...
 load_more: Load More
 
-error404: Page not found
+error404: Page Not Found

languages/en.yml

@@ -3,9 +3,9 @@ footer:
   theme: Theme
 
 copy:
-  success: Copy successfully
+  success: Copy Successful
-  error: Copy error
+  error: Copy Error
-  noSupport: The browser does not support
+  noSupport: Browser Not Supported
 
 page:
   articles: Articles
@@ -15,16 +15,15 @@ page:
 
 card_post_count: comments
 
-sticky: Sticky
+no_title: Untitled
-no_title: No title
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
+  wordcount: Word Count
-  min2read: Reading time
+  min2read: Reading Time
-  min2read_unit: min
+  min2read_unit: mins
-  page_pv: Post View
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
@@ -48,8 +47,8 @@ search:
     hits_stats: '${hits} results found'
 
 pagination:
-  prev: Previous Post
+  prev: Previous
-  next: Next Post
+  next: Next
 
 comment: Comment
 
@@ -69,40 +68,41 @@ aside:
       name: Runtime
       unit: days
     last_push_date:
-      name: Last Push
+      name: Last Update
     site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
-  more_button: More
+  more_button: View More
   card_newest_comments:
-    headline: Newest Comments
+    headline: Latest Comments
     loading_text: loading...
-    error: Unable to get the data, please make sure the settings are correct.
+    error: Unable to retrieve comments, please check the configuration
-    zero: No Comment
+    zero: No comments
     image: image
     link: link
     code: code
-  card_toc: Catalog
+  card_toc: Contents
+  card_post_series: Series
 
 date_suffix:
-  just: Just
+  just: Just now
   min: minutes ago
   hour: hours ago
   day: days ago
   month: months ago
 
-donate: Donate
+donate: Sponsor
 share: Share
 
 rightside:
   readmode_title: Read Mode
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
+  translate_title: Toggle Between Traditional Chinese 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
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-  aside: Toggle between single-column and double-column
+  aside: Toggle between Single-column and Double-column
   chat: Chat
 
 copy_copyright:
@@ -112,12 +112,12 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  chs_to_cht: Traditional Chinese Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
-  cht_to_chs: Simplified Chinese Activated Manually
+  cht_to_chs: You have switched to Simplified Chinese
-  day_to_night: Dark Mode Activated Manually
+  day_to_night: You have switched to Dark Mode
-  night_to_day: Light Mode Activated Manually
+  night_to_day: You have switched to Light Mode
 
 loading: Loading...
 load_more: Load More
 
-error404: Page not found
+error404: Page Not Found

languages/zh-CN.yml

@@ -15,7 +15,6 @@ page:
 
 card_post_count: 条评论
 
-sticky: 置顶
 no_title: 无题
 
 post:
@@ -84,6 +83,7 @@ aside:
     link: 链接
     code: 代码
   card_toc: 目录
+  card_post_series: 系列文章
 
 date_suffix:
   just: 刚刚
@@ -92,7 +92,7 @@ date_suffix:
   day: 天前
   month: 个月前
 
-donate: 打赏
+donate: 赞助
 share: 分享
 
 rightside:
@@ -113,8 +113,8 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  chs_to_cht: 你已切换为繁体
+  chs_to_cht: 你已切换为繁体中文
-  cht_to_chs: 你已切换为简体
+  cht_to_chs: 你已切换为简体中文
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
 

languages/zh-TW.yml

@@ -15,8 +15,7 @@ page:
 
 card_post_count: 條評論
 
-sticky: 置頂
+no_title: 無標題
-no_title: 無題
 
 post:
   created: 發表於
@@ -84,6 +83,7 @@ aside:
     link: 連結
     code: 程式碼
   card_toc: 目錄
+  card_post_series: 文章系列
 
 date_suffix:
   just: 剛剛
@@ -92,14 +92,14 @@ date_suffix:
   day: 天前
   month: 個月前
 
-donate: 打賞
+donate: 贊助
 share: 分享
 
 rightside:
   readmode_title: 閱讀模式
   translate_title: 簡繁轉換
   night_mode_title: 淺色和深色模式轉換
-  back_to_top: 回到頂部
+  back_to_top: 返回頂部
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
@@ -110,11 +110,11 @@ copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  chs_to_cht: 你已切換為繁體
+  chs_to_cht: 你已切換為繁體中文
-  cht_to_chs: 你已切換為簡體
+  cht_to_chs: 你已切換為簡體中文
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 

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/includes/head.pug

@@ -40,7 +40,7 @@ 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'")
@@ -55,14 +55,13 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font &&　theme.blog_title_font.font_link
+if theme.blog_title_font && theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
-include ./head/noscript.pug
 
 !=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 

layout/includes/head/config.pug

@@ -78,9 +78,11 @@
   }
 
   let highlight = 'undefined';
-  if ((config.highlight && config.highlight.enable) || (config.prismjs && config.prismjs.enable)) {
+  let syntaxHighlighter = config.syntax_highlighter;
+  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable);
+  if (highlightEnable) {
     highlight = JSON.stringify({
-      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
+      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
       highlightCopy: theme.highlight_copy,
       highlightLang: theme.highlight_lang,
       highlightHeightLimit: theme.highlight_height_limit
@@ -115,11 +117,9 @@ script.
     copyright: !{copyright},
     lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "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},
@@ -127,5 +127,6 @@ script.
     percent: {
       toc: !{theme.toc.scroll_percent},
       rightside: !{theme.rightside_scroll_percent},
-    }
+    },
+    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }

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/header/index.pug

@@ -44,7 +44,7 @@ header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
             span#subtitle
         if(theme.social)
           #site_social_icons
-            !=fragment_cache('social', function(){return partial('includes/header/social')})
+            !=partial('includes/header/social', {}, {cache: true})
       #scroll-down
         i.fas.fa-angle-down.scroll-down-effects
     else

layout/includes/header/post-info.pug

@@ -102,13 +102,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

layout/includes/loading/fullpage-loading.pug

@@ -9,14 +9,17 @@
     .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')
       }
     }
 
@@ -27,3 +30,4 @@ script.
       document.addEventListener('pjax:send', () => { preloader.initLoading() })
       document.addEventListener('pjax:complete', () => { preloader.endLoading() })
     }
+  })()

layout/includes/mixins/post-ui.pug

@@ -19,13 +19,11 @@ mixin postUI(posts)
             else
               div.post-bg(style=`background: ${post_cover}`)
       .recent-post-info(class=no_cover)
-        a.article-title(href=url_for(link) title=title)= title
+        a.article-title(href=url_for(link) title=title)
-        .article-meta-wrap
           if (is_home() && (article.top || article.sticky > 0))
-            span.article-meta
             i.fas.fa-thumbtack.sticky
-              span.sticky= _p('sticky')
+          = title
-              span.article-meta-separator |
+        .article-meta-wrap
           if (theme.post_meta.page.date_type)
             span.post-meta-date
               if (theme.post_meta.page.date_type === 'both')
@@ -70,16 +68,12 @@ mixin postUI(posts)
                 block
               span.article-meta-label= ' ' + _p('card_post_count')
           
-          if theme.comments.card_post_count
+          if theme.comments.card_post_count && theme.comments.use
             case theme.comments.use[0]
               when 'Disqus'
-                +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqus_thread')
-                    i.fa-solid.fa-spinner.fa-spin
               when 'Disqusjs'
                 +countBlockInIndex
-                  a(href=full_url_for(link) + '#disqusjs')
+                  a.disqus-count(href=full_url_for(link) + '#post-comment')
-                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
                     i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
@@ -89,7 +83,7 @@ mixin postUI(posts)
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
-                    span.waline-comment-count(id=url_for(link))
+                    span.waline-comment-count(data-path=url_for(link))
                       i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex

layout/includes/page/flink.pug

@@ -1,7 +1,10 @@
 #article-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/post/post-copyright.pug

@@ -5,13 +5,19 @@ if theme.post_copyright.enable && page.copyright !== false
   - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
-      span.post-copyright-meta= _p('post.copyright.author') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-user.fa-fw
+        = _p('post.copyright.author') + ": "
       span.post-copyright-info
         a(href=authorHref)=author
     .post-copyright__type
-      span.post-copyright-meta= _p('post.copyright.link') + ": "
+      span.post-copyright-meta
+        i.fas.fa-square-arrow-up-right.fa-fw
+        = _p('post.copyright.link') + ": "
       span.post-copyright-info
         a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
-      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-exclamation.fa-fw
+        = _p('post.copyright.copyright_notice') + ": "
       span.post-copyright-info!= info

layout/includes/post/reward.pug

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

layout/includes/rightside.pug

@@ -23,7 +23,7 @@ mixin rightsideItem(array)
             i.fas.fa-list-ul
       when 'chat'
         if chat_btn
-          button#chat_btn(type="button" title=_p("rightside.chat"))
+          button#chat-btn(type="button" title=_p("rightside.chat"))
             i.fas.fa-sms
       when 'comment'
         if commentsJsLoad
@@ -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 (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

@@ -14,5 +14,5 @@
         .headline= _p('aside.categories') 
         .length-num= site.categories.length
 
-    hr
+    hr.custom-hr
     !=partial('includes/header/menu_item', {}, {cache: true})

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

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

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

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

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

@@ -2,19 +2,34 @@
 
 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: 'POST',
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Origin': window.location.origin
+          },
+          body: new URLSearchParams({
+            'site_name': '!{site}',
+            'type':'page_comment',
+            'page_keys': keyArray
           })
         }
 
-      if (typeof Artalk === 'function') runWidget()
+        const res = await fetch('!{server}/api/stat', 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/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)

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

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

@@ -1,4 +1,5 @@
 script.
+  (() => {
     window.$crisp = [];
     window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
     (function () {
@@ -10,27 +11,35 @@ script.
     })();
     $crisp.push(["safe", true])
 
-  if (!{theme.chat_btn}) {
+    const isChatBtn = !{theme.chat_btn}
-    $crisp.push(["do", "chat:hide"])
+    const isChatHideShow = !{theme.chat_hide_show}
-    $crisp.push(["on", "chat:closed", function() {
+
-      $crisp.push(["do", "chat:hide"])
+    if (isChatBtn) {
-    }])
+      const open = () => {
-    var chatBtnFn = () => {
-      var chatBtn = document.getElementById("chat_btn")
-      chatBtn.addEventListener("click", function(){
         $crisp.push(["do", "chat:show"])
         $crisp.push(["do", "chat:open"])
-
-      });
       }
-    chatBtnFn()
+
-  } else {
+      const close = () => {
-    if (!{theme.chat_hide_show}) {
-      function chatBtnHide () {
         $crisp.push(["do", "chat:hide"])
       }
-      function chatBtnShow () {
+
+      close()
+      $crisp.push(["on", "chat:closed", function() {
+        close()
+      }])
+
+      window.chatBtnFn = () => {
+        $crisp.is("chat:visible") ? close() : open()
+      }
+    } else if (isChatHideShow) {
+      window.chatBtn = {
+        hide: () => {
+          $crisp.push(["do", "chat:hide"])
+        },
+        show: () => {
           $crisp.push(["do", "chat:show"])
         }
       }
     }
+  })()

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

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

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

@@ -4,6 +4,7 @@
 #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() {
@@ -21,22 +22,23 @@ script.
       fjs.parentNode.insertBefore(js, fjs);
     }(document, 'script', 'facebook-jssdk'));
 
-  if (!{theme.chat_btn}) {
+    const isChatBtn = !{theme.chat_btn}
-    var chatBtnFn = () => {
+    const isChatHideShow = !{theme.chat_hide_show}
-      var chatBtn = document.getElementById("chat_btn")
+
-      chatBtn.addEventListener("click", function(){
+    if (isChatBtn) {
-        FB.CustomerChat.show();
+      window.chatBtnFn = () => {
-      });
+        const isShow = document.querySelector('.fb_customer_chat_bounce_in_v2')
+        isShow ? FB.CustomerChat.hide() : FB.CustomerChat.show()
       }
-    chatBtnFn()
+    } else if (isChatHideShow) {
-  } else {
+      window.chatBtn = {
-    if (!{theme.chat_hide_show}) {
+        hide: () => {
-      function chatBtnHide () {
           FB.CustomerChat.hide()
-      }
+        },
-      function chatBtnShow () {
+        show: () => {
           FB.CustomerChat.show(false)
         }
       }
     }
+  })()
 

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

@@ -1,41 +1,45 @@
 script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async)
-
-if theme.chat_btn
 script.
-    function onTidioChatApiReady() {
+  (() => {
-      window.tidioChatApi.hide();
+    const isChatBtn = !{theme.chat_btn}
-      window.tidioChatApi.on("close", function() {
+    const isChatHideShow = !{theme.chat_hide_show}
-        window.tidioChatApi.hide();
+
-      });
+    if (isChatBtn) {
+      let isShow = false
+      const close = () => {
+        window.tidioChatApi.hide()
+        isShow = false
+      }
+      
+      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 (isChatHideShow) {
-
+      window.chatBtn = {
-else if theme.chat_hide_show
+        hide: () => {
-  script.
+          window.tidioChatApi && window.tidioChatApi.hide()
-    function chatBtnHide () {
+        },
-      if (window.tidioChatApi) {
+        show: () => {
-        //- window.tidioChatApi.hide();
+          window.tidioChatApi && window.tidioChatApi.show()
-        document.getElementById('tidio-chat').style.display= 'none'
+        }
-      }
+      }
-    }
+    }
-
+  })()
-    function chatBtnShow () {
-      if (window.tidioChatApi) {
-        //- window.tidioChatApi.show();
-        document.getElementById('tidio-chat').style.display= 'block'
-      } 
-    }
-
 

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

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

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

@@ -1,51 +1,59 @@
-- 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 disqus_config = function () {
       this.page.url = '!{ page.permalink }'
       this.page.identifier = '!{ url_for(page.path) }'
       this.page.title = '!{ disqusPageTitle }'
-    };
+    }
 
-    window.disqusReset = () => {
+    const disqusReset = () => {
-      DISQUS.reset({
+      window.DISQUS && window.DISQUS.reset({
         reload: true,
         config: disqus_config
       })
     }
 
+    btf.addGlobalFn('themeChange', disqusReset, 'disqus')
+
+    const loadDisqus = () =>{
       if (window.DISQUS) disqusReset()
       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', () => {
+    const getCount = async() => {
-      setTimeout(() => window.disqusReset(), 200)
+      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 ('!{use[0]}' === 'Disqus' || !!{lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
+      if (!{lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
-    else loadDisqus()
+      else {
-  } else {
-    function loadOtherComment () {
         loadDisqus()
+        !{ count ? 'GLOBAL_CONFIG_SITE.isPost && 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,18 +1,19 @@
 - let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+- const { shortname:dqShortname, apikey:dqApikey, option:dqOption } = theme.disqusjs
 
 script.
-  function loadDisqusjs () {
+  (() => {
-    function initDisqusjs () {
+    const initDisqusjs = () => {
       window.disqusjs = null
       disqusjs = new DisqusJS(Object.assign({
-        shortname: '!{theme.disqusjs.shortname}',
+        shortname: '!{dqShortname}',
         identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
-        apikey: '!{theme.disqusjs.apikey}',
+        apikey: '!{dqApikey}',
-      },!{JSON.stringify(theme.disqusjs.option)}))
+      },!{JSON.stringify(dqOption)}))
 
-      disqusjs.render(document.getElementById('disqusjs'))
+      disqusjs.render(document.getElementById('disqusjs-wrap'))
     }
 
     const themeChange = () => {
@@ -22,36 +23,42 @@ script.
       initDisqusjs()
     }
 
+    btf.addGlobalFn('themeChange', themeChange, 'disqusjs')
 
-    document.getElementById('darkmode').addEventListener('click', themeChange)
+    const loadDisqusjs = async() => {
-
       if (window.disqusJsLoad) initDisqusjs()
       else {
-      getCSS('!{url_for(theme.asset.disqusjs_css)}')
+        await getCSS('!{url_for(theme.asset.disqusjs_css)}')
-      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
+        await getScript('!{url_for(theme.asset.disqusjs)}')
+        initDisqusjs()
         window.disqusJsLoad = true
       }
     }
 
+    const getCount = async() => {
+      try {
+        const eleGroup = document.querySelector('#post-meta .disqusjs-comment-count')
+        if (!eleGroup) return
+        const cleanedLinks = eleGroup.href.replace(/#post-comment$/, '')
+
+        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 ('!{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.isPost && 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

@@ -2,7 +2,8 @@
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.
-  function loadFBComment () {
+  (()=>{
+    const loadFBComment = () => {
       document.getElementById('fb-root') ? '' : document.body.insertAdjacentHTML('afterend', '<div id="fb-root"></div>')
 
       const themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
@@ -25,12 +26,21 @@ 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 ('!{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,34 +1,36 @@
 - const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
 - const giscusUrl = theme.asset.giscus || 'https://giscus.app/client.js'
 - const giscusOriginUrl = new URL(giscusUrl).origin
+- const { use, lazyload } = theme.comments
 
 script.
-  function getGiscusTheme () {
+  (()=>{
-    return document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
+    const getGiscusTheme = theme => {
+      return theme === 'dark' ? '!{themes.dark}' : '!{themes.light}'
     }
 
-  function loadGiscus () {
+    const loadGiscus = () => {
       const config = Object.assign({
         src: '!{giscusUrl}',
         'data-repo': '!{repo}',
         'data-repo-id': '!{repo_id}',
         'data-category-id': '!{category_id}',
         'data-mapping': 'pathname',
-      'data-theme': getGiscusTheme(),
+        'data-theme': getGiscusTheme(document.documentElement.getAttribute('data-theme')),
         'data-reactions-enabled': '1',
         crossorigin: 'anonymous',
         async: true
       },!{JSON.stringify(option)})
 
-    let ele = document.createElement('script')
+      const ele = document.createElement('script')
       for (let key in config) {
         ele.setAttribute(key, config[key])
       }
-    document.getElementById('giscus-wrap').insertAdjacentElement('afterbegin',ele)
+      document.getElementById('giscus-wrap').appendChild(ele)
     }
 
-  function changeGiscusTheme () {
+    const changeGiscusTheme = theme => {
-    function sendMessage(message) {
+      const sendMessage = message => {
         const iframe = document.querySelector('iframe.giscus-frame')
         if (!iframe) return
         iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
@@ -36,16 +38,17 @@ script.
 
       sendMessage({
         setConfig: {
-        theme: getGiscusTheme()
+          theme: getGiscusTheme(theme)
         }
       });
     }
 
-  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 ('!{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,30 +1,34 @@
+- const { client_id, client_secret, repo, owner, admin, option } = theme.gitalk
+
 script.
-  function loadGitalk () {
+  (() => {
-    function initGitalk () {
+    const initGitalk = () => {
-      var gitalk = new Gitalk(Object.assign({
+      const gitalk = new Gitalk(Object.assign({
-        clientID: '!{theme.gitalk.client_id}',
+        clientID: '!{client_id}',
-        clientSecret: '!{theme.gitalk.client_secret}',
+        clientSecret: '!{client_secret}',
-        repo: '!{theme.gitalk.repo}',
+        repo: '!{repo}',
-        owner: '!{theme.gitalk.owner}',
+        owner: '!{owner}',
-        admin: ['!{theme.gitalk.admin}'],
+        admin: ['!{admin}'],
         id: '!{md5(page.path)}',
         updateCountCallback: commentCount
-      },!{JSON.stringify(theme.gitalk.option)}))
+      },!{JSON.stringify(option)}))
 
       gitalk.render('gitalk-container')
     }
 
+    const loadGitalk = async() => {
       if (typeof Gitalk === 'function') initGitalk()
       else {
-      getCSS('!{url_for(theme.asset.gitalk_css)}')
+        await getCSS('!{url_for(theme.asset.gitalk_css)}')
-      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
+        await getScript('!{url_for(theme.asset.gitalk)}')
+        initGitalk()
       }
     }
     
-  function commentCount(n){
+    const commentCount = n => {
-    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+      const isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
       if (isCommentCount) {
-      isCommentCount.innerHTML= n
+        isCommentCount.textContent= n
       }
     }
 
@@ -32,10 +36,9 @@ script.
       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,9 @@
+- const { use, lazyload } = theme.comments
+
 script.
-  function loadLivere () {
+  (()=>{
-    if (typeof LivereTower === 'object') {
+    const loadLivere = () => {
-      window.LivereTower.init()
+      if (typeof LivereTower === 'object') window.LivereTower.init()
-    }
       else {
         (function(d, s) {
             var j, e = d.getElementsByTagName(s)[0];
@@ -15,12 +16,10 @@ script.
       }
     }
 
-  if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
+    if ('!{use[0]}' === 'Livere' || !!{lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
+      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

@@ -51,11 +51,12 @@ script.
     }
   }
 
-  document.getElementById('darkmode').addEventListener('click',()=>{
+  function remarkChangeMode (theme) {
     if (!window.REMARK42) return
-    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
     window.REMARK42.changeTheme(theme)
-  })
+  }
+
+  btf.addGlobalFn('themeChange', remarkChangeMode, 'remark42')
 
   if ('!{theme.comments.use[0]}' === 'Remark42' || !!{theme.comments.lazyload}) {
     if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('remark42'), loadRemark42)

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

@@ -8,12 +8,17 @@ script.
         el: '#twikoo-wrap',
         envId: '!{envId}',
         region: '!{region}',
-        onCommentLoaded: function () {
+        onCommentLoaded: () => {
           btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
         }
       }, !{JSON.stringify(option)}))
     }
 
+    const loadTwikoo = () => {
+      if (typeof twikoo === 'object') setTimeout(init,0)
+      else getScript('!{url_for(theme.asset.twikoo)}').then(init)
+    }
+
     const getCount = () => {
       const countELement = document.getElementById('twikoo-count')
       if(!countELement) return
@@ -22,32 +27,20 @@ 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 = () => {
-      init()
-      !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
-    }
-
-    const loadTwikoo = () => {
-      if (typeof twikoo === 'object') {
-        setTimeout(runFn,0)
-        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 {
-    } else {
-      window.loadOtherComment = () => {
         loadTwikoo()
+        !{count ? 'GLOBAL_CONFIG_SITE.isPost && getCount()' : ''}
       }
+    } else {
+      window.loadOtherComment = loadTwikoo
     }
   })()

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

@@ -1,21 +1,25 @@
+- const { use, lazyload } = theme.comments
+- const { repo, issue_term, light_theme, dark_theme } = theme.utterances
+
 script.
-  function loadUtterances () {
+  (() => {
+    const loadUtterances = () => {
       let ele = document.createElement('script')
-    ele.setAttribute('id', 'utterances_comment')
+      ele.id = 'utterances_comment'
-    ele.setAttribute('src', 'https://utteranc.es/client.js')
+      ele.src = 'https://utteranc.es/client.js'
-    ele.setAttribute('repo', '!{theme.utterances.repo}')
+      ele.setAttribute('repo', '!{repo}')
-    ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
+      ele.setAttribute('issue-term', '!{issue_term}')
-    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
+      const nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{dark_theme}' : '#{light_theme}'
       ele.setAttribute('theme', nowTheme)
-    ele.setAttribute('crossorigin', 'anonymous')
+      ele.crossOrigin = 'anonymous'
-    ele.setAttribute('async', 'true')
+      ele.async = true
-    document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
+      document.getElementById('utterances-wrap').appendChild(ele)
     }
 
-  function utterancesTheme () {
+    const utterancesTheme = theme => {
       const iframe = document.querySelector('.utterances-frame')
       if (iframe) {
-      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
+        const theme = theme === 'dark' ? '#{dark_theme}' : '#{light_theme}'
         const message = {
           type: 'set-theme',
           theme: theme
@@ -24,11 +28,12 @@ script.
       }
     }
 
-  if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
+    btf.addGlobalFn('themeChange', utterancesTheme, 'utterances')
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+
+    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,38 @@
+- const { use, lazyload } = theme.comments
+- const { appId, appKey, avatar, serverURLs, visitor, option } = theme.valine
+
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
 
 script.
-  function loadValine () {
+  (() => {
-    function initValine () {
+    const initValine = () => {
       const valine = new Valine(Object.assign({
         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: #{theme.valine.visitor}
+        visitor: #{visitor}
-      }, !{JSON.stringify(theme.valine.option)}))
+      }, !{JSON.stringify(option)}))
     }
 
+    const loadValine = async () => {
       if (typeof Valine === 'function') initValine()
-    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
+      else {
+        await getScript('!{url_for(theme.asset.valine)}')
+        initValine()
+      }
     }
 
-  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
+    if ('!{use[0]}' === 'Valine' || !!{lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
+      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,8 +2,8 @@
 - const { lazyload, count, use } = theme.comments
 
 script.
-  function loadWaline () {
+  (() => {
-    function initWaline () {
+    const initWaline = () => {
       const waline = Waline.init(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
@@ -12,17 +12,21 @@ script.
         path: window.location.pathname,
         comment: !{lazyload ? false : count},
       }, !{JSON.stringify(option)}))
+
+      const destroyWaline = () => {
+        waline.destroy()
       }
 
-    const walineCSSLoad = document.getElementById('waline-css')
+      btf.addGlobalFn('pjax', destroyWaline, 'destroyWaline')
 
-    if (typeof Waline === 'object') {
-      walineCSSLoad ? initWaline() : getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(initWaline)
     }
+
+    const loadWaline = async () => {
+      if (typeof Waline === 'object') initWaline()
       else {
-      getCSS('!{url_for(theme.asset.waline_css)}','waline-css').then(() => {
+        await getCSS('!{url_for(theme.asset.waline_css)}')
-        getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+        await getScript('!{url_for(theme.asset.waline_js)}')
-      })
+        initWaline()
       }
     }
 
@@ -30,9 +34,7 @@ script.
       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/mathjax.pug

@@ -3,7 +3,7 @@ script.
   if (!window.MathJax) {
     window.MathJax = {
       tex: {
-        inlineMath: [ ['$','$'], ["\\(","\\)"]],
+        inlineMath: [['$', '$'], ['\\(', '\\)']],
         tags: 'ams'
       },
       chtml: {
@@ -21,16 +21,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]
         }
       }
     }

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

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

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

@@ -1,6 +1,6 @@
 - 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)
 
 script.
   window.addEventListener('load', () => {
@@ -40,25 +40,45 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom && ($dom.innerHTML= result))
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
 
+    const getSetting = async () => {
+      try {
+        const res = await fetch('!{server}/api/conf', { method: 'GET' })
+        return await res.json()
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
     const headerList = {
       method: 'POST',
       headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
         'Origin': window.location.origin
-      }
+      },
+      body: new URLSearchParams({
+        'site_name': '!{site}',
+        'limit': '!{theme.newest_comments.limit}',
+        'type':'latest_comments'
+      })
     }
 
-    const getComment = () => {
+    const getComment = async () => {
-      fetch('!{server}/api/stat?type=latest_comments&limit=!{theme.newest_comments.limit}&site_name=!{site}', headerList)
+      try {
-        .then(response => response.json())
+        const res = await fetch('!{server}/api/stat', headerList)
-        .then(d => {
+        const result = await res.json()
-          const artalk = d.data.map(function (e) {
+        const avatarStr = await getSetting()
+        const { mirror, params, default:defaults } = avatarStr.data.frontend_conf.gravatar
+        const avatarCdn = !{avatarCdn} || mirror
+        let avatarDefault = !{avatarDefault} || params || defaults
+        avatarDefault = avatarDefault.startsWith('d=') ? avatarDefault : `d=${avatarDefault}`
+        const artalk = result.data.map(function (e) {
           return {
-              'avatar': '!{avatarCdn}' + e.email_encrypted + '?d=!{avatarDefault}',
+            'avatar': `${avatarCdn}${e.email_encrypted}?${avatarDefault}`,
             'content': changeContent(e.content_marked),
             'nick': e.nick,
             'url': e.page_url,
@@ -67,10 +87,11 @@ script.
         })
         saveToLocal.set('artalk-newest-comments', JSON.stringify(artalk), !{theme.newest_comments.storage}/(60*24))
         generateHtml(artalk)
-        }).catch(e => {
+      } catch (e) {
+        console.log(e)
         const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
-        })
+      }
     }
 
     const newestCommentInit = () => {

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

@@ -32,7 +32,7 @@ script.
           generateHtml(disqusArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
@@ -58,7 +58,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -17,7 +17,10 @@ script.
     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 {
@@ -48,7 +51,7 @@ script.
           const githubArray = data.map(item => {
             return {
               'avatar': item.user.avatar_url,
-              'content': changeContent(item.body_html),
+              'content': changeContent(item.body_html || item.body),
               'nick': item.user.login,
               'url': item.issue_url,
               'date': item.updated_at,
@@ -58,7 +61,7 @@ script.
           findTrueUrl(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 
@@ -84,7 +87,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -38,7 +38,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
@@ -60,7 +60,7 @@ script.
           generateHtml(remark42)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
     }
 

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

@@ -36,7 +36,7 @@ script.
           generateHtml(twikooArray)
         }).catch(function (err) {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         })
       }
 
@@ -69,7 +69,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }

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

@@ -46,7 +46,7 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
@@ -79,7 +79,7 @@ script.
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+          $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
         }) 
     }
 

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

@@ -1,6 +1,8 @@
+- const serverURL = theme.waline.serverURL.replace(/\/$/, '')
+
 script.
   window.addEventListener('load', () => {
-    const changeContent = (content) => {
+    const changeContent = content => {
       if (content === '') return content
 
       content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
@@ -36,36 +38,31 @@ script.
       }
 
       let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
+      $dom && ($dom.innerHTML= result)
       window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getComment = () => {
+    const getComment = async () => {
-      const loadWaline = () => {
+      try {
-        Waline.RecentComments({
+        const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.newest_comments.limit}', { method: 'GET' })
-          serverURL: '!{theme.waline.serverURL}',
+        const result = await res.json()
-          count: !{theme.newest_comments.limit}
+        const walineArray = result.data.map(e => {
-        }).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))
         generateHtml(walineArray)
-        }).catch(e => {
+      } catch (err) {
+        console.error(err)
         const $dom = document.querySelector('#card-newest-comments .aside-list')
-          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        $dom.textContent= "!{_p('aside.card_newest_comments.error')}"
-        }) 
       }
-
-      if (typeof Waline === 'object') loadWaline()
-      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pjax.pug

@@ -26,11 +26,11 @@ script.
 
   document.addEventListener('pjax:send', function () {
 
-    // removeEventListener scroll 
+    // removeEventListener
-    window.tocScrollFn && window.removeEventListener('scroll', window.tocScrollFn)
+    btf.removeGlobalFnEvent('pjax')
-    window.scrollCollect && window.removeEventListener('scroll', scrollCollect)
+    btf.removeGlobalFnEvent('themeChange')
 
-    document.getElementById('rightside').style.cssText = "opacity: ''; transform: ''"
+    document.getElementById('rightside').classList.remove('rightside-show')
     
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
@@ -62,7 +62,6 @@ script.
 
     GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
-    typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
     // google analytics
@@ -77,8 +76,8 @@ script.
     typeof Prism === 'object' && Prism.highlightAll()
   })
 
-  document.addEventListener('pjax:error', (e) => {
+  document.addEventListener('pjax:error', e => {
     if (e.request.status === 404) {
-      pjax.loadUrl('/404.html')
+      pjax.loadUrl('!{url_for("/404.html")}')
     }
   })

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

@@ -13,11 +13,12 @@
         container: '#docsearch',
       }, !{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/local-search.pug

@@ -15,7 +15,7 @@
         .local-search-box
           input(placeholder=_p("search.local_search.input_placeholder") type="text").local-search-box--input
       hr
-      #local-search-results.no-result
+      #local-search-results
       #local-search-stats-wrap
   #search-mask
 

layout/includes/third-party/share/add-this.pug

@@ -1,2 +0,0 @@
-.addthis_inline_share_toolbox
-script(src=`//s7.addthis.com/js/300/addthis_widget.js#pubid=${theme.addThis.pubid}` async)

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

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

layout/includes/third-party/subtitle.pug

@@ -38,7 +38,7 @@ case source
               sub.unshift(data.hitokoto, from)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').innerHTML = data.hitokoto
+              document.getElementById('subtitle').textContent = data.hitokoto
             }
           })
       }
@@ -55,7 +55,7 @@ case source
             sub.unshift(con, from)
             typedJSFn.init(sub)
           } else {
-            document.getElementById('subtitle').innerHTML = con
+            document.getElementById('subtitle').textContent = con
           }
         })
       }
@@ -72,7 +72,7 @@ case source
               sub.unshift(content)
               typedJSFn.init(sub)
             } else {
-              document.getElementById('subtitle').innerHTML = result.data.content
+              document.getElementById('subtitle').textContent = result.data.content
             }
           })
         })
@@ -86,7 +86,7 @@ case source
         if (!{effect}) {
           typedJSFn.init(!{JSON.stringify(subContent)})
         } else {
-          document.getElementById("subtitle").innerHTML = '!{subContent[0]}'
+          document.getElementById("subtitle").textContent = !{JSON.stringify(subContent[0])}
         }
       }
       typedJSFn.run(subtitleType)

layout/includes/widget/card_author.pug

@@ -24,4 +24,4 @@ if theme.aside.card_author.enable
   
     if(theme.social)
         .card-info-social-icons.is-center
-          !=fragment_cache('social', function(){return partial('includes/header/social')}) 
+          !=partial('includes/header/social', {}, {cache: true})

layout/includes/widget/card_newest_comment.pug

@@ -1,4 +1,4 @@
-if theme.newest_comments.enable && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
+if theme.newest_comments.enable && theme.comments.use && !['Livere','Facebook Comments','Giscus'].includes(theme.comments.use[0])
   .card-widget#card-newest-comments
     .item-headline
       i.fas.fa-comment-dots

layout/includes/widget/card_post_series.pug

@@ -0,0 +1,21 @@
+if theme.aside.card_post_series.enable
+  - const array = fragment_cache('seriesArr', groupPosts)
+  .card-widget.card-post-series
+    .item-headline
+      i.fa-solid.fa-layer-group
+      span= theme.aside.card_post_series.series_title ? page.series : _p('aside.card_post_series')
+    .aside-list
+      each item in array[page.series]
+        - const { path, title = _p('no_title'), cover, cover_type, date:dateA } = item
+        - let link = url_for(path)
+        - let no_cover = cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        .aside-list-item(class=no_cover)
+          if cover && theme.cover.aside_enable
+            a.thumbnail(href=link title=title)
+              if cover_type === 'img'
+                img(src=url_for(cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+              else
+                div(style=`background: ${cover}`)
+          .content
+            a.title(href=link title=title)= title
+            time(datetime=date_xml(dateA) title=_p('post.created') + ' ' + full_date(dateA)) #[=date(dateA, config.date_format)]

layout/includes/widget/card_post_toc.pug

@@ -1,5 +1,5 @@
-- let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+- let tocNumber = typeof page.toc_number === 'boolean' ? page.toc_number : theme.toc.number
-- let tocExpand = page.toc_expand !== undefined ? page.toc_expand : theme.toc.expand
+- let tocExpand = typeof page.toc_expand === 'boolean' ? page.toc_expand : theme.toc.expand
 - let tocExpandClass = tocExpand ? 'is-expand' : ''
 
 #card-toc.card-widget

layout/includes/widget/index.pug

@@ -13,6 +13,8 @@
       .sticky_layout
         if showToc
           include ./card_post_toc.pug
+        if page.series
+          include ./card_post_series.pug
         !=partial('includes/widget/card_recent_post', {}, {cache: true})
         !=partial('includes/widget/card_ad', {}, {cache: true})
   else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.8.1",
+  "version": "4.12.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,7 +23,7 @@
     "email": "my@crazywong.com"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^2.1.0",
+    "hexo-renderer-stylus": "^3.0.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",

plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.17.0
+  version: 4.22.0
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.54.0
+  version: 4.63.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -37,17 +37,17 @@ disqusjs_css:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.14
+  version: 1.6.29
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 2.14.9
+  version: 2.15.8
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 2.14.9
+  version: 2.15.8
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js
@@ -64,16 +64,16 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.16.4
+  version: 0.16.9
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.4
+  version: 0.16.9
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 9.4.3
+  version: 10.6.1
 canvas_ribbon:
   name: butterfly-extsrc
   file: dist/canvas-ribbon.min.js
@@ -98,14 +98,14 @@ click_heart:
   name: butterfly-extsrc
   file: dist/click-heart.min.js
   version: 1.1.3
-ClickShowText:
+clickShowText:
   name: butterfly-extsrc
   file: dist/click-show-text.min.js
   version: 1.1.3
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
-  version: 17.8.3
+  version: 17.8.5
 instantpage:
   name: instant.page
   file: instantpage.js
@@ -113,7 +113,7 @@ instantpage:
 typed:
   name: typed.js
   file: dist/typed.umd.js
-  version: 2.0.15
+  version: 2.1.0
 pangu:
   name: pangu
   file: dist/browser/pangu.min.js
@@ -121,17 +121,17 @@ pangu:
 fancybox_css:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.css
-  version: 5.0.15
+  version: 5.0.32
   other_name: fancyapps-ui
 fancybox:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  version: 5.0.15
+  version: 5.0.32
   other_name: fancyapps-ui
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js
-  version: 1.0.8
+  version: 1.1.0
 snackbar_css:
   name: node-snackbar
   file: dist/snackbar.min.css
@@ -144,7 +144,7 @@ fontawesome:
   name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
   other_name: font-awesome
-  version: 6.4.0
+  version: 6.5.1
 flickr_justified_gallery_js:
   name: flickr-justified-gallery
   file: dist/fjGallery.min.js
@@ -153,6 +153,11 @@ flickr_justified_gallery_css:
   name: flickr-justified-gallery
   file: dist/fjGallery.css
   version: 2.1.2
+egjs_infinitegrid:
+  name: '@egjs/infinitegrid'
+  other_name: egjs-infinitegrid
+  file: dist/infinitegrid.min.js
+  version: 4.11.0
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -183,11 +188,11 @@ prismjs_autoloader:
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.5.4
+  version: 2.7.3
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.5.4
+  version: 2.7.3
 pace_js:
   name: pace-js
   other_name: pace
@@ -202,13 +207,13 @@ docsearch_js:
   name: '@docsearch/js'
   other_name: docsearch-js
   file: dist/umd/index.js
-  version: 3.3.3
+  version: 3.5.2
 docsearch_css:
   name: '@docsearch/css'
   other_name: docsearch-css
   file: dist/style.css
-  version: 3.3.3
+  version: 3.5.2
 abcjs_basic_js:
   name: abcjs
   file: dist/abcjs-basic-min.js
-  version: 6.2.0
+  version: 6.2.3

scripts/events/init.js

@@ -1,21 +1,19 @@
 hexo.extend.filter.register('before_generate', () => {
   // Get first two digits of the Hexo version number
-  const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
+  const { version, log, locals } = hexo
-  const logger = hexo.log
+  const hexoVer = version.replace(/(^.*\..*)\..*/, '$1')
 
   if (hexoVer < 5.3) {
-    logger.error('Please update Hexo to V5.3.0 or higher!')
+    log.error('Please update Hexo to V5.3.0 or higher!')
-    logger.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
+    log.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
     process.exit(-1)
   }
 
-  if (hexo.locals.get) {
+  if (locals.get) {
-    const data = hexo.locals.get('data')
+    const data = locals.get('data')
     if (data && data.butterfly) {
-      logger.error(
+      log.error("'butterfly.yml' is deprecated. Please use '_config.butterfly.yml'")
-        " 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' "
+      log.error("'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml'")
-      )
-      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
       process.exit(-1)
     }
   }

scripts/events/merge_config.js

@@ -0,0 +1,545 @@
+hexo.extend.filter.register('before_generate', () => {
+  const defaultConfig = {
+    nav: {
+      logo: null,
+      display_title: true,
+      fixed: false
+    },
+    menu: null,
+    highlight_theme: 'light',
+    highlight_copy: true,
+    highlight_lang: true,
+    highlight_shrink: false,
+    highlight_height_limit: false,
+    code_word_wrap: false,
+    social: null,
+    favicon: '/img/favicon.png',
+    avatar: {
+      img: 'https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png',
+      effect: false
+    },
+    disable_top_img: false,
+    index_img: null,
+    default_top_img: null,
+    archive_img: null,
+    tag_img: null,
+    tag_per_img: null,
+    category_img: null,
+    category_per_img: null,
+    cover: {
+      index_enable: true,
+      aside_enable: true,
+      archives_enable: true,
+      position: 'both',
+      default_cover: null
+    },
+    error_img: {
+      flink: '/img/friend_404.gif',
+      post_page: '/img/404.jpg'
+    },
+    error_404: {
+      enable: false,
+      subtitle: 'Page Not Found',
+      background: 'https://i.loli.net/2020/05/19/aKOcLiyPl2JQdFD.png'
+    },
+    post_meta: {
+      page: {
+        date_type: 'created',
+        date_format: 'date',
+        categories: true,
+        tags: false,
+        label: true
+      },
+      post: {
+        date_type: 'both',
+        date_format: 'date',
+        categories: true,
+        tags: true,
+        label: true
+      }
+    },
+    index_post_content: {
+      method: 3,
+      length: 500
+    },
+    anchor: {
+      auto_update: false,
+      click_to_scroll: false
+    },
+    photofigcaption: false,
+    copy: {
+      enable: true,
+      copyright: {
+        enable: false,
+        limit_count: 50
+      }
+    },
+    toc: {
+      post: true,
+      page: false,
+      number: true,
+      expand: false,
+      style_simple: false,
+      scroll_percent: true
+    },
+    post_copyright: {
+      enable: true,
+      decode: false,
+      author_href: null,
+      license: 'CC BY-NC-SA 4.0',
+      license_url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/'
+    },
+    reward: {
+      enable: false,
+      text: null,
+      QR_code: null
+    },
+    post_edit: {
+      enable: false,
+      url: null
+    },
+    related_post: {
+      enable: true,
+      limit: 6,
+      date_type: 'created'
+    },
+    post_pagination: 1,
+    noticeOutdate: {
+      enable: false,
+      style: 'flat',
+      limit_day: 500,
+      position: 'top',
+      message_prev: 'It has been',
+      message_next: 'days since the last update, the content of the article may be outdated.'
+    },
+    footer: {
+      owner: {
+        enable: true,
+        since: 2020
+      },
+      custom_text: null,
+      copyright: true
+    },
+    aside: {
+      enable: true,
+      hide: false,
+      button: true,
+      mobile: true,
+      position: 'right',
+      display: {
+        archive: true,
+        tag: true,
+        category: true
+      },
+      card_author: {
+        enable: true,
+        description: null,
+        button: {
+          enable: true,
+          icon: 'fab fa-github',
+          text: 'Follow Me',
+          link: 'https://github.com/xxxxxx'
+        }
+      },
+      card_announcement: {
+        enable: true,
+        content: 'This is my Blog'
+      },
+      card_recent_post: {
+        enable: true,
+        limit: 5,
+        sort: 'date',
+        sort_order: null
+      },
+      card_categories: {
+        enable: true,
+        limit: 8,
+        expand: 'none',
+        sort_order: null
+      },
+      card_tags: {
+        enable: true,
+        limit: 40,
+        color: false,
+        orderby: 'random',
+        order: 1,
+        sort_order: null
+      },
+      card_archives: {
+        enable: true,
+        type: 'monthly',
+        format: 'MMMM YYYY',
+        order: -1,
+        limit: 8,
+        sort_order: null
+      },
+      card_webinfo: {
+        enable: true,
+        post_count: true,
+        last_push_date: true,
+        sort_order: null
+      },
+      card_post_series: {
+        enable: true,
+        series_title: false,
+        orderBy: 'date',
+        order: -1
+      }
+    },
+    busuanzi: {
+      site_uv: true,
+      site_pv: true,
+      page_pv: true
+    },
+    runtimeshow: {
+      enable: false,
+      publish_date: null
+    },
+    newest_comments: {
+      enable: false,
+      sort_order: null,
+      limit: 6,
+      storage: 10,
+      avatar: true
+    },
+    translate: {
+      enable: false,
+      default: '繁',
+      defaultEncoding: 2,
+      translateDelay: 0,
+      msgToTraditionalChinese: '繁',
+      msgToSimplifiedChinese: '簡'
+    },
+    readmode: true,
+    darkmode: {
+      enable: true,
+      button: true,
+      autoChangeMode: false,
+      start: null,
+      end: null
+    },
+    rightside_scroll_percent: false,
+    rightside_item_order: {
+      enable: false,
+      hide: null,
+      show: null
+    },
+    mathjax: {
+      enable: false,
+      per_page: false
+    },
+    katex: {
+      enable: false,
+      per_page: false,
+      hide_scrollbar: true
+    },
+    algolia_search: {
+      enable: false,
+      hits: {
+        per_page: 6
+      }
+    },
+    local_search: {
+      enable: false,
+      preload: false,
+      top_n_per_article: 1,
+      unescape: false,
+      CDN: null
+    },
+    docsearch: {
+      enable: false,
+      appId: null,
+      apiKey: null,
+      indexName: null,
+      option: null
+    },
+    sharejs: {
+      enable: true,
+      sites: 'facebook,twitter,wechat,weibo,qq'
+    },
+    addtoany: {
+      enable: false,
+      item: 'facebook,twitter,wechat,sina_weibo,facebook_messenger,email,copy_link'
+    },
+    comments: {
+      use: null,
+      text: true,
+      lazyload: false,
+      count: false,
+      card_post_count: false
+    },
+    disqus: {
+      shortname: null,
+      apikey: null
+    },
+    disqusjs: {
+      shortname: null,
+      apikey: null,
+      option: null
+    },
+    livere: {
+      uid: null
+    },
+    gitalk: {
+      client_id: null,
+      client_secret: null,
+      repo: null,
+      owner: null,
+      admin: null,
+      option: null
+    },
+    valine: {
+      appId: null,
+      appKey: null,
+      avatar: 'monsterid',
+      serverURLs: null,
+      bg: null,
+      visitor: false,
+      option: null
+    },
+    waline: {
+      serverURL: null,
+      bg: null,
+      pageview: false,
+      option: null
+    },
+    utterances: {
+      repo: null,
+      issue_term: 'pathname',
+      light_theme: 'github-light',
+      dark_theme: 'photon-dark'
+    },
+    facebook_comments: {
+      app_id: null,
+      user_id: null,
+      pageSize: 10,
+      order_by: 'social',
+      lang: 'zh_TW'
+    },
+    twikoo: {
+      envId: null,
+      region: null,
+      visitor: false,
+      option: null
+    },
+    giscus: {
+      repo: null,
+      repo_id: null,
+      category_id: null,
+      theme: {
+        light: 'light',
+        dark: 'dark'
+      },
+      option: null
+    },
+    remark42: {
+      host: null,
+      siteId: null,
+      option: null
+    },
+    artalk: {
+      server: null,
+      site: null,
+      visitor: false,
+      option: null
+    },
+    chat_btn: false,
+    chat_hide_show: false,
+    chatra: {
+      enable: false,
+      id: null
+    },
+    tidio: {
+      enable: false,
+      public_key: null
+    },
+    daovoice: {
+      enable: false,
+      app_id: null
+    },
+    crisp: {
+      enable: false,
+      website_id: null
+    },
+    messenger: {
+      enable: false,
+      pageID: null,
+      lang: 'zh_TW'
+    },
+    baidu_analytics: null,
+    google_analytics: null,
+    cloudflare_analytics: null,
+    microsoft_clarity: null,
+    google_adsense: {
+      enable: false,
+      auto_ads: true,
+      js: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+      client: null,
+      enable_page_level_ads: true
+    },
+    site_verification: null,
+    index_site_info_top: null,
+    index_top_img_height: null,
+    category_ui: null,
+    tag_ui: null,
+    text_align_justify: false,
+    background: null,
+    footer_bg: false,
+    mask: {
+      header: true,
+      footer: true
+    },
+    rightside_bottom: null,
+    enter_transitions: true,
+    activate_power_mode: {
+      enable: false,
+      colorful: true,
+      shake: true,
+      mobile: false
+    },
+    canvas_ribbon: {
+      enable: false,
+      size: 150,
+      alpha: 0.6,
+      zIndex: -1,
+      click_to_change: false,
+      mobile: false
+    },
+    canvas_fluttering_ribbon: {
+      enable: false,
+      mobile: false
+    },
+    canvas_nest: {
+      enable: false,
+      color: '0,0,255',
+      opacity: 0.7,
+      zIndex: -1,
+      count: 99,
+      mobile: false
+    },
+    fireworks: {
+      enable: false,
+      zIndex: 9999,
+      mobile: false
+    },
+    click_heart: {
+      enable: false,
+      mobile: false
+    },
+    clickShowText: {
+      enable: false,
+      text: null,
+      fontSize: '15px',
+      random: false,
+      mobile: false
+    },
+    display_mode: 'light',
+    beautify: {
+      enable: false,
+      field: 'post',
+      'title-prefix-icon': null,
+      'title-prefix-icon-color': null
+    },
+    font: {
+      'global-font-size': null,
+      'code-font-size': null,
+      'font-family': null,
+      'code-font-family': null
+    },
+    blog_title_font: {
+      font_link: null,
+      'font-family': null
+    },
+    hr_icon: {
+      enable: true,
+      icon: null,
+      'icon-top': null
+    },
+    subtitle: {
+      enable: false,
+      effect: true,
+      typed_option: null,
+      source: false,
+      sub: null
+    },
+    preloader: {
+      enable: false,
+      source: 1,
+      pace_css_url: null
+    },
+    wordcount: {
+      enable: false,
+      post_wordcount: true,
+      min2read: true,
+      total_wordcount: true
+    },
+    medium_zoom: false,
+    fancybox: true,
+    series: {
+      enable: true,
+      orderBy: 'title',
+      order: 1,
+      number: true
+    },
+    abcjs: {
+      enable: false,
+      per_page: true
+    },
+    mermaid: {
+      enable: false,
+      theme: {
+        light: 'default',
+        dark: 'dark'
+      }
+    },
+    note: {
+      style: 'flat',
+      icons: true,
+      border_radius: 3,
+      light_bg_offset: 0
+    },
+    pjax: {
+      enable: false,
+      exclude: null
+    },
+    aplayerInject: {
+      enable: false,
+      per_page: true
+    },
+    snackbar: {
+      enable: false,
+      position: 'bottom-left',
+      bg_light: '#49b1f5',
+      bg_dark: '#1f1f1f'
+    },
+    instantpage: false,
+    pangu: {
+      enable: false,
+      field: 'site'
+    },
+    lazyload: {
+      enable: false,
+      field: 'site',
+      placeholder: null,
+      blur: false
+    },
+    Open_Graph_meta: {
+      enable: true,
+      option: null
+    },
+    css_prefix: true,
+    inject: {
+      head: null,
+      bottom: null
+    },
+    CDN: {
+      internal_provider: 'local',
+      third_party_provider: 'jsdelivr',
+      version: true,
+      custom_format: null,
+      option: null
+    }
+  }
+
+  hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+}, 1)

scripts/events/stylus.js

@@ -1,15 +1,23 @@
 /**
- * stylus
+ * Stylus renderer
  */
 
 'use strict'
 
-hexo.extend.filter.register('stylus:renderer', function (style) {
+hexo.extend.filter.register('stylus:renderer', style => {
-  const { highlight, prismjs } = hexo.config
+  const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
-  style
+  let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
-    .define('$highlight_enable', highlight && highlight.enable)
+  let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
-    .define('$highlight_line_number', highlight && highlight.line_number)
+
-    .define('$prismjs_enable', prismjs && prismjs.enable)
+  // for hexo > 7.0
-    .define('$prismjs_line_number', prismjs && prismjs.line_number)
+  if (syntaxHighlighter) {
-    // .import(this.source_dir.replace(/\\/g, '/') + '_data/css/*')
+    highlightEnable = syntaxHighlighter === 'highlight.js'
+    prismjsEnable = syntaxHighlighter === 'prismjs'
+  }
+
+  style.define('$highlight_enable', highlightEnable)
+    .define('$highlight_line_number', highlightLineNumber)
+    .define('$prismjs_enable', prismjsEnable)
+    .define('$prismjs_line_number', prismjsLineNumber)
+  // .import(`${this.source_dir.replace(/\\/g, '/')}_data/css/*`)
 })

scripts/filters/post_lazyload.js

@@ -8,22 +8,20 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function lazyload (htmlContent) {
+const lazyload = htmlContent => {
   const bg = hexo.theme.config.lazyload.placeholder ? urlFor(hexo.theme.config.lazyload.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
   return htmlContent.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
 }
 
-hexo.extend.filter.register('after_render:html', function (data) {
+hexo.extend.filter.register('after_render:html', data => {
-  const config = hexo.theme.config.lazyload
+  const { enable, field } = hexo.theme.config.lazyload
-  if (!config.enable) return
+  if (!enable || field !== 'site') return
-  if (config.field !== 'site') return
+  return lazyload(data)
-  return lazyload.call(this, data)
 })
 
 hexo.extend.filter.register('after_post_render', data => {
-  const config = hexo.theme.config.lazyload
+  const { enable, field } = hexo.theme.config.lazyload
-  if (!config.enable) return
+  if (!enable || field !== 'post') return
-  if (config.field !== 'post') return
+  data.content = lazyload(data.content)
-  data.content = lazyload.call(this, data.content)
   return data
 })

scripts/filters/random_cover.js

@@ -5,40 +5,35 @@
 
 'use strict'
 
-hexo.extend.filter.register('before_post_render', function (data) {
+hexo.extend.filter.register('before_post_render', data => {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
-  let randomCover
+  let { cover: coverVal, top_img: topImg } = data
-  let coverVal = data.cover
 
   // Add path to top_img and cover if post_asset_folder is enabled
   if (hexo.config.post_asset_folder) {
-    const topImg = data.top_img
+    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = `${data.path}${topImg}`
-    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = data.path + topImg
+    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
-    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = data.path + coverVal
   }
 
   const randomCoverFn = () => {
-    const theme = hexo.theme.config
+    const { cover: { default_cover: defaultCover } } = hexo.theme.config
-    if (!(theme.cover && theme.cover.default_cover)) return false
+    if (!defaultCover) return false
-    if (!Array.isArray(theme.cover.default_cover)) return theme.cover.default_cover
+    if (!Array.isArray(defaultCover)) return defaultCover
-    const num = Math.floor(Math.random() * theme.cover.default_cover.length)
+    const num = Math.floor(Math.random() * defaultCover.length)
-    return theme.cover.default_cover[num]
+    return defaultCover[num]
   }
 
   if (coverVal === false) return data
 
   // If cover is not set, use random cover
   if (!coverVal) {
-    randomCover = randomCoverFn()
+    const randomCover = randomCoverFn()
     data.cover = randomCover
     coverVal = randomCover // update coverVal
   }
 
-  if (coverVal) {
+  if (coverVal && (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal))) {
-    if (coverVal.indexOf('//') !== -1 || imgTestReg.test(coverVal)) {
     data.cover_type = 'img'
-      return data
-    }
   }
 
   return data

scripts/helpers/aside_categories.js

@@ -31,6 +31,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
     if (parent) { query.parent = parent } else { query.parent = { $exists: false } }
     return categories.find(query).sort(orderby, order).filter((cat) => cat.length)
   }
+  let expandBtn = ''
 
   const hierarchicalList = (t, level, parent, topparent = true) => {
     let result = ''
@@ -59,6 +60,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
           }
 
           if (isExpand && isTopParent && child) {
+            expandBtn = ' expandBtn'
             result += `<i class="fas fa-caret-left ${expandClass}"></i>`
           }
 
@@ -91,7 +93,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
             <span>${this._p('aside.card_categories')}</span>
             ${moreButton()}
             </div>
-            <ul class="card-category-list" id="aside-cat-list">
+            <ul class="card-category-list${expandBtn}" id="aside-cat-list">
             ${list[0]}
             </ul>`
 })

scripts/helpers/findArchiveLength.js

@@ -1,36 +1,36 @@
-hexo.extend.helper.register('findArchiveLength', function (func) {
+hexo.extend.helper.register('getArchiveLength', function () {
-  const allPostsLength = this.site.posts.length
+  const { archive_generator: archiveGenerator } = hexo.config
-  if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false) return allPostsLength
+  if (archiveGenerator && archiveGenerator.enable === false) return this.site.posts.length
-  const { yearly, monthly, daily } = hexo.config.archive_generator
+  const { yearly, monthly, daily } = archiveGenerator
   const { year, month, day } = this.page
-  if (yearly === false || !year) return allPostsLength
+  if (yearly === false || !year) return this.site.posts.length
 
   const posts = this.site.posts.sort('date')
 
   const compareFunc = (type, y1, m1, d1, y2, m2, d2) => {
-    if (type === 'year') {
+    switch (type) {
+      case 'year':
         return y1 === y2
-    } else if (type === 'month') {
+      case 'month':
         return y1 === y2 && m1 === m2
-    } else if (type === 'day') {
+      case 'day':
         return y1 === y2 && m1 === m2 && d1 === d2
+      default:
+        return false
     }
   }
 
   const generateDateObj = (type) => {
-    const dateObj = []
+    return posts.reduce((dateObj, post) => {
-    let length = 0
-
-    posts.forEach(post => {
       const date = post.date.clone()
       const year = date.year()
       const month = date.month() + 1
       const day = date.date()
-      const lastData = dateObj[length - 1]
+      const lastData = dateObj[dateObj.length - 1]
 
       if (!lastData || !compareFunc(type, lastData.year, lastData.month, lastData.day, year, month, day)) {
         const name = type === 'year' ? year : type === 'month' ? `${year}-${month}` : `${year}-${month}-${day}`
-        length = dateObj.push({
+        dateObj.push({
           name,
           year,
           month,
@@ -40,19 +40,19 @@ hexo.extend.helper.register('findArchiveLength', function (func) {
       } else {
         lastData.count++
       }
-    })
 
       return dateObj
+    }, [])
   }
 
-  const data = func('createArchiveObj', () => {
+  const data = this.fragment_cache('createArchiveObj', () => {
-    const yearObj = yearly ? generateDateObj('year') : []
+    const dateObjs = []
-    const monthObj = monthly ? generateDateObj('month') : []
+    if (yearly) dateObjs.push(...generateDateObj('year'))
-    const dayObj = daily ? generateDateObj('day') : []
+    if (monthly) dateObjs.push(...generateDateObj('month'))
-    const fullObj = [...yearObj, ...monthObj, ...dayObj]
+    if (daily) dateObjs.push(...generateDateObj('day'))
-    return fullObj
+    return dateObjs
   })
 
-  const name = month ? day ? `${year}-${month}-${day}` : `${year}-${month}` : year
+  const name = month ? (day ? `${year}-${month}-${day}` : `${year}-${month}`) : year
   return data.find(item => item.name === name).count
 })

scripts/helpers/inject_head_js.js

@@ -7,35 +7,36 @@
 
 hexo.extend.helper.register('inject_head_js', function () {
   const { darkmode, aside } = this.theme
-  const start = darkmode.start ? darkmode.start : 6
+  const start = darkmode.start || 6
-  const end = darkmode.end ? darkmode.end : 18
+  const end = darkmode.end || 18
   const { theme_color } = hexo.theme.config
   const themeColorLight = (theme_color && theme_color.enable && theme_color.meta_theme_color_light) || '#ffffff'
   const themeColorDark = (theme_color && theme_color.enable && theme_color.meta_theme_color_dark) || '#0d0d0d'
 
-  const localStore = `
+  const createLocalStore = () => {
+    return `
       win.saveToLocal = {
-      set: function setWithExpiry(key, value, ttl) {
+        set: (key, value, ttl) => {
           if (ttl === 0) return
-        const now = new Date()
+          const now = Date.now()
-        const expiryDay = ttl * 86400000
+          const expiry = now + ttl * 86400000
           const item = {
-          value: value,
+            value,
-          expiry: now.getTime() + expiryDay,
+            expiry
           }
           localStorage.setItem(key, JSON.stringify(item))
         },
       
-      get: function getWithExpiry(key) {
+        get: key => {
           const itemStr = localStorage.getItem(key)
       
           if (!itemStr) {
             return undefined
           }
           const item = JSON.parse(itemStr)
-        const now = new Date()
+          const now = Date.now()
       
-        if (now.getTime() > item.expiry) {
+          if (now > item.expiry) {
             localStorage.removeItem(key)
             return undefined
           }
@@ -43,10 +44,12 @@ hexo.extend.helper.register('inject_head_js', function () {
         }
       }
     `
+  }
 
   // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
-  const getScript = `
+  const createGetScript = () => {
-    win.getScript = url => new Promise((resolve, reject) => {
+    return `
+      win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
         const script = document.createElement('script')
         script.src = url
         script.async = true
@@ -57,11 +60,18 @@ hexo.extend.helper.register('inject_head_js', function () {
           script.onload = script.onreadystatechange = null
           resolve()
         }
+
+        Object.keys(attr).forEach(key => {
+          script.setAttribute(key, attr[key])
+        })
+
         document.head.appendChild(script)
       })
     `
+  }
 
-  const getCSS = `
+  const createGetCSS = () => {
+    return `
       win.getCSS = (url, id = false) => new Promise((resolve, reject) => {
         const link = document.createElement('link')
         link.rel = 'stylesheet'
@@ -77,17 +87,19 @@ hexo.extend.helper.register('inject_head_js', function () {
         document.head.appendChild(link)
       })
     `
+  }
 
-  let darkmodeJs = ''
+  const createDarkmodeJs = () => {
-  if (darkmode.enable) {
+    if (!darkmode.enable) return ''
-    darkmodeJs = `
+
-      win.activateDarkMode = function () {
+    let darkmodeJs = `
+      win.activateDarkMode = () => {
         document.documentElement.setAttribute('data-theme', 'dark')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorDark}')
         }
       }
-      win.activateLightMode = function () {
+      win.activateLightMode = () => {
         document.documentElement.setAttribute('data-theme', 'light')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
           document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorLight}')
@@ -114,7 +126,7 @@ hexo.extend.helper.register('inject_head_js', function () {
               const isNight = hour <= ${start} || hour >= ${end}
               isNight ? activateDarkMode() : activateLightMode()
             }
-            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+            window.matchMedia('(prefers-color-scheme: dark)').addListener(e => {
               if (saveToLocal.get('theme') === undefined) {
                 e.matches ? activateDarkMode() : activateLightMode()
               }
@@ -137,11 +149,14 @@ hexo.extend.helper.register('inject_head_js', function () {
         else if (t === 'light') activateLightMode()
       `
     }
+
+    return darkmodeJs
   }
 
-  let asideStatus = ''
+  const createAsideStatus = () => {
-  if (aside.enable && aside.button) {
+    if (!aside.enable || !aside.button) return ''
-    asideStatus = `
+
+    return `
       const asideStatus = saveToLocal.get('aside-status')
       if (asideStatus !== undefined) {
         if (asideStatus === 'hide') {
@@ -153,7 +168,8 @@ hexo.extend.helper.register('inject_head_js', function () {
     `
   }
 
-  const detectApple = `
+  const createDetectApple = () => {
+    return `
       const detectApple = () => {
         if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
           document.documentElement.classList.add('apple')
@@ -161,6 +177,7 @@ hexo.extend.helper.register('inject_head_js', function () {
       }
       detectApple()
     `
+  }
 
-  return `<script>(win=>{${localStore + getScript + getCSS + darkmodeJs + asideStatus + detectApple}})(window)</script>`
+  return `<script>(win=>{${createLocalStore() + createGetScript() + createGetCSS() + createDarkmodeJs() + createAsideStatus() + createDetectApple()}})(window)</script>`
 })

scripts/helpers/page.js

@@ -1,10 +1,3 @@
-/**
- * Butterfly
- * @example
- *  page_description()
- *  cloudTags(source, minfontsize, maxfontsize, limit)
- */
-
 'use strict'
 
 const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
@@ -60,12 +53,8 @@ hexo.extend.helper.register('md5', function (path) {
 })
 
 hexo.extend.helper.register('injectHtml', function (data) {
-  let result = ''
   if (!data) return ''
-  for (let i = 0; i < data.length; i++) {
+  return data.join('')
-    result += data[i]
-  }
-  return result
 })
 
 hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
@@ -95,8 +84,5 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
 
 hexo.extend.helper.register('isImgOrUrl', function (path) {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
-  if (path.indexOf('//') !== -1 || imgTestReg.test(path)) {
+  return path.indexOf('//') !== -1 || imgTestReg.test(path)
-    return true
-  }
-  return false
 })

scripts/helpers/series.js

@@ -0,0 +1,22 @@
+'use strict'
+
+hexo.extend.helper.register('groupPosts', function () {
+  const getGroupArray = array => {
+    const groups = {}
+    array.forEach(item => {
+      const Key = item.series
+      if (!Key) return
+      groups[Key] = groups[Key] || []
+      groups[Key].push(item)
+    })
+    return groups
+  }
+
+  const sortPosts = posts => {
+    const { orderBy = 'date', order = 1 } = this.theme.aside.card_post_series
+    if (orderBy === 'title') return posts.sort('title', order)
+    return posts.sort('date', order)
+  }
+
+  return getGroupArray(sortPosts(this.site.posts))
+})

scripts/tag/button.js

@@ -9,17 +9,9 @@
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function btn (args) {
+const btn = args => {
   args = args.join(' ').split(',')
-  let url = args[0] || ''
+  const [url = '', text = '', icon = '', option = ''] = args.map(arg => arg.trim())
-  let text = args[1] || ''
-  let icon = args[2] || ''
-  let option = args[3] || ''
-
-  url = url.trim()
-  text = text.trim()
-  icon = icon.trim()
-  option = option.trim()
 
   return `<a class="btn-beautify ${option}" href="${urlFor(url)}" 
   title="${text}">${icon.length ? `<i class="${icon}"></i>` : ''}${text.length ? `<span>${text}</span>` : ''}</a>`

scripts/tag/gallery.js

@@ -2,23 +2,25 @@
  * Butterfly
  * galleryGroup and gallery
  * {% galleryGroup [name] [descr] [url] [img] %}
- * {% gallery [lazyload],[rowHeight],[limit] %}
+ *
- * {% gallery url,[url],[lazyload],[rowHeight],[limit] %}
+ * {% gallery [button],%}
+ * {% gallery url,[url],[button]%}
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function gallery (args, content) {
+const gallery = (args, content) => {
-  const { data, languages } = hexo.theme.i18n
   args = args.join(' ').split(',')
-  let rowHeight, limit, lazyload, type, dataStr
+  let button = false
+  let type = 'data'
+  let dataStr = ''
 
   if (args[0] === 'url') {
-    [type, dataStr, lazyload, rowHeight = 220, limit = 10] = args // url,[link],[lazyload],[rowHeight],[limit]
+    [type, dataStr, button] = args // url,[link],[lazyload]
   } else {
-    [lazyload, rowHeight = 220, limit = 10] = args // [lazyload],[rowHeight],[limit]
+    [button] = args // [lazyload]
     const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
     let m
     const arr = []
@@ -36,30 +38,24 @@ function gallery (args, content) {
     dataStr = JSON.stringify(arr)
   }
 
-  type = type ? ' url' : ' data'
+  return `<div class="gallery-container" data-type="${type}" data-button="${button}">
-  const lazyloadClass = lazyload === 'true' ? 'lazyload' : ''
+      <div class="gallery-data">${dataStr}</div>
-
+      <div class="gallery-items">
-  return `<div class="gallery">
-    <div class="fj-gallery ${lazyloadClass + type}" data-rowHeight="${rowHeight}" data-limit="${limit}">
-    <span class="gallery-data">${dataStr}</span>
       </div>
-    <button class="gallery-load-more"><span>${data[languages[0]].load_more}</span><i class="fa-solid fa-arrow-down"></i></button>
     </div>`
 }
 
-function galleryGroup (args) {
+const galleryGroup = args => {
-  const name = args[0]
+  const [name, descr, url, img] = args
-  const descr = args[1]
+  const imgUrl = urlFor(img)
-  const url = urlFor(args[2])
+  const urlLink = urlFor(url)
-  const img = urlFor(args[3])
 
-  return `
+  return `<figure class="gallery-group">
-  <figure class="gallery-group">
+  <img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
-  <img class="gallery-group-img no-lightbox" src='${img}' alt="Group Image Gallery">
   <figcaption>
   <div class="gallery-group-name">${name}</div>
   <p>${descr}</p>
-  <a href='${url}'></a>
+  <a href='${urlLink}'></a>
   </figcaption>
   </figure>
   `

scripts/tag/hide.js

@@ -16,51 +16,46 @@
 
 'use strict'
 
-function hideInline (args) {
+const parseArgs = args => {
-  args = args.join(' ').split(',')
+  return args.join(' ').split(',')
-  const content = args[0]
+}
-  const display = args[1] || 'Click'
-  const bg = args[2] || false
-  const color = args[3] || false
-  let group = 'style="'
 
-  if (bg) group += `background-color: ${bg};`
+const generateStyle = (bg, color) => {
-  if (color) group += `color: ${color}`
+  let style = 'style="'
-  group += '"'
+  if (bg) {
+    style += `background-color: ${bg};`
+  }
+  if (color) {
+    style += `color: ${color}`
+  }
+  style += '"'
+  return style
+}
+
+const hideInline = args => {
+  const [content, display = 'Click', bg = false, color = false] = parseArgs(args)
+  const group = generateStyle(bg, color)
 
   return `<span class="hide-inline"><button type="button" class="hide-button" ${group}>${display}
   </button><span class="hide-content">${content}</span></span>`
 }
 
-function hideBlock (args, content) {
+const hideBlock = (args, content) => {
-  args = args.join(' ').split(',')
+  const [display = 'Click', bg = false, color = false] = parseArgs(args)
-  const display = args[0] || 'Click'
+  const group = generateStyle(bg, color)
-  const bg = args[1] || false
-  const color = args[2] || false
-  let group = 'style="'
-
-  if (bg) group += `background-color: ${bg};`
-  if (color) group += `color: ${color}`
-  group += '"'
 
   return `<div class="hide-block"><button type="button" class="hide-button" ${group}>${display}
     </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
-function hideToggle (args, content) {
+const hideToggle = (args, content) => {
-  args = args.join(' ').split(',')
+  const [display, bg = false, color = false] = parseArgs(args)
-  const display = args[0]
+  const group = generateStyle(bg, color)
-  const bg = args[1] || false
-  const color = args[2] || false
-  let group = 'style="'
   let border = ''
 
   if (bg) {
     border = `style="border: 1px solid ${bg}"`
-    group += `background-color: ${bg};`
   }
-  if (color) group += `color: ${color}`
-  group += '"'
 
   return `<details class="toggle" ${border}><summary class="toggle-button" ${group}>${display}</summary><div class="toggle-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></details>`
 }

scripts/tag/inlineImg.js

@@ -1,17 +1,19 @@
 /**
  * inlineImg 圖片
- * {% inlineImg src height %}
+ * @param {Array} args 圖片名稱和高度
+ * @param {string} args[0] 圖片名稱
+ * @param {number} args[1] 圖片高度
+ * @returns {string} 圖片標籤
  */
 
 'use strict'
 
 const urlFor = require('hexo-util').url_for.bind(hexo)
 
-function inlineImg (args) {
+const inlineImg = ([img, height = '']) => {
-  const img = args[0]
+  const heightStyle = height ? `style="height:${height}"` : ''
-  const height = args[1] ? `style="height:${args[1]}"` : ''
+  const src = urlFor(img)
-
+  return `<img class="inline-img" src="${src}" ${heightStyle} />`
-  return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
 }
 
 hexo.extend.tag.register('inlineImg', inlineImg, { ends: false })

scripts/tag/label.js

@@ -6,10 +6,8 @@
 
 'use strict'
 
-function addLabel (args, content) {
+const addLabel = args => {
-  const text = args[0]
+  const [text, className = 'default'] = args
-  const className = args[1] || 'default'
-
   return `<mark class="hl-label ${className}">${text}</mark> `
 }
 

scripts/tag/mermaid.js

@@ -8,7 +8,7 @@
 
 const { escapeHTML } = require('hexo-util')
 
-function mermaid (args, content) {
+const mermaid = (args, content) => {
   return `<div class="mermaid-wrap"><pre class="mermaid-src" hidden>
   ${escapeHTML(content)}
   </pre></div>`

scripts/tag/note.js

@@ -6,10 +6,10 @@
 
 'use strict'
 
-function postNote (args, content) {
+const postNote = (args, content) => {
   const styleConfig = hexo.theme.config.note.style
-  const lastArgs = args[args.length - 1]
+  const noteTag = ['flat', 'modern', 'simple', 'disabled']
-  if (!(lastArgs === 'flat' || lastArgs === 'modern' || lastArgs === 'simple' || lastArgs === 'disabled')) {
+  if (!noteTag.includes(args[args.length - 1])) {
     args.push(styleConfig)
   }
 

scripts/tag/score.js

@@ -3,20 +3,20 @@
  * {% score %}
  */
 
-'use strict';
+'use strict'
 
-function score(args, content) {
+const score = (args, content) => {
-    function escapeHtmlTags(s) {
+  const escapeHtmlTags = s => {
-        let lookup = {
+    const lookup = {
-            '&': "&",
+      '&': '&',
-            '"': """,
+      '"': '"',
-            '\'': "'",
+      '\'': ''',
-            '<': "&lt;",
+      '<': '&lt;',
-            '>': "&gt;"
+      '>': '&gt;'
-        };
-        return s.replace(/[&"'<>]/g, c => lookup[c]);
     }
-    return `<div class="abc-music-sheet">${escapeHtmlTags(content)}</div>`;
+    return s.replace(/[&"'<>]/g, c => lookup[c])
+  }
+  return `<div class="abc-music-sheet">${escapeHtmlTags(content)}</div>`
 }
 
-hexo.extend.tag.register('score', score, {ends: true});
+hexo.extend.tag.register('score', score, { ends: true })

scripts/tag/series.js

@@ -0,0 +1,69 @@
+/**
+ * series plugin
+ * Syntax:
+ *  {% series [series name] %}
+ * Usage:
+ * {% series %}
+ * {% series series1 %}
+ */
+
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+const groups = {}
+
+hexo.extend.filter.register('before_post_render', data => {
+  if (!hexo.theme.config.series.enable) return data
+  const { layout, series } = data
+  if (layout === 'post' && series) {
+    groups[series] = groups[series] || []
+    groups[series].push({
+      title: data.title,
+      path: data.path,
+      date: data.date.unix()
+    })
+  }
+  return data
+})
+
+function series (args) {
+  const { series } = hexo.theme.config
+  if (!series.enable) {
+    hexo.log.warn('Series plugin is disabled in the theme config')
+    return ''
+  }
+
+  const seriesArr = args.length ? groups[args[0]] : groups[this.series]
+
+  if (!seriesArr) {
+    hexo.log.warn(`There is no series named "${args[0]}"`)
+    return ''
+  }
+
+  const isAsc = (series.order || 1) === 1 // 1: asc, -1: desc
+  const isSortByTitle = series.orderBy === 'title'
+
+  const compareFn = (a, b) => {
+    const itemA = isSortByTitle ? a.title.toUpperCase() : a.date
+    const itemB = isSortByTitle ? b.title.toUpperCase() : b.date
+
+    if (itemA < itemB) {
+      return isAsc ? -1 : 1
+    }
+    if (itemA > itemB) {
+      return isAsc ? 1 : -1
+    }
+    return 0
+  }
+
+  seriesArr.sort(compareFn)
+
+  let result = ''
+  seriesArr.forEach(ele => {
+    result += `<li><a href="${urlFor(ele.path)}" title="${ele.title}">${ele.title}</a></li>`
+  })
+
+  return series.number ? `<ol>${result}</ol>` : `<ul>${result}</ul>`
+}
+
+hexo.extend.tag.register('series', series, { ends: false })

scripts/tag/tabs.js

@@ -6,24 +6,22 @@
 
 'use strict'
 
-function postTabs (args, content) {
+const postTabs = (args, content) => {
   const tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g
-
   args = args.join(' ').split(',')
   const tabName = args[0]
   const tabActive = Number(args[1]) || 0
-
   const matches = []
   let match
   let tabId = 0
   let tabNav = ''
   let tabContent = ''
+  let noDefault = true
 
   !tabName && hexo.log.warn('Tabs block must have unique name!')
 
   while ((match = tabBlock.exec(content)) !== null) {
-    matches.push(match[1])
+    matches.push(match[1], match[2])
-    matches.push(match[2])
   }
 
   for (let i = 0; i < matches.length; i += 2) {
@@ -44,17 +42,21 @@ function postTabs (args, content) {
     const icon = tabIcon.trim()
     tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)
 
-    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button>'
+    let isActive = ''
-
+    if ((tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1)) {
-    const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
+      isActive = ' active'
-    tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
+      noDefault = false
-    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
+    }
+    tabNav += `<button type="button" class="tab ${isActive}" data-href="${tabHref}">${tabIcon + tabCaption.trim()}</button>`
+    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent}</div>`
   }
 
-  tabNav = `<ul class="nav-tabs">${tabNav}</ul>`
+  const toTop = '<div class="tab-to-top"><button type="button" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button></div>'
+
+  tabNav = `<ul class="nav-tabs${noDefault ? ' no-default' : ''}">${tabNav}</ul>`
   tabContent = `<div class="tab-contents">${tabContent}</div>`
 
-  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`
+  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent + toTop}</div>`
 }
 
 hexo.extend.tag.register('tabs', postTabs, { ends: true })

scripts/tag/timeline.js

@@ -5,15 +5,15 @@
 
 'use strict'
 
-function timeLineFn (args, content) {
+const timeLineFn = (args, content) => {
   const tlBlock = /<!--\s*timeline (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtimeline\s*-->/g
 
   let result = ''
   let color = ''
+  let text = ''
   if (args.length) {
-    args = args.join(' ').split(',')
+    [text, color] = args.join(' ').split(',')
-    color = args[1]
+    const mdContent = hexo.render.renderSync({ text, engine: 'markdown' })
-    const mdContent = hexo.render.renderSync({ text: args[0], engine: 'markdown' })
     result += `<div class='timeline-item headline'><div class='timeline-item-title'><div class='item-circle'>${mdContent}</div></div></div>`
   }
 

source/css/_global/function.styl

@@ -72,6 +72,30 @@
       cursor: pointer
       transition: all .3s ease-out
 
+.custom-hr
+  position: relative
+  margin: 40px auto
+  border: 2px dashed var(--hr-border)
+
+  if hexo-config('hr_icon.enable')
+    width: calc(100% - 4px)
+
+    &:hover
+      &:before
+        left: calc(95% - 20px)
+
+    &:before
+      position: absolute
+      top: $hr-icon-top
+      left: 5%
+      z-index: 1
+      color: var(--hr-before-color)
+      content: $hr-icon
+      font-size: 20px
+      line-height: 1
+      transition: all 1s ease-in-out
+      @extend .fontawesomeIcon
+
 maxWidth600()
   @media screen and (max-width: 600px)
     {block}
@@ -110,7 +134,7 @@ if hexo-config('enter_transitions')
   #footer
     animation: bottom-top 1s
 
-  #page-header
+  #page-header:not(.full_page)
     animation: header-effect 1s
 
   #site-title,
@@ -131,7 +155,7 @@ if hexo-config('enter_transitions')
     &.open
       for i in 1 2 3 4
         > :nth-child({i})
-          animation: sidebarItem (i / 5)s
+          animation: sidebarItem (i / 5s)
 
 .scroll-down-effects
   animation: scroll-down-effect 1.5s infinite
@@ -145,16 +169,16 @@ if hexo-config('avatar.effect') == true
 
 @keyframes scroll-down-effect
   0%
-    top: 0
     opacity: .4
+    transform: translate(0, 0)
 
   50%
-    top: -16px
     opacity: 1
+    transform: translate(0, -16px)
 
   100%
-    top: 0
     opacity: .4
+    transform: translate(0, 0)
 
 @keyframes header-effect
   0%
@@ -174,12 +198,12 @@ if hexo-config('avatar.effect') == true
 
 @keyframes bottom-top
   0%
-    margin-top: 50px
     opacity: 0
+    transform: translateY(50px)
 
   100%
-    margin-top: 0
     opacity: 1
+    transform: translateY(0)
 
 @keyframes titleScale
   0%

source/css/_global/index.styl

@@ -34,6 +34,8 @@
   --headline-presudo: #a0a0a0
   --scrollbar-color: $scrollbar-color
   --default-bg-color: $theme-color
+  --zoom-bg: #fff
+  --mark-bg: alpha($dark-black, .3)
 
 body
   position: relative
@@ -47,6 +49,7 @@ body
 
   if !hexo-config('copy.enable')
     user-select: none
+    -webkit-user-select: none
 
 // scrollbar - chrome/safari
 *::-webkit-scrollbar
@@ -96,30 +99,6 @@ h6
 *
   box-sizing: border-box
 
-hr
-  position: relative
-  margin: 40px auto
-  border: 2px dashed var(--hr-border)
-
-  if hexo-config('hr_icon.enable')
-    width: calc(100% - 4px)
-
-    &:hover
-      &:before
-        left: calc(95% - 20px)
-
-    &:before
-      position: absolute
-      top: $hr-icon-top
-      left: 5%
-      z-index: 1
-      color: var(--hr-before-color)
-      content: $hr-icon
-      font-size: 20px
-      line-height: 1
-      transition: all 1s ease-in-out
-      @extend .fontawesomeIcon
-
 .table-wrap
   overflow-x: scroll
   margin: 0 0 20px
@@ -174,9 +153,6 @@ if $site-name-font
 .is-center
   text-align: center
 
-.copy-true
-  user-select: all
-
 .pull-left
   float: left
 

source/css/_highlight/highlight.styl

@@ -13,6 +13,16 @@ wordWrap = $highlight_enable && !$highlight_line_number && hexo-config('code_wor
   --hlscrollbar-bg: $highlight-scrollbar
   --hlexpand-bg: linear-gradient(180deg, rgba($highlight-background, .6), rgba($highlight-background, .9))
 
+[data-theme='dark']
+  --hl-color: alpha(#FFFFFF, .7)
+  --hl-bg: lighten(#121212, 2)
+  --hltools-bg: lighten(#121212, 3)
+  --hltools-color: #90a4ae
+  --hlnumber-bg: lighten(#121212, 2)
+  --hlnumber-color: alpha(#FFFFFF, .4)
+  --hlscrollbar-bg: lighten(#121212, 5)
+  --hlexpand-bg: linear-gradient(180deg, rgba(lighten(#121212, 2), .6), rgba(lighten(#121212, 2), .9))
+
 if $highlight_enable
   @require 'highlight/index'
 
@@ -75,6 +85,15 @@ $code-block
         &:hover
           border-bottom-color: var(--hl-color)
 
+    &.copy-true
+      user-select: all
+      -webkit-user-select: all
+
+      & > table,
+      & > pre
+        display: block !important
+        opacity: 0
+
   .highlight-tools
     position: relative
     display: flex
@@ -86,9 +105,14 @@ $code-block
     color: var(--hltools-color)
     font-size: $code-font-size
 
-    &.closed ~ *
+    &.closed
+      & ~ *
         display: none
 
+      .expand
+        transition: all .3s
+        transform: rotate(-90deg) !important
+
     .expand
       position: absolute
       padding: .57em .7em
@@ -98,10 +122,6 @@ $code-block
       & + .code-lang
         left: 1.7em
 
-      &.closed
-        transition: all .3s
-        transform: rotate(-90deg) !important
-
     .code-lang
       position: absolute
       left: 14px
@@ -109,6 +129,7 @@ $code-block
       font-weight: bold
       font-size: 1.15em
       user-select: none
+      -webkit-user-select: none
 
     .copy-notice
       position: absolute
@@ -127,6 +148,7 @@ $code-block
 
   .gutter
     user-select: none
+    -webkit-user-select: none
 
   .gist table
     width: auto

source/css/_highlight/prismjs/line-number.styl

@@ -27,6 +27,7 @@
         font-size: 100%
         pointer-events: none
         user-select: none
+        -webkit-user-select: none
 
         & > span
           display: block

source/css/_layout/aside.styl

@@ -179,6 +179,13 @@
 
       > .parent
         > a
+          &.expand
+            i
+              transform: rotate(-90deg)
+
+            & + .child
+              display: block
+
           .card-category-list
             &-name
               width: 70% !important
@@ -194,9 +201,6 @@
             transition: transform .3s
             transform: rotate(0)
 
-          &.expand
-            transform: rotate(-90deg)
-
         if hexo-config('aside.card_categories.expand') == false
           > .child
             display: none
@@ -220,16 +224,19 @@
 
     +maxWidth900()
       position: fixed
-      right: -100%
+      right: 55px
       bottom: 30px
       z-index: 100
       max-width: $toc-mobile-maxWidth
       max-height: calc(100% - 60px)
       width: $toc-mobile-width
-      opacity: 0
+      transition: none
-      transition: initial
+      transform: scale(0)
       transform-origin: right bottom
 
+      &.open
+        transform: scale(1)
+
     .toc-percentage
       float: right
       margin-top: -9px
@@ -242,6 +249,7 @@
       overflow-y: overlay
       margin: 0 -24px
       max-height: calc(100vh - 120px)
+      width: calc(100% + 48px)
 
       +maxWidth900()
         max-height: calc(100vh - 140px)

source/css/_layout/comments.styl

@@ -2,13 +2,18 @@
   .comment-head
     margin-bottom: 20px
 
+    &:after
+      display: block
+      clear: both
+      content: ''
+
     .comment-headline
       display: inline-block
       vertical-align: middle
       font-weight: 700
       font-size: 1.43em
 
-    #comment-switch
+    .comment-switch
       display: inline-block
 
       if hexo-config('comments.text')
@@ -30,7 +35,7 @@
       .second-comment
         color: $comments-switch-second-text
 
-      .switch-btn
+      #switch-btn
         position: relative
         display: inline-block
         margin: -4px 8px 0
@@ -53,12 +58,24 @@
           content: ''
           transition: .4s
 
+  .comment-wrap
+    > div
+      animation: tabshow .5s
+
+      &:nth-child(2)
+        display: none
+
   &.move
+    #switch-btn
       background-color: $comments-switch-second-text
 
       &:before
         transform: translateX(20px)
 
     .comment-wrap
-    > div:nth-child(2)
+      > div
+        &:first-child
           display: none
+
+        &:last-child
+          display: block

source/css/_layout/footer.styl

@@ -5,12 +5,12 @@
   background-position: bottom
   background-size: cover
 
-  if hexo-config('footer_bg') != false
+  if hexo-config('footer_bg') != false && hexo-config('mask.footer')
     &:before
       position: absolute
       width: 100%
       height: 100%
-      background-color: alpha($dark-black, .5)
+      background-color: var(--mark-bg)
       content: ''
 
 #footer-wrap

source/css/_layout/head.styl

@@ -7,11 +7,12 @@
   background-repeat: no-repeat
   transition: all .5s
 
+  if hexo-config('mask.header')
     &:not(.not-top-img):before
       position: absolute
       width: 100%
       height: 100%
-    background-color: alpha($dark-black, .3)
+      background-color: var(--mark-bg)
       content: ''
 
   // index
@@ -50,7 +51,6 @@
   #site_social_icons
     display: none
     margin: 0 auto
-    width: 300px
     text-align: center
 
     +maxWidth768()
@@ -64,7 +64,7 @@
 
   #scroll-down
     position: absolute
-    bottom: 0
+    bottom: 10px
     width: 100%
     cursor: pointer
 
@@ -72,7 +72,7 @@
       position: relative
       width: 100%
       color: var(--light-grey)
-      font-size: 30px
+      font-size: 20px
 
   // page
   &.not-home-page
@@ -97,9 +97,6 @@
     +maxWidth768()
       height: 360px
 
-    &:before
-      background-color: alpha($dark-black, .5)
-
   #post-info
     position: absolute
     bottom: 100px