hexo-theme-solitude 1.8.3 → 1.8.5

package/.github/ISSUE_TEMPLATE/config.yml

@@ -8,10 +8,10 @@ contact_links:
     url: https://solitude-docs.efu.me/faq
     about: Solitude Q&A
 
+  - name: Discord
+    url: https://discord.gg/Y8VEvVgW
+    about: 'Official Discord Group'
+
   - name: Telegram
-    url: https://t.me/efuome
+    url: https://t.me/solitudePro
     about: 'Official Telegram Group'
-
-  - name: QQ 群
-    url: https://qm.qq.com/q/VlqOewI4Cu
-    about: '群号 773016811'

package/_config.yml

@@ -410,6 +410,7 @@ footer:
   # 底部上方一排图标
   # Bottom row of icons
   information:
+    author: false # 是否显示 site_icon / enable site_icon in footer
     left: # 左侧显示图标
     #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
     #  Mail: mailto:o@efu.me || st-mail-line

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/footer.pug

@@ -17,8 +17,9 @@ div#footer_deal
         a.deal_link(href=url_for(trim(array[0])), title=label)
             i.solitude(class=array[1])
 
-    div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
-        img(src=theme.site.icon, alt=_p('nav.backtop'))
+    if theme.footer.information.author
+        div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
+            img(src=theme.site.icon, alt=_p('nav.backtop'))
 
     each value, label in rightInfo
         - var array = value.split('||')

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

@@ -11,6 +11,8 @@ mixin katex
                 })();
 
 div
+    script(src=url_for(theme.cdn.utils))
+    script(src=url_for(theme.cdn.main))
     script(src=url_for(theme.cdn.waterfall))
     script(src=url_for(theme.cdn.pjax))
 
@@ -22,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
@@ -91,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))
 
@@ -104,7 +110,7 @@ if theme.footer.randomlink
 include ../widgets/third-party/news-comment/newest-comment.pug
 
 // pjax
-include ../widgets/third-party/pjax.pug
+!= partial("includes/widgets/third-party/pjax", {}, { cache: true })
 
 // theme
 include ../body/mode

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.3",
+        "%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;"
@@ -38,5 +38,4 @@ if theme.extends.head
     each item in theme.extends.head
         != item
 
-script(src=url_for(theme.cdn.utils))
-script(src=url_for(theme.cdn.main))
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})

package/layout/includes/page/says.pug

@@ -51,4 +51,4 @@ if theme.says.enable
                 if theme.says.strip === -1
                     | - 已展开所有短文 -
                 else
-                    | - 只展示最近 #{theme.says.strip} 条短文 -
+                    | - 只展示最近 #{theme.says.strip} 条短文 -

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/artalk.pug

@@ -2,7 +2,7 @@
 - const { lazyload, count ,use} = theme.comment
 
 script.
-    !function () {
+    (() => {
         let artalkItem = null
         const initArtalk = () => {
             artalkItem = Artalk.init({
@@ -31,7 +31,7 @@ script.
             utils.addGlobalFn('pjax', destroyArtalk, 'destroyArtalk')
         }
         const loadArtalk = async () => {
-            if (typeof Artalk === 'object') await initArtalk()
+            if (typeof Artalk === 'object') initArtalk()
             else {
                 await utils.getCSS('!{theme.cdn.artalk_css}')
                 await utils.getScript('!{theme.cdn.artalk_js}').then(initArtalk)
@@ -50,7 +50,7 @@ script.
         } else {
             window.loadTwoComment = loadArtalk
         }
-    }()
+    })()
 
 if commentBarrage
     script.

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

@@ -1,8 +1,8 @@
 - const { envId, region, option ,accessToken } = theme.twikoo
 - const { lazyload, count, use,commentBarrage } = theme.comment
 
-script.
-    !function () {
+script().
+    (() => {
         const getCount = () => {
             const ele = document.querySelectorAll('.twikoo-count')
             if (!ele) return
@@ -17,11 +17,12 @@ script.
                 console.error(err)
             })
         }
-        const init = async () => {
+        const init = () => {
             twikoo.init(Object.assign({
                 el: '#twikoo-wrap',
                 envId: '!{envId}',
                 region: '!{region}',
+                path: window.location.pathname,
                 onCommentLoaded: () => {
                     utils.lightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
                 }
@@ -33,11 +34,11 @@ script.
                 item: '.OwO-items li'
             })
 
-            if (!{commentBarrage}) await barrageTwikoo()
+            barrageTwikoo()
         }
 
         const loadTwikoo = () => {
-            if (typeof twikoo === 'object') init()
+            if (typeof twikoo === 'object') setTimeout(init,0)
             else utils.getScript('!{url_for(theme.cdn.twikoo)}').then(init)
         }
 
@@ -45,9 +46,9 @@ script.
             if (!{lazyload}) utils.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
             else loadTwikoo()
         } else {
-            window.loadTwoComment = init
+            window.loadTwoComment = loadTwikoo
         }
-    }()
+    })()
 
 if commentBarrage
     script.

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

@@ -6,7 +6,7 @@ if site.data.valine
     - emojiMaps = JSON.stringify(site.data.valine)
 
 script.
-    !function () {
+    (() => {
         const initValine = () => {
             const valine = new Valine({
                 el: '#vcomment',
@@ -23,7 +23,7 @@ script.
             sco.owoBig({body: '.vwrap', item: '.vemojis i'})
         }
         const loadValine = async () => {
-            if (typeof Valine === 'function') await initValine()
+            if (typeof Valine === 'function') setTimeout(initValine, 0)
             else {
                 await utils.getScript('!{url_for(theme.cdn.valine)}').then(initValine)
             }
@@ -35,7 +35,7 @@ script.
         } else {
             window.loadTwoComment = loadValine
         }
-    }()
+    })()
 
 if commentBarrage
     script.

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

@@ -2,7 +2,7 @@
 - const { lazyload, count, commentBarrage,use } = theme.comment
 
 script.
-    !function () {
+    (() => {
         let walineInitFunction = window.walineFn || null
 
         function initWaline(initFn) {
@@ -40,7 +40,7 @@ script.
             if (!{lazyload}) utils.loadComment(document.getElementById('waline-wrap'), loadWaline)
             else loadWaline()
         } else window.loadTwoComment = loadWaline
-    }()
+    })()
 
 if commentBarrage
     script.

package/layout/includes/widgets/third-party/pjax.pug

@@ -17,6 +17,17 @@ script.
 
     document.addEventListener('pjax:complete', () => {
         window.refreshFn()
+
+        document.querySelectorAll('script[data-pjax]').forEach(item => {
+            const newScript = document.createElement('script')
+            const content = item.text || item.textContent || item.innerHTML || ""
+            Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
+            newScript.appendChild(document.createTextNode(content))
+            item.parentNode.replaceChild(newScript, item)
+        })
+
+        GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
+
     })
 
     document.addEventListener('pjax:error', (e) => {

package/layout/index.pug

@@ -16,7 +16,7 @@ block content
             for post, index in page.posts.sort("-sticky" || "-date").data
                 include ./includes/widgets/home/postList
 
-            // pageination
+            // pagination
             include ./includes/mixins/pagination
         // aside
         include ./includes/widgets/aside/aside

package/package.json

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

package/scripts/event/merge_config.js

@@ -152,6 +152,7 @@ hexo.extend.filter.register('before_generate', () => {
             },
             footer: {
                 information: {
+                    author: false,
                     left: null,
                     right: null,
                 },

package/scripts/event/welcome.js

@@ -1,14 +1,14 @@
 hexo.on('ready', () => {
-  const {version} = require('../../package.json')
-  hexo.log.info(`
-===================================================================
-     #####  ####  #     #####  ###### #     # ######   ######
-    #      #    # #       #      #    #     # #      # #
-     ##### #    # #       #      #    #     # #      # ######
-         # #    # #       #      #    #     # #      # #
-    ######  ####  ##### #####    #      ###   ######   ######
-                          ${version}
-===================================================================
-GitHub: https://github.com/valor-x/hexo-theme-solitude
-`)
+    const {version} = require('../../package.json')
+    hexo.log.info(`
+  ===================================================================
+       #####  ####  #     #####  ###### #     # ######   ######
+      #      #    # #       #      #    #     # #      # #
+       ##### #    # #       #      #    #     # #      # ######
+           # #    # #       #      #    #     # #      # #
+      ######  ####  ##### #####    #      ###   ######   ######
+                            ${version}
+  ===================================================================
+  GitHub: https://github.com/valor-x/hexo-theme-solitude
+  `)
 })

package/scripts/helper/inject_head_js.js

@@ -0,0 +1,86 @@
+/**
+ * Solitude
+ * inject is to head
+ */
+
+'use strict';
+
+hexo.extend.helper.register('inject_head_js', function () {
+    const createJS = () => `
+        const saveToLocal = {
+            set: function setWithExpiry(key, value, ttl) {
+                if (ttl === 0)
+                    return
+                const now = new Date()
+                const expiryDay = ttl * 86400000
+                const item = {
+                    value: value,
+                    expiry: now.getTime() + expiryDay
+                }
+                localStorage.setItem(key, JSON.stringify(item))
+            },
+            get: function getWithExpiry(key) {
+                const itemStr = localStorage.getItem(key)
+    
+                if (!itemStr) {
+                    return undefined
+                }
+                const item = JSON.parse(itemStr)
+                const now = new Date()
+    
+                if (now.getTime() > item.expiry) {
+                    localStorage.removeItem(key)
+                    return undefined
+                }
+                return item.value
+            }
+        };
+        window.utils = {
+            saveToLocal: saveToLocal,
+            getCSS: (url, id = false) => new Promise((resolve, reject) => {
+              const link = document.createElement('link')
+              link.rel = 'stylesheet'
+              link.href = url
+              if (id) link.id = id
+              link.onerror = reject
+              link.onload = link.onreadystatechange = function() {
+                const loadState = this.readyState
+                if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+                link.onload = link.onreadystatechange = null
+                resolve()
+              }
+              document.head.appendChild(link)
+            }),
+            getScript: (url, attr = {}) => new Promise((resolve, reject) => {
+              const script = document.createElement('script')
+              script.src = url
+              script.async = true
+              script.onerror = reject
+              script.onload = script.onreadystatechange = function() {
+                const loadState = this.readyState
+                if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+                script.onload = script.onreadystatechange = null
+                resolve()
+              }
+    
+              Object.keys(attr).forEach(key => {
+                script.setAttribute(key, attr[key])
+              })
+    
+              document.head.appendChild(script)
+            }),
+            addGlobalFn: (key, fn, name = false, parent = window) => {
+                const globalFn = parent.globalFn || {}
+                const keyObj = globalFn[key] || {}
+        
+                if (name && keyObj[name]) return
+        
+                name = name || Object.keys(keyObj).length
+                keyObj[name] = fn
+                globalFn[key] = keyObj
+                parent.globalFn = globalFn
+            },
+        }
+    `
+    return `<script>(()=>{${createJS()}})()</script>`
+})

package/source/css/_layout/footer.styl

@@ -80,20 +80,21 @@
         background var(--efu-main)
         transform scale(1.1)
 
-    .footer_mini_logo
-      width 50px
-      height 50px
-      margin 0 1rem
-      cursor pointer
-      transition cubic-bezier(0, 0, 0, 1.29) .5s
-      user-select none
-      border-radius 50px
-      overflow hidden
-      +maxWidth768()
-        display none
-
-      &:hover
-        transform scale(1.2)
+    if hexo-config('footer.information.author')
+      .footer_mini_logo
+        width 50px
+        height 50px
+        margin 0 1rem
+        cursor pointer
+        transition cubic-bezier(0, 0, 0, 1.29) .5s
+        user-select none
+        border-radius 50px
+        overflow hidden
+        +maxWidth768()
+          display none
+
+        &:hover
+          transform scale(1.2)
 
   #st-footer
     display flex

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