hexo-theme-solitude 1.8.0 → 1.8.1

package/layout/includes/console.pug

@@ -39,7 +39,7 @@ div#console
             div.console-btn-item#consoleMusic(onclick="sco.musicToggle()")
                 span.music-switch(title=_p('console.switch_music'))
                     i.solitude.st-disc-fill
-        if theme.comment.enable && theme.comment.commentBarrage
+        if theme.comment.use && theme.comment.commentBarrage
             div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
                 span.commentBarrage
                     i.solitude.st-chat-fill

package/layout/includes/footer.pug

@@ -52,7 +52,7 @@ div#footer-bar
                     a.footer-bar-link(href=url_for("/"))= config.author
         div.footer-bar-right
             each item in theme.footer.links
-                a.footer-bar-link(href=url_for(item.url), title=item.name)= item.name
+                a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
             a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
                 i.solitude.st-copyright-line
                 i.solitude.st-creative-commons-by-line
@@ -65,5 +65,5 @@ if theme.footer.privacy
             span.cookies-tip= __('cookies.tip')
             a.cookies-link(href=url_for(theme.footer.privacy), title=_p('cookies.privacy'))
                 i.solitude.st-right-btn-fill
-if theme.comment.enable && theme.comment.commentBarrage
+if theme.comment.use && theme.comment.commentBarrage
     div.comment-barrage.needEndHide

package/layout/includes/head/config.pug

@@ -26,7 +26,7 @@
 
     let comment = false
 
-    if (theme.comment.enable) {
+    if (theme.comment.use) {
         comment = {
             avatar: theme.comment.avatar,
             commentBarrage: theme.comment.commentBarrage,
@@ -85,7 +85,7 @@
         }
     }
 
-    if (theme.comment.enable && theme.comment.commentBarrage) {
+    if (theme.comment.use && theme.comment.commentBarrage) {
         lang.barrage = {
             title: _p('commentBarrage.title'),
         }
@@ -106,7 +106,7 @@
                 stop: _p('right_menu.music.stop'),
             }
         }
-        if (theme.comment.enable && theme.comment.commentBarrage) {
+        if (theme.comment.use && theme.comment.commentBarrage) {
             rightMenu.barrage = {
                 open: _p('right_menu.barrage.open'),
                 close: _p('right_menu.barrage.close')

package/layout/includes/inject/head.pug

@@ -28,7 +28,7 @@ if theme.pwa.enable
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.0",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.1",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"
@@ -39,7 +39,4 @@ if theme.extends.head
         != item
 
 script(src=url_for(theme.cdn.utils))
-script(src=url_for(theme.cdn.main))
-
-if theme.comment.use.includes('Valine')
-    script(src=url_for(theme.cdn.blueimp_md5))
+script(src=url_for(theme.cdn.main))

package/layout/includes/rightmenu.pug

@@ -17,7 +17,7 @@ div#rightMenu
         div.rightMenu-item#menu-pastetext
             i.solitude.st-clipboard-fill
             span= _p('right_menu.paste')
-        if theme.comment.enable
+        if theme.comment.use
             div.rightMenu-item#menu-commenttext
                 i.solitude.st-chat-new-fill
                 span= _p('right_menu.comment')
@@ -56,7 +56,7 @@ div#rightMenu
                 i.solitude(class=item.icon)
                 span= item.name
     div.rightMenu-group.rightMenu-line.rightMenuOther
-        if theme.right_menu.commentBarrage && theme.comment.enable && theme.comment.commentBarrage
+        if theme.right_menu.commentBarrage && theme.comment.use && theme.comment.commentBarrage
             div.rightMenu-item#menu-commentBarrage(onclick="sco.switchCommentBarrage()")
                 i.solitude.st-chat-fill
                 span.menu-commentBarrage-text= _p('right_menu.barrage.open')

package/layout/includes/widgets/page/links/banner.pug

@@ -7,7 +7,7 @@
         a.banner-button.secondary(onclick="travelling()")
             i.solitude.st-signal-tower-fill
             span.banner-button-text=_p('link.banner.random')
-    if theme.comment.enable
+    if theme.comment.use
         a.banner-button(onclick="sco.scrollToComment()")
             i.solitude.st-right-btn-fill
             span.solitude.banner-button-text=_p('link.banner.toComment')

package/layout/includes/widgets/post/postMeta.pug

@@ -40,25 +40,26 @@
             if theme.post.meta.pv
                 a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))
                     i.post-meta-icon.solitude.st-fire-fill
-                    case theme.comment.use[0]
-                        when "Twikoo"
-                            span#twikoo_visitors
-                                i.solitude.st-loading-line
-                        when "Waline"
-                            span.waline-pageview-count
-                                i.solitude.st-loading-line
-                        when "Valine"
-                            span.leancloud_visitors(id=url_for(page.path))
-                                span.leancloud-visitors-count
+                    if theme.comment.use
+                        case theme.comment.use[0]
+                            when "Twikoo"
+                                span#twikoo_visitors
+                                    i.solitude.st-loading-line
+                            when "Waline"
+                                span.waline-pageview-count
+                                    i.solitude.st-loading-line
+                            when "Valine"
+                                span.leancloud_visitors(id=url_for(page.path))
+                                    span.leancloud-visitors-count
+                                        i.solitude.st-loading-line
+                            when 'Artalk'
+                                span#ArtalkPV
                                     i.solitude.st-loading-line
-                        when 'Artalk'
-                            span#ArtalkPV
+                    else
+                        if theme.busuanzi
+                            span#busuanzi_value_page_pv
                                 i.solitude.st-loading-line
-                        default
-                            if theme.busuanzi
-                                span#busuanzi_value_page_pv
-                            i.solitude.st-loading-line
-            if theme.post.meta.comment && page.comment && theme.comment.count
+            if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
                 span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
                     i.solitude.st-chat-fill
                     a(href=url_for(page.path) + "#post-comment")

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

@@ -25,7 +25,7 @@ script.
                     utils.lightbox($content.querySelectorAll('img:not([atk-emoticon])'))
                     sco.owoBig({body: '.atk-grp', item: '.atk-item'})
                 })
-                !{commentBarrage} && getBarrage(array)
+                !{commentBarrage} && barrageArtalk(array)
             })
             const destroyArtalk = () => artalkItem.destroy()
             utils.addGlobalFn('pjax', destroyArtalk, 'destroyArtalk')
@@ -54,7 +54,7 @@ script.
 
 if commentBarrage
     script.
-        async function getBarrage(array) {
+        const barrageArtalk = async array => {
             await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
                 initializeCommentBarrage(array)
             })

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

@@ -12,7 +12,7 @@ script.
                 urls: [window.location.pathname],
                 includeReply: false
             }).then(res => {
-                ele.forEach(item => item.textContent=res[0].count)
+                ele.forEach(item => item.textContent = res[0].count)
             }).catch(err => {
                 console.error(err)
             })
@@ -33,7 +33,7 @@ script.
                 item: '.OwO-items li'
             })
 
-            !{commentBarrage} && getBarrage()
+            if (!{commentBarrage}) await barrageTwikoo()
         }
 
         const loadTwikoo = () => {
@@ -51,23 +51,20 @@ script.
 
 if commentBarrage
     script.
-        async function getBarrage() {
-            try {
-                const response = await fetch("!{envId}", {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify({
-                        event: "COMMENT_GET",
-                        accessToken: "!{accessToken}",
-                        url: window.location.pathname
-                    })
-                });
-                if (!response.ok) {
-                    throw new Error("HTTP error! status: " + response.status);
-                }
-                const data = await response.json();
+        const barrageTwikoo = async () => {
+            await fetch("!{envId}", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    event: "COMMENT_GET",
+                    accessToken: "!{accessToken}",
+                    url: window.location.pathname
+                })
+            }).then(async res => {
+                if (!res.ok) throw new Error("HTTP error! status: " + res.status)
+                const data = await res.json();
                 await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
                     initializeCommentBarrage((data.data).map(item => Object.assign({
                         content: item.comment,
@@ -76,7 +73,5 @@ if commentBarrage
                         id: item.id
                     })))
                 })
-            } catch (error) {
-                console.error("An error occurred while fetching comments: ", error);
-            }
+            }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

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

@@ -27,7 +27,7 @@ script.
             else {
                 await utils.getScript('!{url_for(theme.cdn.valine)}').then(initValine)
             }
-            !{commentBarrage} && getBarrage()
+            !{commentBarrage} && barrageValine()
         }
         if ('!{use[0]}' === 'Valine' || !{lazyload}) {
             if (!{lazyload}) utils.loadComment(document.getElementById('vcomment'), loadValine)
@@ -39,26 +39,24 @@ script.
 
 if commentBarrage
     script.
-        async function getBarrage() {
+        const barrageValine = async () => {
             const url = new URL('!{serverURLs}/1.1/classes/Comment')
             const params = {
                 url: window.location.pathname,
                 order: '-createdAt'
             }
             Object.entries(params).forEach(([key, value]) => url.searchParams.append(key, value))
-            try {
-                const response = await fetch(url, {
-                    method: "GET",
-                    headers: {
-                        "X-LC-Id": "#{appId}",
-                        "X-LC-Key": "#{appKey}",
-                        "Content-Type": "application/json"
-                    },
-                })
-                if (!response.ok) {
-                    throw new Error(`HTTP error! status: ${response.status}`)
-                }
-                const data = await response.json()
+            await fetch(url, {
+                method: "GET",
+                headers: {
+                    "X-LC-Id": "#{appId}",
+                    "X-LC-Key": "#{appKey}",
+                    "Content-Type": "application/json"
+                },
+            }).then(async res => {
+                if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
+                const data = await res.json()
+                if(typeof md5 ==="undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
                 await utils.getScript('!{url_for(theme.cdn.commentBarrage)}')
                 initializeCommentBarrage(data.results
                     .filter(item => item.url === window.location.pathname)
@@ -68,7 +66,5 @@ if commentBarrage
                         mailMd5: md5(item.mail),
                         id: item.objectId
                     })))
-            } catch (error) {
-                console.error("An error occurred while fetching comments: ", error)
-            }
+            }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

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

@@ -30,7 +30,7 @@ script.
                 initWaline(walineInitFunction)
                 window.walineFn = walineInitFunction
             }
-            if (!{commentBarrage}) getBarrage()
+            if (!{commentBarrage}) barrageWaline()
         }
 
         if ('!{use[0]}' === 'Valine' || !{lazyload}) {
@@ -41,17 +41,16 @@ script.
 
 if commentBarrage
     script.
-        async function getBarrage() {
+        const barrageWaline = async () => {
             const url = new URL('!{envId}/api/comment')
             const params = {path: window.location.pathname, sortBy: 'insertedAt_asc'}
             Object.entries(params).forEach(([key, value]) => url.searchParams.append(key, value))
-            try {
-                const response = await fetch(url, {
-                    method: "GET",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                })
+            const response = await fetch(url, {
+                method: "GET",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+            }).then(async res => {
                 if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
                 const data = await response.json();
                 await utils.getScript('!{url_for(theme.cdn.commentBarrage)}')
@@ -61,7 +60,5 @@ if commentBarrage
                     content: item.comment,
                     id: item.objectId
                 })))
-            } catch (error) {
-                console.error("An error occurred while fetching comments: ", error)
-            }
+            }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/news-comment/newest-comment.pug

@@ -1,10 +1,10 @@
-if theme.console_plus && theme.comment.newest_comment.enable
+if theme.comment.use && theme.console_plus && theme.comment.newest_comment.enable
     case theme.comment.use[0]
         when 'Twikoo'
-            !=partial('includes/widgets/third-party/news-comment/twikoo',{}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/twikoo', {}, {cache: true})
         when 'Waline'
-            !=partial('includes/widgets/third-party/news-comment/waline',{}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/waline', {}, {cache: true})
         when 'Valine'
-            !=partial('includes/widgets/third-party/news-comment/valine',{}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/valine', {}, {cache: true})
         when 'Artalk'
-            !=partial('includes/widgets/third-party/news-comment/artalk',{}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/artalk', {}, {cache: true})

package/layout/includes/widgets/third-party/news-comment/valine.pug

@@ -5,7 +5,10 @@ script.
 
             const replacements = [
                 {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[!{_p("console.newest_comment.image")}]'},
-                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[!{_p("console.newest_comment.link")}]'},
+                {
+                    regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi,
+                    replacement: '[!{_p("console.newest_comment.link")}]'
+                },
                 {regex: /```[\s\S]*?```/g, replacement: '[!{_p("console.newest_comment.code")}]'},
                 {regex: /<[^>]+>/g, replacement: ""}
             ];
@@ -26,17 +29,16 @@ script.
         }
 
         const getComment = async () => {
-            try {
-                const settings = {
-                    "method": "GET",
-                    "headers": {
-                        "X-LC-Id": '!{theme.valine.appId}',
-                        "X-LC-Key": '!{theme.valine.appKey}',
-                        "Content-Type": "application/json"
-                    },
-                }
-
-                const res = await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings)
+            const settings = {
+                "method": "GET",
+                "headers": {
+                    "X-LC-Id": '!{theme.valine.appId}',
+                    "X-LC-Key": '!{theme.valine.appKey}',
+                    "Content-Type": "application/json"
+                },
+            }
+            if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
+            await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(async res => {
                 const result = await res.json()
                 window.res = result
                 const valineArray = result.results.map(e => {
@@ -50,10 +52,10 @@ script.
                 })
                 utils.saveToLocal.set('valine-newest-comment', valineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(valineArray)
-            } catch (err) {
-                console.error(err)
+            }).catch(error => {
+                console.error(error);
                 $asideList.textContent = "!{_p('newest_comment.error')}"
-            }
+            })
         }
 
         const generateHtml = array => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/scripts/filter/default.js

@@ -19,7 +19,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
         data.excerpt = data.title
         data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);
     }
-    data.comment = !!(config.comment.enable && data.comment !== false);
+    data.comment = !!(config.comment.use && data.comment !== false);
     return data;
 });
 

package/source/css/index.styl

@@ -26,5 +26,5 @@ if hexo-config('search.enable')
 @import "_tags/*"
 
 // comment
-if hexo-config('comment.enable')
+if hexo-config('comment.use')
   @import '_comments/comment.styl'

package/source/js/barrage_comment.js

@@ -1,15 +1,12 @@
-/**
- * Comment Barrage
- * author: @efu
- * website: efu.me
- * copyright: MIT
- * date: 2024-04-12
- * update: 2024-04-12
- * @param array
- */
 function initializeCommentBarrage(array) {
     if (array === undefined) return;
-    new class {
+    let existingBarrage = window.currentBarrage;
+
+    if (existingBarrage) {
+        existingBarrage.destroy();
+    }
+
+    let barrage = class {
         constructor() {
             this.config = {
                 barrageTimer: [],
@@ -36,7 +33,7 @@ function initializeCommentBarrage(array) {
             if (!content) return false;
             const element = document.createElement("div");
             element.className = "comment-barrage-item";
-            element.innerHTML = `<div class="barrageHead"><a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">${GLOBAL_CONFIG.lang.barrage.title}</a><div class="barrageNick">${comment.nick}</div><img class="barrageAvatar" src="${GLOBAL_CONFIG.comment.avatar}/avatar/${comment.mailMd5}"/><a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="solitude st-close-fill"></i></a></div><a class="barrageContent" href="${comment.id ? `javascript:sco.scrollTo(\'${comment.id}\')` : 'javascript:sco.scrollTo(\'post-comment\')' }">${content}</a>`;
+            element.innerHTML = `<div class="barrageHead"><a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">${GLOBAL_CONFIG.lang.barrage.title}</a><div class="barrageNick">${comment.nick}</div><img class="barrageAvatar" src="${GLOBAL_CONFIG.comment.avatar}/avatar/${comment.mailMd5}"/><a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="solitude st-close-fill"></i></a></div><a class="barrageContent" href="${comment.id ? `javascript:sco.scrollTo(\'${comment.id}\')` : 'javascript:sco.scrollTo(\'post-comment\')'}">${content}</a>`;
             this.config.dom.appendChild(element);
             this.config.barrageTimer.push(element);
             return true;
@@ -74,5 +71,14 @@ function initializeCommentBarrage(array) {
             this.config.dom.addEventListener('mouseover', () => this.hoverOnCommentBarrage = true);
             this.config.dom.addEventListener('mouseout', () => this.hoverOnCommentBarrage = false);
         }
-    }();
+
+        destroy() {
+            clearInterval(this.commentInterval);
+            this.config.dom.removeEventListener('mouseover', () => this.hoverOnCommentBarrage = true)
+            this.config.dom.removeEventListener('mouseout', () => this.hoverOnCommentBarrage = false)
+            this.config.dom.innerHTML = ""
+        }
+    }
+
+    window.currentBarrage = new barrage();
 }

package/source/js/right_menu.js

@@ -130,11 +130,11 @@ window.oncontextmenu = (ele) => {
     if (selectTextNow && window.getSelection()) {
         display = true;
         rm.menuItems.copy.style.display = 'block';
-        rm.menuItems.comment.style.display = 'block';
+        GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = 'block');
         rm.menuItems.search.style.display = 'block';
     } else {
         rm.menuItems.copy.style.display = 'none';
-        rm.menuItems.comment.style.display = 'none';
+        GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = 'none');
         rm.menuItems.search.style.display = 'none';
     }
 
@@ -220,7 +220,7 @@ window.oncontextmenu = (ele) => {
     })
 
     rm.menuItems.paste.addEventListener('click', () => rm.pasteText() && rm.hideRightMenu())
-    rm.menuItems.comment.addEventListener('click', () => rm.hideRightMenu() || sco.toTalk(selectTextNow))
+    GLOBAL_CONFIG.comment && rm.menuItems.comment.addEventListener('click', () => rm.hideRightMenu() || sco.toTalk(selectTextNow))
     rm.menuItems.new.addEventListener('click', () => window.open(rm.domhref) && rm.hideRightMenu())
     rm.menuItems.downloadImg.addEventListener('click', () => rm.downloadImage() && rm.hideRightMenu())
     rm.menuItems.copyImg.addEventListener('click', () => rm.copyImage() && rm.hideRightMenu())