hexo-theme-solitude 1.1.0 → 1.1.3

package/layout/page/rss.ejs

@@ -1,37 +1,39 @@
 <main class="layout hide-aside" id="content-inner">
     <div id="page">
         <div class="rss-plan-list">
-            <a class="rss-plan-item rss-plan-wechat" href="<%- theme.footer.rss.wechatOA %>" title="公众号" target="_blank">
+            <a class="rss-plan-item rss-plan-wechat" href="<%- theme.footer.rss.wechatOA %>" title="公众号"
+               target="_blank">
                 <div class="rss-plan-description">推送精选文章<br>推送全文</div>
                 <div class="rss-plan-info-group">
                     <div class="rss-plan-title">公众号订阅</div>
                     <div class="rss-plan-info">推荐的订阅方式</div>
                     <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d14a4de78.png" alt="wechat">
                 </div>
-            </a><a class="rss-plan-item rss-plan-mail" href="<%- theme.footer.rss.emailOA %>" rel="external nofollow"
-                   title="竹白" target="_blank">
+            </a>
+            <a class="rss-plan-item rss-plan-mail" href="<%- theme.footer.rss.emailOA %>" rel="external nofollow"
+               title="email" target="_blank">
                 <div class="rss-plan-description">推送全部文章<br>推送封面与简介</div>
                 <div class="rss-plan-info-group">
                     <div class="rss-plan-title">邮件订阅</div>
                     <div class="rss-plan-info">推荐的订阅方式</div>
-                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d16c3ea22.png" alt="wechat">
+                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d16c3ea22.png" alt="email">
                 </div>
             </a><a class="rss-plan-item rss-plan-rss" href="<%- theme.footer.rss.rssOA %>" title="rss" target="_blank">
                 <div class="rss-plan-description">推送全部文章<br>推送简介</div>
                 <div class="rss-plan-info-group">
                     <div class="rss-plan-title">RSS</div>
                     <div class="rss-plan-info">备用订阅方式</div>
-                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d184e2a09.png" alt="wechat">
+                    <img class="rss-plan-icon" src="https://bu.dusays.com/2023/11/01/6541d184e2a09.png" alt="rss">
                 </div>
             </a></div>
-            <%- page.content %>
+        <%- page.content %>
 
         <% if(page.comment){ %>
             <%- partial('partial/compoment/third-party/comments/comment') %>
         <% } %>
     </div>
 
-    <% if(page.aside){%>
+    <% if(page.aside){ %>
         <%- partial('partial/compoment/aside/aside') %>
-    <%} %>
+    <% } %>
 </main>

package/layout/partial/compoment/about/award.ejs

@@ -24,7 +24,7 @@
             <% if(theme.post.award.enable){ %>
                 <div class="post-reward">
                     <div class="post-reward" onclick="AddRewardMask()"></div>
-                    <div class="reward-button" title="赞赏作者"><i class="heofont icon-hand-heart-fill"></i> 打赏作者
+                    <div class="reward-button" title="赞赏作者"><i class="scoicon sco-hand-heart-fill"></i> 打赏作者
                     </div>
                     <div class="reward-main">
                         <ul class="reward-all">

package/layout/partial/compoment/circle/angle.ejs

@@ -18,7 +18,7 @@
 </div>
 <script>
     var fdata = {
-        apiurl: "<%= theme.circle.api %>",
+        apiurl: "<%= theme.thirdparty.circle.api %>",
         defaultFish: 100,
         hungryFish: 100,
     }

package/layout/partial/compoment/circle/content.ejs

@@ -2,18 +2,18 @@
 <script>
     let UserConfig = {
         // 填写你的api地址
-        private_api_url: '<%= theme.circle.api %>',
+        private_api_url: '<%= theme.thirdparty.circle.api %>',
         // 默认加载文章数
-        page_init_number: <%= theme.circle.page_init_number%>,
+        page_init_number: <%= theme.thirdparty.circle.page_init_number%>,
         // 点击加载更多时，一次最多加载几篇文章，默认10
-        page_turning_number: <%= theme.circle.page_turning_number %>,
+        page_turning_number: <%= theme.thirdparty.circle.page_turning_number %>,
         // 头像加载失败时，默认头像地址
-        error_img: '<%= theme.circle.error_img %>',
+        error_img: '<%= theme.thirdparty.circle.error_img %>',
         // 进入页面时第一次的排序规则
-        sort_rule: '<%= theme.circle.sort_rule %>',
+        sort_rule: '<%= theme.thirdparty.circle.sort_rule %>',
         // 本地文章缓存数据过期时间（天）
-        expire_days: <%= theme.circle.expire_days %>,
+        expire_days: <%= theme.thirdparty.circle.expire_days %>,
     }
 </script>
-<script type="text/javascript" src="<%= theme.circle.appjs %>"></script>
-<script type="text/javascript" src="<%= theme.circle.bundlejs %>"></script>
+<%- js(theme.thirdparty.circle.appjs) %>
+<%- js(theme.thirdparty.circle.bundlejs) %>

package/layout/partial/compoment/dorakika/rightmenu.ejs

@@ -19,7 +19,7 @@
             <span>复制选中文本</span>
         </div>
         <div class="rightMenu-item" id="menu-pastetext">
-            <i class="heofont icon-clipboard-fill"></i>
+            <i class="scoicon sco-clipboard-fill"></i>
             <span>粘贴文本</span>
         </div>
         <a class="rightMenu-item" id="menu-commenttext" data-pjax-state="">

package/layout/partial/compoment/inject/body.ejs

@@ -36,9 +36,7 @@
         var meting_api = "<%- theme.thirdparty.aplayer.api %>";
     </script>
 <% } %>
-<% if(theme.post.covercolor && !theme.post.covercolor.local){ %>
-    <%- js('/js/extend/covercolor/web') %>
-<% }else{ %>
+<% if(theme.post.covercolor){ %>
     <%- js('/js/extend/covercolor/local') %>
 <% } %>
 

package/layout/partial/compoment/inject/head.ejs

@@ -56,11 +56,10 @@
                 }
             }
 
-            const DarkModeStatus = saveToLocal.get('theme')
-            if(DarkModeStatus !== undefined){
+            const DarkModeStatus = localStorage.getItem('theme')
+            if(DarkModeStatus !== null){
                 if(DarkModeStatus === 'dark'){
                     document.documentElement.setAttribute('data-theme', 'dark')
-
                 }else{
                     document.documentElement.setAttribute('data-theme', 'light')
                 }
@@ -79,6 +78,6 @@
 
     console.log("%c🔥 程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：DuoSco团队 | 官网：https://github.com/DuoSco/Hexo-theme-solitude 😋", "color:#fff; background: linear-gradient(270deg, #18d7d3, #68b7dd, #8695e6, #986fee); padding: 8px 15px; border-radius: 8px");
 </script>
-<% if(theme.ai.enable){ %>
+<% if(theme.thirdparty.ai.enable){ %>
     <%- js('/lib/chuckle-post-ai') %>
 <% } %>

package/layout/partial/compoment/links/angle.ejs

@@ -18,9 +18,9 @@
 </div>
 <script>
     var fdata = {
-        apiurl: "<%= theme.circle.api %>",
+        apiurl: "<%= theme.thirdparty.circle.api %>",
         defaultFish: 100,
         hungryFish: 100,
     }
 </script>
-<script type="text/javascript" src="/lib/friends_post.js"></script>
+<%- js('/lib/friends_post') %>

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

@@ -1,25 +1,6 @@
 <div class="post-reward">
-    <div class="reward-button button--animated" title="赞赏作者">
-        <script>
-            if (utils.isMobile()) {
-                const showReward = () => {
-                    const rewardMain = document.querySelector('.reward-main');
-                    rewardMain.style.display = 'flex';
-                    document.addEventListener('touchstart', hideReward);
-                };
-                const hideReward = () => {
-                    const rewardMain = document.querySelector('.reward-main');
-                    rewardMain.style.display = 'none';
-                    document.removeEventListener('touchstart', hideReward);
-                };
-                const rewardButton = document.querySelector('.reward-button');
-                rewardButton.addEventListener('touchstart', event => {
-                    event.stopPropagation();
-                    showReward();
-                });
-            }
-        </script>
-        <i class="heofont icon-hand-heart-fill"></i>
+    <div class="reward-button button--animated" onclick="AddRewardMask()" title="赞赏作者">
+        <i class="scoicon sco-hand-heart-fill"></i>
         打赏作者
     </div>
     <div class="reward-main">
@@ -49,4 +30,31 @@
             </a>
         </ul>
     </div>
-</div>
+</div>
+<script type="text/javascript">
+    function RemoveRewardMask() {
+        let rewardMainElements = document.querySelectorAll(".reward-main");
+        let quitBoxElement = document.querySelector("#quit-box");
+
+        rewardMainElements.forEach(element => {
+            element.style.display = "none";
+        });
+
+        if (quitBoxElement) {
+            quitBoxElement.style.display = "none";
+        }
+    }
+
+    function AddRewardMask() {
+        let rewardMainElements = document.querySelectorAll(".reward-main");
+        let quitBoxElement = document.querySelector("#quit-box");
+
+        rewardMainElements.forEach(element => {
+            element.style.display = "flex";
+        });
+
+        if (quitBoxElement) {
+            quitBoxElement.style.display = "flex";
+        }
+    }
+</script>

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

@@ -11,15 +11,17 @@
     </div>
     <div class="post-tools" id="post-tools">
         <div class="post-tools-left">
-            <% if(theme.post.award.enable){%>
+            <% if(theme.post.award.enable){ %>
                 <%- partial('/award', {cache: true}) %>
-            <%} %>
-            <div class="reward-link mode">
-                <a class="reward-link-button" href="<%= theme.footer.rss.url %>">
-                    <i class="heofont icon-plant-fill"></i>
-                    订阅
-                </a>
-            </div>
+            <% } %>
+            <% if(theme.footer.rss.enable){ %>
+                <div class="reward-link mode">
+                    <a class="reward-link-button" href="<%- theme.footer.rss.url %>">
+                        <i class="scoicon sco-plant-fill"></i>
+                        订阅
+                    </a>
+                </div>
+            <% } %>
         </div>
     </div>
     <div class="post-copyright__notice">

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,10 +29,12 @@
     <h1 class="post-title"><%= page.title %></h1>
     <div id="post-meta">
         <div class="meta-secondline">
-            <span class="post-meta-date" title="发布于">
+            <% 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 scoicon sco-refresh-line"></i>
@@ -66,7 +68,7 @@
                         <span id="twikoo_visitors"><i class="scoicon sco-loading-line"></i></span>
                     <% }else{ %>
                         <span id="busuanzi_value_page_pv"><i class="scoicon sco-loading-line"></i></span>
-                    <% } %>        
+                    <% } %>
                 </span>
             <% } %>
             <% if(theme.post.meta.comment && page.comment){ %>
@@ -76,8 +78,8 @@
                         <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/footer.ejs

@@ -96,9 +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){ %>
+    <div class="comment-barrage">
+    </div>
+<% } %>

package/layout/partial/nav.ejs

@@ -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/post.ejs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.1.0",
+  "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"
@@ -20,4 +20,4 @@
     "url": "https://github.com/DuoSco/Hexo-theme-solitude/issues"
   },
   "homepage": "https://github.com/DuoSco/hexo-theme-solitude#readme"
-}
+}

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/related_post.js

@@ -1,5 +1,5 @@
 /**
- * Butterfly
+ * Solitude
  * Related Posts
  * According the tag
  */
@@ -42,7 +42,7 @@ 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">'
@@ -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/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});

package/scripts/tags/tabs.js

@@ -41,7 +41,7 @@ function postTabs (args, content) {
 
     const isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : ''
     const icon = tabIcon.trim()
-    tabIcon.length > 0 && (tabIcon = `<svg ${isOnlyicon} class="scoicon tab" aria-hidden="true"><use xlink:href="#${icon}"></use></svg>`)
+    tabIcon.length > 0 && (tabIcon = `<i ${isOnlyicon} class="tab scoicon ${icon}"></i>`)
 
     const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="scoicon sco-arrow-up-line"></i></button>'