hexo-theme-solitude 1.10.5 → 1.11.0

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

@@ -0,0 +1,72 @@
+script(pjax).
+    (async () => {
+        document.querySelector('#comments-page').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)
+            return
+        }
+        let ls = []
+        await fetch('!{theme.waline.envId}/api/comment?type=recent&count=!{limit}', {method: 'GET'}).then(async res => res.json())
+            .then(async data => {
+                console.log(data)
+                for (const i of data.data) {
+                    let title = ''
+                    if (i.url) {
+                        await fetch(i.url).then(res => res.text()).then(html => {
+                            const parser = new DOMParser()
+                            const doc = parser.parseFromString(html, 'text/html')
+                            title = doc.querySelector('title').innerText
+                        }).catch(() => {
+                            title = i.url
+                        })
+                    }
+                    if (title.indexOf('|') > 0) {
+                        title = title.split('|')[0]
+                    }
+                    ls.push({
+                        title: title,
+                        url: i.url,
+                        nick: i.nick,
+                        avatar: i.avatar,
+                        time: new Date(i.time),
+                        content: formatContent(i.comment)
+                    })
+                }
+                setHtml(document.querySelector('#comments-page'), ls)
+                utils.saveToLocal.set('waline-recent-comments', ls, !{cache})
+            })
+
+        function setHtml(el, data) {
+            el.innerHTML = data.map(i => `
+                                <div class="comment-card" title="${i.title}" onclick="pjax.loadUrl('${i.url}')">
+                                    <div class="comment-info">
+                                        <img src="${i.avatar}" class="nolazyload" alt="${i.nick}">
+                                        <div>
+                                            <span class="comment-user">${i.nick}</span>
+                                        </div>
+                                        <time class="comment-time" datetime="${i.time}"></time>
+                                    </div>
+                                    <div class="comment-content">${i.content}</div>
+                                    <div class="comment-title">
+                                    <i class="solitude st-chat-fill"></i>
+                                    ${i.title}</div>
+                                </div>
+                            `).join('')
+            if (typeof sco !== 'undefined') sco.changeTimeFormat(document.querySelectorAll('.comment-time'))
+            else {
+                document.addEventListener('pjax:complete', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))
+                document.addEventListener('DOMContentLoaded', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))
+            }
+        }
+
+        function formatContent(content) {
+            content = content.replace(emojiReg, '[!{__("console.newest_comment.emoji")}]')
+            content = content.replace(/<img.*?>/g, '[!{__("console.newest_comment.image")}]');
+            content = content.replace(/<a.*?>.*?<\/a>/g, '[!{__("console.newest_comment.link")}]');
+            content = content.replace(/<pre.*?>.*?<\/pre>/g, '[!{__("console.newest_comment.code")}]');
+            content = content.replace(/<.*?>/g, '');
+            return content
+        }
+    })()

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

@@ -41,7 +41,7 @@ script.
             const artalkWrap = document.getElementById('artalk-wrap')
             if (!(artalkWrap && artalkWrap.children.length)) return
             const isDark = theme === 'dark'
-            artalkItem.setDarkMode(!isDark)
+            artalkItem.setDarkMode(isDark)
         }
         utils.addGlobalFn('themeChange', artalkChangeMode, 'artalk')
         if ('!{use[0]}' === 'Artalk' || !{lazyload}) {

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

@@ -61,7 +61,7 @@ script.
                     nick: e.nick,
                     url: e.page_key,
                     date: e.date,
-                }))
+                })).slice(0, 6)
                 utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage})
                 generateHtml(artalk, asideList)
             }).catch(error => {

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

@@ -46,7 +46,7 @@ script.
                         nick: e.nick,
                         url: `${e.url}#${e.id}`,
                         date: new Date(e.created).toString()
-                    }))
+                    })).slice(0, 6)
                     utils.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
                 }).catch((err) => {

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

@@ -1,5 +1,6 @@
 script.
     window.addEventListener('load', () => {
+        const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
         const changeContent = (content) => {
             if (content === '') return content;
 
@@ -38,31 +39,32 @@ script.
                 },
             }
             if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
-            await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(async res => {
-                const result = await res.json()
-                window.res = result
-                const valineArray = result.results.map(e => {
-                    return {
-                        'content': changeContent(e.comment),
-                        'avatar': '!{theme.comment.avatar}' + '/avatar/' + md5(e.mail.toLowerCase()),
-                        'nick': e.nick,
-                        'url': e.url + '#' + e.objectId,
-                        'date': e.updatedAt || e.createdAt
+            await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(res => res.json())
+                .then(async result => {
+                    let ls = []
+                    for (const i of result.results.slice(0, 6)) {
+                        if (emojiReg.test(i.comment)) continue
+                        ls.push({
+                            content: changeContent(i.comment),
+                            avatar: '!{theme.comment.avatar}' + '/avatar/' + md5(i.mail.toLowerCase()),
+                            nick: i.nick,
+                            url: i.url,
+                            date: i.updatedAt || i.createdAt
+                        })
                     }
+                    utils.saveToLocal.set('valine-newest-comment', ls, !{theme.comment.newest_comment.storage})
+                    generateHtml(ls)
+                }).catch(error => {
+                    console.error(error);
+                    $asideList.textContent = "!{_p('newest_comment.error')}"
                 })
-                utils.saveToLocal.set('valine-newest-comment', valineArray, !{theme.comment.newest_comment.storage})
-                generateHtml(valineArray)
-            }).catch(error => {
-                console.error(error);
-                $asideList.textContent = "!{_p('newest_comment.error')}"
-            })
         }
 
         const generateHtml = array => {
             const $dom = document.querySelector('#card-newest-comments .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                         <div class='aside-list-item'>
-                          <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                          <div onclick='pjax.loadUrl(\"${item.url}\")' class='thumbnail'>
                             <img src='${item.avatar}' alt='${item.nick}'>
                             <div class='name'><span>${item.nick}</span></div>
                           </div>

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

@@ -29,7 +29,7 @@ script.
         }
 
         const getComment = async () => {
-            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=8', {method: 'GET'}).then(async res => {
+            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=6', {method: 'GET'}).then(async res => {
                 const result = await res.json()
                 const walineArray = result.data.map(e => {
                     return {
@@ -37,7 +37,7 @@ script.
                         'avatar': e.avatar,
                         'nick': e.nick,
                         'url': e.url + '#' + e.objectId,
-                        'date': e.time || e.insertedAt
+                        'date': new Date(e.time || e.insertedAt)
                     }
                 })
                 utils.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})

package/layout/page.pug

@@ -22,6 +22,8 @@ block content
                     include includes/page/music
                 when 'message'
                     !=partial('includes/page/message', {}, {cache: true})
+                when 'recentcomment'
+                    !=partial('includes/page/recentcomment', {}, {cache: true})
                 when 'banner'
                     include includes/widgets/page/banner
                     if page.container

package/package.json

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

package/plugins.yml

@@ -5,7 +5,7 @@ algolia_search:
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.67.0
+  version: 4.68.1
 pjax:
   name: pjax
   file: pjax.min.js
@@ -31,11 +31,11 @@ valine:
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.8.5
+  version: 2.8.6
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.8.5
+  version: 2.8.6
 katex:
   name: katex
   file: dist/katex.min.css

package/scripts/event/merge_config.js

@@ -200,12 +200,19 @@ hexo.extend.filter.register('before_generate', () => {
             style: 1,
             strip: 30
         },
+        recent_comments: {
+            enable: false,
+            limit: 50,
+            console: false,
+            page: '/recentcomments/'
+        },
         envelope: {
             enable: false,
             line: 10,
             speed: 20,
             hover: true,
             loop: true,
+            page: '/message/'
         },
         meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r",
         music: {

package/source/css/_comments/comment.styl

@@ -154,7 +154,7 @@ div#post-comment
   border var(--style-border-always)
   border-radius 10px
   z-index 9999
-  width 142px
+  max-width 142px
   display none
   transform translate(0, -105%)
   overflow hidden

package/source/css/_comments/valine.styl

@@ -46,6 +46,7 @@
     padding 0
     overflow: inherit;
     flex-direction column-reverse
+    margin-bottom 0
 
     .vheader
       display flex

package/source/css/_global/index.styl

@@ -86,15 +86,38 @@ main
 
 // scrollbar - chrome/safari
 *::-webkit-scrollbar
-  width 5px
-  height 5px
+  width 12px
+  height 6px
 
 *::-webkit-scrollbar-thumb
   background var(--scrollbar-color)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
+
+  &:hover
+    background var(--efu-lighttext)
+    display block
 
 *::-webkit-scrollbar-track
   background-color transparent
 
+::-webkit-scrollbar-thumb
+  background var(--efu-card-border)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
+
+::-webkit-scrollbar-thumb:hover
+  background var(--efu-main)
+  opacity 1
+  display block !important
+
+::-webkit-scrollbar-track
+  background-color var(--efu-none)
+
 if hexo-config('lazyload.enable') && !hexo-config('lazyload.placeholder')
   img
     &[data-lazy-src]:not(.loaded)
@@ -116,7 +139,7 @@ h1, h2, h3, h4, h5, h6
   padding-left 0
   font-weight 700
   position relative
-  margin 1rem 0 0.7rem
+  margin .5rem 0
   color var(--efu-fontcolor)
 
 hr
@@ -319,25 +342,6 @@ li, ul
   margin 0
   padding 0
 
-::-webkit-scrollbar
-  width 10px
-  height 6px
-
-::-webkit-scrollbar-thumb
-  background var(--efu-card-border)
-  opacity .5
-  border-radius 8px
-  cursor pointer
-  border 2px solid var(--efu-background)
-
-::-webkit-scrollbar-thumb:hover
-  background var(--efu-main)
-  opacity 1
-  display block !important
-
-::-webkit-scrollbar-track
-  background-color var(--efu-none)
-
 [data-theme=dark] img
   filter brightness(1)
 
@@ -383,7 +387,7 @@ i.solitude
     +maxWidth1200()
       width 100%
 
-  > #post,#category,#tag,#archive
+  > #post, #category, #tag, #archive
     box-shadow var(--efu-shadow-border)
     padding 1rem 2rem
     border-radius 12px

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

@@ -191,7 +191,7 @@
       font-size 1.3rem
       line-height 1.3
       border-top 1px dashed var(--efu-theme-op)
-      padding-top 1.5rem
+      padding-top 1rem
 
     h3
       font-size 1.1rem

package/source/css/_layout/aside.styl

@@ -678,6 +678,7 @@ if hexo-config('aside.card.style') == 2
     opacity 0
     transition .3s
     display flex
+    pointer-events none
     gap 5px
   .more-info
     if hexo-config('aside.position') == 0

package/source/css/_layout/console.styl

@@ -17,6 +17,15 @@
   &.show .close-btn i
     transform rotate(0)
 
+  if hexo-config('recent_comments.enable') && hexo-config('recent_comments.console')
+    .recent-comment-more
+      margin-left auto
+      display flex
+      align-items center
+
+      &:hover
+        color var(--efu-main)
+
   .console-card-group
     display flex
     justify-content space-between
@@ -35,11 +44,13 @@
     +maxHeight800()
       display none
 
+
   &.show
     .console-card-group
       transform translateY(0)
       opacity 1
       transition-delay .1s
+      max-height 80%
 
   .console-card-group-left
     margin-right .5rem
@@ -102,6 +113,8 @@
     font-size 36px
     font-weight 700
     line-height 1
+    display flex
+    align-items center
 
   .aside-list-item
     .thumbnail

package/source/css/_layout/footer.styl

@@ -135,7 +135,7 @@
     .footer-title-group
       display flex
       align-items center
-      margin 1rem 0 .7rem 8px
+      margin .5rem 0 .7rem 8px
 
       a
         margin-left 8px

package/source/css/_layout/header.styl

@@ -521,33 +521,6 @@
           padding 4px
           transition transform .3s ease 0s
 
-  &.hide-menu
-    #toggle-menu
-      display inline-block
-
-      +minWidth768()
-        display none
-
-      .site-page
-        font-size inherit
-
-        +maxWidth768()
-          width 35px
-          height 35px
-          display flex
-          align-items center
-          justify-content center
-
-    .menus_items
-      position absolute
-      left 0
-      visibility hidden
-      opacity 0
-
-    #search-button
-      span
-        display none
-
   #search-button
     display inline
     padding 0 .4rem

package/source/css/_layout/rightmenu.styl

@@ -23,7 +23,7 @@ if hexo-config('right_menu.enable')
       box-shadow var(--efu-shadow-theme)
 
     .rightMenu-group
-      padding .5rem .3rem
+      padding .35rem .3rem
 
       &.rightMenu-small
         display flex

package/source/css/_page/_about/about.styl

@@ -3,11 +3,12 @@
   padding-top 1rem
   flex-direction column
   align-items center
+  gap .5rem
 
   .author-title
     font-size 2rem
     font-weight 700
-    margin 1rem 0
+    margin .5rem 0
     line-height 1
 
 if "tenyear" in $about

package/source/css/_page/_about/buff.styl

@@ -13,7 +13,7 @@
     animation gradient 15s ease infinite
     min-height 200px
     height fit-content
-    width 59%
+    width 59.5%
 
     .card-content
       display flex

package/source/css/_page/_about/contentinfo.styl

@@ -7,7 +7,7 @@
     background linear-gradient(120deg, #5b27ff 0, #00d4ff 100%)
     background-size 200%
     animation gradient 15s ease infinite
-    width 59%
+    width 59.5%
 
     .title1
       opacity .8
@@ -28,7 +28,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width 39%
+    width 39.5%
 
     h2
       margin-right auto

package/source/css/_page/_about/maxim.styl

@@ -7,7 +7,7 @@
     align-items flex-start
     flex-direction column
     justify-content center
-    width 39%
+    width 39.5%
 
     .maxim-title
       display flex

package/source/css/_page/_about/myphoto.styl

@@ -4,7 +4,7 @@
     min-height 240px
     position relative
     overflow hidden
-    width 39%
+    width 39.5%
     display flex
     align-items center
     justify-content center

package/source/css/_page/_about/oneself.styl

@@ -10,7 +10,8 @@
         width 100% !important
 
     &.mapAndInfo
-      width 59%
+      width 59.5%
+      gap .5rem
 
   .author-content-item
     +minWidth1300()
@@ -22,7 +23,6 @@
       max-height 400px
       position relative
       overflow hidden
-      margin-bottom 0.5rem
       height 60%
       background-size 100%
       transition 1s ease-in-out

package/source/css/_page/_about/personalities.styl

@@ -1,7 +1,7 @@
 .author-content-item.personalities
   overflow hidden
   position relative
-  width 59%
+  width 59.5%
   +maxWidth768()
     min-height 360px
 

package/source/css/_page/_about/skills.styl

@@ -4,7 +4,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width 49%
+    width 49.5%
     min-height 450px
 
     .tags-group-all

package/source/css/_page/_about/statistic.styl

@@ -5,7 +5,7 @@
 
   .about-statistic
     min-height 380px
-    width 39%
+    width 39.5%
     background-size cover
     color var(--efu-white)
     overflow hidden