hexo-theme-solitude 1.0.0 → 1.1.3

package/layout/partial/compoment/post/postMeta.ejs

@@ -8,11 +8,11 @@
                 <%= page.cc %>
             </a>
             <% if (page.categories.data.length) { %>
-            <span class="post-meta-categories">
-                <% page.categories.data.forEach(item => { %>
-                    <a class="post-meta-categories" href="<%= url_for(item.path) %>"><%= item.name %></a>
-                <% }) %>
-            </span>
+                <span class="post-meta-categories">
+                    <% page.categories.data.forEach(item => { %>
+                        <a class="post-meta-categories" href="<%= url_for(item.path) %>"><%= item.name %></a>
+                    <% }) %>
+                </span>
             <% } %>
             <div class="tag_share">
                 <div class="post-meta__tag-list">
@@ -29,55 +29,57 @@
     <h1 class="post-title"><%= page.title %></h1>
     <div id="post-meta">
         <div class="meta-secondline">
-            <span class="post-meta-date" title="发布于">
-                <i class="post-meta-icon ri-calendar-todo-fill"></i>
+            <% if(theme.post.meta.date){ %>
+                <span class="post-meta-date" title="发布于">
+                <i class="post-meta-icon scoicon sco-calendar-todo-fill"></i>
                 <time datetime="<%= moment(page.date).format() %>"></time>
             </span>
+            <% } %>
             <% if(theme.post.meta.updated){ %>
                 <span class="post-meta-date" title="更新于">
-                    <i class="post-meta-icon ri-refresh-line"></i>
+                    <i class="post-meta-icon scoicon sco-refresh-line"></i>
                     <time datetime="<%= moment(page.updated).format() %>"></time>
                 </span>
             <% } %>
             <% if(theme.post.meta.locate){ %>
                 <span class="post-meta-position" title="作者IP归属地为<%= page.locate %>">
-                    <i class="post-meta-icon ri-map-pin-fill"></i>
+                    <i class="post-meta-icon scoicon sco-map-pin-fill"></i>
                     <span><%= page.locate %></span>
                 </span>
             <% } %>
             <% if(theme.thirdparty.wordcount){ %>
                 <% if(theme.post.meta.wordcount){ %>
                     <span class="post-meta-wordcount">
-                        <i class="ri-file-word-fill post-meta-icon" title="文章字数"></i>
+                        <i class="scoicon sco-word-fill post-meta-icon" title="文章字数"></i>
                         <span class="word-count"><%= wordcount(page.content) %></span>
                     </span>
                 <% } %>
                 <% if(theme.post.meta.readtime){ %>
                     <span class="post-meta-time">
-                        <i class="ri-time-fill post-meta-icon" title="阅读耗时"></i>
+                        <i class="scoicon sco-clock-fill post-meta-icon" title="阅读耗时"></i>
                         <span><%= min2read(page.content) %> min</span>
                     </span>
                 <% } %>
             <% } %>
             <% if(theme.thirdparty.busuanzi.enable && theme.post.meta.pv){ %>
                 <span class="post-meta-pv" title="文章热度">
-                    <i class="ri-fire-fill post-meta-icon"></i>
+                    <i class="scoicon sco-fire-fill post-meta-icon"></i>
                     <% if(theme.thirdparty.busuanzi.usecomment){ %>
-                        <span id="twikoo_visitors"><i class="ri-loader-2-fill"></i></span>
+                        <span id="twikoo_visitors"><i class="scoicon sco-loading-line"></i></span>
                     <% }else{ %>
-                        <span id="busuanzi_value_page_pv"><i class="ri-loader-2-fill"></i></span>
-                    <% } %>        
+                        <span id="busuanzi_value_page_pv"><i class="scoicon sco-loading-line"></i></span>
+                    <% } %>
                 </span>
             <% } %>
             <% if(theme.post.meta.comment && page.comment){ %>
                 <span class="post-meta-commentcount" title="评论数">
-                    <i class="ri-message-fill"></i>
+                    <i class="scoicon sco-chat-fill"></i>
                     <a href="#post-comment">
-                        <span id="twikoo-count"><i class="ri-loader-2-fill"></i></span>
+                        <span id="twikoo-count"><i class="scoicon sco-loading-line"></i></span>
                     </a>
                 </span>
-            <% } %>    
+            <% } %>
         </div>
     </div>
 </div>
-<%- partial('partial/compoment/post/wave', {cache: true}) %>
+<%- partial('partial/compoment/post/wave', {cache: true}) %>

package/layout/partial/compoment/says/saysBottom.ejs

@@ -1,18 +1,18 @@
 <div class="bber-bottom">
     <div class="bber-info">
         <div class="bber-info-time">
-            <i class="ri-time-fill"></i>
+            <i class="scoicon sco-calendar-todo-fill"></i>
             <time class="datetime" datetime="<%= moment(item.date).format() %>"></time>
         </div>
         <% if(item.link){ %>
             <a class="bber-content-link" href="<%= url_for(item.link) %>" title="跳转到短文指引的链接">
-                <i class="ri-link-m"></i>
+                <i class="scoicon sco-link-m-line"></i>
                 链接
             </a>   
         <% } %> 
     </div>
     <a class="bber-reply" onclick="sco.toTalk('<%- item.content %>')" >
-        <i class="ri-message-3-fill" style="font-size: 1rem;">
+        <i class="scoicon sco-chat-fill" style="font-size: 1rem;">
         </i>
       </a>
 </div>

package/layout/partial/compoment/says/saysContent.ejs

@@ -5,7 +5,6 @@
             <% item.image.forEach(img => { %>
                 <img src="<%= img %>" title="即刻短文配图">
             <% }); %>
-            </a>
         </div>
     <% } %>
 </div>

package/layout/partial/compoment/says/saysFunction.ejs

@@ -0,0 +1,15 @@
+<% if(item.aplayer){ %>
+<div class="bber-music">
+    <meting-js server="<%= item.aplayer.server %>" type="song" id="<%= item.aplayer.id %>" mutex="true" preload="none" theme="var(--sco-main)" data-lrctype="0"></meting-js>
+</div>
+<% } %>
+<% if(item.video){ %>
+<div class="bber-video">
+    <% if(item.video.player){ %>
+        <video src="<%= item.video.player %>" controls="controls" style="object-fit: cover;"></video>
+    <% } %>
+    <% if(item.video.bilibili){ %>
+        <iframe src="<%= item.video.bilibili %>" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
+    <% } %>
+</div>
+<% } %>

package/layout/partial/compoment/third-party/comments/comment.ejs

@@ -1,7 +1,7 @@
 <div id="post-comment" view-image>
     <div class="comment-head">
         <div class="comment-headline">
-            <i class="scoicon ri-message-fill"></i>
+            <i class="scoicon sco-chat-fill"></i>
             <span> 评论</span>
         </div>
     </div>

package/layout/partial/compoment/third-party/comments/twikoo.ejs

@@ -6,7 +6,8 @@
                 el: '#comment',
                 onCommentLoaded: function() {
                     GLOBALCONFIG.lightbox && sco.lightbox('#article-container img, #twikoo .tk-content img:not(.tk-owo-emotion)')
-                }
+                },
+                lang: '<%= theme.comment.twikoo.lang %>',
             }
         )
         await twikoo.init(initOptions)

package/layout/partial/compoment/third-party/search/algolia-search.ejs

@@ -3,7 +3,7 @@
         <nav class="search-nav">
             <span class="search-dialog-title">搜索</span>
             <button class="search-close-button">
-                <i class="ri-time-fill"></i>
+                <i class="scoicon sco-close-fill"></i>
             </button>
         </nav>
         <div class="search-wrap">
@@ -12,7 +12,7 @@
                 <div id="algolia-hits">
                 </div>
                 <div class="algolia-stats"></div>
-                <div class="algolia-poweredBy" style="display: none"></div>
+                <div class="algolia-poweredBy"></div>
             </div>
         </div>
     </div>

package/layout/partial/compoment/third-party/search/local-search.ejs

@@ -3,11 +3,11 @@
         <nav class="search-nav">
             <span class="search-dialog-title">搜索</span>
             <button class="search-close-button">
-                <i class="ri-time-fill"></i>
+                <i class="scoicon sco-close-fill"></i>
             </button>
         </nav>
         <div id="loading-database">
-            <i class="ri-loader-2-fill"></i>
+            <i class="scoicon sco-loading-line"></i>
             <span>加载中</span>
         </div>
         <div class="search-wrap">

package/layout/partial/console.ejs

@@ -1,6 +1,6 @@
 <div id="console" style="zoom: 1;" class="">
     <div class="close-btn" onclick="sco.hideConsole()" href="javascript:void(0);">
-        <i class="ri-close-fill"></i>
+        <i class="scoicon sco-close-fill"></i>
     </div>
     <% if(theme.thirdparty.consolePlus){ %>
         <div class="console-card-group">
@@ -39,13 +39,19 @@
         <div class="console-btn-item">
             <a class="darkmode_switchbutton" onclick="sco.switchDarkMode()" title="显示模式切换"
                href="javascript:void(0);" rel="external nofollow" data-pjax-state="">
-                <i class="ri-contrast-2-fill" style="font-size: 1rem;"></i>
+                <i class="scoicon sco-moon-clear-fill" style="font-size: 1rem;"></i>
+            </a>
+        </div>
+        <div class="console-btn-item" id="consoleHideAside">
+            <a class="asideSwitch" onclick="sco.switchHideAside()" title="边栏显示控制"
+               href="javascript:void(0);" rel="external nofollow" data-pjax-state="">
+                <i class="scoicon sco-side-bar-fill" style="font-size: 1rem;"></i>
             </a>
         </div>
         <% if(theme.thirdparty.aplayer.enable){ %>
             <div class="console-btn-item" id="consoleMusic" onclick="sco.musicToggle()" title="音乐开关">
                 <a class="music-switch">
-                    <i class="ri-disc-fill"></i>
+                    <i class="scoicon sco-disc-fill"></i>
                 </a>
             </div>
         <% } %>
@@ -53,7 +59,7 @@
             <div class="console-btn-item on" id="consoleCommentBarrage" onclick="sco.switchCommentBarrage()"
                  title="热评开关">
                 <a class="commentBarrage">
-                    <i class="ri-message-3-fill"></i>
+                    <i class="scoicon sco-chat-fill"></i>
                 </a>
             </div>
         <% }%>

package/layout/partial/footer.ejs

@@ -44,7 +44,7 @@
             <div class="footer-title-group">
                 <h3 class="footer-title">友链</h3>
                 <a class="random-friends-btn" href="javascript:randomLinksList();" rel="external nofollow">
-                    <i class="ri-refresh-line"></i>
+                    <i class="scoicon sco-refresh-line"></i>
                 </a>
             </div>
             <div class="footer-links" id="friend-links-in-footer">
@@ -83,10 +83,10 @@
                 </a>
             <% } %>
             <a class="footer-bar-link cc" href="<%- theme.footer.license.url %>" target="_self" rel="external nofollow">
-                <i class="ri-copyright-line"></i>
-                <i class="ri-creative-commons-by-line"></i>
-                <i class="ri-creative-commons-nc-line"></i>
-                <i class="ri-creative-commons-nd-line"></i>
+                <i class="scoicon sco-copyright-line"></i>
+                <i class="scoicon sco-creative-commons-by-line"></i>
+                <i class="scoicon sco-creative-commons-nc-line"></i>
+                <i class="scoicon sco-creative-commons-nd-line"></i>
             </a>
         </div>
     </div>
@@ -96,12 +96,14 @@
     <div class="cookies-window-content">
         <span class="cookies-tip">查看本站为你的个人隐私做出的努力</span>
         <a class="cookies-link" href="/privacy/" title="本站如何保护你的隐私" data-pjax-state="">
-            <i class="heofont icon-arrow-right-circle-fill"></i>
+            <i class="scoicon sco-arrow-right-circle-fill"></i>
         </a>
     </div>
 </div>
-<div class="comment-barrage">
-</div>
+<% if(theme.post.award.enable){%>
+    <div id="quit-box" onclick="RemoveRewardMask()" style="display: none"></div>
+<%} %>
 <% if(theme.comment.enable){ %>
-    <%- js('/js/commentBarrage') %>
+    <div class="comment-barrage">
+    </div>
 <% } %>

package/layout/partial/nav.ejs

@@ -3,7 +3,7 @@
         <div id="blog_name">
             <% if(theme.nav.left.enable){ %>
                 <div class="back-home-button" tabindex="-1">
-                    <i class="back-home-button-icon scoicon ri-apps-fill"></i>
+                    <i class="back-home-button-icon scoicon sco-more-fill"></i>
                     <%- partial('partial/compoment/nav/left') %>
                 </div>
             <% } %>
@@ -11,7 +11,7 @@
                     <% if (theme.site.name.class === 'i_class') { %>
                         <i class="<%= theme.site.name.custom %>" style="font-size: 16px;"></i>
                       <% } else if (theme.site.name.class === 'img') { %>
-                        <i style="background-image: url('<%= url_for(theme.site.name.custom) %>')"></i>
+                        <img src="<%= url_for(theme.site.name.custom) %>"></img>
                       <% } else if (theme.site.name.class === 'text') { %>
                         <span class="scoicon"><%= theme.site.name.custom %></span>
                     <% } %>

package/layout/partial/sidebar.ejs

@@ -5,7 +5,7 @@
         <div class="sidebar-menu-item">
             <a class="darkmode_switchbutton menu-child" onclick="sco.switchDarkMode()" title="显示模式切换"
                href="javascript:void(0);" rel="external nofollow">
-                <i class="scoicon ri-contrast-2-fill" style="font-size: 1rem;"></i>
+                <i class="scoicon sco-moon-clear-fill" style="font-size: 1rem;"></i>
                 <span>显示模式</span>
             </a>
         </div>
@@ -16,7 +16,7 @@
         <span class="sidebar-menu-item-title">标签</span>
         <div class="card-widget card-tags card-archives card-webinfo card-allinfo">
             <div class="item-headline">
-                <i class="scoicon ri-price-tag-3-fill"></i>
+                <i class="scoicon sco-price-tag-fill"></i>
                 <span>标签</span>
             </div>
             <div class="card-tag-cloud">

package/layout/post.ejs

@@ -19,7 +19,9 @@
             </div>
         </div>
 
-        <%- partial('partial/compoment/post/postNav') %>
+        <% if(site.posts.length > 1){ %>
+            <%- partial('partial/compoment/post/postNav') %>
+        <% } %>
 
         <%- related_posts(page, site.posts) %>
 
@@ -30,7 +32,21 @@
 
     <%- partial('partial/compoment/aside/aside') %>
 
-    <% if(theme.ai.enable){ %>
-        <script type="text/javascript" src="/js/post_ai.js"></script>
+    <% if(theme.thirdparty.ai.enable){ %>
+        <script data-pjax defer>
+            // AI构造函数
+            new ChucklePostAI({
+                /* 必须配置 */
+                // 文章内容所在的元素属性的选择器，也是AI挂载的容器，AI将会挂载到该容器的最前面
+                el: '#post #article-container',
+                // 驱动AI所必须的key，即是tianliGPT后端服务所必须的key
+                key: '<%= theme.thirdparty.ai.key %>',
+                /* 非必须配置，但最好根据自身需要进行配置 */
+                // 文章标题所在的元素属性的选择器，默认获取当前网页的标题
+                title_el: '.post-title',
+                // 文章推荐方式，all：匹配数据库内所有文章进行推荐，web：仅当前站内的文章，默认all
+                rec_method: '<%= theme.thirdparty.ai.rec_method || 'web' %>',
+            })
+        </script>
     <% } %>
 </main>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.0.0",
-  "description": "A beautiful, powerful, and efficient Hexo theme developed by the hexo-theme-Solitude team",
+  "version": "1.1.3",
+  "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -14,11 +14,10 @@
     "theme",
     "hexo-theme-solitude"
   ],
-  "author": "Hexo-Theme-Solitude <wleelw@sondy.top>",
+  "author": "Hexo-Theme-Solitude<admin@wzsco.top>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/DuoSco/Hexo-theme-solitude/issues"
   },
-  "homepage": "https://github.com/DuoSco/hexo-theme-solitude#readme",
-  "main": "index.js"
+  "homepage": "https://github.com/DuoSco/hexo-theme-solitude#readme"
 }

package/scripts/event/welcome.js

@@ -2,14 +2,13 @@ hexo.on('ready', () => {
   const { version } = require('../../package.json')
   hexo.log.info(`
   ===================================================================
-      #####  #    #  ####  #####  ######   ##   #####
-      #    # #    # #    # #    # #       #  #  #    #
-      #####  #    # #      #####  ###### #    # ######
-      #    # #    # #  ### #    # #      ###### #  #
-      #    # #    # #    # #    # #      #    # #   #
-      #####   ####    ###  #####  ###### #    # #    #
+       #####  ####  #     #####  ###### #     # ######   ######
+      #      #    # #       #      #    #     # #      # #
+       ##### #    # #       #      #    #     # #      # ######
+           # #    # #       #      #    #     # #      # #
+      ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
   主题链接：https://github.com/DuoSco/Hexo-theme-solitude
-  主题开发：王卓Sco`)
+  `)
 })

package/scripts/helper/charts.js

@@ -1,38 +1,41 @@
-const cheerio = require('cheerio')
-const moment = require('moment')
-
 hexo.extend.filter.register('after_render:html', function (locals) {
-    const $ = cheerio.load(locals)
-    const post = $('#posts-chart')
-    const tag = $('#tags-chart')
-    const category = $('#categories-chart')
-    const htmlEncode = false
+    try {
+        const cheerio = require('cheerio')
+        const $ = cheerio.load(locals)
+        const post = $('#posts-chart')
+        const tag = $('#tags-chart')
+        const category = $('#categories-chart')
+        const htmlEncode = false
 
-    if (post.length > 0 || tag.length > 0 || category.length > 0) {
-        if (post.length > 0 && $('#postsChart').length === 0) {
-            if (post.attr('data-encode') === 'true') htmlEncode = true
-            post.after(postsChart(post.attr('data-start')))
-        }
-        if (tag.length > 0 && $('#tagsChart').length === 0) {
-            if (tag.attr('data-encode') === 'true') htmlEncode = true
-            tag.after(tagsChart(tag.attr('data-length')))
-        }
-        if (category.length > 0 && $('#categoriesChart').length === 0) {
-            if (category.attr('data-encode') === 'true') htmlEncode = true
-            category.after(categoriesChart(category.attr('data-parent')))
-        }
+        if (post.length > 0 || tag.length > 0 || category.length > 0) {
+            if (post.length > 0 && $('#postsChart').length === 0) {
+                if (post.attr('data-encode') === 'true') htmlEncode = true
+                post.after(postsChart(post.attr('data-start')))
+            }
+            if (tag.length > 0 && $('#tagsChart').length === 0) {
+                if (tag.attr('data-encode') === 'true') htmlEncode = true
+                tag.after(tagsChart(tag.attr('data-length')))
+            }
+            if (category.length > 0 && $('#categoriesChart').length === 0) {
+                if (category.attr('data-encode') === 'true') htmlEncode = true
+                category.after(categoriesChart(category.attr('data-parent')))
+            }
 
-        if (htmlEncode) {
-            return $.root().html().replace(/&#/g, '&#')
+            if (htmlEncode) {
+                return $.root().html().replace(/&#/g, '&#')
+            } else {
+                return $.root().html()
+            }
         } else {
-            return $.root().html()
+            return locals
         }
-    } else {
-        return locals
+    } catch (e) {
+
     }
 }, 15)
 
-function postsChart (startMonth) {
+function postsChart(startMonth) {
+    const moment = require('moment')
     const startDate = moment(startMonth || '2020-01')
     const endDate = moment()
 
@@ -164,12 +167,14 @@ function postsChart (startMonth) {
   </script>`
 }
 
-function tagsChart (len) {
+function tagsChart(len) {
     const tagArr = []
     hexo.locals.get('tags').map(function (tag) {
-        tagArr.push({ name: tag.name, value: tag.length, path: tag.path })
+        tagArr.push({name: tag.name, value: tag.length, path: tag.path})
+    })
+    tagArr.sort((a, b) => {
+        return b.value - a.value
     })
-    tagArr.sort((a, b) => { return b.value - a.value })
 
     const dataLength = Math.min(tagArr.length, len) || tagArr.length
     const tagNameArr = []
@@ -285,7 +290,7 @@ function tagsChart (len) {
   </script>`
 }
 
-function categoriesChart (dataParent) {
+function categoriesChart(dataParent) {
     const categoryArr = []
     let categoryParentFlag = false
     hexo.locals.get('categories').map(function (category) {
@@ -299,8 +304,11 @@ function categoriesChart (dataParent) {
         })
     })
     categoryParentFlag = categoryParentFlag && dataParent === 'true'
-    categoryArr.sort((a, b) => { return b.value - a.value })
-    function translateListToTree (data, parent) {
+    categoryArr.sort((a, b) => {
+        return b.value - a.value
+    })
+
+    function translateListToTree(data, parent) {
         let tree = []
         let temp
         data.forEach((item, index) => {
@@ -316,7 +324,10 @@ function categoriesChart (dataParent) {
         })
         return tree
     }
-    const categoryNameJson = JSON.stringify(categoryArr.map(function (category) { return category.name }))
+
+    const categoryNameJson = JSON.stringify(categoryArr.map(function (category) {
+        return category.name
+    }))
     const categoryArrJson = JSON.stringify(categoryArr)
     const categoryArrParentJson = JSON.stringify(translateListToTree(categoryArr, '0'))
 

package/scripts/helper/randomLinks.js

@@ -12,5 +12,5 @@ hexo.extend.helper.register('randomLinks', function(){
             })
         }
     });
-    return `<script>const links=${JSON.stringify(links)};function travelling(){const link=links[utils.randomNum(links.length)];utils.snackbarShow('您即将前往 ⌈ '+link.name+' ⌋ , 安全性未知',false,3000);setTimeout(()=>{window.open(link.link,"_blank")},3000)};function randomLinksList(){let data='';for(let i=1;i<=3;i++){const link=links[utils.randomNum(links.length)];data+='<a class="footer-item" href="'+link.link+'" target="_blank" rel="noopener nofollow">'+link.name+'</a>'};document.getElementById('friend-links-in-footer').innerHTML=data + '<a class="footer-item" href="/links/">更多</a>'};</script>`
+    return `<script>const links=${JSON.stringify(links)};function travelling(){const link=links[utils.randomNum(links.length)];utils.snackbarShow('您即将前往 ⌈ '+link.name+' ⌋ , 安全性未知',false,3000);setTimeout(()=>{window.open(link.link,"_blank")},3000)};function randomLinksList(){let data='';let linksCopy = [...links];let count = Math.min(3, linksCopy.length);for (let i = 0; i < count; i++) {let index = utils.randomNum(linksCopy.length);const link = linksCopy[index];data += '<a class="footer-item" href="' + link.link + '" target="_blank" rel="noopener nofollow">' + link.name + '</a>';linksCopy.splice(index, 1);}document.getElementById('friend-links-in-footer').innerHTML = data + '<a class="footer-item" href="/links/">更多</a>';};</script>`
 })

package/scripts/helper/related_post.js

@@ -1,5 +1,5 @@
 /**
- * Butterfly
+ * Solitude
  * Related Posts
  * According the tag
  */
@@ -42,11 +42,11 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     const dateType = config.related_post.date_type || 'created'
     const headlineLang = this._p('喜欢这篇的人也看了')
 
-    relatedPosts = relatedPosts.sort(compare('weight'))
+    relatedPosts = relatedPosts.sort(compare('weight', dateType))
 
     if (relatedPosts.length > 0) {
         result += '<div class="relatedPosts">'
-        result += `<div class="headline"><i class="ri-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="scoicon sco-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="relatedPosts-list">'
 
         for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
@@ -82,10 +82,17 @@ function findItem(arrayToSearch, attr, val) {
     return -1
 }
 
-function compare(attr) {
+function compare(attr, dateType) {
     return function (a, b) {
         const val1 = a[attr]
         const val2 = b[attr]
+        if (val1 === val2) {
+            if (dateType === 'created') {
+                return b.created - a.created
+            } else if (dateType === 'updated') {
+                return b.updated - a.updated
+            }
+        }
         return val2 - val1
     }
 }

package/scripts/helper/themeJsExport.js

@@ -1,5 +1,5 @@
-hexo.extend.helper.register('export_config', function() {
-    const { config, theme } = this, lang = hexo.theme.i18n.get(config.language || 'zh-CN')
+hexo.extend.helper.register('export_config', function () {
+    const {config, theme} = this, lang = hexo.theme.i18n.get(config.language || 'zh-CN')
     let exportGlobalConfig = {
         root: config.root,
         runtime: theme.aside.siteinfo.runtimeenable ? theme.aside.siteinfo.runtime : false,
@@ -47,17 +47,19 @@ hexo.extend.helper.register('export_config', function() {
         covercolor: theme.post.covercolor.enable,
         comment: {
             enable: theme.comment.enable,
-            twikooUrl: theme.comment.twikoo.envId
-
-        }
+            twikooUrl: theme.comment.twikoo.envId,
+            twikooAccessToken: theme.comment.twikoo.accessToken
+        },
     }
 
     // 搜索数据
-    if(theme.thirdparty.search.local_search.enable)exportGlobalConfig = Object.assign(exportGlobalConfig, {localsearch: {
-        preload: theme.thirdparty.search.local_search.preload,
-        path: theme.thirdparty.search.local_search.path || '/search.xml'
-    }})
-    if(theme.thirdparty.search.algolia_search.enable)exportGlobalConfig = Object.assign(exportGlobalConfig, {
+    if (theme.thirdparty.search.local_search.enable) exportGlobalConfig = Object.assign(exportGlobalConfig, {
+        localsearch: {
+            preload: theme.thirdparty.search.local_search.preload,
+            path: theme.thirdparty.search.local_search.path || '/search.xml'
+        }
+    })
+    if (theme.thirdparty.search.algolia_search.enable) exportGlobalConfig = Object.assign(exportGlobalConfig, {
         algolia: {
             appId: config.algolia.appId,
             apiKey: config.algolia.apiKey,

package/scripts/tags/fold.js

@@ -7,10 +7,9 @@
 
 function postTabs(args, content) {
     const title = args[0] ? args[0] : ""
-    const date = args[1] ? args[1] : ""
-    const open = args[2] ? args[2] : ""
+    const open = args[1] ? args[1] : ""
 
-    return `<details ${open}><summary>${title + " " + date}</summary><div class="content">${hexo.render.renderSync({
+    return `<details ${open}><summary>${title}</summary><div class="content">${hexo.render.renderSync({
         text: content,
         engine: 'markdown'
     })}</div></details>`

package/scripts/tags/note.js

@@ -1,3 +1,7 @@
-hexo.extend.tag.register('note', function(type, content){
-    return `<div class="note ${type}">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div>`
+hexo.extend.tag.register('note', function (types, content) {
+    let type = ""
+    for (let i = 0; i < types.length; i++) {
+        type += " " + types[i]
+    }
+    return `<div class="note ${type}">${hexo.render.renderSync({text: content, engine: 'markdown'})}</div>`
 }, {ends: true});