hexo-theme-solitude 1.12.3 → 1.13.2

package/README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-   <img src=".github/logo.svg" alt="Solitude logo" height="200">
+   <img src=".github/persona.avif" alt="Solitude logo" height="200">
 
    <h1>Hexo Theme Solitude</h1>
 
@@ -31,11 +31,11 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[文档](https://solitude.js.org/)丨[预览](https://www.efu.me/)
+[文档](https://solitude.js.org/)丨[预览](https://everfu.github.io/Solitude/)
 
 </div>
 
-![Screenshot](.github/screenshot.webp)
+![Screenshot](.github/screenshot.avif)
 
 ## 特性
 

package/README_en-US.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-   <img src=".github/logo.svg" alt="Solitude logo" height="200">
+   <img src=".github/persona.avif" alt="Solitude logo" height="200">
 
    <h1>Hexo Theme Solitude</h1>
 
@@ -31,11 +31,11 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[Documentation](https://solitude.js.org/)丨[Preview](https://www.efu.me/)
+[Documentation](https://solitude.js.org/)丨[Preview](https://everfu.github.io/Solitude/)
 
 </div>
 
-![Screenshot](.github/screenshot.webp)
+![Screenshot](.github/screenshot.avif)
 
 ## Features
 

package/README_zh-Hant.md

@@ -2,7 +2,7 @@
 
 <div align="center">
   
-   <img src=".github/logo.svg" alt="Solitude logo" height="200">
+   <img src=".github/persona.avif" alt="Solitude logo" height="200">
 
   <h1>Hexo Theme Solitude</h1>
 
@@ -31,11 +31,11 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[文档](https://solitude.js.org/)丨[預覽](https://www.efu.me/)
+[文档](https://solitude.js.org/)丨[預覽](https://everfu.github.io/Solitude/)
 
 </div>
 
-![Screenshot](.github/screenshot.webp)
+![Screenshot](.github/screenshot.avif)
 
 ## 特性
 

package/_config.yml

@@ -329,6 +329,7 @@ page:
 # post default settings
 post:
   default:
+    top_cover: true # 顶部描述 / Top description
     # 文章默认图片
     # default cover
     cover:
@@ -760,7 +761,7 @@ post_ai:
 
 # latex 公式支持
 # latex formula support
-# docs: https://solitude.js.org/configuration/extra#数学公式
+# docs: https://solitude.js.org/config/extend.html#数学公式
 katex:
   enable: false
   per_page: false # 是否在每页都加载 / Whether to load on each page
@@ -776,6 +777,9 @@ comment:
   count: false # 评论数展示
   pv: false # 是否使用評論統計頁面訪問
   avatar: https://cravatar.cn # Gravatar link
+  hot_tip: # 多人互动
+    enable: false # 开启后将在文章列表显示多人互动
+    count: 3 # 设置大于多少评论时显示
 
 # twikoo 配置信息
 # twikoo settings
@@ -822,8 +826,15 @@ giscus:
     dark: dark
   option:
 
-# 中控台扩展 ： 最新评论 + 标签 + 文章
-console_plus: false
+# 中控台
+console:
+  enable: false # 开启后显示中控台
+  recentComment: # 开启后显示最近评论
+    enable: false # 开启前请先配置评论
+    storage: .2 # 缓存时间
+  card:
+    tags: true # 开启后显示 标签
+    archive: true # 开启后显示 归档
 
 # 站点验证
 # Site verification
@@ -862,7 +873,7 @@ extends:
 
 # PWA
 # https://developer.mozilla.org/zh-CN/docs/Web/Progressive_web_apps
-# docs: https://solitude.js.org/configuration/extra#pwa
+# docs: https://solitude.js.org/config/extra#pwa
 pwa:
   enable: false
   manifest: /manifest.json # manifest.json 文件路径
@@ -931,11 +942,43 @@ memorial:
   enable: false
   # 日期, (M-D)
   # Date, (M-D)
-  # eg: 7-8, 9-18, 12-13 ...
+  # eg: 7-7, 9-18, 12-13 ...
   date:
-    - "7-8" #七八卢沟桥事变
-    - "9-18" #九一八事变/建军节
-    - "12-13" #南京国家公祭日
+    - "7-7" # 七七事变
+    - "9-18" # 九一八事变/建军节
+    - "12-13" # 南京国家公祭日
+
+# 诱骗
+# lure
+lure:
+  enable: false
+  # 跳出
+  # Jump out
+  jump: "404 Not Found"
+  # 切回
+  # Switch back
+  back: "ヾ(≧∇≦*)ゝ嘿嘿，上当了吧"
+
+# 文章过期提醒
+# Article expiration reminder
+expire:
+  enable: false
+  # 过期时间
+  # Expiration time
+  time: 30
+  position: top # top / bottom
+  # 过期提示
+  # Expiration prompt
+  text_prev: "本文已于"
+  text_next: "天前过期，如果内容不符，请联系站长更新。"
+
+# 背景图片
+# Background image
+background:
+  enable: false
+  opacity: .2
+  dark: https://bu.dusays.com/2023/09/29/651685ce667d1.jpg
+  light: https://bu.dusays.com/2023/09/29/651685cc18d39.jpg
 
 # CDN
 # Don't modify the following settings unless you know how they work
@@ -958,6 +1001,7 @@ CDN:
 
   option:
     solitude_css: https://cdn2.codesign.qq.com/icons/7pOrz0WXB5ZWJPX/latest/iconfont.css
+    busuanzi_qj_js: https://pv.lemonso.com/js
     # algolia_search:
     # instantsearch:
     # pjax:

package/languages/default.yml

@@ -5,6 +5,7 @@ upload: 'datetime: '
 totalk: You don't need to delete blank lines, just type in your comments.
 loading: Loading...
 day: ' days'
+hot-tip: Hot
 
 theme:
   dark: Dark

package/languages/en.yml

@@ -5,6 +5,7 @@ upload: 'datetime: '
 totalk: You don't need to delete blank lines, just type in your comments.
 loading: Loading...
 day: ' days'
+hot-tip: Hot
 
 theme:
   dark: Dark

package/languages/zh-CN.yml

@@ -5,6 +5,7 @@ upload: 发布时间：
 totalk: 无需删除空行，直接输入评论即可
 loading: 加载中...
 day: ' 天'
+hot-tip: 多人互动
 
 # Language: 简体中文
 theme:

package/languages/zh-TW.yml

@@ -5,6 +5,7 @@ upload: 發佈時間：
 totalk: 無需刪除空行，直接輸入評論即可
 loading: 加載中...
 day: ' 天'
+hot-tip: 多人互動
 
 # Language: 繁體中文 (台灣)
 theme:

package/layout/includes/console.pug

@@ -1,33 +1,51 @@
+- const { recentComment, card } = theme.console
+- const { cache } = recentComment
+- const limit = 6
+- const { use } = theme.comment
+
 div#console
     div.close-btn(onclick="sco.hideConsole()")
         i.solitude.st-close-fill
-    if theme.console_plus
-        div.console-card-group
-            if theme.recent_comments.enable && theme.recent_comments.img
-                div.console-card-group-left
-                    div.console-card#card-newest-comments(onclick="sco.hideConsole()")
-                        div.card-content
-                            div.author-content-item-tips= _p('console.comment_tip')
-                            div.author-content-item-title
-                                | #{_p('console.comment_title')}
-                                if theme.recent_comments.enable
-                                    a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
-                                        i.solitude.st-right-btn-fill
-                        a.recent-comment-image(href=url_for(theme.recent_comments.page))
-                            img(src=theme.recent_comments.img)
-
-            div.console-card-group-right
-                div.console-card.tags(onclick="sco.hideConsole()")
+    div.console-card-group
+        if use && recentComment.enable
+            div.console-card-group-left
+                div.console-card#card-newest-comments(onclick="sco.hideConsole()")
                     div.card-content
-                        div.author-content-item-tips= _p('console.tag_tip')
-                        div.author-content-item-title= _p('console.tag_title')
-                    div.card-tag-cloud
-                        each tag in site.tags.find({ parent: { $exists: false } }).data
-                            a(href=url_for(tag.path))= tag.name
-                                sup= tag.length
-
-                div.console-card.history(onclick="sco.hideConsole()")
-                    include ./widgets/aside/asideArchive.pug
+                        div.author-content-item-tips= _p('console.comment_tip')
+                        div.author-content-item-title
+                            | #{_p('console.comment_title')}
+                            if theme.recent_comments.enable
+                                a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
+                                    i.solitude.st-right-btn-fill
+                    .console_recentcomments
+                        - var sel = '.console-card .console_recentcomments'
+                        case use[0]
+                            when 'Twikoo'
+                                - var str_name = 'twikoo-recent-comments-console'
+                                include ./widgets/page/recentcomment/twikoo
+                            when 'Valine'
+                                - var str_name = 'valine-recent-comments-console'
+                                include ./widgets/page/recentcomment/valine
+                            when 'Waline'
+                                - var str_name = 'waline-recent-comments-console'
+                                include ./widgets/page/recentcomment/waline
+                            when 'Artalk'
+                                - var str_name = 'artalk-recent-comments-console'
+                                include ./widgets/page/recentcomment/artalk
+        if card.tags || card.archive
+            div.console-card-group-right
+                if card.tags
+                    div.console-card.tags(onclick="sco.hideConsole()")
+                        div.card-content
+                            div.author-content-item-tips= _p('console.tag_tip')
+                            div.author-content-item-title= _p('console.tag_title')
+                        div.card-tag-cloud
+                            each tag in site.tags.find({ parent: { $exists: false } }).data
+                                a(href=url_for(tag.path))= tag.name
+                                    sup= tag.length
+                if card.archive
+                    div.console-card.history(onclick="sco.hideConsole()")
+                        include ./widgets/aside/asideArchive.pug
 
     div.button-group
         div.console-btn-item

package/layout/includes/head/config.pug

@@ -132,6 +132,24 @@
         }
     }
 
+    let lure = false
+    if (theme.lure.enable) {
+        lure = {
+            jump: theme.lure.jump,
+            back: theme.lure.back,
+        }
+    }
+
+    let expire = false
+    if (theme.expire.enable) {
+        expire = {
+            time: theme.expire.time,
+            position: theme.expire.position,
+            text_prev: theme.expire.text_prev,
+            text_next: theme.expire.text_next,
+        }
+    }
+
 script.
     const GLOBAL_CONFIG = {
         root: '!{config.root}',
@@ -167,4 +185,6 @@ script.
         lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
         post_ai: !{post_ai},
         right_menu: !{rightMenu ? JSON.stringify(rightMenu) : false},
+        lure: !{lure ? JSON.stringify(lure) : false},
+        expire: !{expire ? JSON.stringify(expire) : false},
     };

package/layout/includes/header.pug

@@ -1,4 +1,6 @@
-header#page-header(class=is_post() ? 'post-bg' : 'not-top-img')
+- const not_cover = !(typeof page.not_cover ==='undefined' ? false : page.not_cover)
+header#page-header(class=is_post() && theme.post.default.top_cover && not_cover ? 'post-bg' : 'not-top-img')
     include ./nav.pug
     if is_post()
-        include ./widgets/post/postMeta.pug
+        if theme.post.default.top_cover && !page.not_cover
+            include ./widgets/post/postMeta.pug

package/layout/includes/layout.pug

@@ -9,12 +9,17 @@ html(lang=config.language, data-theme="light")
         if theme.display_mode.universe
             canvas#universe
 
+        // background img
+        if theme.background.enable
+            #global_bg
+
         // loading
         if theme.loading.fullpage
             include ./loading.pug
 
         // console
-        include ./console.pug
+        if theme.console.enable
+            include ./console.pug
 
         // sidebar
         include ./sidebar.pug

package/layout/includes/page/recentcomment.pug

@@ -4,13 +4,18 @@
 include ../widgets/page/banner
 
 if enable && use
-    #comments-page
+    .console_recentcomments
+    - var sel = '#page .console_recentcomments'
     case use[0]
         when 'Twikoo'
+            - var str_name = 'twikoo-recent-comments'
             include ../widgets/page/recentcomment/twikoo
         when 'Valine'
+            - var str_name = 'valine-recent-comments'
             include ../widgets/page/recentcomment/valine
         when 'Waline'
+            - var str_name = 'waline-recent-comments'
             include ../widgets/page/recentcomment/waline
         when 'Artalk'
+            - var str_name = 'artalk-recent-comments'
             include ../widgets/page/recentcomment/artalk

package/layout/includes/widgets/home/banner.pug

@@ -1,6 +1,8 @@
+- const { title, url, icon} = theme.hometop.banner
+
 div.banners-title
-    div.banners-title-big!= theme.hometop.banner.title
-    div.banners-title-small= theme.hometop.banner.url
+    div.banners-title-big!= title
+    div.banners-title-small= url
 - var group = theme.hometop.group
 if group
     div.banners-links
@@ -11,13 +13,14 @@ if group
                     i.solitude(class=array[1])
                 .banners-link-title= label
 
-div.tags-group-all
-    .tags-group-wrapper
-        each i in [1,2]
-            - var keys = Object.keys(theme.hometop.banner.icon)
-            - var pairs = keys.map((val, i) => i % 2 ? [keys[i - 1], val] : []).filter(x => x.length)
-            each pair in pairs
-                .tags-group-icon-pair
-                    each key in pair
-                        .tags-group-icon(style=`background: ${theme.hometop.banner.icon[key].color}`)
-                            img.nolazyload(src=theme.hometop.banner.icon[key].img, title=key)
+if icon
+    div.tags-group-all
+        .tags-group-wrapper
+            each i in [1,2]
+                - var keys = Object.keys(icon)
+                - var pairs = keys.map((val, i) => i % 2 ? [keys[i - 1], val] : []).filter(x => x.length)
+                each pair in pairs
+                    .tags-group-icon-pair
+                        each key in pair
+                            .tags-group-icon(style=`background: ${icon[key].color}`)
+                                img.nolazyload(src=icon[key].img, title=key)

package/layout/includes/widgets/home/hot/index.pug

@@ -0,0 +1,7 @@
+- const { count } = theme.comment.hot_tip
+- const { use } = theme.comment
+
+if use
+    case use[0]
+      when 'Twikoo'
+          include ./twikoo

package/layout/includes/widgets/home/hot/twikoo.pug

@@ -0,0 +1,46 @@
+script.
+    function updatePostsBasedOnComments() {
+        const location = window.location
+        const posts = Array.from(document.querySelectorAll('.recent-post-item[onclick] .post_cover a')).map(item => item.href.replace(location, '/'))
+
+        function get() {
+            twikoo.getCommentsCount({
+                envId: "!{theme.twikoo.envId}",
+                urls: posts,
+                includeReply: true
+            }).then(function (response) {
+                response.forEach(function (comment) {
+                    if (comment.count > !{count}) {
+                        const postElement = document.querySelector(`.recent-post-item[onclick*="${comment.url}"]`);
+                        if (postElement) {
+                            const infoTopTips = postElement.querySelector(".recent-post-info-top-tips"),
+                                originalSpan = infoTopTips ? infoTopTips.querySelector(".original") : null;
+                            if (originalSpan) {
+                                const hotTip = createHotTipElement();
+                                infoTopTips.insertBefore(hotTip, originalSpan);
+                            }
+                        }
+                    }
+                });
+            }).catch(function (error) {
+                console.error("Error fetching comments:", error);
+            });
+        }
+
+        function createHotTipElement() {
+            const hotTip = document.createElement("span");
+            hotTip.classList.add("hot-tip");
+
+            const icon = document.createElement("i");
+            icon.classList.add("solitude", "st-fire-fill");
+            hotTip.appendChild(icon);
+
+            const commentCount = document.createTextNode("!{_p('hot-tip')}");
+            hotTip.appendChild(commentCount);
+
+            return hotTip;
+        }
+
+        if (typeof twikoo === 'object') get()
+        else utils.getScript('!{url_for(theme.cdn.twikoo)}').then(get)
+    }

package/layout/includes/widgets/nav/right.pug

@@ -11,7 +11,7 @@ if theme.search.enable
     .nav-button#search-button
         a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'))
             i.solitude.st-search-line
-if theme.nav.right.console
+if theme.console.enable
     .nav-button#nav-console
         a.console_switchbutton(onclick="sco.showConsole()", title=_p('nav.console'), href="javascript:void(0);")
             i.solitude.st-dashboard-fill

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

@@ -28,4 +28,5 @@
                     .tags-group-icon-pair
                         each y in pair
                             a.tags-group-icon(href=url_for(y.link), title=y.name)
-                                img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
+                                img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
+                                span.tags-group-title=y.name

package/layout/includes/widgets/page/recentcomment/artalk.pug

@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#comments-page').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img [^>]+ atk-emoticon="[^"]+">/g
-        let cache = utils.saveToLocal.get('artalk-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#comments-page'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -37,8 +37,8 @@ script(pjax).
                         content: formatContent(i.content)
                     })
                 }
-                setHtml(document.querySelector('#comments-page'), ls)
-                utils.saveToLocal.set('artalk-recent-comments', ls, !{cache})
+                setHtml(document.querySelector('!{sel}'), ls)
+                utils.saveToLocal.set('!{str_name}', ls, !{cache})
             })
 
         function setHtml(el, data) {

package/layout/includes/widgets/page/recentcomment/twikoo.pug

@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#comments-page').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img class="tk-owo-emotion" [^>]+>/g
-        let cache = utils.saveToLocal.get('twikoo-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#comments-page'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -44,8 +44,8 @@ script(pjax).
                     time: i.created
                 })
             }
-            setHtml(document.querySelector('#comments-page'), ls)
-            utils.saveToLocal.set('twikoo-recent-comments', ls, !{cache})
+            setHtml(document.querySelector('!{sel}'), ls)
+            utils.saveToLocal.set('!{str_name}', ls, !{cache})
         });
 
         function setHtml(el, data) {

package/layout/includes/widgets/page/recentcomment/valine.pug

@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#comments-page').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
-        let cache = utils.saveToLocal.get('valine-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#comments-page'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -42,8 +42,8 @@ script(pjax).
                     content: formatContent(i.comment)
                 })
             }
-            setHtml(document.querySelector('#comments-page'), ls)
-            utils.saveToLocal.set('valine-recent-comments', ls, !{cache})
+            setHtml(document.querySelector('!{sel}'), ls)
+            utils.saveToLocal.set('!{str_name}', ls, !{cache})
         })
 
         function setHtml(el, data) {

package/layout/includes/widgets/page/recentcomment/waline.pug

@@ -1,10 +1,10 @@
 script(pjax).
     (async () => {
-        document.querySelector('#comments-page').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img [^>]+ class="wl-emoji">/g
-        let cache = utils.saveToLocal.get('waline-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#comments-page'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -34,8 +34,8 @@ script(pjax).
                         content: formatContent(i.comment)
                     })
                 }
-                setHtml(document.querySelector('#comments-page'), ls)
-                utils.saveToLocal.set('waline-recent-comments', ls, !{cache})
+                setHtml(document.querySelector('!{sel}'), ls)
+                utils.saveToLocal.set('!{str_name}', ls, !{cache})
             })
 
         function setHtml(el, data) {