hexo-theme-solitude 1.4.6 → 1.4.7

package/layout/includes/head/config.pug

@@ -7,7 +7,7 @@
                 localSearch = JSON.stringify({
                     preload: theme.search.local.preload,
                     path: theme?.search?.local?.CDN || '/search.xml'
-                })
+                });
                 break;
             case 'algolia':
                 algolia = JSON.stringify({
@@ -17,7 +17,7 @@
                     hits: {
                         per_page: theme?.search?.algolia?.hits?.per_page || 10
                     }
-                })
+                });
                 break;
         }
     }
@@ -27,12 +27,12 @@
         translate = JSON.stringify({
             defaultEncoding: theme.translate.defaultEncoding,
             translateDelay: theme.translate.translateDelay,
-        })
+        });
     }
 
-    const commentInfoStart = theme.comment.randomInfoStart.map(item => `"${item}"`) || ""
-    const commentInfoEnd = theme.comment.randomInfoEnd.map(item => `"${item}"`) || ""
-    var sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || []
+    const commentInfoStart = theme.comment.randomInfoStart.map(item => `"${item}"`) || [];
+    const commentInfoEnd = theme.comment.randomInfoEnd.map(item => `"${item}"`) || [];
+    const sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || [];
 
 script.
     const GLOBAL_CONFIG = {
@@ -119,4 +119,4 @@ script.
             enable: !{theme.music.enable},
         },
         translate: !{translate},
-    }
+    };

package/layout/includes/head/opengraph.pug

@@ -1,10 +1,11 @@
 if theme.opengraph.enable
     -
         const coverVal = page.cover || theme.site.siteIcon
-        let ogOption = Object.assign({
-                    type: is_post() ? 'article' : 'website',
-                    image: coverVal ? full_url_for(coverVal) : '',
-                }, theme.opengraph.options)
+        let ogOption = {
+            type: is_post() ? 'article' : 'website',
+            image: coverVal ? full_url_for(coverVal) : '',
+            ...theme.opengraph.options
+        }
     -
     != open_graph(ogOption)
 else

package/layout/includes/head/pwa.pug

@@ -1,11 +1,11 @@
 if theme.pwa.enable
     meta(name="theme-color", content=theme.pwa.theme_color)
     link(rel="manifest" href=url_for(theme.pwa.manifest))
-    if(theme.pwa.theme_color)
+    if theme.pwa.theme_color
         meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
     if theme.pwa.mask_icon
         link(rel="mask-icon", href=theme.pwa.mask_icon, color=theme.pwa.theme_color)
-    if(theme.pwa.apple_touch_icon)
+    if theme.pwa.apple_touch_icon
         link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
     if theme.pwa.favicon_16_16
         link(rel="icon", type="image/png", sizes="16x16", href=theme.pwa.favicon_16_16)
@@ -13,7 +13,6 @@ if theme.pwa.enable
         link(rel="icon", type="image/png", sizes="32x32", href=theme.pwa.favicon_32_32)
     if theme.pwa.bookmark_icon
         link(rel="bookmark", href=theme.pwa.bookmark_icon)
-
 else
     meta(name="apple-mobile-web-app-capable", content=config.title)
     link(rel="bookmark", href=theme.site.siteIcon)

package/layout/includes/inject/body.pug

@@ -1,5 +1,15 @@
 - page.type = is_post() ? 'post' : page.type
 
+mixin katex
+    if theme.katex.copytex
+        script(src=url_for(theme.cdn.katex_copytex))
+            script.
+                (() => {
+                    document.querySelectorAll('#article-container span.katex-display').forEach(item => {
+                        utils.wrap(item, 'div', {class: 'katex-wrap'})
+                    })
+                })();
+
 div
     script(src=url_for(theme.cdn.main))
     script(src=url_for(theme.cdn.utils))
@@ -19,24 +29,11 @@ div
     if theme.translate.enable
         script(src=url_for(theme.cdn.translate))
 
-    mixin katex
-        link(rel="stylesheet", href=url_for(theme.cdn.katex))
-        if theme.katex.copytex
-            script(src=url_for(theme.cdn.katex_copytex))
-                script.
-                    (() => {
-                        document.querySelectorAll('#article-container span.katex-display').forEach(item => {
-                            utils.wrap(item, 'div', {class: 'katex-wrap'})
-                        })
-                    })()
-
     if theme.katex && theme.katex.enable
-        if theme.katex.per_page
-            if is_post() || is_page()
-                +katex
-        else
-            if page.katex
-                +katex
+        if theme.katex.per_page && (is_post() || is_page())
+            +katex
+        else if page.katex
+            +katex
 
     script(src=url_for(theme.cdn.pjax))
     if theme.lazyload.enable
@@ -111,6 +108,9 @@ div#js-pjax
     if page.type === 'album' && theme.album.enable
         script.
             initGallery()
+    if is_home() && theme.says.home_mini
+        script.
+            sco.initbbtalk();
     if page.type === 'says' && theme.says.enable
         script.
             window.addEventListener('resize', utils.throttle(function () {

package/layout/includes/inject/head.pug

@@ -15,6 +15,9 @@ if theme.says.home_mini
 if theme.lightbox && theme.fancybox
     link(rel="stylesheet", href=url_for(theme.cdn.fancyapps_css))
 
+if theme.katex && theme.katex.enable
+   link(rel="stylesheet", href=url_for(theme.cdn.katex))
+
 // Open Graph
 include ../head/opengraph.pug
 
@@ -78,8 +81,6 @@ script.
         "%c🔥 !{_p('head.console')}",
         "color: #fff; background: linear-gradient(-25deg, #a8edea, #fed6e3); padding: 8px 15px; border-radius: 8px; text-shadow: 2px 2px 4px white; color: black;"
     );
-
-// custom inject
 if theme.extends.head
     each item in theme.extends.head
         != item

package/layout/includes/mixins/pagination.pug

@@ -3,6 +3,6 @@ nav#pagination
         - var options = {mid_size: 1,escape: false,next_text: '<div class="pagination_tips_next">下页</div> <i class="scoicon sco-arrow-right-bold"></i>',prev_text: '<i class="scoicon sco-arrow-left-bold"></i> <div class="pagination_tips_prev">上页</div>'}
         !=paginator(options)
         div.toPageGroup
-            input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')", maxlength="3", title="跳转到指定页面", onkeyup="if (this.value === '0') this.value = ''")
+            input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')" maxlength="3" title="跳转到指定页面" onkeyup="if (this.value === '0') this.value = ''")
             a#toPageButton(onclick="sco.toPage()")
                 i.scoicon.sco-show-right-line

package/layout/includes/page/says.pug

@@ -3,13 +3,50 @@ if theme.says.enable
     #bber
         section.timeline.page-1
             ul.list#waterfall
-                case theme.says.mode
-                    when 'local'
-                        include ../widgets/page/says/local
-                    when 'json'
-                        include ../widgets/page/says/json
-                    when 'memos'
-                        include ../widgets/page/says/memos
+                each item in site.data.essay.essay_list.slice(0, theme.says.strip)
+                    li.item
+                        if theme.says.style === 2
+                            .meta
+                                img.avatar(src=theme.aside.card.author.img)
+                                .info
+                                    span.bber_nick= config.author
+                                    time.datetime.bber_date(datetime=moment(item.date).format())
+                                if item.content
+                                    a.bber-reply.goComment(onclick=`sco.toTalk('${item.content}')`)
+                                        i.scoicon.sco-chat-fill
+
+                        #bber-content
+                            p.datacont= item.content
+                            if item.image
+                                .bber-content-img
+                                    each img in item.image
+                                        img(src=img title="即刻短文配图")
+
+                        if item.aplayer
+                            .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")
+
+                        if item.video
+                            .bber-video
+                                if item.video.player
+                                    video(src=item.video.player controls="controls" style="object-fit: cover;")
+                                if item.video.bilibili
+                                    iframe(src='//player.bilibili.com/player.html?auto-play=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
+
+                        if theme.says.style === 1
+                            hr
+                            .bber-bottom
+                                .bber-info
+                                    .bber-info-time
+                                        i.scoicon.sco-calendar-todo-fill
+                                        time.datetime(datetime=moment(item.date).format())
+                                    if item.link
+                                        a.bber-content-link(href=url_for(item.link) title="跳转到短文指引的链接" target="_blank")
+                                            i.scoicon.sco-link-m-line
+                                            | 链接
+                                if item.content
+                                    a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
+                                        i.scoicon.sco-chat-fill
             #bber-tips
                 if theme.says.strip === -1
                     | - 已展开所有短文 -

package/layout/includes/widgets/home/bbTimeList.pug

@@ -2,11 +2,17 @@
     i.bber-logo.scoicon.sco-bblogo(onclick=`pjax.loadUrl('/essay/')`)
     .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('/essay/')`)
         .swiper-wrapper#bber-talk
-            case theme.says.mode
-                when 'local'
-                    include bb/local
-                when 'json'
-                    include bb/json
-                when 'memos'
-                    include bb/memos
+            each item, i in site.data.essay.essay_list.slice(0, 10)
+                .li-style.swiper-slide
+                    | #{item.content}
+                    if item.image
+                        i.scoicon.sco-image-fill
+                    else if item.aplayer
+                        i.scoicon.sco-disc-fill
+                    else if item.video
+                        i.scoicon.sco-video-fill
+                    else if item.bilibili
+                        i.scoicon.sco-bilibili-line
+                    else if item.link
+                        i.scoicon.sco-links
     i.bber-gotobb.scoicon.sco-right-btn-fill(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('/essay/')`)

package/layout/includes/widgets/page/banner.pug

@@ -3,18 +3,13 @@
         .author-content-item-tips= page.title
         span.author-content-item-title= page.desc
         .content-bottom
-            if (page.leftend)
-                .tips!= page.leftend
-            if(page.rightend)
-                .tips!= page.rightend
+            if page.leftend
+                .tips= page.leftend
+            if page.rightend
+                .tips= page.rightend
         if page.rightbtn
             .banner-button-group
-                case page.rightbtnlink.startsWith('/')
-                    when true
-                        a.banner-button(onclick="pjax.loadUrl(\"" + page.rightbtnlink + "\")")
-                            i.scoicon.sco-right-btn-fill
-                            span.banner-button-text= page.rightbtn
-                    when false
-                        a.banner-button(href=page.rightbtnlink, target="_blank")
-                            i.scoicon.sco-right-btn-fill
-                            span.banner-button-text= page.rightbtn
+                - const isInternalLink = page.rightbtnlink.startsWith('/')
+                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")` : null, href=isInternalLink ? null : page.rightbtnlink, target=isInternalLink ? null : "_blank")
+                    i.scoicon.sco-right-btn-fill
+                    span.banner-button-text= page.rightbtn

package/layout/page.pug

@@ -18,8 +18,6 @@ block content
                     include includes/page/says
                 when 'equipment'
                     include includes/page/equipment
-                when 'rss'
-                    include includes/page/rss
                 when 'moment'
                     include includes/page/moment
                 when 'douban'

package/package.json

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

package/scripts/event/init.js

@@ -1,21 +1,22 @@
 hexo.extend.filter.register('before_generate', () => {
-        const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-        const nodeVer = process.version.replace(/^v/, '');
-        const [majorVer] = nodeVer.split('.');
-        const logger = hexo.log, config = hexo.config
+    const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1');
+    const nodeVer = process.version.replace(/^v/, '');
+    const [majorVer] = nodeVer.split('.');
+    const logger = hexo.log;
+    const config = hexo.config;
 
-        if (hexoVer < 6.3) {
-            logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！')
-            process.exit(-1)
-        }
+    if (hexoVer < 6.3) {
+        logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！');
+        process.exit(-1);
+    }
+
+    if (config.prismjs.enable) {
+        logger.error('主题尚未支持 prismjs 请使用 highlightjs ！');
+        process.exit(-1);
+    }
 
-        if (config.prismjs.enable) {
-            logger.error('主题尚未支持 prismjs 请使用 highlightjs ！')
-            process.exit(-1)
-        }
-        if (Number(majorVer) < 14) {
-            logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
-            process.exit(-1);
-        }
+    if (Number(majorVer) < 14) {
+        logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
+        process.exit(-1);
     }
-)
+});

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  主题链接：https://github.com/wleelw/Hexo-theme-solitude
+  GitHub: https://github.com/wleelw/hexo-theme-solitude
   `)
 })

package/scripts/generator/gallery.js

@@ -6,20 +6,23 @@ hexo.extend.generator.register('gallery', function (locals) {
     if (!hexo.theme.config.album.enable) return;
     const album = locals.data.gallery.gallery;
     if (!album) return;
+    const { url, cover, comment, title, album_list, descr, rightbtn, rightbtnlink } = album;
     return {
-        path: album.url + '/index.html', layout: ['page'], data: {
-            url: album.url,
-            cover: album.cover,
+        path: `${url}/index.html`,
+        layout: ['page'],
+        data: {
+            url,
+            cover,
             type: 'gallery',
-            comment: album.comment,
-            desc: album.title,
-            title: album.title,
-            album: album.album_list,
-            leftend: album.descr,
-            rightbtn: album.rightbtn,
-            rightbtnlink: album.rightbtnlink
+            comment,
+            desc: title,
+            title,
+            album: album_list,
+            leftend: descr,
+            rightbtn,
+            rightbtnlink
         }
-    }
+    };
 });
 
 hexo.extend.generator.register('album', function (locals) {
@@ -27,21 +30,20 @@ hexo.extend.generator.register('album', function (locals) {
     const album = locals.data.gallery.gallery;
     let back = hexo.config.language === 'zh-CN' ? '返回相册' : hexo.config.language === 'zh-TW' ? '返回相冊' : 'Back to Album';
     if (!album) return;
-    const albumPages = [];
-    album.album_list.forEach(function (item) {
-        albumPages.push({
-            path: album.url + '/' + item.album + '/index.html', layout: ['page'], data: {
-                album: item,
-                type: 'album',
-                cover: item.cover,
-                title: item.class_name,
-                desc: item.class_name,
-                leftend: item.descr,
-                rightbtn: back,
-                rightbtnlink: `/${album.url}/`,
-                comment: item.comment
-            }
-        });
-    });
+    const albumPages = album.album_list.map(item => ({
+        path: `${album.url}/${item.album}/index.html`,
+        layout: ['page'],
+        data: {
+            album: item,
+            type: 'album',
+            cover: item.cover,
+            title: item.class_name,
+            desc: item.class_name,
+            leftend: item.descr,
+            rightbtn: back,
+            rightbtnlink: `/${album.url}/`,
+            comment: item.comment
+        }
+    }));
     return albumPages;
 });

package/scripts/helper/getArchiveLength.js

@@ -6,13 +6,9 @@ hexo.extend.helper.register('getArchiveLength', function (type) {
     }
     const posts = this.site.posts.sort('-date').data
     let archive = {}
-    posts.forEach(post => {
+    for (const post of posts) {
         const postdate = type === 'year' ? moment(post.date).format('YYYY') : moment(post.date).format('YYYY/MM');
-        if(!archive[postdate]){
-            archive[postdate] = 1
-        } else {
-            archive[postdate] ++
-        }
-    });
-    return archive
-});
+        archive[postdate] = (archive[postdate] || 0) + 1;
+    }
+    return archive;
+});

package/scripts/helper/related_post.js

@@ -1,10 +1,15 @@
 'use strict'
 
 hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
-    let relatedPosts = []
+    const relatedPosts = []
+    const config = hexo.theme.config
+    const limitNum = config.related_post.limit || 6
+    const dateType = config.related_post.date_type || 'created'
+    const headlineLang = this._p('喜欢这篇的人也看了')
+
     currentPost.tags.forEach(function (tag) {
         allPosts.forEach(function (post) {
-            if (isTagRelated(tag.name, post.tags)) {
+            if (isTagRelated(tag.name, post.tags) && currentPost.path !== post.path) {
                 const relatedPost = {
                     title: post.title,
                     path: post.path,
@@ -18,61 +23,45 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
                 if (index !== -1) {
                     relatedPosts[index].weight += 1
                 } else {
-                    if (currentPost.path !== post.path) {
-                        relatedPosts.push(relatedPost)
-                    }
+                    relatedPosts.push(relatedPost)
                 }
             }
         })
     })
+
     if (relatedPosts.length === 0) {
         return ''
     }
-    let result = ''
-    const config = hexo.theme.config
-
-    const limitNum = config.related_post.limit || 6
-    const dateType = config.related_post.date_type || 'created'
-    const headlineLang = this._p('喜欢这篇的人也看了')
-
-    relatedPosts = relatedPosts.sort(compare('weight', dateType))
 
-    if (relatedPosts.length > 0) {
-        result += '<div class="relatedPosts">'
-        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">'
+    relatedPosts.sort(compare('weight', dateType))
 
-        for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
-            const cover = relatedPosts[i].cover || 'var(--default-bg-color)'
-            const title = this.escape_html(relatedPosts[i].title)
-            result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
-            result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
-            result += `<div class="content is-center"><div class="title">${title}</div></div>`
-            result += '</a></div>'
-        }
+    let result = '<div class="relatedPosts">'
+    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">'
 
-        result += '</div></div>'
-        return result
+    for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
+        const cover = relatedPosts[i].cover || 'var(--default-bg-color)'
+        const title = this.escape_html(relatedPosts[i].title)
+        result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
+        result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
+        result += `<div class="content is-center"><div class="title">${title}</div></div>`
+        result += '</a></div>'
     }
+
+    result += '</div></div>'
+    return result
 })
 
 function isTagRelated(tagName, TBDtags) {
-    let result = false
-    TBDtags.forEach(function (tag) {
-        if (tagName === tag.name) {
-            result = true
-        }
+    return TBDtags.some(function (tag) {
+        return tagName === tag.name
     })
-    return result
 }
 
 function findItem(arrayToSearch, attr, val) {
-    for (let i = 0; i < arrayToSearch.length; i++) {
-        if (arrayToSearch[i][attr] === val) {
-            return i
-        }
-    }
-    return -1
+    return arrayToSearch.findIndex(function (item) {
+        return item[attr] === val
+    })
 }
 
 function compare(attr, dateType) {

package/scripts/helper/stylus.js

@@ -1,13 +1,13 @@
 hexo.extend.filter.register('stylus:renderer', function (style) {
-    const {config, theme} = this
+    const {config, theme} = this;
     const data = hexo.locals.get('data');
 
     if (theme.config.aside.tags.highlight) {
-        let array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
+        const array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
         style.define('highlightTags', array);
     }
 
-    let aside = [
+    const aside = [
         theme.config.aside.home.noSticky,
         theme.config.aside.home.Sticky,
         theme.config.aside.post.noSticky,
@@ -15,14 +15,10 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
         theme.config.aside.page.Sticky,
         theme.config.aside.page.noSticky
     ].join(',').split(',');
-    let uniqueArr = [...new Set(aside)]; // 去重
+    const uniqueArr = [...new Set(aside)];
     if (uniqueArr.length > 0) {
         style.define('aside', uniqueArr);
     }
 
-    if (data && data.about) {
-        style.define('about', Object.keys(data.about));
-    } else {
-        style.define('about', []);
-    }
+    style.define('about', data && data.about ? Object.keys(data.about) : []);
 });