Merge pull request #136 from wleelw/dev

release: v1.4.7
everfu · Feb 8, 2024 · 6789fa7 · 6789fa7
2 parents 8f64944 + 7caf302
commit 6789fa7
Show file tree

Hide file tree

Showing 37 changed files with 898 additions and 1,751 deletions.
diff --git a/_config.yml b/_config.yml
diff --git a/languages/en-US.yml b/languages/en-US.yml
@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: Please enable JavaScript to view the site
-  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/wleelw/Hexo-theme-solitude | Version: v1.4.6 😄'
+  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/wleelw/Hexo-theme-solitude | Version: v1.4.7 😄'
 
 aside:
   postcount: 'Posts :'
@@ -144,4 +144,7 @@ rightmenu:
   dark: Dark
   light: Light
   chs_to_cht: Traditional
-  cht_to_chs: Simplified
+  cht_to_chs: Simplified
+
+404:
+  button: Back to home
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: 开启JavaScript才能访问本站哦~
-  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/wleelw/Hexo-theme-solitude | 版本：v1.4.6 😄'
+  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/wleelw/Hexo-theme-solitude | 版本：v1.4.7 😄'
 
 aside:
   postcount: '文章总数 :'
@@ -144,4 +144,7 @@ rightmenu:
   dark: 深色模式
   light: 浅色模式
   chs_to_cht: 轉為繁體
-  cht_to_chs: 转为简体
+  cht_to_chs: 转为简体
+
+404:
+  button: 返回首页
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: 開啟JavaScript才能訪問本站哦~
-  console: '程式：Hexo |主題：Hexo-Theme-Solitude |作者：王卓Sco、亦封 |Github位址： https://github.com/wleelw/Hexo-theme-solitude |版本：v1.4.6 😄'
+  console: '程式：Hexo |主題：Hexo-Theme-Solitude |作者：王卓Sco、亦封 |Github位址： https://github.com/wleelw/Hexo-theme-solitude |版本：v1.4.7 😄'
 
 aside:
   postcount: '文章數：'
@@ -144,4 +144,7 @@ rightmenu:
   dark: 深色模式
   light: 淺色模式
   chs_to_cht: 轉為繁體
-  cht_to_chs: 转为简体
+  cht_to_chs: 转为简体
+
+404:
+  button: 返回首頁
diff --git a/layout/404.pug b/layout/404.pug
@@ -3,13 +3,13 @@ extends includes/layout.pug
 block content
     #error-wrap
         .error-content
-            .error-img(style='background-image: url(' + url_for(theme.errorpage.img) + ')')
+            .error-img(style=`background-image: url(${url_for(theme.errorpage.img)})`)
             .error-info
                 h1.error_title 404
                 .error_subtitle= theme.errorpage.text
                 a.button--animated(href="/")
                     i.scoicon.sco-external-link
-                    | 回到主页
+                    =_p('404.button')
 
     if theme.errorpage.recommendList
         .aside-list

diff --git a/layout/includes/head/config.pug b/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},
-    }
+    };
diff --git a/layout/includes/head/opengraph.pug b/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

diff --git a/layout/includes/head/pwa.pug b/layout/includes/head/pwa.pug
@@ -1,19 +1,18 @@
 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)
     if theme.pwa.favicon_32_32
         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)

diff --git a/layout/includes/inject/body.pug b/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 () {

diff --git a/layout/includes/inject/head.pug b/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
diff --git a/layout/includes/mixins/pagination.pug b/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
diff --git a/layout/includes/page/rss.pug b/layout/includes/page/rss.pug
diff --git a/layout/includes/page/says.pug b/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
                     | - 已展开所有短文 -

diff --git a/layout/includes/widgets/home/bb/json.pug b/layout/includes/widgets/home/bb/json.pug
diff --git a/layout/includes/widgets/home/bb/local.pug b/layout/includes/widgets/home/bb/local.pug
diff --git a/layout/includes/widgets/home/bb/memos.pug b/layout/includes/widgets/home/bb/memos.pug