hexo-theme-solitude 1.3.0 → 1.4.0

package/layout/includes/inject/body.pug

@@ -1,29 +1,124 @@
-- cdn = theme.cdn.body
 - page.type = is_post() ? 'post' : page.type
 
-script(src=url_for(cdn.pjaxjs))
-if theme.lazyload.enable
-    script(src=cdn_url_for("/lib/lazyload.min.js"))
-script(src=cdn_url_for("/lib/snackbar.min.js"))
-if theme.lightbox
-    script(src=cdn_url_for("/lib/view-image.min.js"))
-if theme.says.home_mini || theme.aside.history.enable
-    script(src=url_for(cdn.swiperjs))
-
-if theme.rightside.enable
-    include ../widgets/rightside/index.pug
-    script(src=cdn_url_for("/lib/rightside.min.js"))
+div
+    script(src=url_for(theme.cdn.main))
+
+    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
+
+    script(src=url_for(theme.cdn.pjax))
+    if theme.lazyload.enable
+        script(src=url_for(theme.cdn.lazyload))
+    script(src=url_for(theme.cdn.snackbar))
+    if theme.lightbox
+        if theme.mediumZoom
+            script(src=url_for(theme.cdn.medium_zoom))
+        if theme.fancybox
+            script(src=url_for(theme.cdn.fancyapps_ui))
+    if theme.says.home_mini
+        script(src=url_for(theme.cdn.swiper_js))
+
+    if theme.rightside.enable
+        include ../widgets/rightside/index
+        script(src=url_for(theme.cdn.rightside_js))
+
+    // post-ai)
+    if theme.post_ai.enable
+        script(src=url_for(theme.cdn.sco_ai_js))
+
+    if theme.capsule.enable || theme.music.enable
+        script(src=url_for(theme.cdn.aplayer_js))
+        script(src=url_for(theme.cdn.meting_js))
+        script.
+            const meting_api = '!{theme.meting_api}';
+
+    if theme.post.covercolor.enable
+        case theme.post.covercolor.mode
+            when 'local'
+                script(src=url_for(theme.cdn.cover_local))
+            when 'api'
+                script.
+                    const coverColorConfig = {
+                        api: '!{theme.post.covercolor.api}',
+                        time: !{theme.post.covercolor.time},
+                    }
+                script(src=url_for(theme.cdn.cover_api))
+
+    // waterfall
+    if theme.says.enable
+        script(src=url_for(theme.cdn.waterfall))
+
+    // comment
+    if theme.comment.enable
+        case theme.comment.type
+            when 'twikoo'
+                script(src=url_for(theme.cdn.twikoo))
+            when 'waline'
+                script(src=url_for(theme.cdn.waline_js))
+                link(rel="stylesheet", href=url_for(theme.cdn.waline_css))
+
+        if theme.comment.commentBarrage
+            case theme.comment.type
+                when 'twikoo'
+                    script(src=url_for(theme.cdn.twikoo_commentBarrage))
+                when 'waline'
+                    script(src=url_for(theme.cdn.waline_commentBarrage))
+
+    // music
+    if theme.music.enable
+        script(src=url_for(theme.cdn.music_js))
+
+    // gallery
+    if theme.gallery
+        script(src=url_for(theme.cdn.fj_gallery))
+        link(rel="stylesheet", href=url_for(theme.cdn.fj_gallery_css))
+
+    // pace 胶囊加载条(Capsule loading bar)
+    if theme.loading.pace
+        script(src=url_for(theme.cdn.pace_js))
+
+    // search
+    if theme.search.enable
+        case theme.search.type
+            when 'algolia'
+                script(src=url_for(theme.cdn.instantsearch))
+                script(src=url_for(theme.cdn.algolia_search))
+            when 'local'
+                script(src=url_for(theme.cdn.lunr_js))
+
+    // inject custom body
+    if theme.extends.body
+        each item in theme.extends.body
+            != item
 
 div#js-pjax
-    if page.type === 'says'
+    if page.type === 'says' && theme.says.enable
         script.
             window.addEventListener('resize', utils.throttle(function () {
                 if (document.getElementById('waterfall')) {
                     sco.reflashEssayWaterFall();
                 }
             }), 500);
-    if theme.thirdparty.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv || theme.thirdparty.busuanzi.usecomment === false)
-        script(async src=url_for(cdn.busuanzijs))
+            sco.reflashEssayWaterFall();
+            GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
+    if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
+        script(async src=url_for(theme.cdn.busuanzi_js))
 
     script#config-diff.
         var PAGE_CONFIG = {
@@ -35,57 +130,14 @@ div#js-pjax
             comment: !{!!page.comment},
         }
 
-// post-ai)
-if theme.thirdparty.ai.enable
-    script(src=cdn_url_for("/lib/sco-ai.min.js"))
-
-if theme.thirdparty.aplayer.enable || theme.music.enable
-    script(src=url_for(cdn.aplayerjs))
-    script(src=url_for(cdn.metingjs))
-    script.
-        const meting_api = '!{theme.thirdparty.aplayer.api}';
-
-if theme.post.covercolor.enable
-    script.
-        const coverColorConfig = {
-            mode: '!{theme.post.covercolor.mode}',
-            api: '!{theme.post.covercolor.api}',
-            time: !{theme.post.covercolor.time},
-        }
-    script(src=cdn_url_for("/lib/cover-color.min.js"))
-
 if theme.footer.randomlink
     include ../widgets/randomlink.pug
 
-if page.katex
-    link(rel="stylesheet", href=url_for(cdn.katexcss))
-    script(src=url_for(cdn.katexjs))
-
-if theme.aside.welcome.enable
-    script(src=cdn_url_for("/lib/txmap.min.js"))
-
-// waterfall
-if theme.says.enable
-    script(src=cdn_url_for("/lib/waterfall.min.js"))
-
-if theme.comment.enable
-    case theme.comment.type
-        when 'twikoo'
-            script(src=cdn_url_for("/js/extend/comment/twikoo/twikoo.js"))
-            script(src=cdn_url_for("/js/extend/comment/twikoo/commentBarrage.js"))
-        when 'waline'
-            script(src=cdn_url_for("/js/extend/comment/waline/waline.js"))
-            script(src=cdn_url_for("/js/extend/comment/waline/commentBarrage.js"))
-
+// newest comment
+include ../widgets/third-party/news-comment/newest-comment.pug
 
 // pjax
 include ../widgets/third-party/pjax.pug
 
-// music
-if theme.music.enable
-    script(src=cdn_url_for("/js/music.js"))
-
-// inject custom body
-if theme.extends.body
-    each item in theme.extends.body
-        != item
+// theme
+include ../body/mode

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

@@ -34,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 theme.about && 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))