hexo-theme-solitude 2.1.6 → 2.1.8

package/layout/includes/widgets/page/about/hobbies.pug

@@ -1,24 +1,25 @@
-- var game1 = site.data.about.game1
-- var game2 = site.data.about.game2
+- var games = site.data.about.game
 
-if game1 || game2
+if games
     .author-content
-        if game1
-            .author-content-item.game-apex(style=`background: url(${game1.img}) no-repeat top; background-size: cover;`)
+        each game, index in games
+            style.
+                .game-#{index}::after {
+                    box-shadow: #{game.box_shadow} !important;
+                }
+            .author-content-item.game(class=`game-${index}`, style=`background: url(${game.img}) no-repeat top; background-size: cover;`)
                 .card-content
-                    .author-content-item-tips= game1.title
-                    span.author-content-item-title= game1.subtitle
+                    .author-content-item-tips= game.title
+                    span.author-content-item-title= game.subtitle
                     .content-bottom
-                        .tips= game1.tips_left
-                        .tips= game1.tips_right
-        if game2
-            .author-content-item.game-jl(style=`background: url(${game2.img}) no-repeat top; background-size: cover;`)
-                .card-content
-                    .author-content-item-tips= game2.title
-                    span.author-content-item-title= game2.subtitle
-                    .content-bottom
-                        .tips= game2.tips_left
-                        .tips= game2.tips_right
+                        if game.icon_group
+                            .icon-group
+                                each icon in game.icon_group
+                                    i(style=`background-image: url(${icon})`)
+                        else if game.tips_left
+                            .tips= game.tips_left
+                        if game.tips_right
+                            .tips= game.tips_right
 
 if site.data.about.likes
     - const likes = site.data.about.likes

package/layout/includes/widgets/page/about/tenyear.pug

@@ -2,47 +2,46 @@
 if tenyear
     .author-content#tenyear
         .create-site-post.author-content-item.single
-            .author-content-item-tips=tenyear.tips
-            .author-content-item-title=tenyear.title
-            p=tenyear.text
+            .author-content-item-tips= tenyear.tips
+            .author-content-item-title= tenyear.title
+            p= tenyear.text
             .tenyear-timeline
                 .progress
                 .past-time
                 .percentage-label
             .time-labels
-                .start-time#tenyear-start-time= tenyear.start
-                .end-time#tenyear-end-time= tenyear.end
+                .start-time#tenyear-start-time= new Date(tenyear.start).toLocaleDateString()
+                .end-time#tenyear-end-time= new Date(tenyear.end).toLocaleDateString()
 
     script.
-        function parseDateString(e) {
-            return e.replace(/年|月/g, '-').replace(/日/g, '');
-        }
+        const tenYear = () => {
+            const progressElement = document.querySelector(".progress");
+            const pastTimeElement = document.querySelector(".past-time");
+            const percentageLabelElement = document.querySelector(".percentage-label");
+            const startTimeElement = document.getElementById("tenyear-start-time");
+            const endTimeElement = document.getElementById("tenyear-end-time");
 
-        function tenYear() {
-            let progressElement = document.querySelector(".progress");
-            let pastTimeElement = document.querySelector(".past-time");
-            let percentageLabelElement = document.querySelector(".percentage-label");
-            let startTimeElement = document.getElementById("tenyear-start-time");
-            let endTimeElement = document.getElementById("tenyear-end-time");
+            const startTime = new Date(startTimeElement.textContent).getTime();
+            const endTime = new Date(endTimeElement.textContent).getTime();
 
-            let startTime = new Date(parseDateString(startTimeElement.textContent)).getTime();
-            let endTime = new Date(parseDateString(endTimeElement.textContent)).getTime();
-
-            function updateProgress() {
-                let currentTime = new Date().getTime();
-                let progress = ((currentTime - startTime) / (endTime - startTime) * 100);
-                let progressPercentage = progress <= 100 ? progress + "%" : "100%";
+            const updateProgress = () => {
+                const currentTime = new Date().getTime();
+                const progress = ((currentTime - startTime) / (endTime - startTime) * 100);
+                const progressPercentage = Math.min(progress, 100) + "%";
 
                 pastTimeElement.style.setProperty("--past-time-percentage", progress + "%");
                 progressElement.style.setProperty("--progress-percentage", progressPercentage);
-                if(progress > 5){
+                if (progress > 5) {
                     percentageLabelElement.textContent = `${progress.toFixed(0)}%`;
                     percentageLabelElement.style.left = `calc(${progress}% - 35px)`;
                 }
-            }
+            };
 
             percentageLabelElement.style.visibility = "visible";
             updateProgress();
-        }
+        };
 
-        document.getElementById("tenyear") && tenYear() && window.Pjax.on('complete', tenYear)
+        if (document.getElementById("tenyear")) {
+            tenYear();
+            window.Pjax.on('complete', tenYear);
+        }

package/layout/includes/widgets/page/links/linksCard.pug

@@ -2,8 +2,11 @@
     each item in data.link_list
         .site-card
             if item.tag
-                span.site-card-tag(class=item.color)= item.tag
-                    i.light
+                if item.color == 'vip' || item.color == 'speed'
+                    span.site-card-tag(class=item.color)= item.tag
+                        i.light
+                else
+                    span.site-card-tag(style=`background-color: ${item.color};`)= item.tag
             a.img(title=item.name, href=url_for(item.link))
                 img.flink-avatar(src=item.topimg + (data.topimg_suffix || ''), alt=item.name)
             a.info.cf-friends-link(title=item.name, href=url_for(item.link))

package/layout/includes/widgets/page/message/content.pug

@@ -1,4 +1,4 @@
-#article-container
+.article-container
     != page.content
     if theme.envelope.enable
         .switch_message

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

@@ -0,0 +1,56 @@
+- const { server, site } = theme.artalk
+
+script.
+    function updatePostsBasedOnComments() {
+        const location = window.location;
+        const posts = Array.from(document.querySelectorAll('.recent-post-item[onclick] .post_cover a'))
+            .map(item => item.href.replace(location, ''));
+
+        fetchCommentsData(posts)
+            .then(data => updatePostElements(posts, data))
+            .catch(error => console.error("Error fetching comments:", error));
+    }
+
+    function fetchCommentsData(posts) {
+        const url = `!{server}/api/v2/stats/page_comment?page_keys=${posts.join(',')}&site_name=!{site}`;
+        return fetch(url)
+            .then(res => res.json())
+            .then(data => data.data);
+    }
+
+    function updatePostElements(posts, data) {
+        posts.forEach(post => {
+            const commentCount = data[post];
+            if (commentCount > !{count}) {
+                const postElement = document.querySelector(`.recent-post-item[onclick*="${post}"]`);
+                if (postElement) {
+                    addHotTipIfNeeded(postElement);
+                }
+            }
+        });
+    }
+
+    function addHotTipIfNeeded(postElement) {
+        const infoTopTips = postElement.querySelector(".recent-post-info-top-tips");
+        const originalSpan = infoTopTips?.querySelector(".original");
+        const existingHotTip = infoTopTips?.querySelector(".hot-tip");
+
+        if (!existingHotTip && originalSpan) {
+            const hotTip = createHotTipElement();
+            infoTopTips.insertBefore(hotTip, originalSpan);
+        }
+    }
+
+    function createHotTipElement() {
+        const hotTip = document.createElement("span");
+        hotTip.classList.add("hot-tip");
+
+        const icon = document.createElement("i");
+        icon.classList.add("solitude", "fas", "fa-fire-flame-curved");
+        hotTip.appendChild(icon);
+
+        const commentCount = document.createTextNode("!{_p('hot-tip')}");
+        hotTip.appendChild(commentCount);
+
+        return hotTip;
+    }

package/layout/includes/widgets/third-party/hot/twikoo.pug

@@ -0,0 +1,57 @@
+script.
+    function updatePostsBasedOnComments() {
+        const location = window.location.origin;
+        const posts = Array.from(document.querySelectorAll('.recent-post-item[onclick] .post_cover a'))
+            .map(item => item.href.replace(location, ''));
+
+        const fetchCommentsCount = () => {
+            twikoo.getCommentsCount({
+                envId: "!{theme.twikoo.envId}",
+                urls: posts,
+                includeReply: true
+            }).then(handleCommentsResponse)
+              .catch(error => console.error("Error fetching comments:", error));
+        };
+
+        const handleCommentsResponse = (response) => {
+            response.forEach(comment => {
+                if (comment.count > !{count}) {
+                    const postElement = document.querySelector(`.recent-post-item[onclick*="${comment.url}"]`);
+                    if (postElement) {
+                        updatePostElement(postElement);
+                    }
+                }
+            });
+        };
+
+        const updatePostElement = (postElement) => {
+            const infoTopTips = postElement.querySelector(".recent-post-info-top-tips");
+            const originalSpan = infoTopTips?.querySelector(".original");
+            const existingHotTip = infoTopTips?.querySelector(".hot-tip");
+
+            if (!existingHotTip && originalSpan) {
+                const hotTip = createHotTipElement();
+                infoTopTips.insertBefore(hotTip, originalSpan);
+            }
+        };
+
+        const createHotTipElement = () => {
+            const hotTip = document.createElement("span");
+            hotTip.classList.add("hot-tip");
+
+            const icon = document.createElement("i");
+            icon.classList.add("solitude", "fas", "fa-fire-flame-curved");
+            hotTip.appendChild(icon);
+
+            const commentCount = document.createTextNode("!{_p('hot-tip')}");
+            hotTip.appendChild(commentCount);
+
+            return hotTip;
+        };
+
+        if (typeof twikoo === 'object') {
+            fetchCommentsCount();
+        } else {
+            utils.getScript('!{url_for(theme.cdn.twikoo)}').then(fetchCommentsCount);
+        }
+    }

package/layout/includes/widgets/third-party/pjax.pug

@@ -1,9 +1,10 @@
 - const google_adsense = theme.google_adsense.enable
+- const select = ['title','#body-wrap','#site-config','meta[name="description"]','.js-pjax','meta[property^="og:"]','#config-diff', '.rs_show', '.rs_hide']
 
 script.
     const pjax = new Pjax({
         elements: 'a:not([target="_blank"])',
-        selectors: ['title','#body-wrap','#site-config','meta[name="description"]','.js-pjax','meta[property^="og:"]','#config-diff', '.rs_show', '.rs_hide'],
+        selectors: !{JSON.stringify(select)},
         cacheBust: false,
         analytics: !{google_adsense},
         scrollRestoration: false

package/layout/index.pug

@@ -13,7 +13,7 @@ block content
                 include ./includes/widgets/home/categoryBar
             .recent-posts#recent-posts
                 if theme.comment.hot_tip.enable
-                    include ./includes/widgets/home/hot/index.pug
+                    include ./includes/widgets/third-party/hot/index.pug
                 if theme.carousel && is_home_first_page()
                     include ./includes/widgets/home/carousel.pug
                 for post, index in page.posts.sort("-sticky" || "-date").data

package/layout/post.pug

@@ -5,7 +5,7 @@ block content
         #post
             if page.not_cover
                 include includes/widgets/post/postInfo
-            article.post-content#article-container
+            article.post-content.article-container
                 if theme.post_ai.enable && page.ai
                     include includes/widgets/post/post-ai
                 != page.content

package/layout/tag.pug

@@ -14,4 +14,6 @@ block content
                 each post,index in page.posts.find({ parent: { $exists: false } }).data
                     include includes/widgets/home/postList
                 include includes/mixins/pagination
+            if theme.comment.hot_tip.enable
+                include ./includes/widgets/third-party/hot/index.pug
         include includes/widgets/aside/aside

package/package.json

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

package/plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch.umd.js
-  version: 5.9.1
+  version: 5.14.2
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.74.1
+  version: 4.75.5
 pjax:
   name: pjax
   file: pjax.min.js
@@ -13,16 +13,16 @@ pjax:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.39
+  version: 1.6.40
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 3.3.1
+  version: 3.3.2
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
-  version: 3.3.1
+  version: 3.3.2
   other_name: waline
 valine:
   name: valine
@@ -31,11 +31,11 @@ valine:
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.9.0
+  version: 2.9.1
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.9.0
+  version: 2.9.1
 katex:
   name: katex
   file: dist/katex.min.css
@@ -106,7 +106,7 @@ fancyapps_css:
 mermaid_js:
   name: mermaid
   file: dist/mermaid.js
-  version: 10.9.1
+  version: 11.4.0
 chart_js:
   name: chart.js
   file: dist/chart.umd.js
@@ -115,7 +115,7 @@ chart_js:
 typeit_js:
   name: typeit
   file: index.umd.min.js
-  version: 8.8.4
+  version: 8.8.7
   other_name: typeit
 blueimp_md5:
   name: blueimp-md5
@@ -129,5 +129,5 @@ qrcode:
 color_thief:
   name: colorthief
   file: color-thief.min.js
-  version: 2.4.0
+  version: 2.6.0
   other_name: color-thief

package/scripts/event/init.js

@@ -3,7 +3,6 @@ hexo.extend.filter.register('before_generate', () => {
     const nodeVer = process.version.replace(/^v/, '');
     const [majorVer] = nodeVer.split('.');
     const logger = hexo.log;
-    const config = hexo.config;
 
     if (hexoVer < 7.0) {
         logger.error('请把 Hexo 升级到 V7.0.0 或更高的版本！');

package/scripts/event/merge_config.js

@@ -33,18 +33,9 @@ hexo.extend.filter.register('before_generate', () => {
       }
     },
     aside: {
-      home: {
-        noSticky: 'about',
-        Sticky: 'allInfo'
-      },
-      post: {
-        noSticky: 'about',
-        Sticky: 'allInfo'
-      },
-      page: {
-        noSticky: 'about',
-        Sticky: 'allInfo'
-      },
+      home: { noSticky: 'about', Sticky: 'allInfo' },
+      post: { noSticky: 'about', Sticky: 'allInfo' },
+      page: { noSticky: 'about', Sticky: 'allInfo' },
       card: {
         style: 0,
         author: {
@@ -73,24 +64,12 @@ hexo.extend.filter.register('before_generate', () => {
       },
       newest_comment: {
         enable: false,
-        storage: .5,
+        storage: 0.5,
         limit: 5
       },
-      toc: {
-        post: true,
-        page: false,
-        vague: true,
-      },
-      tags: {
-        enable: true,
-        limit: 20,
-        highlight: false,
-        list: [],
-      },
-      archive: {
-        enable: true,
-        type: 'month'
-      },
+      toc: { post: true, page: false, vague: true },
+      tags: { enable: true, limit: 20, highlight: false, list: [] },
+      archive: { enable: true, type: 'month' },
       siteinfo: {
         postcount: true,
         wordcount: false,
@@ -111,9 +90,7 @@ hexo.extend.filter.register('before_generate', () => {
       tags: true,
       categories: true,
       archives: 0,
-      default: {
-        cover: ['/img/default.avif'],
-      }
+      default: { cover: ['/img/default.avif'] },
     },
     post: {
       default: {
@@ -150,10 +127,7 @@ hexo.extend.filter.register('before_generate', () => {
         api: 'https://api.qjqq.cn/api/Imgcolor?img=',
         time: 43200000,
       },
-      share: {
-        enable: false,
-        list: []
-      },
+      share: { enable: false, list: [] },
       footer: {
         enable: true,
         desc: "The article from Solitude",
@@ -341,7 +315,7 @@ hexo.extend.filter.register('before_generate', () => {
       enable: false,
       recentComment: {
         enable: false,
-        storage: .2,
+        storage: 0.2,
       },
       card: {
         tags: true,
@@ -404,7 +378,7 @@ hexo.extend.filter.register('before_generate', () => {
       enable: false,
       dark: 'https://bu.dusays.com/2023/09/29/651685ce667d1.jpg',
       light: 'https://bu.dusays.com/2023/09/29/651685cc18d39.jpg',
-      opacity: .2,
+      opacity: 0.2,
     },
     translate: {
       enable: false,
@@ -427,6 +401,7 @@ hexo.extend.filter.register('before_generate', () => {
       custom_format: '//open.lightxi.com/cdnjs/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}',
       option: {}
     }
-  }
-  hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+  };
+
+  hexo.theme.config = { ...defaultConfig, ...hexo.theme.config };
 }, 1)

package/scripts/event/welcome.js

@@ -1,14 +1,18 @@
 hexo.on('ready', () => {
-    const {version} = require('../../package.json')
-    hexo.log.info(`
-  =====================[ Hexo Theme - Solitude ]=====================
+    const { version } = require('../../package.json')
+    const logo = `
        #####  ####  #     #####  ###### #     # ######   ######
       #      #    # #       #      #    #     # #      # #
        ##### #    # #       #      #    #     # #      # ######
            # #    # #       #      #    #     # #      # #
       ######  ####  ##### #####    #      ###   ######   ######
-                            ${version}
-  ===================================================================
-  GitHub: https://github.com/everfu/hexo-theme-solitude
-  `)
+    `.replace(/#/g, '●')
+    const message = `
+  \x1b[38;5;45m=====================[ Hexo Theme - Solitude ]=====================\x1b[0m
+  \x1b[38;5;45m${logo}\x1b[0m
+                         \x1b[38;5;45m version: ${version}\x1b[0m
+  \x1b[38;5;45m===================================================================\x1b[0m
+         \x1b[38;5;45mGitHub: https://github.com/everfu/hexo-theme-solitude\x1b[0m
+  `
+    hexo.log.info(message)
 })

package/scripts/filter/default.js

@@ -2,32 +2,31 @@
 
 hexo.extend.filter.register('after_post_render', function (data) {
     data.title = data.title || 'Untitled';
-    const {config} = hexo.theme;
-    if (data.layout === 'post') {
-        let {copyright, locate, cover} = hexo.theme.config.post.default
-        cover = cover !== null ? cover : ['/img/default.avif']
-        data.locate = data.locate || locate
-        data.cc = data.cc || copyright
-        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
-        data.excerpt = data.description || data.excerpt
-        data.toc = !!(config.aside.toc.post && data.toc !== false)
-        data.ai = data.ai !== false;
-        data.aside = data.aside || true;
+    const { config } = hexo.theme;
+    const defaultCover = ['/img/default.avif'];
+
+    const setCoverAndExcerpt = (layout) => {
+        const { copyright, locate, cover } = hexo.theme.config[layout].default;
+        data.locate = data.locate || locate;
+        data.cc = data.cc || copyright;
+        data.cover = data.cover || (cover?.length ? cover[getRandomInt(0, cover.length)] : defaultCover[0]);
+        data.excerpt = layout === 'post' ? data.description || data.excerpt : data.title;
+        data.toc = !!(config.aside.toc[layout] && data.toc !== false);
+        data.aside = layout === 'post' ? (data.aside || true) : (data.aside || false);
+    };
+
+    if (data.layout === 'post' || data.layout === 'page') {
+        setCoverAndExcerpt(data.layout);
     }
-    if (data.layout === 'page') {
-        let {cover} = hexo.theme.config.page.default
-        cover = cover !== null ? cover : ['/img/default.avif']
-        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
-        data.excerpt = data.title
-        data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);
-        data.aside = data.aside || false;
+
+    if (data.layout === 'post') {
+        data.ai = data.ai || true;
     }
+
     data.comment = !!(config.comment.use && data.comment !== false);
     return data;
 });
 
 function getRandomInt(min, max) {
-    min = Math.ceil(min);
-    max = Math.floor(max);
-    return Math.floor(Math.random() * (max - min)) + min;
+    return Math.floor(Math.random() * (max - min)) + Math.ceil(min);
 }

package/scripts/filter/lazyload.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const urlFor = require('hexo-util').url_for.bind(hexo)
-
 const lazyload = (content, img) => {
     return content.replace(/(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi, `$1 "${img}" data-lazy-src=`)
 }
@@ -9,12 +7,12 @@ const lazyload = (content, img) => {
 hexo.extend.filter.register('after_render:html', function (data) {
     const { enable, placeholder ,field } = hexo.theme.config.lazyload
     if (!enable || field !== 'site') return;
-    return lazyload(data, urlFor(placeholder))
+    return lazyload(data, placeholder)
 })
 
 hexo.extend.filter.register('after_post_render', data => {
     const { enable, placeholder, field } = hexo.theme.config.lazyload
     if (!enable || field !== 'post') return
-    data.content = lazyload(data.content, urlFor(placeholder))
+    data.content = lazyload(data.content, placeholder)
     return data
 })

package/scripts/filter/randomPosts.js

@@ -1,5 +1,16 @@
 hexo.extend.filter.register('after_render:html', function (data) {
-    const posts = hexo.locals.get('posts').filter(post => post.random !== false).map(post => post.path);
-    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl(GLOBAL_CONFIG.root+posts[Math.floor(Math.random()*posts.length)]); }</script>`;
-    return data;
+    const posts = hexo.locals.get('posts')
+        .filter(post => post.random !== false)
+        .map(post => post.path);
+    
+    const scriptContent = `
+        <script>
+            const posts = ${JSON.stringify(posts)};
+            function toRandomPost() {
+                const randomPost = posts[Math.floor(Math.random() * posts.length)];
+                pjax.loadUrl(GLOBAL_CONFIG.root + randomPost);
+            }
+        </script>`;
+    
+    return data + scriptContent;
 });

package/scripts/helper/getArchiveLength.js

@@ -1,14 +1,12 @@
-const moment = require('moment')
+const moment = require('moment');
 
-hexo.extend.helper.register('getArchiveLength', function (type) {
-    if (type !== 'year' && type !== 'month') {
-        type = 'year';
-    }
-    const posts = this.site.posts.sort('-date').data
-    let archive = {}
-    for (const post of posts) {
-        const postdate = type === 'year' ? moment(post.date).format('YYYY') : moment(post.date).format('YYYY/MM');
+hexo.extend.helper.register('getArchiveLength', function (type = 'year') {
+    const validTypes = ['year', 'month'];
+    type = validTypes.includes(type) ? type : 'year';
+
+    return this.site.posts.sort('-date').data.reduce((archive, post) => {
+        const postdate = moment(post.date).format(type === 'year' ? 'YYYY' : 'YYYY/MM');
         archive[postdate] = (archive[postdate] || 0) + 1;
-    }
-    return archive;
+        return archive;
+    }, {});
 });