hexo-theme-solitude 1.12.2 → 1.13.1

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

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

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

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

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

@@ -0,0 +1,80 @@
+#post-info
+    #post-firstinfo
+        .meta-firstline
+            - var cc = page.reprint ? _p('post.reprint') : _p('post.original')
+            a.post-meta-original(title=_p('post.cc').replace(/\$\{cc}/, cc))= cc
+            if page.categories.data.length > 0
+                span.post-meta-categories
+                    a.post-meta-categories(href=url_for('/' + page.categories.data[0].path))= page.categories.data[0].name
+            .tag_share
+                .post-meta__tag-list
+                    each tag in page.tags.data
+                        a.post-meta__tags(href=url_for(tag.path))
+                            span.tags-name.tags-punctuation= tag.name
+    h1.post-title= page.title
+    #post-meta
+        .meta-secondline
+            if theme.post.meta.date
+                span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
+                    i.post-meta-icon.solitude.st-calendar-todo-fill
+                    time(datetime=date_xml(page.date))= date_xml(page.date)
+            if theme.post.meta.updated
+                span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))
+                    i.post-meta-icon.solitude.st-refresh-line
+                    time(datetime=date_xml(page.updated))= date_xml(page.updated)
+            if theme.wordcount
+                span.post-meta-wordcount
+                    if theme.post.meta.wordcount
+                        i.post-meta-icon.solitude.st-word-fill(title=_p('post.wordcount'))
+                        span.word-count= wordcount(page.content)
+                    span.post-meta-separator
+                    if theme.post.meta.readtime
+                        i.post-meta-icon.solitude.st-clock-fill(title=_p('post.minread'))
+                        span= min2read(page.content) + " min"
+            if theme.post.meta.locate
+                span.post-meta-position(title=_p('post.ip') + page.locate)
+                    i.post-meta-icon.solitude.st-map-pin-fill
+                    span= page.locate
+            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
+                    if theme.comment.use && theme.comment.pv
+                        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
+                    else
+                        if theme.busuanzi
+                            if theme.busuanzi_use === 0
+                                span#busuanzi_value_page_pv
+                                    i.solitude.st-loading-line
+                            else
+                                span#busuanzi_page_pv
+                                    i.solitude.st-loading-line
+            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")
+                        case theme.comment.use[0]
+                            when "Twikoo"
+                                span.twikoo-count
+                                    i.solitude.st-loading-line
+                            when "Waline"
+                                span.waline-comment-count
+                                    i.solitude.st-loading-line
+                            when "Valine"
+                                span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+                                    i.solitude.st-loading-line
+                            when 'Artalk'
+                                span.artalk-count
+                                    i.solitude.st-loading-line

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

@@ -1,84 +1,4 @@
 .coverdiv#coverdiv
     img#post-cover.nolazyload(src=url_for(page.cover), alt=page.title)
-#post-info
-    #post-firstinfo
-        .meta-firstline
-            - var cc = page.reprint ? _p('post.reprint') : _p('post.original')
-            a.post-meta-original(title=_p('post.cc').replace(/\$\{cc}/, cc))= cc
-            if page.categories.data.length > 0
-                span.post-meta-categories
-                    a.post-meta-categories(href=url_for('/' + page.categories.data[0].path))= page.categories.data[0].name
-            .tag_share
-                .post-meta__tag-list
-                    each tag in page.tags.data
-                        a.post-meta__tags(href=url_for(tag.path))
-                            span.tags-name.tags-punctuation= tag.name
-    h1.post-title= page.title
-    #post-meta
-        .meta-secondline
-            if theme.post.meta.date
-                span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
-                    i.post-meta-icon.solitude.st-calendar-todo-fill
-                    time(datetime=date_xml(page.date))= date_xml(page.date)
-            if theme.post.meta.updated
-                span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))
-                    i.post-meta-icon.solitude.st-refresh-line
-                    time(datetime=date_xml(page.updated))= date_xml(page.updated)
-            if theme.wordcount
-                span.post-meta-wordcount
-                    if theme.post.meta.wordcount
-                        i.post-meta-icon.solitude.st-word-fill(title=_p('post.wordcount'))
-                        span.word-count= wordcount(page.content)
-                    span.post-meta-separator
-                    if theme.post.meta.readtime
-                        i.post-meta-icon.solitude.st-clock-fill(title=_p('post.minread'))
-                        span= min2read(page.content) + " min"
-            if theme.post.meta.locate
-                span.post-meta-position(title=_p('post.ip') + page.locate)
-                    i.post-meta-icon.solitude.st-map-pin-fill
-                    span= page.locate
-            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
-                    if theme.comment.use && theme.comment.pv
-                        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
-                    else
-                        if theme.busuanzi
-                            if theme.busuanzi_use === 0
-                                span#busuanzi_value_page_pv
-                                    i.solitude.st-loading-line
-                            else
-                                span#busuanzi_page_pv
-                                    i.solitude.st-loading-line
-            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")
-                        case theme.comment.use[0]
-                            when "Twikoo"
-                                span.twikoo-count
-                                    i.solitude.st-loading-line
-                            when "Waline"
-                                span.waline-comment-count
-                                    i.solitude.st-loading-line
-                            when "Valine"
-                                span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                                    i.solitude.st-loading-line
-                            when 'Artalk'
-                                span.artalk-count
-                                    i.solitude.st-loading-line
-
+include ./postInfo
 include ./wave

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

@@ -34,7 +34,7 @@ script().
                 item: '.OwO-items li'
             })
 
-            barrageTwikoo()
+            !{commentBarrage} && barrageTwikoo()
         }
 
         const loadTwikoo = () => {

package/layout/index.pug

@@ -12,6 +12,8 @@ block content
             #category-bar
                 include ./includes/widgets/home/categoryBar
             .recent-posts#recent-posts
+                if theme.comment.hot_tip.enable
+                    include ./includes/widgets/home/hot/index.pug
                 if theme.carousel && is_home_first_page()
                     include ./includes/widgets/home/carousel.pug
                 for post, index in page.posts.sort("-sticky" || "-date").data

package/layout/post.pug

@@ -3,9 +3,12 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #post
-            if theme.post_ai.enable && page.ai
-                include includes/widgets/post/post-ai
-            article.post-content#article-container!= page.content
+            if page.not_cover
+                include includes/widgets/post/postInfo
+            article.post-content#article-container
+                if theme.post_ai.enable && page.ai
+                    include includes/widgets/post/post-ai
+                != page.content
             include includes/widgets/post/copyright
             .post-tools-right
                 .tag_share

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.12.2",
+  "version": "1.13.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -24,9 +24,9 @@
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
-    "email": "o@efu.me"
+    "email": "o@everfu.org"
   },
   "homepage": "https://www.efu.me/",
-  "author": "Hexo-Theme-Solitude<o@efu.me>",
+  "author": "Hexo-Theme-Solitude<o@everfu.org>",
   "license": "MIT"
 }

package/plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.23.3
+  version: 4.24.0
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.70.0
+  version: 4.73.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -18,11 +18,11 @@ waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 3.2.1
+  version: 3.2.7
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
-  version: 3.2.1
+  version: 3.2.7
   other_name: waline
 valine:
   name: valine
@@ -31,11 +31,11 @@ valine:
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.8.6
+  version: 2.8.7
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.8.6
+  version: 2.8.7
 katex:
   name: katex
   file: dist/katex.min.css

package/scripts/event/merge_config.js

@@ -13,7 +13,6 @@ hexo.extend.filter.register('before_generate', () => {
             menu: null,
             right: {
                 random: false,
-                console: false,
                 custom: [],
             }
         },
@@ -119,6 +118,7 @@ hexo.extend.filter.register('before_generate', () => {
         },
         post: {
             default: {
+                top_cover: true,
                 cover: ['/img/default.avif'],
                 locate: 'China, Changsha',
                 copyright: {
@@ -306,6 +306,10 @@ hexo.extend.filter.register('before_generate', () => {
             lazyload: false,
             count: false,
             avatar: 'https://cravatar.cn',
+            hot_tip: {
+                enable: true,
+                count: 3
+            }
         },
         twikoo: {
             envId: 'your envId',
@@ -333,6 +337,17 @@ hexo.extend.filter.register('before_generate', () => {
             site: 'your site-name',
             option: null,
         },
+        console: {
+            enable: false,
+            recentComment: {
+                enable: false,
+                storage: .2,
+            },
+            card: {
+                tags: true,
+                archive: true
+            }
+        },
         verify_site: [],
         css_prefix: false,
         font: {
@@ -376,6 +391,24 @@ hexo.extend.filter.register('before_generate', () => {
             },
             custom_list: []
         },
+        lure: {
+            enable: false,
+            jump: '404 Not Found',
+            back: 'ヾ(≧∇≦*)ゝ嘿嘿，上当了吧'
+        },
+        expire: {
+            enable: false,
+            time: 30,
+            position: 'top',
+            text_prev: '本文已于',
+            text_next: '天前过期，如果内容不符，请联系站长更新。',
+        },
+        background: {
+            enable: false,
+            dark: 'https://bu.dusays.com/2023/09/29/651685ce667d1.jpg',
+            light: 'https://bu.dusays.com/2023/09/29/651685cc18d39.jpg',
+            opacity: .2,
+        },
         CDN: {
             internal: 'local',
             third_party: 'cdnjs',

package/scripts/filter/checkThemeConfig.js

@@ -4,11 +4,6 @@ hexo.extend.filter.register('before_post_render', () => {
         const data = hexo.locals.get('data');
         const logger = hexo.log;
         const theme = hexo.theme.config;
-        if (theme.hometop.enable && !theme.hometop.banner.icon) {
-            logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
-            logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
-            process.exit(-1);
-        }
         if (theme.says.enable && !data.essay) {
             logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
             logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');

package/scripts/helper/inject_head_js.js

@@ -83,4 +83,9 @@ hexo.extend.helper.register('inject_head_js', function () {
         }
     `
     return `<script>(()=>{${createJS()}})()</script>`
+})
+
+hexo.extend.helper.register('packageVersion', function () {
+    const {version} = require('../../package.json')
+    return version
 })

package/source/css/_comments/comment.styl

@@ -53,10 +53,9 @@
 .post-comment
   background var(--efu-card-bg)
 
-div#post-comment
-  margin-top 2rem
-
 #post-comment
+  .post &
+    padding 0 2rem
   > div.comment-head
     > div.comment-privacy
       display block
@@ -100,7 +99,7 @@ div#post-comment
 
   .comment-head
     font-size .8em
-    margin-bottom .5rem
+    margin .5rem 0
     position relative
 
     if hexo-config('comment.use')[1]

package/source/css/_global/index.styl

@@ -148,9 +148,6 @@ hr
   overflow visible
   display: none
 
-pre
-  font-family monospace, monospace
-
 a
   color var(--efu-fontcolor)
   text-decoration none
@@ -165,7 +162,7 @@ abbr[title]
 b, strong
   font-weight bolder
 
-code, kbd, samp
+code, kbd, samp, pre
   font-family $code-font-family
   font-size $code-font-size
 
@@ -404,7 +401,8 @@ i.solitude
       box-shadow none
       border none
       padding 0 1rem
-      background var(--efu-background)
+  > #post
+    padding 0
 
 .show
   opacity 1 !important
@@ -431,4 +429,19 @@ if hexo-config('memorial.enable')
     -moz-filter grayscale(100%)
     -ms-filter grayscale(100%)
     -o-filter grayscale(100%)
-    filter grayscale(100%)
+    filter grayscale(100%)
+
+if hexo-config('background.enable')
+  #global_bg
+    position fixed
+    z-index 999
+    opacity hexo-config('background.opacity')
+    width 100%
+    height 100%
+    background-image url(hexo-config('background.light'))
+    background-size cover
+    pointer-events none
+    background-repeat no-repeat
+
+    [data-theme=dark] &
+      background-image url(hexo-config('background.dark'))

package/source/css/_highlight/highlight/index.styl

@@ -1,4 +1,5 @@
-@import "diff"
+if hexo-config('highlight.enable')
+  @import "diff"
 figure
   pre
     margin 0

package/source/css/_highlight/index.styl

@@ -1,6 +1,6 @@
-@import "color"
-
-@import "theme/" + hexo-config('highlight.theme')
+if hexo-config('highlight.enable')
+  @import "color"
+  @import "theme/" + hexo-config('highlight.theme')
 
 if $highlight_enable
   @require "highlight/index.styl"

package/source/css/_highlight/prismjs/index.styl

@@ -1,6 +1,7 @@
 @require line-number
 
-@require diff
+if hexo-config('highlight.enable')
+  @require diff
 
 #article-container
   pre[class*='language-']

package/source/css/_layout/article-container.styl

@@ -2,6 +2,10 @@
   overflow-wrap break-word
   +maxWidth768()
     overflow hidden
+    padding .5rem
+
+  .post &
+    padding 1rem 2rem
 
   iframe
     border-radius 12px

package/source/css/_layout/console.styl

@@ -28,7 +28,7 @@
 
   .console-card-group
     display flex
-    justify-content space-between
+    justify-content center
     align-items center
     margin 0 30px
     transform translateY(20px)

package/source/css/_layout/expire.styl

@@ -0,0 +1,13 @@
+if hexo-config("expire.enable")
+  .expire
+    display flex
+    align-items center
+    border-radius 8px
+    background-color rgba(255,0,0,.5)
+    border-left 5px solid var(--efu-red)
+    padding 10px 16px
+    color var(--efu-white)
+
+    i.solitude
+      color var(--efu-white)
+      margin-right 8px

package/source/css/_layout/header.styl

@@ -567,12 +567,6 @@
 .nav-button
   cursor pointer
 
-#site-name
-  .iconfont
-    font-size 20px
-    font-weight 400
-    line-height 48px
-
 #site-logo
   width 121px
 
@@ -692,6 +686,7 @@ if hexo-config('nav.group')
       opacity 0
       pointer-events none
       backdrop-filter blur(20px)
+      -webkit-backdrop-filter  blur(20px)
 
       +maxWidth768()
         left 0
@@ -737,14 +732,15 @@ if hexo-config('nav.group')
             background-color var(--efu-main)
 
 .post
-  if hexo-config('nav.group')
-    .back-home-button
-      color var(--efu-white)
-
-      &:hover
-        background var(--efu-white-op)
+  .post-bg
+    if hexo-config('nav.group')
+      .back-home-button
         color var(--efu-white)
-        cursor pointer
+
+        &:hover
+          background var(--efu-white-op)
+          color var(--efu-white)
+          cursor pointer
 
   #nav
     #site-name
@@ -760,6 +756,12 @@ if hexo-config('nav.group')
       #site-name
         &:after
           color var(--efu-card-bg)
+  .not-top-img
+    #nav
+      a
+        &:hover
+          +minWidth900()
+            background var(--efu-lighttext)
 
 .back-menu-list
   display flex

package/source/css/_page/_home/home-top.styl

@@ -25,6 +25,7 @@
       .recent-post-group
         display flex
         flex-direction row
+        justify-content space-between
         flex-wrap wrap
         align-content space-between
         gap .5rem
@@ -79,6 +80,7 @@
       display flex
       flex-direction column
       width calc(100% / 3 - 0.5rem)
+      min-width 200px
       align-items flex-start
       background var(--efu-card-bg)
       border-radius 12px
@@ -90,6 +92,10 @@
       position relative
       box-shadow var(--efu-shadow-border)
 
+      &:nth-last-child(2):nth-child(1),
+      &:nth-last-child(1):nth-child(2)
+        width calc(100% / 2 - 0.5rem)
+
       +maxWidth1200()
         width 200px
         min-width 200px
@@ -243,6 +249,7 @@
 
           .banner-button-group
             bottom: 1rem
+
 .banners-links
   display flex
   position absolute

package/source/css/_page/_home/home.styl

@@ -21,4 +21,7 @@ if hexo-config('aside.position') == 0
     order 2
 else
   #home
-    order 1
+    order 1
+
+if hexo-config('comment.hot_tip.enable')
+  @import "hot-tip.styl"

package/source/css/_page/_home/hot-tip.styl

@@ -0,0 +1,11 @@
+.hot-tip
+  display flex
+  color var(--efu-red)
+  font-size .5rem
+  position relative
+  margin-right 8px
+  align-items center
+  gap 1px
+
+  i
+    font-size 10px

package/source/css/_page/index.styl

@@ -6,7 +6,7 @@
 
 @import "error.styl"
 
-if hexo-config('recent_comments.enable')
+if hexo-config('recent_comments.enable') || (hexo-config('console.enable') && hexo-config('console.recentComment.enable'))
   @import "recentcomment.styl"
 
 if hexo-config('says.enable')