hexo-theme-solitude 1.6.1 → 1.7.0

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

@@ -15,12 +15,12 @@ script.
             return content.length > 150 ? content.substring(0, 150) + '...' : content;
         }
 
-        const getComment = () => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('#card-newest-comments .aside-list')
 
+        const getComment = () => {
             const runTwikoo = () => {
                 twikoo.getRecentComments({
-                    envId: GLOBAL_CONFIG.comment.twikoo.url,
+                    envId: GLOBAL_CONFIG.comment.url,
                     region: '',
                     pageSize: 6,
                     includeReply: true
@@ -32,18 +32,18 @@ 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))
                     generateHtml(twikooArray)
                 }).catch(function (err) {
                     console.error(err)
-                    $dom.innerHTML = "无法获取评论，请确认相关配置是否正确"
+                    $asideList.textContent = "!{_p('newest_comment.error')}"
                 })
             }
             runTwikoo()
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
-            $dom.innerHTML = array.length ? array.map(item => `
+            $asideList.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
                   <a onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
                     <img src='${item.avatar}' alt='${item.nick}'>
@@ -54,15 +54,17 @@ script.
                     <time class="datetime" datetime="${item.date}"></time>
                   </div>
                 </div>
-              `).join('') : '没有评论'
+              `).join('') : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance && window.lazyLoadInstance.update()
-            window.pjax && window.pjax.refresh($dom)
+            window.pjax && window.pjax.refresh()
             utils && utils.changeTimeFormat()
         }
 
         const newestCommentInit = () => {
-            const $asideList = document.querySelector('#card-newest-comments .aside-list')
-            if ($asideList) {
+            const data = saveToLocal.get('twikoo-newest-comment')
+            if (data) {
+                generateHtml(JSON.parse(data))
+            } else {
                 getComment()
             }
         }

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

@@ -0,0 +1,79 @@
+script.
+    window.addEventListener('load', () => {
+        const changeContent = (content) => {
+            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: /<[^>]+>/g, replacement: ""}
+            ];
+
+            content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
+
+            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+        }
+
+        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const newestCommentInit = () => {
+            const data = saveToLocal.get('valine-newest-comment')
+            if (data) {
+                generateHtml(JSON.parse(data))
+            } else {
+                getComment()
+            }
+        }
+
+        const getComment = async () => {
+            try {
+                const settings = {
+                    "method": "GET",
+                    "headers": {
+                        "X-LC-Id": '!{theme.comment.valine.appId}',
+                        "X-LC-Key": '!{theme.comment.valine.appKey}',
+                        "Content-Type": "application/json"
+                    },
+                }
+
+                const res = await fetch('!{theme.comment.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings)
+                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
+                    }
+                })
+                saveToLocal.set('valine-newest-comment', JSON.stringify(valineArray), !{theme.comment.newest_comment.storage} / (60 * 24))
+                generateHtml(valineArray)
+            } catch (err) {
+                console.error(err)
+                $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'>
+                          <a onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                            <img src='${item.avatar}' alt='${item.nick}'>
+                            <div class='name'><span>${item.nick}</span></div>
+                          </a>
+                          <div class='content'>
+                            <a class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</a>
+                            <time class="datetime" datetime="${item.date}"></time>
+                          </div>
+                        </div>
+                      `).join('') : "!{_p('newest_comment.zero')}"
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+            window.pjax && window.pjax.refresh()
+            utils && utils.changeTimeFormat()
+        }
+
+        newestCommentInit()
+    })

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

@@ -17,28 +17,33 @@ script.
 
         const $asideList = document.querySelector('#card-newest-comments .aside-list')
         const newestCommentInit = () => {
-            if ($asideList) {
+            const data = saveToLocal.get('waline-newest-comment')
+            if (data) {
+                generateHtml(JSON.parse(data))
+            } else {
                 getComment()
             }
         }
-        const getComment = () => {
-            Waline.RecentComments(
-                options = {
-                    serverURL: GLOBAL_CONFIG.comment.waline.url,
-                    count: 6,
-                }
-            ).then(function (res) {
-                const walineArray = res.comments.map(item => ({
-                    'content': changeContent(item.comment),
-                    'avatar': item.avatar,
-                    'nick': item.nick,
-                    'url': `${item.url}#${item.objectId}`,
-                    'date': new Date(item.insertedAt).toISOString()
-                }))
+
+        const getComment = async () => {
+            try {
+                const res = await fetch('!{theme.comment.waline.envId}/api/comment?type=recent&count=8', {method: 'GET'})
+                const result = await res.json()
+                const walineArray = result.data.map(e => {
+                    return {
+                        'content': changeContent(e.comment),
+                        'avatar': e.avatar,
+                        'nick': e.nick,
+                        'url': e.url + '#' + e.objectId,
+                        'date': e.time || e.insertedAt
+                    }
+                })
+                saveToLocal.set('waline-newest-comment', JSON.stringify(walineArray), !{theme.comment.newest_comment.storage} / (60 * 24))
                 generateHtml(walineArray)
-            }).catch(
-                $asideList.innerHTML = "无法获取评论，请确认相关配置是否正确"
-            )
+            } catch (err) {
+                console.error(err)
+                $asideList.textContent = "!{_p('newest_comment.error')}"
+            }
         }
 
         const generateHtml = array => {
@@ -54,9 +59,9 @@ script.
                     <time class="datetime" datetime="${item.date}"></time>
                   </div>
                 </div>
-              `).join('') : '没有评论'
+              `).join('') : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance && window.lazyLoadInstance.update()
-            window.pjax && window.pjax.refresh($dom)
+            window.pjax && window.pjax.refresh()
             utils && utils.changeTimeFormat()
         }
 

package/layout/page.pug

@@ -25,6 +25,9 @@ block content
                     != page.content
                 when 'music'
                     include includes/page/music
+                when 'banner'
+                    include includes/widgets/page/banner
+                    include includes/page/default
                 default
                     include includes/page/default
             if page.comment

package/layout/tag.pug

@@ -10,7 +10,7 @@ block content
                         | #{tag.name}
                         span.tagsPageCount #{tag.length}
             .recent-posts#recent-posts
-                each post in page.posts.find({ parent: { $exists: false } }).data
+                each post,index in page.posts.find({ parent: { $exists: false } }).data
                     include includes/widgets/home/postList
             include includes/mixins/pagination
         include includes/widgets/aside/aside

package/package.json

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

package/plugins.yml

@@ -15,10 +15,18 @@ twikoo:
   file: dist/twikoo.all.min.js
   version: 1.6.31
 waline_js:
-  name: '@waline/client'
+  name: 'waline'
   file: dist/waline.js
   other_name: waline
-  version: 2.15.8
+  version: 3.1.3
+waline_css:
+  name: 'waline'
+  file: dist/waline.css
+  version: 3.1.3
+valine:
+  name: valine
+  file: dist/Valine.min.js
+  version: 1.5.1
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js
@@ -97,4 +105,8 @@ fancyapps_css:
 mermaid_js:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 10.8.0
+  version: 10.8.0
+blueimp_md5:
+  name: blueimp-md5
+  file: js/md5.min.js
+  version: 2.19.0

package/scripts/event/cdn.js

@@ -54,9 +54,9 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/tw_cn.js',
             version
         },
-        sco_ai_js: {
+        efu_ai: {
             name: 'hexo-theme-solitude',
-            file: 'js/third_party/sco-ai.min.js',
+            file: 'js/third_party/efu_ai.min.js',
             version
         },
         twikoo_commentBarrage: {
@@ -69,6 +69,11 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/commentBarrage/waline.js',
             version
         },
+        valine_commentBarrage: {
+            name: 'hexo-theme-solitude',
+            file: 'js/commentBarrage/valine.js',
+            version
+        },
         waterfall: {
             name: 'hexo-theme-solitude',
             file: 'js/third_party/waterfall.min.js',

package/scripts/event/init.js

@@ -5,13 +5,15 @@ hexo.extend.filter.register('before_generate', () => {
     const logger = hexo.log;
     const config = hexo.config;
 
-    if (hexoVer < 6.3) {
-        logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！');
+    if (hexoVer < 7.0) {
+        logger.error('请把 Hexo 升级到 V7.0.0 或更高的版本！');
+        logger.error('Please upgrade your Hexo to V7.0.0 or higher!');
         process.exit(-1);
     }
 
     if (Number(majorVer) < 14) {
         logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
+        logger.error('Please upgrade Node.js to v14.0.0 or later!');
         process.exit(-1);
     }
 });

package/scripts/event/merge_config.js

@@ -129,7 +129,8 @@ hexo.extend.filter.register('before_generate', () => {
             randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
         }, keyboard: {
             enable: false, list: []
-        }, lazyload: {
+        }
+        ,lazyload: {
             enable: false, field: 'site', placeholder: '/img/loading.gif', errorimg: '/img/error_load.png'
         }, loading: {
             fullpage: false, pace: true,
@@ -150,7 +151,7 @@ hexo.extend.filter.register('before_generate', () => {
             enable: true,
             copyright: {
                 enable: false,
-                limit_count: 50
+                limit: 50
             }
         }
         , post_ai: {
@@ -164,7 +165,7 @@ hexo.extend.filter.register('before_generate', () => {
             enable: false, per_page: false, copytex: false,
         }, comment: {
             enable: false,
-            type: 'twikoo',
+            type: '',
             commentBarrage: false,
             newComment: false,
             randomInfoStart: [`baby's`, `little`, `my`,],
@@ -180,8 +181,8 @@ hexo.extend.filter.register('before_generate', () => {
             font: {
                 'font-size': '16px',
                 'code-font-size': '16px',
-                'font-family': '"PingFang SC","Hiragino Sans GB","Microsoft YaHei"',
-                'code-font-family': '"monospace", "monospace"',
+                'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei',
+                'code-font-family': 'monospace, monospace',
             },
             extends: {
                 head: [], body: [],

package/scripts/helper/related_post.js

@@ -5,7 +5,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     const config = hexo.theme.config
     const limitNum = config.related_post.limit || 6
     const dateType = config.related_post.date_type || 'created'
-    const headlineLang = this._p('喜欢这篇的人也看了')
+    const headlineLang = this._p('star')
 
     currentPost.tags.forEach(function (tag) {
         allPosts.forEach(function (post) {
@@ -36,7 +36,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     relatedPosts.sort(compare('weight', dateType))
 
     let result = '<div class="relatedPosts">'
-    result += `<div class="headline"><i class="solitude st-star-smile-fill"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">随便逛逛</a></div></div>`
+    result += `<div class="headline"><i class="solitude st-star-smile-fill"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a></div></div>`
     result += '<div class="relatedPosts-list">'
 
     for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {

package/scripts/tags/tabs.js

@@ -1,6 +1,6 @@
 /**
  * Tabs
- * from butterfly
+ * from solitude
  */
 
 'use strict'

package/source/css/_comments/{index.styl → comment.styl}

@@ -72,21 +72,6 @@ div#post-comment
       a:hover
         color var(--efu-main)
 
-  .comment-tips
-    background-color rgba(103, 194, 58, 0.13)
-    border var(--style-border-always)
-    border-color var(--efu-green)
-    color var(--efu-green)
-    border-radius 8px
-    padding 8px 12px
-    margin-top 0.5rem
-    display none
-    width 100%
-
-    &.show
-      display flex
-      font-weight 700
-
   blockquote
     background var(--efu-secondbg)
     border var(--style-border)
@@ -104,14 +89,6 @@ div#post-comment
     flex-wrap wrap
     position relative
 
-.comment-randomInfo
-  margin-left auto
-  font-size 13px
-
-  &:hover
-    a
-      color var(--efu-theme)
-
 #owo-big
   position fixed
   align-items center
@@ -123,4 +100,7 @@ div#post-comment
   transform translate(0, -105%)
   overflow hidden
   animation owoIn .3s cubic-bezier(.42,0,.3,1.11)
-  padding 1rem
+  padding 1rem
+
+@import 'twikoo.styl' when hexo-config('comment.type') == 'twikoo'
+@import 'valine.styl' when hexo-config('comment.type') == 'valine'

package/source/css/_comments/valine.styl

@@ -0,0 +1,245 @@
+#comment
+  .vcount
+    display none !important
+
+  .vpreview-btn
+    display none
+
+  .vemoji-btn
+    position absolute
+    bottom 4.5px
+    left 50px
+
+  .vpanel
+    display flex
+    flex-direction column
+    position relative
+
+    .vemojis
+      display: none;
+      position: absolute;
+      left: 0;
+      right: 0;
+      max-width: 500px;
+      color: #4a4a4a;
+      border: 1px solid rgba(144, 147, 153, 0.31);
+      top: 6.7rem
+      z-index: 1000;
+      animation: .3s ease .1s 1 normal both running donate_effcet
+      width: 500px;
+      border: var(--style-border-always)
+      border-radius: 8px !important;
+      overflow: hidden;
+      background-color: var(--efu-maskbg)
+      backdrop-filter: saturate(180%) blur(10px);
+      transform: translateZ(0);
+      overflow-y: auto;
+      padding: 10px;
+
+  .vwrap
+    flex 1
+    display flex
+    border none !important
+    padding 0
+    overflow: inherit;
+    flex-direction column-reverse
+
+    .vheader
+      display flex
+      margin .5rem 0
+      position relative
+      width calc(100% - 5.5rem)
+      gap .5rem
+
+      +maxWidth768()
+        flex-direction column
+
+      input
+        border-radius 12px
+        width calc((100% - 1rem) / 3)
+        flex 1
+        position relative
+        font-size 13px
+        background var(--efu-secondbg)
+        border var(--style-border-always)
+        padding 6px 10px
+        line-height 1
+
+        +maxWidth768()
+          width 100%
+
+  .vquote
+
+    .vcard
+      background: var(--efu-card-bg);
+      border none
+      border-top: var(--style-border-dashed);
+      border-radius: 12px;
+      transition: .3s;
+      padding: 1rem 0 0;
+      margin-top: 0;
+      box-shadow: none;
+
+  .vreply-wrapper
+
+    .vrow .vcol:first-child
+      bottom 78px
+
+      +maxWidth768()
+        bottom 164px
+
+    .vrow .vcol.text-right:not(.vctrl)
+      bottom 31px
+
+      +maxWidth768()
+        bottom 117px
+
+    .cancel-reply
+      display flex !important
+      flex-direction row
+      justify-content center
+      margin 0
+
+    .cancel-reply-btn
+      position inherit
+
+  .vrow
+    padding 0
+
+    .vcol
+      position absolute
+
+      &:first-child
+        bottom 56px
+        left 20px
+        width auto
+
+        +maxWidth768()
+          bottom 141px
+
+      &.text-right:not(.vctrl)
+        bottom 9px
+        right 0
+        transition .3s
+        border 0 solid var(--efu-main)
+        width 5rem
+        margin-left .5rem
+        border-radius 12px
+        height 34px
+
+        +maxWidth768()
+          bottom 94px
+
+        button
+          background-color var(--efu-fontcolor)
+          width 100%
+          height 100%
+          color var(--efu-card-bg)
+          border-radius 12px
+          opacity .2
+
+          +maxWidth768()
+            height 119px
+
+      svg
+        width 18px
+        height 18px
+
+  #veditor
+    display block
+    padding 16px 16px 40px 16px
+    line-height 1.5
+    width 100%
+    font-size 14px
+    background var(--efu-secondbg)
+    color var(--efu-fontcolor)
+    border-radius 12px
+    min-height 121px
+    border var(--style-border-always)
+
+    &:focus
+      border var(--style-border-hover-always)
+      box-shadow var(--efu-shadow-main)
+
+  .vcard
+    margin-top: 0
+    margin-bottom: .5rem
+    background: var(--efu-card-bg);
+    transition: .3s;
+    border-radius: 12px;
+    padding: 0;
+    padding-top: .5rem;
+    border: none;
+    border-top: var(--style-border-dashed);
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+
+    +maxWidth768()
+      padding: 1rem;
+      border: var(--style-border-always);
+      box-shadow: var(--efu-shadow-border)
+
+    .vimg
+      width 32px
+      height 32px
+      border-radius 32px
+      cursor pointer
+      margin-right 16px
+
+      &:hover
+        transform: rotate(360deg)
+
+    .vh
+      flex 1
+      padding 0
+      border 0
+
+      .vhead
+        display flex
+        align-items center
+        gap: 5px;
+
+    .vnick
+      font-size 1rem
+      line-height 32px
+      margin-right 0
+
+    .vsys
+      background: var(--efu-card-bg);
+      border: var(--style-border-always);
+      padding: 3px 5px
+      border-radius: 8px;
+      color: var(--efu-secondtext)
+      display: inline
+      font-size: .5rem;
+
+    .vat
+      display: flex;
+      align-items: center;
+      color: var(--efu-lighttext)
+      padding: 3px 12px
+      transition: all .3s;
+      border-radius: 8px;
+      background-color: var(--efu-secondbg);
+      border: var(--style-border-always);
+      position: absolute;
+      right: 0;
+      bottom: 18px
+
+      &:hover
+        background-color: var(--efu-lighttext)
+        color: var(--efu-card-bg)
+
+  .vquote
+    border-left none
+
+  .vicon.actived
+    fill var(--efu-main)
+
+#page
+  .vcard
+    padding: 1rem 1rem 1.5rem;
+    border: var(--style-border);
+    border-top: var(--style-border);
+    box-shadow: var(--efu-shadow-border);

package/source/css/_global/index.styl

@@ -66,6 +66,9 @@ body
   line-height 2
   -webkit-tap-highlight-color transparent
   margin 0
+  if !hexo-config('copy.enable')
+    user-select none
+    -webkit-user-select none
 
 *
   box-sizing border-box