fix merge conflict

README.md

@@ -79,7 +79,7 @@ npm i hexo-theme-butterfly
 - [x] Related articles
 - [x] Displays outdated notice for a post
 - [x] Share (AddThis/Sharejs/Addtoany)
-- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
 - [x] Web analytics

README_CN.md

@@ -79,7 +79,7 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統

_config.yml

@@ -259,7 +259,7 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42
   use: # Valine,Disqus
   text: true # Display the comment name next to the button
   # lazyload: The comment system will be load when comment element enters the browser's viewport.
@@ -354,6 +354,13 @@ giscus:
     dark: dark
   option:
 
+# Remark42
+# https://remark42.com/docs/configuration/frontend/
+remark42:
+  host: # Your Host URL
+  siteId: # Your Site ID
+  option:
+
 # Chat Services
 # --------------------------------------
 
@@ -621,7 +628,10 @@ aside:
   button: true
   mobile: true # display on mobile
   position: right # left or right
-  archives: true
+  display:
+    archive: true
+    tag: true
+    category: true
   card_author:
     enable: true
     description:
@@ -836,13 +846,22 @@ inject:
 # 非必要請不要修改
 CDN:
   # The CDN provider of internal scripts (主題內部 js 的 cdn 配置)
-  # option: local/jsdelivr
-  # Dev version cannot choose jsdelivr (dev版的主題不能設置為 jsdelivr)
+  # option: local/jsdelivr/unpkg/cdnjs/custom
+  # Dev version can only choose. ( dev版的主題只能設置為 local )
   internal_provider: local
+
   # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
-  # option: local/jsdelivr
+  # option: local/jsdelivr/unpkg/cdnjs/custom
   # when set it to local, you need to install hexo-butterfly-extjs
   third_party_provider: jsdelivr
+
+  # Add version number to CDN, true or false  
+  version: false
+
+  # Custom format
+  # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
+  custom_format:
+
   option:
     # main_css:
     # main:
@@ -867,7 +886,6 @@ CDN:
     # mathjax:
     # katex:
     # katex_copytex:
-    # katex_copytex_css:
     # mermaid:
     # canvas_ribbon:
     # canvas_fluttering_ribbon:

layout/archive.pug

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

layout/includes/header/index.pug

@@ -19,7 +19,7 @@ if !theme.disable_top_img && page.top_img !== false
   if top_img !== false
     - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''
-    - var site_title = is_archive() ? fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);}) : page.title || page.tag || page.category || config.title
+    - var site_title = is_archive() ? findArchivesTitle(page, theme.menu, date) : page.title || page.tag || page.category || config.title
     - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else

layout/includes/header/post-info.pug

@@ -63,26 +63,26 @@
 
       - const commentUse = comments.use
       if commentUse && !comments.lazyload
-        case commentUse[0]
-          when 'Valine'
-            if theme.valine.visitor
-              +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
-                span.leancloud-visitors-count
-          when 'Waline'
-            if theme.waline.pageview
-              +pvBlock('','','')
-                span.waline-pageview-count(data-path=url_for(page.path))
-          when 'Twikoo'
-            if theme.twikoo.visitor
-              +pvBlock('','','')
-                span#twikoo_visitors
-          default
-            if theme.busuanzi.page_pv
-              +pvBlock('','post-meta-pv-cv','')
-                span#busuanzi_value_page_pv
+        if commentUse[0] === 'Valine' && theme.valine.visitor
+          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+            span.leancloud-visitors-count
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse[0] === 'Waline' && theme.waline.pageview
+          +pvBlock('','','')
+            span.waline-pageview-count(data-path=url_for(page.path))
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor
+          +pvBlock('','','')
+            span#twikoo_visitors
+              i.fa-solid.fa-spinner.fa-spin
+        else if theme.busuanzi.page_pv
+          +pvBlock('','post-meta-pv-cv','')
+            span#busuanzi_value_page_pv
+              i.fa-solid.fa-spinner.fa-spin
       else if theme.busuanzi.page_pv
         +pvBlock('','post-meta-pv-cv','')
           span#busuanzi_value_page_pv
+            i.fa-solid.fa-spinner.fa-spin
 
       if comments.count && !comments.lazyload && page.comments !== false && comments.use
         - var whichCount = comments.use[0]
@@ -97,27 +97,42 @@
 
         case whichCount
           when 'Disqus'
-          when 'Disqusjs'
             +countBlock
               span.disqus-comment-count
                 a(href=full_url_for(page.path) + '#disqus_thread')
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Disqusjs'
+            +countBlock
+              a(href=full_url_for(page.path) + '#disqusjs')
+                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Waline'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.waline-comment-count(data-path=url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Gitalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.gitalk-comment-count
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Twikoo'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span#twikoo-count
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Facebook Comments'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.fb-comments-count(data-href=urlNoIndex())
+                span.fb-comments-count(data-href=urlNoIndex())
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Remark42'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.remark42__counter(data-url=urlNoIndex())
+                  i.fa-solid.fa-spinner.fa-spin

layout/includes/layout.pug

@@ -1,5 +1,5 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
-- page.aside = is_archive() ? theme.aside.archives : page.aside
+- page.aside = is_archive() ? theme.aside.display.archive: is_category() ? theme.aside.display.category : is_tag() ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 - var pageType = is_post() ? 'post' : 'page'
 

layout/includes/mixins/post-ui.pug

@@ -5,7 +5,7 @@ mixin postUI(posts)
         let link = article.link || article.path
         let title = article.title || _p('no_title')
         const position = theme.cover.position
-        let leftOrRight = position === 'both' 
+        let leftOrRight = position === 'both'
           ? index%2 == 0 ? 'left' : 'right'
           : position === 'left' ? 'left' : 'right'
         let post_cover = article.cover
@@ -70,24 +70,38 @@ mixin postUI(posts)
           if theme.comments.card_post_count
             case theme.comments.use[0]
               when 'Disqus'
-              when 'Disqusjs'
                 +countBlockInIndex
                   a(href=full_url_for(link) + '#disqus_thread')
+                    i.fa-solid.fa-spinner.fa-spin
+              when 'Disqusjs'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqusjs')
+                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
-                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+                  a(href=url_for(link) + '#post-comment')
+                    span.valine-comment-count(data-xid=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.waline-comment-count(id=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex
                   a.twikoo-count(href=url_for(link) + '#post-comment')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Facebook Comments'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+                      i.fa-solid.fa-spinner.fa-spin
+              when 'Remark42'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.remark42__counter(data-url=urlNoIndex(article.permalink))
+                      i.fa-solid.fa-spinner.fa-spin
 
         //- Display the article introduction on homepage
         case theme.index_post_content.method

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

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

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

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

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

@@ -8,6 +8,7 @@ script.
           appKey: '#{theme.valine.appKey}',
           serverURLs: '#{theme.valine.serverURLs}'
         }
+
         const valine = new Valine(initData)
       }
 

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

@@ -4,7 +4,7 @@ script.
   function loadDisqus () {
     var disqus_config = function () {
       this.page.url = '!{ page.permalink }'
-      this.page.identifier = '!{ page.path }'
+      this.page.identifier = '!{ url_for(page.path) }'
       this.page.title = '!{ disqusPageTitle }'
     };
 
@@ -24,6 +24,10 @@ script.
         (d.head || d.body).appendChild(s);
       })();
     }
+
+    document.getElementById('darkmode').addEventListener('click', () => {
+      setTimeout(() => window.disqusReset(), 200)
+    })
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {

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

@@ -10,18 +10,27 @@ script.
     }
 
     function initDisqusjs () {
-      window.DISQUS = null
-      new DisqusJS(Object.assign({
+      window.disqusjs = null
+      disqusjs = new DisqusJS(Object.assign({
         shortname: '!{theme.disqusjs.shortname}',
-        identifier: '!{ page.path }',
+        identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
         apikey: '!{theme.disqusjs.apikey}',
       },!{JSON.stringify(theme.disqusjs.option)}))
+
+      disqusjs.render(document.getElementById('disqusjs'))
+    }
+
+    const themeChange = () => {
+      const ele = document.getElementById('disqus_thread')
+      if(!ele) return
+      disqusjs.destroy()
+      initDisqusjs()
     }
 
 
-    window.disqusReset = initDisqusjs
+    document.getElementById('darkmode').addEventListener('click', themeChange)
 
     if (window.disqusJsLoad) initDisqusjs()
     else {
@@ -32,7 +41,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
     else loadDisqusjs()
   }
   else {

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

@@ -22,7 +22,7 @@ hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqus_thread
+            #disqusjs
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'
@@ -40,3 +40,5 @@ hr
                         data-numposts= theme.facebook_comments.pageSize || 10
                         data-order-by= theme.facebook_comments.order_by || 'social'
                         data-width="100%")
+          when 'Remark42'
+            #remark42

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

@@ -20,3 +20,5 @@ each name in theme.comments.use
       !=partial('includes/third-party/comments/giscus', {}, {cache: true})
     when 'Facebook Comments'
       !=partial('includes/third-party/comments/facebook_comments', {}, {cache: true})
+    when 'Remark42'
+      !=partial('includes/third-party/comments/remark42', {}, {cache: true})