hexo-theme-solitude 1.8.4 → 1.8.5

package/layout/includes/body/mode.pug

@@ -11,7 +11,7 @@ case theme.display_mode.type
                 } else {
                     document.documentElement.setAttribute('data-theme', cachedMode);
                 }
-                right_menu && rm.mode(cachedMode === 'dark' && isDarkMode)
+                is_rm && rm.mode(cachedMode === 'dark' && isDarkMode)
             }
             initTheme()
     when "dark"
@@ -22,7 +22,7 @@ case theme.display_mode.type
                     document.documentElement.setAttribute('data-theme', 'dark');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                right_menu && rm.mode(cachedMode === undefined || cachedMode === 'dark')
+                is_rm && rm.mode(cachedMode === undefined || cachedMode === 'dark')
             }
             initTheme()
     when "light"
@@ -33,6 +33,6 @@ case theme.display_mode.type
                     document.documentElement.setAttribute('data-theme', 'light');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                right_menu && rm.mode(cachedMode === 'dark')
+                is_rm && rm.mode(cachedMode === 'dark')
             }
             initTheme()

package/layout/includes/head/config.pug

@@ -26,7 +26,7 @@
 
     let comment = false
 
-    if (theme.comment.use) {
+    if (theme.comment.use && theme.comment.commentBarrage) {
         comment = {
             avatar: theme.comment.avatar,
             commentBarrage: theme.comment.commentBarrage,

package/layout/includes/head/page_config.pug

@@ -6,4 +6,5 @@ script#config-diff.
         page: '!{page.type}',
         toc: !{!!page.toc},
         comment: !{!!page.comment},
+        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false},
     }

package/layout/includes/inject/body.pug

@@ -24,7 +24,7 @@ div
         script.
             dark()
 
-    if theme.right_menu.translate.enable
+    if theme.right_menu.enable && theme.right_menu.translate.enable
         script(src=url_for(theme.cdn.translate_js))
 
     if theme.katex && theme.katex.enable
@@ -93,8 +93,12 @@ div
                 carousel_swiper()
         if page.type === 'says' && theme.says.enable
             script.
-                GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
-                sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
+                setTimeout(() => {
+                    sco.refreshWaterFall();
+                    GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg();
+                    GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
+                    sco.changeTimeFormat(document.querySelectorAll('.info time'));
+                }, 500)
         if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
             script(async src=url_for(theme.cdn.busuanzi_js))
 

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.4",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.5",
         "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;"

package/layout/includes/rightmenu.pug

@@ -59,7 +59,7 @@ div#rightMenu
         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')
+                span.menu-commentBarrage-text= _p('right_menu.barrage.close')
         div.rightMenu-item#menu-darkmode(onclick="sco.switchDarkMode()")
             i.solitude.st-moon-clear-fill
             case theme.display_mode.type

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

@@ -1,3 +1,4 @@
+- const {copyright} = theme.post.default
 .post-copyright
     .post-copyright__author_group
         a.post-copyright__author_img(href=url_for("/about/"))
@@ -14,7 +15,7 @@
                     a.reward-link-button(href=url_for(theme.post.rss))
                         i.solitude.st-plant-fill
                         = _p('footer.rss')
-    if theme.post.default.copyright.enable || page.copyright
+    if copyright.enable || page.copyright
         .post-copyright__notice
             span.post-copyright-info
                 if page.reprint
@@ -24,4 +25,4 @@
                     a(href=url_for(theme.post.default.copyright.licenurl))
                         | #{theme.post.default.copyright.license}
                     = _p('post.copyright.original_end')
-                    a(href=url_for("/")) #{config.title}
+                    a(href=url_for("/")) #{config.title}

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

@@ -33,6 +33,8 @@ script().
                 body: '.OwO-body',
                 item: '.OwO-items li'
             })
+
+            barrageTwikoo()
         }
 
         const loadTwikoo = () => {

package/package.json

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

package/source/css/_layout/header.styl

@@ -100,7 +100,6 @@
     user-select none
 
     +maxWidth768()
-      background linear-gradient(to top, var(--efu-main-none) 0, var(--efu-main) 100%)
       transition 0s
 
     +maxWidth1400()

package/source/css/_layout/recent-post.styl

@@ -131,6 +131,9 @@ if hexo-config('index_post_list.direction') == "column"
           font-size 14px
           line-height 1.8
 
+          +maxWidth600()
+            -webkit-line-clamp 1
+
         span.tags-punctuation
           transition .3s
 
@@ -353,6 +356,8 @@ else if hexo-config('index_post_list.direction') == "row"
           line-height 1.8
           +maxWidth768()
             -webkit-line-clamp 2
+          +maxWidth600()
+            -webkit-line-clamp 1
 
         span.tags-punctuation
           transition .3s

package/source/css/_post/commentBarrage.styl

@@ -3,7 +3,7 @@
   bottom 0
   right 20px
   padding 0 0 20px 10px
-  display flex
+  display none
   flex-direction column
   justify-content flex-end
   z-index 999

package/source/js/main.js

@@ -36,10 +36,10 @@ const sidebarFn = () => {
 
 const scrollFn = function () {
     const innerHeight = window.innerHeight;
-    const $header = document.getElementById('page-header');
-    if (!$header || document.body.scrollHeight <= innerHeight) return;
+    if (document.body.scrollHeight <= innerHeight) return;
 
     let initTop = 0;
+    const $header = document.getElementById('page-header');
     window.addEventListener('scroll', utils.throttle(function (e) {
         const currentTop = window.scrollY || document.documentElement.scrollTop;
         const isDown = scrollDirection(currentTop);
@@ -52,7 +52,9 @@ const scrollFn = function () {
             }
             $header.classList.add('nav-fixed');
         } else {
+            if (currentTop ===0){
             $header.classList.remove('nav-fixed', 'nav-visible');
+            }
         }
     }, 200));
 
@@ -215,7 +217,7 @@ class toc {
 
 let lastSayHello = "";
 let wleelw_musicPlaying = false
-let right_menu = false
+let is_rm = typeof rm !== 'undefined'
 
 let sco = {
     hideCookie: function () {
@@ -257,10 +259,10 @@ let sco = {
         $console.classList.toggle("on", wleelw_musicPlaying);
         if (wleelw_musicPlaying) {
             $meting.aplayer.play();
-            right_menu && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude st-pause-fill')
+            rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude st-pause-fill')
         } else {
             $meting.aplayer.pause();
-            right_menu && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.start) && ($rm_icon.className = 'solitude st-play-fill')
+            rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.start) && ($rm_icon.className = 'solitude st-play-fill')
         }
     },
     switchCommentBarrage: function () {
@@ -270,18 +272,18 @@ let sco = {
                 commentBarrageElement.style.display = "none";
                 document.querySelector("#consoleCommentBarrage").classList.remove("on");
                 utils.saveToLocal.set("commentBarrageSwitch", false, .2);
-                right_menu && rm.barrage(true)
+                rm?.menuItems.barrage && rm.barrage(true)
             } else {
                 commentBarrageElement.style.display = "flex";
                 document.querySelector("#consoleCommentBarrage").classList.add("on");
                 utils.saveToLocal.set("commentBarrageSwitch", true, .2);
-                right_menu && rm.barrage(false)
+                rm?.menuItems.barrage && rm.barrage(false)
             }
         }
     },
     switchHideAside: function () {
         const htmlClassList = document.documentElement.classList;
-        htmlClassList.contains("hide-aside") ? utils.saveToLocal.set("aside-status", "show", 1) : saveToLocal.set("aside-status", "hide", 1)
+        htmlClassList.contains("hide-aside") ? utils.saveToLocal.set("aside-status", "show", 1) : utils.saveToLocal.set("aside-status", "hide", 1)
         htmlClassList.toggle("hide-aside");
         htmlClassList.contains("hide-aside") ? document.querySelector("#consoleHideAside").classList.add("on") : document.querySelector("#consoleHideAside").classList.remove("on");
     },
@@ -319,12 +321,12 @@ let sco = {
             document.documentElement.setAttribute('data-theme', 'dark')
             utils.saveToLocal.set('theme', 'dark', 0.02);
             utils.snackbarShow(GLOBAL_CONFIG.lang.theme.dark, false, 2000)
-            right_menu && rm.mode(true)
+            is_rm && rm.mode(true)
         } else {
             document.documentElement.setAttribute('data-theme', 'light')
             utils.saveToLocal.set('theme', 'light', 0.02);
             utils.snackbarShow(GLOBAL_CONFIG.lang.theme.light, false, 2000)
-            right_menu && rm.mode(false)
+            is_rm && rm.mode(false)
         }
         handleThemeChange(nowMode)
     },
@@ -351,7 +353,7 @@ let sco = {
         el && GLOBAL_CONFIG.runtime && (el.innerText = utils.timeDiff(new Date(GLOBAL_CONFIG.runtime), new Date()) + GLOBAL_CONFIG.lang.time.day)
     },
     toTalk: function (txt) {
-        const inputs = ["#wl-edit", ".el-textarea__inner", "#veditor",".atk-textarea"]
+        const inputs = ["#wl-edit", ".el-textarea__inner", "#veditor", ".atk-textarea"]
         for (let i = 0; i < inputs.length; i++) {
             let el = document.querySelector(inputs[i])
             if (el != null) {
@@ -561,16 +563,14 @@ let sco = {
         });
     },
     addNavBackgroundInit: function () {
-        const scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
-        if (scrollTop !== 0) {
-            const pageHeader = document.getElementById("page-header");
-            if (pageHeader) {
-                pageHeader.classList.add("nav-fixed", "nav-visible");
-            }
-            const cookiesWindow = document.getElementById("cookies-window");
-            if (cookiesWindow) {
-                cookiesWindow.style.display = 'none';
-            }
+        let e = 0
+            , t = 0;
+        document.body && (e = document.body.scrollTop),
+        document.documentElement && (t = document.documentElement.scrollTop),
+        0 !== (e - t > 0 ? e : t) && (document.getElementById("page-header").classList.add("nav-fixed"), document.getElementById("page-header").classList.add("nav-visible"))
+        const cookiesWindow = document.getElementById("cookies-window");
+        if (cookiesWindow) {
+            cookiesWindow.style.display = 'none';
         }
     },
     initAdjust: function (change = false) {
@@ -811,7 +811,7 @@ const addCopyright = () => {
     document.body.addEventListener('copy', handleCopy)
 }
 
-const asideStatus = () =>{
+const asideStatus = () => {
     const asideStatus = utils.saveToLocal.get('aside-status')
     if (asideStatus !== undefined) {
         if (asideStatus === 'hide') {
@@ -883,14 +883,12 @@ window.refreshFn = () => {
     PAGE_CONFIG.toc && toc.init();
     (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((addHighlight()) || tabs.init())
     PAGE_CONFIG.is_home && showTodayCard()
-    GLOBAL_CONFIG.covercolor.enable && coverColor()
+    GLOBAL_CONFIG.covercolor.enable && setTimeout(coverColor, 0)
     PAGE_CONFIG.page === "music" && scoMusic.init()
     GLOBAL_CONFIG.post_ai && PAGE_CONFIG.is_post && efu_ai.init()
     sco.switchComments()
 }
 
-utils.addGlobalFn('pjaxComplete', refreshFn, 'refreshFn')
-
 document.addEventListener('DOMContentLoaded', function () {
     sco.initAdjust()
     percent()

package/source/js/right_menu.js

@@ -26,6 +26,8 @@ const rm = {
         downloadImg: document.getElementById('menu-downloadimg'),
         search: document.getElementById('menu-search'),
         barrage: document.getElementById('menu-commentBarrage'),
+        mode: document.getElementById('menu-darkmode'),
+        translate: document.getElementById('menu-translate'),
         music: [
             toggle = document.getElementById('menu-music-toggle'),
             back = document.getElementById('menu-music-back'),
@@ -131,11 +133,11 @@ window.oncontextmenu = (ele) => {
         display = true;
         rm.menuItems.copy.style.display = 'block';
         GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = 'block');
-        rm.menuItems.search.style.display = 'block';
+        rm.menuItems.search && (rm.menuItems.search.style.display = 'block');
     } else {
         rm.menuItems.copy.style.display = 'none';
         GLOBAL_CONFIG.comment && (rm.menuItems.comment.style.display = 'none');
-        rm.menuItems.search.style.display = 'none';
+        rm.menuItems.search && (rm.menuItems.search.style.display = 'none');
     }
 
     if (link) {
@@ -170,7 +172,7 @@ window.oncontextmenu = (ele) => {
         display = true;
         rm.menuItems.music.forEach(item => item.style.display = 'block');
     } else {
-        rm.menuItems.music.forEach(item => item.style.display = 'none');
+        rm.menuItems.music[0] && rm.menuItems.music.forEach(item => item.style.display = 'none');
     }
 
     Array.from(display ? rm.menuItems.other : rm.menuItems.plugin).forEach(item => item.style.display = 'none');
@@ -219,8 +221,8 @@ window.oncontextmenu = (ele) => {
         rm.hideRightMenu()
     })
 
-    if(GLOBAL_CONFIG.comment.commentBarrage){
-        rm.barrage(!utils.saveToLocal.get('commentBarrageSwitch'))
+    if(utils.saveToLocal.get('commentBarrageSwitch')!==null){
+        rm.menuItems.barrage && rm.barrage(!utils.saveToLocal.get('commentBarrageSwitch'))
     }
 
     rm.menuItems.paste.addEventListener('click', () => rm.pasteText() && rm.hideRightMenu())
@@ -230,4 +232,4 @@ window.oncontextmenu = (ele) => {
     rm.menuItems.copyImg.addEventListener('click', () => rm.copyImage() && rm.hideRightMenu())
 }()
 
-right_menu = true
+is_rm = true

package/source/js/third_party/efu_ai.min.js

@@ -3,4 +3,4 @@
  * email: o@efu.me
  * website: https://efu.me
  */
-class efuAI{constructor(){this.root="https://summary.tianli0.top",this.aiTalkMode=!1,this.aiPostExplanation="",this.config=GLOBAL_CONFIG.post_ai,this.scoGPTIsRunning=!1}init(){this.scoGPTIsRunning=!1,this.generate(),this.AIEngine()}getTitleAndContent(){const e=document.getElementById("article-container"),t=document.title,n=e.getElementsByTagName("p"),i=e.querySelectorAll("h1, h2, h3, h4, h5");return(t+" "+Array.from(i).concat(Array.from(n)).map((e=>e.innerText.replace(/https?:\/\/[^\s]+/g,""))).join(" ")).slice(0,1e3)}async generate(){this.aiShowAnimation(this.fetch(document.title,this.getTitleAndContent(),this.config.key))}async fetch(e,t,n){const i=`${this.root}/?content=${encodeURIComponent(t)}&title=${e}&key=${encodeURIComponent(n)}&url=${encodeURIComponent(window.location.href)}`,s=await fetch(i),o=await s.json();return s.ok?(this.aiPostExplanation=o.summary,o.summary):(console.error("Request failed:",o.err_msg),o.err_msg)}aiShowAnimation(e,t=!1){const n=document.querySelector(".ai-explanation"),i=document.querySelector(".ai-tag");if(!n||this.scoGPTIsRunning)return;this.scoGPTIsRunning=!0,this.cleanSuggestions(),i.classList.add("loadingAI"),n.style.display="block",n.innerHTML='生成中...<span class="blinking-cursor"></span>';let s,o,a=!0,c=0,r=!0;const l=new IntersectionObserver((e=>{a=e[0].isIntersecting,a&&requestAnimationFrame(o)}),{threshold:0});e.then((e=>{s=performance.now(),o=()=>{if(c<e.length&&a){const r=performance.now(),g=r-s,h=e.slice(c,c+1),u=/[，。！、？,.!?]/.test(h),m=/[a-zA-Z0-9]/.test(h);g>=(u?100*Math.random()+100:m?10:25)&&(n.innerText=e.slice(0,c+1),s=r,c++,c<e.length?n.innerHTML=e.slice(0,c)+'<span class="blinking-cursor"></span>':(n.innerHTML=e,n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect(),t&&this.createSuggestions())),a&&requestAnimationFrame(o)}},a&&r&&setTimeout((()=>{requestAnimationFrame(o),r=!1}),3e3),l.observe(n)})).catch((e=>{console.error("检索信息失败：",e),n.innerHTML="检索信息失败",n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect()}))}AIEngine(){const e=document.querySelector(".ai-tag");e&&e.addEventListener("click",(()=>{this.scoGPTIsRunning||(this.aiTalkMode=!0,this.aiShowAnimation(Promise.resolve(this.config.talk),!0))}))}cleanSuggestions(){const e=document.querySelector(".ai-suggestions");e?e.innerHTML="":console.error("没有这个元素：'ai-suggestions'")}createSuggestions(){this.aiTalkMode&&(this.cleanSuggestions(),this.createSuggestionItemWithAction("这篇文章讲了什么？",(()=>{""===this.aiPostExplanation?this.generate():this.aiShowAnimation(Promise.resolve(this.aiPostExplanation),!0)})),this.config.randomPost&&this.createSuggestionItemWithAction("带我去看看其他文章",(()=>toRandomPost())),this.aiTalkMode=!0)}createSuggestionItemWithAction(e,t){const n=document.querySelector(".ai-suggestions");if(!n)return void console.error("无法找到具有class为ai-suggestions的元素");const i=document.createElement("div");i.classList.add("ai-suggestions-item"),i.textContent=e,i.addEventListener("click",t),n.appendChild(i)}}const efu_ai=new efuAI;
+class efuAI{constructor(){this.root="https://summary.tianli0.top",this.aiTalkMode=!1,this.aiPostExplanation='',this.config=GLOBAL_CONFIG.post_ai,this.scoGPTIsRunning=!1}init(){this.scoGPTIsRunning=!1;this.aiPostExplanation=PAGE_CONFIG.ai_text?PAGE_CONFIG.ai_text+"":false;if(!this.aiPostExplanation){this.generate()}else{this.aiShowAnimation(Promise.resolve(this.aiPostExplanation))}this.AIEngine()}getTitleAndContent(){const e=document.getElementById("article-container"),t=document.title,n=e.getElementsByTagName("p"),i=e.querySelectorAll("h1, h2, h3, h4, h5");return(t+" "+Array.from(i).concat(Array.from(n)).map((e=>e.innerText.replace(/https?:\/\/[^\s]+/g,""))).join(" ")).slice(0,1e3)}async generate(){this.aiShowAnimation(this.fetch(document.title,this.getTitleAndContent(),this.config.key))}async fetch(e,t,n){const i=`${this.root}/?content=${encodeURIComponent(t)}&title=${e}&key=${encodeURIComponent(n)}&url=${encodeURIComponent(window.location.href)}`,s=await fetch(i),o=await s.json();return s.ok?(this.aiPostExplanation=o.summary,o.summary):(console.error("Request failed:",o.err_msg),o.err_msg)}aiShowAnimation(e,t=!1){const n=document.querySelector(".ai-explanation"),i=document.querySelector(".ai-tag");if(!n||this.scoGPTIsRunning)return;this.scoGPTIsRunning=!0,this.cleanSuggestions(),i.classList.add("loadingAI"),n.style.display="block",n.innerHTML='生成中...<span class="blinking-cursor"></span>';let s,o,a=!0,c=0,r=!0;const l=new IntersectionObserver((e=>{a=e[0].isIntersecting,a&&requestAnimationFrame(o)}),{threshold:0});e.then((e=>{s=performance.now(),o=()=>{if(c<e.length&&a){const r=performance.now(),g=r-s,h=e.slice(c,c+1),u=/[，。！、？,.!?]/.test(h),m=/[a-zA-Z0-9]/.test(h);g>=(u?100*Math.random()+100:m?10:25)&&(n.innerText=e.slice(0,c+1),s=r,c++,c<e.length?n.innerHTML=e.slice(0,c)+'<span class="blinking-cursor"></span>':(n.innerHTML=e,n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect(),t&&this.createSuggestions())),a&&requestAnimationFrame(o)}},a&&r&&setTimeout((()=>{requestAnimationFrame(o),r=!1}),3e3),l.observe(n)})).catch((e=>{console.error("检索信息失败：",e),n.innerHTML="检索信息失败",n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect()}))}AIEngine(){const e=document.querySelector(".ai-tag");e&&e.addEventListener("click",(()=>{this.scoGPTIsRunning||(this.aiTalkMode=!0,this.aiShowAnimation(Promise.resolve(this.config.talk),!0))}))}cleanSuggestions(){const e=document.querySelector(".ai-suggestions");e?e.innerHTML="":console.error("没有这个元素：'ai-suggestions'")}createSuggestions(){this.aiTalkMode&&(this.cleanSuggestions(),this.createSuggestionItemWithAction("这篇文章讲了什么？",(()=>{""===this.aiPostExplanation?this.generate():this.aiShowAnimation(Promise.resolve(this.aiPostExplanation),!0)})),this.config.randomPost&&this.createSuggestionItemWithAction("带我去看看其他文章",(()=>toRandomPost())),this.aiTalkMode=!0)}createSuggestionItemWithAction(e,t){const n=document.querySelector(".ai-suggestions");if(!n)return void console.error("无法找到具有class为ai-suggestions的元素");const i=document.createElement("div");i.classList.add("ai-suggestions-item"),i.textContent=e,i.addEventListener("click",t),n.appendChild(i)}}const efu_ai=new efuAI;