hexo-theme-solitude 1.7.12 → 1.7.13

package/_config.yml

@@ -718,7 +718,7 @@ comment:
   avatar: https://cravatar.cn # Gravatar link
   newest_comment:
     enable: false
-    storage: 421000 # 缓存时间
+    storage: .5 # 缓存时间 1: 1天 / .5 : 半天
   # twikoo 配置信息
   # twikoo settings
   twikoo: # https://twikoo.js.org/

package/layout/includes/head/config.pug

@@ -26,43 +26,39 @@
 
     let comment = false
 
-    if (theme.comment.type === 'twikoo') {
-        comment = JSON.stringify({
+    if (theme.comment.enable) {
+        comment = {
             avatar: theme.comment.avatar,
-            url: theme.comment.twikoo.envId,
-            commentBarrage: theme.comment.enable,
-            accessToken: theme.comment.twikoo.accessToken,
-            owo: {
-                body: '.OwO-body',
-                item: '.OwO-items li'
-            }
-        })
-    }
-
-    if (theme.comment.type === 'waline') {
-        comment = JSON.stringify({
-            avatar: theme.comment.avatar,
-            url: theme.comment.waline.envId,
-            commentBarrage: theme.comment.enable,
-            owo: {
-                body: '.wl-emoji-popup',
-                item: '.wl-tab-wrapper button'
-            }
-        })
-    }
-
-    if (theme.comment.type === 'valine') {
-        comment = JSON.stringify({
-            avatar: theme.comment.avatar,
-            url: theme.comment.valine.serverURLs,
-            commentBarrage: theme.comment.enable,
-            appId: theme.comment.valine.appId,
-            appKey: theme.comment.valine.appKey,
-            owo: {
-                body: '.vwrap',
-                item: '.vemojis i'
-            }
-        })
+            commentBarrage: theme.comment.commentBarrage,
+        }
+        switch (theme.comment.type) {
+            case "twikoo":
+                comment.url = theme.comment.twikoo.envId
+                comment.accessToken = theme.comment.twikoo.accessToken
+                comment.owo = {
+                    body: '.OwO-body',
+                    item: '.OwO-items li'
+                }
+                break
+            case "waline":
+                comment.url = theme.comment.waline.envId
+                comment.owo = {
+                    body: '.wl-emoji-popup',
+                    item: '.wl-tab-wrapper button'
+                }
+                break
+            case "valine":
+                comment.url = theme.comment.valine.serverURLs
+                comment.appId = theme.comment.valine.appId
+                comment.appKey = theme.comment.valine.appKey
+                comment.owo = {
+                    body: '.vwrap',
+                    item: '.vemojis i'
+                }
+                break
+            default:
+                break
+        }
     }
 
     let post_ai = false
@@ -138,13 +134,13 @@
                 stop: _p('right_menu.music.stop'),
             }
         }
-        if(theme.comment.enable && theme.comment.commentBarrage){
+        if (theme.comment.enable && theme.comment.commentBarrage) {
             rightMenu.barrage = {
                 open: _p('right_menu.barrage.open'),
                 close: _p('right_menu.barrage.close')
             }
         }
-        if(theme.right_menu.translate.enable){
+        if (theme.right_menu.translate.enable) {
             rightMenu.translate = {
                 translateDelay: theme.right_menu.translate.translateDelay,
                 defaultEncoding: theme.right_menu.translate.defaultEncoding
@@ -185,7 +181,7 @@ script.
         covercolor: {
             enable: !{theme.post.covercolor.enable}
         },
-        comment: !{comment},
+        comment: !{comment ? JSON.stringify(comment) : false},
         lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
         post_ai: !{post_ai},
         right_menu: !{rightMenu ? JSON.stringify(rightMenu) : false},

package/layout/includes/inject/head.pug

@@ -34,7 +34,7 @@ script.
                     const expiryDay = ttl * 86400000
                     const item = {
                         value: value,
-                        expiry: now.getTime() + expiryDay,
+                        expiry: now.getTime() + expiryDay
                     }
                     localStorage.setItem(key, JSON.stringify(item))
                 },
@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.12",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.13",
         "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/widgets/aside/asideInfoCard.pug

@@ -5,8 +5,9 @@
                 .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
         .avatar-img-group
             img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.card.author.img)
-            .avatar-sticker
-                img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
+            if theme.aside.card.author.sticker
+                .avatar-sticker
+                    img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
         .author-info__description_group
             .author-info__description!= theme.aside.card.content
             .author-info__description2!= theme.aside.card.content2

package/layout/includes/widgets/home/{leonus.pug → carousel.pug}

@@ -18,7 +18,7 @@ if recommends
             .blog-slider__pagination.swiper-pagination-clickable.swiper-pagination-bullets
 
     script.
-        function banner_swiper() {
+        function carousel_swiper() {
             let e = new Swiper(".blog-slider", {
                 navigation: {
                     nextEl: ".swiper-button-next",

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

@@ -6,7 +6,7 @@ if group
         each item in group
             - var array = item[1].split('||')
             .categoryItem
-                a.categoryButton(href=url_for(trim(array[0])) if array[2] style="background:" + array[2] + ";")
+                a.categoryButton(href=url_for(trim(array[0])) style="background-image:" + array[2] + ";")
                     span.categoryButtonText= item[0]
                     if array[1]
                         i.solitude(class=trim(array[1]))

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

@@ -4,12 +4,14 @@ script.
             if (content === '') return content;
 
             const replacements = [
-                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[图片]'},
-                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[链接]'},
-                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '[代码]'},
-                {regex: /<[^>]+>/g, replacement: ""}
+                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '<i class="solitude st-image-fill"></i>'},
+                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '<i class="solitude st-link"></i>'},
+                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '<i class="solitude st-code-box-fill"></i>'},
+                {regex: /<p>|<\/p>/g, replacement: ''}
             ];
 
+            console.log(content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '<i class="solitude st-gallery-image">'))
+
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
             return content.length > 150 ? content.substring(0, 150) + '...' : content;
@@ -32,7 +34,7 @@ script.
                         'url': `${e.url}#${e.id}`,
                         'date': new Date(e.created).toISOString()
                     }))
-                    saveToLocal.set('twikoo-newest-comment', JSON.stringify(twikooArray), !{theme.comment.newest_comment.storage}/(60*24))
+                    saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
                 }).catch(function (err) {
                     console.error(err)
@@ -63,7 +65,7 @@ script.
         const newestCommentInit = () => {
             const data = saveToLocal.get('twikoo-newest-comment')
             if (data) {
-                generateHtml(JSON.parse(data))
+                generateHtml(data)
             } else {
                 getComment()
             }

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

@@ -4,9 +4,9 @@ script.
             if (content === '') return content;
 
             const replacements = [
-                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[Image]'},
-                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[URL]'},
-                {regex: /```[\s\S]*?```/g, replacement: '[Code]'},
+                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '<i class="solitude st-image-fill"></i>'},
+                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '<i class="solitude st-link"></i>'},
+                {regex: /```[\s\S]*?```/g, replacement: '<i class="solitude st-code-box-fill"></i>'},
                 {regex: /<[^>]+>/g, replacement: ""}
             ];
 
@@ -19,7 +19,7 @@ script.
         const newestCommentInit = () => {
             const data = saveToLocal.get('valine-newest-comment')
             if (data) {
-                generateHtml(JSON.parse(data))
+                generateHtml(data)
             } else {
                 getComment()
             }
@@ -48,7 +48,7 @@ script.
                         'date': e.updatedAt || e.createdAt
                     }
                 })
-                saveToLocal.set('valine-newest-comment', JSON.stringify(valineArray), !{theme.comment.newest_comment.storage} / (60 * 24))
+                saveToLocal.set('valine-newest-comment', valineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(valineArray)
             } catch (err) {
                 console.error(err)

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

@@ -4,9 +4,9 @@ script.
             if (content === '') return content;
 
             const replacements = [
-                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[图片]'},
-                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[链接]'},
-                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '[代码]'},
+                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '<i class="solitude st-image-fill"></i>'},
+                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '<i class="solitude st-link"></i>'},
+                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '<i class="solitude st-code-box-fill"></i>'},
                 {regex: /<[^>]+>/g, replacement: ""}
             ];
 
@@ -19,7 +19,7 @@ script.
         const newestCommentInit = () => {
             const data = saveToLocal.get('waline-newest-comment')
             if (data) {
-                generateHtml(JSON.parse(data))
+                generateHtml(data)
             } else {
                 getComment()
             }
@@ -38,7 +38,7 @@ script.
                         'date': e.time || e.insertedAt
                     }
                 })
-                saveToLocal.set('waline-newest-comment', JSON.stringify(walineArray), !{theme.comment.newest_comment.storage} / (60 * 24))
+                saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(walineArray)
             } catch (err) {
                 console.error(err)

package/layout/index.pug

@@ -9,8 +9,8 @@ block content
                 include ./includes/widgets/home/hometop
     main.layout#content-inner
         .recent-posts#recent-posts
-            if theme.banner && is_home_first_page()
-                include ./includes/widgets/home/leonus.pug
+            if theme.carousel && is_home_first_page()
+                include ./includes/widgets/home/carousel.pug
             #category-bar
                 include ./includes/widgets/home/categoryBar
             for post, index in page.posts.sort("-sticky" || "-date").data

package/package.json

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

package/source/css/_layout/aside.styl

@@ -190,10 +190,11 @@
 
 #aside-content
   .card-widget
-    &:hover
-      .avatar-sticker
-        opacity 0
-        transform scale(0)
+    if hexo-config('aside.card.author.sticker')
+      &:hover
+        .avatar-sticker
+          opacity 0
+          transform scale(0)
 
     &.card-recent-post
       padding .4rem .6rem !important
@@ -236,29 +237,30 @@
         transform scale(1.03)
 
   .card-info
-    .avatar-sticker
-      position absolute
-      bottom -2px
-      right -2px
-      width 33px
-      height 33px
-      line-height 34px
-      z-index 0
-      display flex
-      align-items center
-      justify-content center
-      transition .3s .2s
-      transform scale(1)
-      background var(--efu-card-bg)
-      border-radius 50%
+    if hexo-config('aside.card.author.sticker')
+      .avatar-sticker
+        position absolute
+        bottom -2px
+        right -2px
+        width 33px
+        height 33px
+        line-height 34px
+        z-index 0
+        display flex
+        align-items center
+        justify-content center
+        transition .3s .2s
+        transform scale(1)
+        background var(--efu-card-bg)
+        border-radius 50%
 
-      img
-        width 26px
-        height 26px
+        img
+          width 26px
+          height 26px
 
-      ../ :hover .avatar-sticker
-        opacity 0
-        transform scale(0)
+        ../ :hover .avatar-sticker
+          opacity 0
+          transform scale(0)
 
     .author-info__desc
       font-size 12px
@@ -440,7 +442,9 @@
             color var(--efu-white)
 
     img.avatar-img
-      width 118px
+      width 108px
+      height 108px
+      object-fit cover
       right 0
       top 0
       border-radius 500px

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

@@ -5,9 +5,12 @@ div#swiper_container
   transition all .3s
   overflow hidden
 
-#swiperBox
-  margin-top 0!important
+#swiperBox.recent-post-item
+  width 100%
   cursor default
+  margin-top 0
+
+#swiperBox
 
   .swiperBox-top-text
     position absolute

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

@@ -21,6 +21,7 @@
         display none
 
       / #bannerGroup
+        display flex
         +minWidth1201()
           width calc(50% - .25rem)
           margin-right 1rem
@@ -73,6 +74,7 @@
               height 100%
               width 100%
               background var(--efu-card-bg)
+              background-size 200%
               border-radius 12px
               display inline-block
               text-align left