hexo-theme-solitude 1.3.1 → 1.4.1

package/layout/includes/inject/head.pug

@@ -1,53 +1,19 @@
-- var cdn = theme.cdn.head
+each item in theme.verify_site || []
+    meta(name=item.name, content=item.content)
 
-if theme.verify.baidu
-    meta(name="baidu-site-verification", content=theme.verify.baidu)
-
-if theme.verify.google
-    meta(name="google-site-verification", content=theme.verify.google)
-
-if theme.verify.sougou
-    meta(name="sogou_site_verification", content=theme.verify.sougou)
-
-link(rel="stylesheet", href=cdn.scoicon)
-link(rel="stylesheet", href=cdn_url_for("/lib/snackbar.min.css"))
-
-// comment
-if theme.comment.enable
-    case theme.comment.type
-        when 'twikoo'
-            script(src=cdn.twikoojs)
-        when 'waline'
-            script(src=cdn.walinejs)
-            link(rel="stylesheet", href=cdn.walinecss)
-
-// pace 胶囊加载条(Capsule loading bar)
-if theme.loading.pace
-    script(src=cdn.pacejs)
-
-// search
-if theme.thirdparty.search.enable
-    if theme.thirdparty.search.type === 'algolia'
-        script(src=url_for(cdn.instantsearch))
-        script(src=url_for(cdn.algoliajs))
-    else if theme.thirdparty.search.type === 'local'
-        script(src=url_for(cdn.lunrjs))
+link(rel="stylesheet", href=url_for(theme.cdn.scoicon_css))
+link(rel="stylesheet", href=url_for(theme.cdn.snackbar_css))
 
 // aplayer
-if theme.thirdparty.aplayer.enable || theme.music.enable
-    link(rel="stylesheet", href=cdn.aplayercss)
+if theme.capsule.enable || theme.music.enable
+    link(rel="stylesheet", href=url_for(theme.cdn.aplayer_css))
 
 // swiper
-if theme.says.home_mini || theme.aside.history.enable
-    link(rel="stylesheet", href=cdn.swipercss)
-
-// echarts
-if theme.about.echarts.enable && theme.about.enable
-    script(src=url_for(cdn.echartsjs))
+if theme.says.home_mini
+    link(rel="stylesheet", href=url_for(theme.cdn.swiper_css))
 
-// 灰色纪念日(Gray Anniversary)
-if theme.fest.enable
-    include ../head/fest.pug
+if theme.fancybox
+    link(rel="stylesheet", href=url_for(theme.cdn.fancyapps_css))
 
 // Open Graph
 include ../head/opengraph.pug
@@ -114,8 +80,7 @@ script.
     );
 
 div
-    script(src=cdn_url_for("/js/utils.js"))
-    script(src=cdn_url_for("/js/main.js"))
+    script(src=url_for(theme.cdn.utils))
 
 // custom inject
 if theme.extends.head

package/layout/includes/layout.pug

@@ -5,7 +5,6 @@ html(lang=config.language, data-theme="light")
     head
         include ./head.pug
     body#body(data-type=page.type)
-        canvas#universe
         // loading
         if theme.loading.fullpage
             include ./loading.pug
@@ -35,5 +34,5 @@ html(lang=config.language, data-theme="light")
         include ./widgets/third-party/search/index.pug
 
         // music
-        if theme.thirdparty.aplayer.enable
+        if theme.capsule.enable
             include ./widgets/third-party/music.pug

package/layout/includes/nav.pug

@@ -11,7 +11,7 @@ nav#nav.show
                 else if theme.site.name.class === 'img'
                     img(src=theme.site.name.custom, alt=config.title)
                 else if theme.site.name.class === 'text'
-                    span.scoicon= theme.site.name.custom
+                    span.title= theme.site.name.custom
         #page-name-mask
             #page-name
                 a#page-name-text(onclick="sco.toTop()")= title || config.title

package/layout/includes/page/about.pug

@@ -1,4 +1,4 @@
-if theme.about.enable && site.data.about
+if site.data.about
     #about-page
         include ../widgets/page/about/authorinfo
         include ../widgets/page/about/contentinfo

package/layout/includes/page/links.pug

@@ -1,7 +1,5 @@
 .flink#banners
     include ../widgets/page/links/banner
-if theme.thirdparty.circle.angle.enable
-    include ../widgets/page/moments/angle
 .flink#article-container
     each data in site.data.links.links
         h2= data.class_name + " (" + data.link_list.length + ")"
@@ -11,4 +9,6 @@ if theme.thirdparty.circle.angle.enable
                 include ../widgets/page/links/linksCard
             when 'item'
                 include ../widgets/page/links/linksItem
+            when 'discn'
+                include ../widgets/page/links/linksDiscn
     != page.content

package/layout/includes/page/rss.pug

@@ -1,17 +1,17 @@
 .rss-plan-list
-    a.rss-plan-item.rss-plan-wechat(href=theme.footer.rss.wechatOA, title="公众号")
+    a.rss-plan-item.rss-plan-wechat(href=page.wechatOA, title="公众号")
         .rss-plan-description 推送精选文章<br>推送全文
         .rss-plan-info-group
             .rss-plan-title 公众号订阅
             .rss-plan-info 推荐的订阅方式
             img.rss-plan-icon(src="https://bu.dusays.com/2023/11/01/6541d14a4de78.png", alt="wechat")
-    a.rss-plan-item.rss-plan-mail(href=theme.footer.rss.emailOA, title="email")
+    a.rss-plan-item.rss-plan-mail(href=page.emailOA, title="email")
         .rss-plan-description 推送全部文章<br>推送封面与简介
         .rss-plan-info-group
             .rss-plan-title 邮件订阅
             .rss-plan-info 推荐的订阅方式
             img.rss-plan-icon(src="https://bu.dusays.com/2023/11/01/6541d16c3ea22.png", alt="email")
-    a.rss-plan-item.rss-plan-rss(href=theme.footer.rss.rssOA, title="rss")
+    a.rss-plan-item.rss-plan-rss(href=page.rssOA, title="rss")
         .rss-plan-description 推送全部文章<br>推送简介
         .rss-plan-info-group
             .rss-plan-title RSS

package/layout/includes/page/says.pug

@@ -1,19 +1,19 @@
+include ../widgets/page/banner
 if theme.says.enable
-    include ../widgets/page/banner
     #bber
         section.timeline.page-1
             ul.list#waterfall
-                - var limitedList = site.data.essay.essay_list.slice(0, 30)
-                each item in limitedList
-                    li.item
-                        if theme.says.style === 2
-                            include ../widgets/page/says/saysMeta
-                        include ../widgets/page/says/saysContent
-                        include ../widgets/page/says/saysFunction
-                        if theme.says.style === 1
-                            hr
-                            include ../widgets/page/says/saysBottom
-    #bber-tips - 只展示最近30条短文 -
-
-script.
-    sco.reflashEssayWaterFall()
+                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
+            #bber-tips
+                if theme.says.strip === -1
+                    | - 已展开所有短文 -
+                else
+                    | - 只展示最近 #{theme.says.strip} 条短文 -
+else
+    include ./not_configured.pug

package/layout/includes/page/tlink.pug

@@ -1,3 +1,4 @@
+- var item_suffix = ''
 include ../widgets/page/banner
 .flink#article-container
     each data in site.data.tlink.links

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

@@ -2,19 +2,19 @@
     - var noSticky, Sticky, customNoSticky, customSticky;
     if(is_home())
         - noSticky = theme.aside.home.noSticky.split(',')
-        - Sticky = theme.aside.home.Sticky.split(',')
         - customNoSticky = site.data.aside?.home?.noSticky
         - customSticky = site.data.aside?.home?.Sticky
+        - Sticky = theme.aside.home.Sticky.split(',')
     else if(is_post())
         - noSticky = theme.aside.post.noSticky.split(',')
-        - Sticky = theme.aside.post.Sticky.split(',')
         - customNoSticky = site.data.aside?.post?.noSticky
         - customSticky = site.data.aside?.post?.Sticky
+        - Sticky = theme.aside.post.Sticky.split(',')
     else if(is_page() || is_archive() || is_tag() || is_category())
         - noSticky = theme.aside.page.noSticky.split(',')
-        - Sticky = theme.aside.page.Sticky.split(',')
         - customNoSticky = site.data.aside?.page?.noSticky
         - customSticky = site.data.aside?.page?.Sticky
+        - Sticky = theme.aside.page.Sticky.split(',')
     each item in noSticky
         include ./asideSwitch.pug
     if customNoSticky
@@ -23,8 +23,8 @@
     .sticky_layout
         if page.toc
             include ./asideToc.pug
-        each item in Sticky
-            include ./asideSwitch.pug
         if customSticky
             each item in customSticky
-                include ./asideCustom.pug
+                include ./asideCustom.pug
+        each item in Sticky
+            include ./asideSwitch.pug

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

@@ -2,5 +2,5 @@
     .item-headline
         i(class=item.icon)
         span=item.name
-    .item-content
+    div(class=item.class_content ||'item-content', id=item.id_content, style=item.style_content)
         != item.html

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

@@ -11,10 +11,10 @@
             .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=theme.about ? "/about" : "/")
+            a.author-info__bottom-group-left(href=theme.about ? "/about/" : "/")
                 .author-info__name= config.author
                 .author-info__desc!= config.subtitle
             .card-info-social-icons.is-center
-                each value, key in theme.aside.card.information
+                each value, key in theme.aside.card.information || []
                     a.social-icon(href=url_for(value.url), title=key)
-                        i(class=value.icon)
+                        i.scoicon(class=value.icon)

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

@@ -3,10 +3,6 @@ case item
         include ./asideInfoCard.pug
     when 'flip'
         include ./asideFlipCard.pug
-    when 'welcome'
-        include ./asideWelcome.pug
-    when 'history'
-        include ./asideHistory.pug
     when 'newestPost'
         include ./asideNewestPost.pug
     when 'allInfo'

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

@@ -2,7 +2,7 @@
     each tag in site.tags.find({ parent: { $exists: false } }).data
         a(href=url_for(tag.path))= tag.name
             sup= tag.length
-if site.tags.length > 50
+if site.tags.length > theme.aside.tags.limit
     a#more-tags-btn(href="javascript:void(0);", onclick="sco.openAllTags();")= __('aside.tagmore')
 else
     style.

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

@@ -5,7 +5,7 @@
                 i.item-icon.scoicon.sco-folder-fill
                 .item-name= __('aside.postcount')
             .item-count= site.posts.length
-    if theme.thirdparty.busuanzi
+    if theme.busuanzi
         if theme.aside.siteinfo.pv
             .webinfo-item
                 .webinfo-item-title
@@ -32,7 +32,7 @@
                 i.item-icon.scoicon.sco-loop-left-fill
                 .item-name= __('aside.updatetime')
             time.item-count(datetime=new Date())
-    if theme.thirdparty.wordcount && theme.aside.siteinfo.wordcount
+    if theme.wordcount && theme.aside.siteinfo.wordcount
         .webinfo-item
             .webinfo-item-title
                 i.item-icon.scoicon.sco-word-fill

package/layout/includes/widgets/home/bb/json.pug

@@ -0,0 +1,22 @@
+script.
+    !async function () {
+        const htmlTagRegex = /<[^>]+>/g;
+
+        await fetch('!{theme.says.mode_link}')
+            .then(res => res.json())
+            .then(res => {
+                let list = res.filter(item => item.content).slice(0, 10);
+
+                document.querySelector('#bber-talk').innerHTML = list.map(item => {
+                    let content = item.content ? item.content.replace(htmlTagRegex, '') : '';
+                    content += item.image ? '<i class="scoicon scp-image-fill"></i>' : '';
+                    content += item.aplayer ? '<i class="scoicon sco-disc-fill"></i>' : '';
+                    content += item.video ? '<i class="scoicon sco-video-fill"></i>' : '';
+                    content += item.bilibili ? '<i class="scoicon sco-bilibili-line"></i>' : '';
+                    content += item.link ? `<i class="scoicon sco-link"></i>` : '';
+                    return `<div class="li-style swiper-slide">${content}</div>`;
+                }).join('');
+
+                sco.initbbtalk();
+            }).catch(err => console.log('bbtime |', err));
+    }();

package/layout/includes/widgets/home/bb/local.pug

@@ -0,0 +1,17 @@
+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
+        if item.aplayer
+            i.scoicon.sco-disc-fill
+        if item.video
+            i.scoicon.sco-video-fill
+        if item.bilibili
+            i.scoicon.sco-bilibili-line
+        if item.link
+            i.scoicon.sco-links
+script.
+    document.addEventListener('DOMContentLoaded', function () {
+        sco.initbbtalk()
+    })

package/layout/includes/widgets/home/bb/memos.pug

@@ -0,0 +1,25 @@
+script.
+    !async function () {
+        await fetch('!{theme.says.mode_link}')
+            .then(response => response.json())
+            .then(data => {
+                let aplayerRegex = /{aplayer,(.*?),(.*?)}/g;
+                let bilibiliRegex = /{bilibili,(.*?)}/g;
+                let playerRegex = /{player,(.*?)}/g;
+                let linkRegex = /(?<!\!)\[([^\]]*)\]\(([^\)]*)\)/g;
+                let imageRegex = /!\[\]\((.*?)\)/g;
+                let contentRegex = /#.*?\s([^{\n]*)/g
+                const list = data.slice(0, 10)
+                document.querySelector('#bber-talk').innerHTML = list.map(item => {
+                    let content = item.content.match(contentRegex, '$1').map(item => item.replace(contentRegex, '$1'));
+                    let imageBox = item.content.match(imageRegex) ? '<i class="scoicon sco-image-fill"></i>' : '';
+                    let aplayer = item.content.match(aplayerRegex) ? '<i class="scoicon sco-disc-fill"></i>' : '';
+                    let video = item.content.match(playerRegex) ? '<i class="scoicon sco-video-fill"></i>' : item.content.match(bilibiliRegex) ? '<i class="scoicon sco-bilibili-line"></i>' : '';
+                    let link = item.content.match(linkRegex) ? `<i class="scoicon sco-link"></i>` : '';
+
+                    return `<div class="li-style swiper-slide">${content+aplayer+video+imageBox+link}</div>`
+                }).join(' ')
+                sco.initbbtalk()
+            })
+            .catch(error => console.error('bbtime | ', error));
+    }()

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

@@ -1,8 +1,12 @@
-.bbTimeList.container#bbTimeList
-    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/')")
+.bbTimeList.container#bbTimeList(class=is_home_first_page() ? '' : 'more-page')
+    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
-            each item, i in site.data.essay.essay_list
-                if i < 10
-                    .li-style.swiper-slide= item.image ? item.content + _p('home.bbtime.image') : item.content
-    i.bber-gotobb.scoicon.sco-right-btn-fill(title=_p('home.bbtime.text'), onclick="pjax.loadUrl('/essay/')")
+            case theme.says.mode
+                when 'local'
+                    include bb/local
+                when 'json'
+                    include bb/json
+                when 'memos'
+                    include bb/memos
+    i.bber-gotobb.scoicon.sco-right-btn-fill(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('/essay/')`)

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

@@ -6,4 +6,4 @@ each groupName, index in groupNames
     .categoryItem(style=`box-shadow: var(${styles[index]});`)
         a.categoryButton(class=classes[index], href=url_for(theme.hometop.categoryGroup[groupName].url))
             span.categoryButtonText= theme.hometop.categoryGroup[groupName].name
-            i(class=theme.hometop.categoryGroup[groupName].icon)
+            i.scoicon(class=theme.hometop.categoryGroup[groupName].icon)

package/layout/includes/widgets/nav/menu.pug

@@ -9,7 +9,7 @@
                     each childValue, y in value.child
                         li
                             a.site-page.child(href=url_for(childValue.url))
-                                i(class=childValue.icon)
+                                i.scoicon(class=childValue.icon)
                                 span= y
             else
                 a.site-page.not-child(href=url_for(value.url))

package/layout/includes/widgets/nav/right.pug

@@ -1,12 +1,13 @@
-if theme.nav.right.travellings
-    .nav-button.only-home#travellings_button
-        a.site-page(href="https://www.travellings.cn/go.html", title=_p('nav.travellings'), target="_blank")
-            i.scoicon.sco-train-line
+- var custom = theme.nav.right.custom || []
+each item in custom
+    .nav-button(id=item.id)
+        a.site-page(href=item.url || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
+            i.scoicon(class=item.icon || '')
 if theme.nav.right.random
     .nav-button#randomPost_button
         a.site-page(onclick="toRandomPost()", title=_p('nav.randompost'), href="javascript:void(0);")
             i.scoicon.sco-signal-tower-fill
-if theme.thirdparty.search.enable
+if theme.search.enable
     .nav-button#search-button
         a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'))
             i.scoicon.sco-search-line

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

@@ -1,12 +1,13 @@
 - const authorinfo = site.data.about.authorinfo
 
-.author-info
-    .author-tag-left
-        each tag in authorinfo.leftTags
-            span.author-tag= tag
-    .author-img
-        img(src=authorinfo.image)
-    .author-tag-right
-        each tag in authorinfo.rightTags
-            span.author-tag= tag
+if authorinfo
+    .author-info
+        .author-tag-left
+            each tag in authorinfo.leftTags
+                span.author-tag= tag
+        .author-img
+            img(src=authorinfo.image)
+        .author-tag-right
+            each tag in authorinfo.rightTags
+                span.author-tag= tag
 .author-title= authorinfo.title

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

@@ -1,38 +1,39 @@
 - const contentinfo = site.data.about.contentinfo
 
-.author-content
-    .author-content-item.myInfoAndSayHello
-        .title1= _p('about.info.title1')
-        .title2= _p('about.info.title2')
-            span.inline-word= contentinfo.name
-        .title1= _p('about.info.title3') + contentinfo.title
-    .aboutsiteTips.author-content-item
-        .author-content-item-tips= _p('about.info.tip1')
-        h2
-            = _p('about.info.tip2')
-            br
-            = _p('about.info.tip3')
-            span.inline-word= _p('about.info.tip4')
-            .mask
-                span.first-tips(data-show='')= contentinfo.product
-                span= contentinfo.design
-                span= contentinfo.program
-                span(data-up='')= contentinfo.user_experience
+if contentinfo
+    .author-content
+        .author-content-item.myInfoAndSayHello
+            .title1= contentinfo.sup
+            .title2
+                span.inline-word= contentinfo.name
+            .title1= contentinfo.title
+        .aboutsiteTips.author-content-item
+            .author-content-item-tips= contentinfo.tip
+            h2
+                span.inline-word!= contentinfo.slogan
+                .mask
+                    each item,index in contentinfo.mask
+                        if index === 0
+                            span.first-tips(data-show='')= item
+                        else if index === contentinfo.mask.length - 1
+                            span(data-up='')= item
+                        else
+                            span= item
 
-script.
-    var pursuitInterval = null;
-    pursuitInterval = setInterval(function () {
-        const show = document.querySelector('span[data-show]')
-        const next = show.nextElementSibling || document.querySelector('.first-tips')
-        const up = document.querySelector('span[data-up]')
-        if (up) {
-            up.removeAttribute('data-up')
-        }
-        show.removeAttribute('data-show')
-        show.setAttribute('data-up', '')
-        next.setAttribute('data-show', '')
-    }, 2000)
+    script.
+        var pursuitInterval = null;
+        pursuitInterval = setInterval(function () {
+            const show = document.querySelector('span[data-show]')
+            const next = show.nextElementSibling || document.querySelector('.first-tips')
+            const up = document.querySelector('span[data-up]')
+            if (up) {
+                up.removeAttribute('data-up')
+            }
+            show.removeAttribute('data-show')
+            show.setAttribute('data-up', '')
+            next.setAttribute('data-show', '')
+        }, 2000)
 
-    document.addEventListener('pjax:send', function(){
-        clearInterval(pursuitInterval);
-    });
+        document.addEventListener('pjax:send', function () {
+            clearInterval(pursuitInterval);
+        });

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

@@ -1,20 +1,24 @@
-.author-content
-    if site.data.about.game1
-        .author-content-item.game-apex(style=`background: url(${site.data.about.game1.img}) no-repeat top; background-size: cover;`)
-            .card-content
-                .author-content-item-tips= site.data.about.game1.title
-                span.author-content-item-title= site.data.about.game1.subtitle
-                .content-bottom
-                    .tips= site.data.about.game1.tips_left
-                    .tips= site.data.about.game1.tips_right
-    if site.data.about.game2
-        .author-content-item.game-jl(style=`background: url(${site.data.about.game2.img}) no-repeat top; background-size: cover;`)
-            .card-content
-                .author-content-item-tips= site.data.about.game2.title
-                span.author-content-item-title= site.data.about.game2.subtitle
-                .content-bottom
-                    .tips= site.data.about.game2.tips_left
-                    .tips= site.data.about.game2.tips_right
+- var game1 = game1
+- var game2 = game2
+
+if game1 || game2
+    .author-content
+        if game1
+            .author-content-item.game-apex(style=`background: url(${game1.img}) no-repeat top; background-size: cover;`)
+                .card-content
+                    .author-content-item-tips= game1.title
+                    span.author-content-item-title= game1.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 site.data.about.likes
     - const likes = site.data.about.likes