hexo-theme-solitude 1.8.9 → 1.8.11

package/_config.yml

@@ -174,6 +174,7 @@ aside:
   # 侧边栏个人信息卡片
   # Sidebar personal information
   card:
+    style: 0 # 0: Heo样式 ：1: 设计样式
     # 头像信息
     # Avatar information
     author:
@@ -524,31 +525,6 @@ capsule:
   # Type of playlist. song: Single / playlist: Playlist / album: Album / artist: Singer
   type: playlist
 
-# 友链鱼塘
-# Links fish pond
-moments:
-  # enable
-  enable: false
-  # API 地址
-  # example: https://example.com/
-  api: # https://example.com/
-  # 加载失败显示图片 / Loading failed display image
-  error_img: /img/pwa/favicon_64.ico
-  # 排序规则：created：按创建时间排序 / updated：按更新时间排序
-  # Sort rule: created: Sort by creation time / updated: Sort by update time
-  sort_rule: created
-  # 缓存过期时间（天），默认为1天 / Cache expiration time (days), default is 1 day
-  expire_days: 1
-  # 页面初始化加载数量，默认为10条 / Page initialization loading quantity, default is 10
-  page_init_number: 10
-  # 页面翻页加载数量，默认为5条 / Page turning loading quantity, default is 5
-  page_turning_number: 5
-  # 鱼塘随机文章 / Fish pond random article
-  angle: false
-  appjs: https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js
-  bundlejs: https://cdn.cbd.int/st-source/js/moment/bundle.min.js
-  randompostjs: https://cdn.cbd.int/st-source/js/moment/random_post.min.js
-
 # 快捷菜单你
 # quick menu
 keyboard:
@@ -657,6 +633,7 @@ wordcount: false
 # 访问统计
 # access statistics
 busuanzi: false
+busuanzi_use: 0 # 0: 原版 / 1: 青秸(other: 其它自定義的busuanzi平台)
 
 # 搜索
 # search

package/languages/default.yml

@@ -55,6 +55,9 @@ post:
     reprint: This article is a reproduction or translation, and the copyright belongs to the original author. Please contact the original author for permission to republish this article.
     original: This piece of writing is an original article, utilizing the
     original_end: Agreement. For complete reproduction, please acknowledge the source as Courtesy of
+  ai:
+    title: Article Summary
+    tip: Complaints
 
 nav:
   site_name_title: Back to home
@@ -90,6 +93,10 @@ aside:
   avatar: Avatar
   sticker: Mood sticker
   newpost: New posts
+  card:
+    posts: 'Posts:'
+    tags: 'Tags:'
+    categories: 'Categories:'
 
 console:
   comment_tip: Interaction

package/languages/en.yml

@@ -55,6 +55,9 @@ post:
     reprint: This article is a reproduction or translation, and the copyright belongs to the original author. Please contact the original author for permission to republish this article.
     original: This piece of writing is an original article, utilizing the
     original_end: Agreement. For complete reproduction, please acknowledge the source as Courtesy of
+  ai:
+    title: Article Summary
+    tip: Complaints
 
 nav:
   site_name_title: Back to home
@@ -90,6 +93,10 @@ aside:
   avatar: Avatar
   sticker: Mood sticker
   newpost: New posts
+  card:
+    posts: 'Posts:'
+    tags: 'Tags:'
+    categories: 'Categories:'
 
 console:
   comment_tip: Interaction

package/languages/zh-CN.yml

@@ -65,6 +65,9 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  ai:
+    title: 文章摘要
+    tip: 投诉
 
 award:
   thanks: 致谢
@@ -92,6 +95,10 @@ aside:
   avatar: 头像
   sticker: 心情贴纸
   newpost: 最近发布
+  card:
+    posts: '累计文章数:'
+    tags: '标签总数:'
+    categories: '分类总数:'
 
 console:
   comment_tip: 互动

package/languages/zh-TW.yml

@@ -65,6 +65,9 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  ai:
+    title: 文章摘要
+    tip: 投訴
 
 award:
   thanks: 致謝
@@ -92,6 +95,10 @@ aside:
   avatar: 头像
   sticker: 心情贴纸
   newpost: 最近发布
+  card:
+    posts: '累計文章數:'
+    tags: '標籤總數:'
+    categories: '分類總數:'
 
 console:
   comment_tip: 互動

package/layout/includes/footer.pug

@@ -5,7 +5,7 @@ div#st-footer-bar
         else if theme.site.name.class === 'img'
             img.solitude.nolazyload(src=url_for(theme.site.name.custom))
         else if theme.site.name.class === 'text'
-            span.solitude= theme.site.name.custom
+            span= theme.site.name.custom
     div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
     a.footer-bar-link(href=url_for('/'))= __('footer.learnmore')
 div#footer_deal

package/layout/includes/head/page_config.pug

@@ -6,5 +6,5 @@ script#config-diff.
         page: '!{page.type}',
         toc: !{!!page.toc},
         comment: !{!!page.comment},
-        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false},
+        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false}
     }

package/layout/includes/inject/body.pug

@@ -65,9 +65,6 @@ div
                     }
                 script(src=url_for(theme.cdn.cover_api))
 
-    if theme.music.enable
-        script(src=url_for(theme.cdn.music_js))
-
     if theme.loading.pace
         script(src=url_for(theme.cdn.pace_js))
 
@@ -96,7 +93,10 @@ div
                 GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
                 sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
         if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
-            script(defer pjax src=url_for(theme.cdn.busuanzi_js))
+            if theme.busuanzi_use === 0
+                script(defer pjax src=url_for(theme.cdn.busuanzi_js))
+            else
+                script(defer pjax src=url_for(theme.cdn.busuanzi_qj_js))
 
 
 if theme.footer.randomlink
@@ -106,7 +106,7 @@ if theme.footer.randomlink
 include ../widgets/third-party/news-comment/newest-comment.pug
 
 // pjax
-!= partial("includes/widgets/third-party/pjax", {}, { cache: true })
+!= partial("includes/widgets/third-party/pjax", {}, {cache: true})
 
 // theme
 include ../body/mode

package/layout/includes/inject/head.pug

@@ -27,11 +27,11 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.9",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.11",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
-        "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"
-    );
+        "padding: 5px 10px;color:white;background:#0084ff;",
+    )
 
 if theme.extends.head
     each item in theme.extends.head

package/layout/includes/page/links.pug

@@ -1,7 +1,5 @@
 .flink#banners
     include ../widgets/page/links/banner
-if theme.moments.angle
-    include ../widgets/page/moments/angle
 .flink#article-container
     each data in site.data.links.links
         h2= data.class_name + " (" + data.link_list.length + ")"

package/layout/includes/page/music.pug

@@ -3,4 +3,9 @@ if theme.music.enable
     #Music-page
         meting-js(id=theme.music.id, server=theme.music.server, type=theme.music.type, mutex=theme.music.mutex, volume=theme.music.volume, preload="none", data-lrctype="0", order="random")
     .Music-loading
-        div APlayer加载中...
+        div APlayer加载中...'
+    script(pjax).
+        (async function () {
+            if (typeof initializeMusicPlayer === "undefined") await utils.getScript('!{url_for(theme.cdn.music_js)}').then(() => initializeMusicPlayer())
+            else initializeMusicPlayer()
+        })()

package/layout/includes/widgets/aside/asideInfoCard.pug

@@ -1,22 +1,56 @@
+- const {style ,url} = theme.aside.card
 .card-widget.card-info
     .card-content
-        .card-info-avatar.is-center
-            .author-info__top-group
-                .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
-        .avatar-img-group
-            img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.card.author.img)
-            if theme.aside.card.author.sticker
-                .avatar-sticker
-                    img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
-        .author-info__description_group
-            .author-info__description!= theme.aside.card.content
-            .author-info__description2!= theme.aside.card.content2
-        .author-info__bottom-group
-            a.author-info__bottom-group-left(href=url_for(theme.aside.card.url))
-                .author-info__name= config.author
-                .author-info__desc!= config.subtitle
-            .card-info-social-icons.is-center
-                each value, label in theme.aside.card.information || {}
-                    - var array = value.split('||')
-                    a.social-icon(href=url_for(trim(array[0])), title=label)
-                        i.solitude(class=array[1])
+        case style
+            when 0
+                .card-info-avatar.is-center
+                    .author-info__top-group
+                        .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
+                .avatar-img-group
+                    img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.card.author.img)
+                    if theme.aside.card.author.sticker
+                        .avatar-sticker
+                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
+                .author-info__description_group
+                    .author-info__description!= theme.aside.card.content
+                    .author-info__description2!= theme.aside.card.content2
+                .author-info__bottom-group
+                    a.author-info__bottom-group-left(href=url_for(theme.aside.card.url))
+                        .author-info__name= config.author
+                        .author-info__desc!= config.subtitle
+                    .card-info-social-icons.is-center
+                        each value, label in theme.aside.card.information || {}
+                            - var array = value.split('||')
+                            a.social-icon(href=url_for(trim(array[0])), title=label)
+                                i.solitude(class=array[1])
+            when 1
+                .card-info-bg-top
+                    .is-center
+                        .author-info__top-group
+                            .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
+                a.card-info-avatar(href=url_for(theme.aside.card.url) title=_p('aside.avatar'))
+                    .avatar-img
+                        img(src=theme.aside.card.author.img)
+                    if theme.aside.card.author.sticker
+                        .avatar-sticker
+                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
+                .card-info__desc_group
+                    .author-info__name= config.author
+                    .author-info__desc!= config.subtitle
+
+                    .card-info__data.is-center
+                        a(href=url_for('/archives/') title=_p('aside.card.posts') + site.posts.length)
+                            .length-num= site.posts.length
+                            .headline= _p('page.archives')
+                        a(href=url_for('/tags/') title=_p('aside.card.tags') + site.tags.length)
+                            .length-num= site.tags.length
+                            .headline= _p('page.tag')
+                        a(href=url_for('/categories/') title=_p('aside.card.categories') + site.categories.length)
+                            .length-num= site.categories.length
+                            .headline= _p('page.category')
+
+                    .card-info-social-icons.is-center
+                        each value, label in theme.aside.card.information || {}
+                            - var array = value.split('||')
+                            a.social-icon(href=url_for(trim(array[0])), title=label)
+                                i.solitude(class=array[1])

package/layout/includes/widgets/aside/asideWebInfo.pug

@@ -11,15 +11,23 @@
                 .webinfo-item-title
                     i.item-icon.solitude.st-visitor-line
                     .item-name= __('aside.pv')
-                span#busuanzi_site_pv
-                    i.solitude.st-loading-line
+                if theme.busuanzi_use === 0
+                    span#busuanzi_value_site_pv
+                        i.solitude.st-loading-line
+                else
+                    span#busuanzi_site_pv
+                        i.solitude.st-loading-line
         if theme.aside.siteinfo.uv
             .webinfo-item
                 .webinfo-item-title
                     i.item-icon.solitude.st-team-fill
                     .item-name= __('aside.uv')
-                span#busuanzi_site_uv
-                    i.solitude.st-loading-line
+                if theme.busuanzi_use === 0
+                    span#busuanzi_value_site_uv
+                        i.solitude.st-loading-line
+                else
+                    span#busuanzi_site_uv
+                        i.solitude.st-loading-line
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
             .webinfo-item-title

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

@@ -2,39 +2,46 @@
 
 if recommends
     .recent-post-item#swiperBox
-        span.swiperBox-top-text= _p('home.recommend')
         div.blog-slider.swiper-container-fade.swiper-container-horizontal#swiper_container
             .blog-slider__wrp.swiper-wrapper
                 each item,index in recommends
-                    .blog-slider__item.swiper-slide(style=`background-image: url(${item.cover})`)
+                    .blog-slider__item.swiper-slide(onclick="pjax.loadUrl('"+item.path+"')")
+                        .blog-slider__img
+                            img(src=item.cover, alt=item.title)
                         .blog-slider__content
-                            a.blog-slider__title(onclick=`event.stopPropagation();`, href=item.path)=item.title
-                            span.blog-slider__code
-                                =_p('upload')
-                                time(datetime=item.date)
-                            .blog-slider__text=item.description
-            .swiper-button-next
-            .swiper-button-prev
+                            span.blog-slider__title=item.title
+                            span.blog-slider__desc=item.description
+                            div.article-meta-wrap
+                                span.article-meta.tags
+                                    each tag in item.tags.data
+                                        a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
+                                            span.tags-punctuation=tag.name
+                                span.post-meta-date
+                                    time(datetime=moment(item.date))
             .blog-slider__pagination.swiper-pagination-clickable.swiper-pagination-bullets
 
     script.
         function carousel_swiper() {
             let e = new Swiper(".blog-slider", {
-                navigation: {
-                    nextEl: ".swiper-button-next",
-                    prevEl: ".swiper-button-prev"
-                },
-                passiveListeners: !0,
-                loop: !0,
+                direction: "vertical",
+                passiveListeners: true,
+                loop: true,
                 autoplay: {
-                    disableOnInteraction: !0,
+                    disableOnInteraction: true,
                     delay: 5e3
                 },
-                mousewheel: !0,
                 pagination: {
                     el: ".blog-slider__pagination",
-                    clickable: !0
-                }
+                    clickable: true
+                },
+                effect: 'fade',
+                fadeEffect: {
+                    crossFade: true
+                },
+                passiveListeners: true,
+                spaceBetween: 30,
+                watchSlidesProgress: true,
+                mousewheel: true
             })
                 , t = document.getElementById("swiper_container");
             null !== t && (t.onmouseenter = () => {
@@ -45,5 +52,4 @@ if recommends
                         e.autoplay.start()
                     }
             )
-        }
-
+        }

package/layout/includes/widgets/post/post-ai.pug

@@ -2,11 +2,11 @@
     .ai-title
         .ai-title-left
             i.ai-title-icon.solitude.st-robot-fill
-            .ai-title-text 文章摘要
+            .ai-title-text=_p('post.ai.title')
         .ai-tag#ai-tag= theme.post_ai.modelName
     .ai-explanation(style="display: block;")
     .ai-suggestions
     .ai-bottom
         .ai-tips= theme.post_ai.tips
         if theme.post_ai.report
-            a.ai-report(title="投诉", href=url_for(theme.post_ai.report)) 投诉
+            a.ai-report(title=_p('post.ai.tip'), href=url_for(theme.post_ai.report))=_p('post.ai.tip')

package/layout/includes/widgets/post/postMeta.pug

@@ -57,8 +57,12 @@
                                     i.solitude.st-loading-line
                     else
                         if theme.busuanzi
-                            span#busuanzi_page_pv
-                                i.solitude.st-loading-line
+                            if theme.busuanzi_use === 0
+                                span#busuanzi_value_page_pv
+                                    i.solitude.st-loading-line
+                            else
+                                span#busuanzi_page_pv
+                                    i.solitude.st-loading-line
             if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
                 span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
                     i.solitude.st-chat-fill

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

@@ -55,7 +55,7 @@ script.
 if commentBarrage
     script.
         async function barrageArtalk(array) {
-            await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
-                initializeCommentBarrage(array)
-            })
+            const init = () => initializeCommentBarrage(array)
+            if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+            else init()
         }

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

@@ -66,13 +66,15 @@ if commentBarrage
             }).then(async res => {
                 if (!res.ok) throw new Error("HTTP error! status: " + res.status)
                 const data = await res.json();
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
+                const init = () => {
                     initializeCommentBarrage((data.data).map(item => Object.assign({
                         content: item.comment,
                         nick: item.nick,
                         mailMd5: item.mailMd5,
                         id: item.id
                     })))
-                })
+                }
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/valine.pug

@@ -56,8 +56,7 @@ if commentBarrage
             }).then(async res => {
                 if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
                 const data = await res.json()
-                if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() =>
+                const init = () =>
                     initializeCommentBarrage(data.results
                         .filter(item => item.url === window.location.pathname)
                         .map(item => ({
@@ -65,6 +64,9 @@ if commentBarrage
                             nick: item.nick,
                             mailMd5: md5(item.mail),
                             id: item.objectId
-                        }))))
+                        })))
+                if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -52,7 +52,7 @@ if commentBarrage
                 if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
                 const data = await res.json();
                 const regex = /<img [^>]*class="wl-emoji"[^>]*>/;
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
+                const init = () => {
                     initializeCommentBarrage(data.data.data
                         .map(item => ({
                             nick: item.nick,
@@ -60,6 +60,8 @@ if commentBarrage
                             content: item.comment.replace(regex, ''),
                             id: item.objectId
                         })))
-                })
+                }
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/page.pug

@@ -18,16 +18,14 @@ block content
                     include includes/page/says
                 when 'equipment'
                     include includes/page/equipment
-                when 'moment'
-                    include includes/page/moment
-                when 'douban'
-                    include includes/widgets/page/banner
-                    != page.content
                 when 'music'
                     include includes/page/music
                 when 'banner'
                     include includes/widgets/page/banner
-                    include includes/page/default
+                    if page.container
+                        include includes/page/default
+                    else
+                        != page.content
                 default
                     include includes/page/default
             if page.comment

package/package.json

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

package/plugins.yml

@@ -78,8 +78,12 @@ swiper_js:
   version: 11.0.5
   other_name: Swiper
 busuanzi_js:
+  name: busuanzi
+  file: bsz.pure.mini.js
+  version: 2.3.0
+busuanzi_qj_js:
   name: pearssauce-busuanzi
-  file: bsz.pure.min.js
+  file: bsz.pure.js
   version: 1.0.0
 snackbar:
   name: node-snackbar

package/scripts/event/merge_config.js

@@ -37,6 +37,7 @@ hexo.extend.filter.register('before_generate', () => {
                     noSticky: 'about', Sticky: 'allInfo'
                 },
                 card: {
+                    style: 0,
                     author: {
                         img: '/img/logo.png', sticker: '/img/happy-sticker.png',
                     },
@@ -189,19 +190,6 @@ hexo.extend.filter.register('before_generate', () => {
                 server: 'netease',
                 type: 'playlist',
             },
-            moments: {
-                enable: false,
-                api: '',
-                error_img: '/img/logo.png',
-                sort_rule: 'created',
-                expire_days: 1,
-                page_init_number: 10,
-                page_turning_number: 5,
-                angle: false,
-                appjs: 'https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js',
-                bundlejs: 'https://cdn.cbd.int/st-source/js/moment/bundle.min.js',
-                randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
-            },
             keyboard: {
                 enable: false,
                 list: []