hexo-theme-solitude 2.1.13 → 2.1.15

package/_config.yml

@@ -279,7 +279,7 @@ post:
       license: CC BY-NC-SA 4.0
       # License link
       # 许可证链接
-      licenurl: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh
+      licenurl: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh-hans
   # Article meta information
   # 文章元信息
   meta:
@@ -553,7 +553,7 @@ footer:
     author: false # img url / false
     left:
       # Github: https://github.com/everfu || fab fa-github # 名称: 链接 || 图标
-      # Mail: mailto:o@everfu.org || fab fa-envelope
+      # Mail: mailto:o@everfu.org || far fa-envelope
     right:
       # Bilibili: https://space.bilibili.com/1329819902 || fab fa-bilibili
       # Douyin: https://v.douyin.com/iJsLc8jt/ || fab fa-tiktok
@@ -570,7 +570,7 @@ footer:
   # 随机友链
   randomlink: false # 随机友链
   # 许可证
-  license: # https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh # 许可证
+  license: # https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh-hans # 许可证
 
   # 备案
   beian:
@@ -998,21 +998,34 @@ CDN:
   custom_format: https://fastly.jsdelivr.net/npm/${name}@${version}/${min_file} # 自定义格式
   # 直接覆盖默认 CDN 链接（优先级最高）
   options:
-    # algolia_search:
-    # instantsearch:
-    # pjax:
-    # twikoo:
-    # waline_js:
-    # waline_css:
-    # katex:
-    # katex_copytex:
-    # lazyload:
-    # aplayer_css:
-    # aplayer_js:
-    # meting_js:
-    # pace_js:
-    # swiper_css:
-    # swiper_js:
-    # busuanzi_js:
-    # snackbar_js:
+    # algolia_search
+    # aplayer_css
+    # aplayer_js
+    # artalk_css
+    # artalk_js
+    # blueimp_md5
+    # busuanzi_js
+    # chart_js
+    # color_thief
+    # fancyapps_css
+    # fancyapps_ui
+    # fontawesome
+    # instantsearch
+    # katex
+    # katex_copytex
+    # lazyload
+    # medium_zoom
+    # mermaid_js
+    # meting_js
+    # pace_js
+    # pjax
+    # qrcode
+    # snackbar
+    # swiper_css
+    # swiper_js
+    # twikoo
+    # typeit_js
+    # valine
+    # waline_css
+    # waline_js
 # --------------------------- end ---------------------------

package/layout/includes/head/opengraph.pug

@@ -8,6 +8,5 @@ if theme.OpenGraph.enable
         }
     -
     != open_graph(ogOption)
-    meta(name="description" content=page_description())
 else
     meta(name="description" content=page_description())

package/layout/includes/inject/body.pug

@@ -111,7 +111,7 @@ div
     if is_home() && theme.carousel && site.posts.data.filter(item => item.recommend === true).slice(0, 6) || false
       script.
         carousel_swiper()
-    if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
+    if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv || is_post() && theme.post.meta.pv)
       script(defer pjax src=url_for(theme.cdn.busuanzi_js))
 
 

package/layout/includes/sidebar.pug

@@ -17,6 +17,12 @@ div#sidebar(style="zoom: 1;")
                     a(href=url_for('/tags/'))
                         .headline=_p('page.tag')
                         .length-num=site.tags.find({parent: {$exists: false}}).length
+            if theme.recent_comments.enable
+                .data-item.is-center
+                    .data-item-link
+                        a(href=url_for(theme.recent_comments.page))
+                            .headline=_p('comment.title')
+                            include ./widgets/sidebar/comment
         span.sidebar-menu-item-title= __('sidebar.function')
         div.sidebar-menu-item
             span.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()")

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

@@ -12,17 +12,19 @@ if skills || careers
                         .tags-group-all
                             .tags-group-wrapper
                                 - var pair = []
-                                each tag, index in skills.tags
-                                    - pair.push(tag)
-                                    if pair.length === 2 || index === skills.tags.length - 1
-                                        .tags-group-icon-pair
-                                            each item in pair
-                                                .tags-group-icon(style=`background:${item.color}`)
-                                                    if item.img
-                                                        img(src=item.img, title=item.title)
-                                                    else if item.icon
-                                                        i(class=item.icon, title=item.title, style=`color: ${item.icon_color ? item.icon_color : ''}`)
-                                        - pair = []
+                                - let times = skills.tags.length? Math.ceil(20/skills.tags.length):0
+                                - for (let i = 0; i < 4 * times; i++)
+                                    each tag, index in skills.tags
+                                        - pair.push(tag)
+                                        if pair.length === 2
+                                            .tags-group-icon-pair
+                                                each item in pair
+                                                    .tags-group-icon(style=`background:${item.color}`)
+                                                        if item.img
+                                                            img(src=item.img, title=item.title)
+                                                        else if item.icon
+                                                            i(class=item.icon, title=item.title, style=`color: ${item.icon_color ? item.icon_color : ''}`)
+                                            - pair = []
                         .skills-list
                             each tag in skills.tags
                                 .skill-info

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

@@ -1,6 +1,6 @@
 .banners-title
-    .banners-title-small= page.title
-    .banners-title-big= page.desc
+    .banners-title-small= page.desc
+    .banners-title-big= page.title
 
 .banner-button-group
     if theme.footer.randomlink
@@ -12,23 +12,31 @@
             i.solitude.fa-solid.fa-circle-chevron-right
             span.solitude.banner-button-text=_p('link.banner.toComment')
 
-.tags-group-all.nowrapMove
-    .tags-group-wrapper
-        - const data = site.data.links.links
-        - for (let i = 0; i < 2; i++)
-            - var links = []
-            each x in data
-                each y in x.link_list
-                    - links.push(y)
-            - var pairs = []
-            each link, index in links
-                if (index % 2 === 0)
-                    - pairs.push([link])
-                else
-                    - pairs[pairs.length - 1].push(link)
-            each pair in pairs
-                .tags-group-icon-pair
-                    each y in pair
-                        a.tags-group-icon(href=url_for(y.link), title=y.name)
-                            img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
-                            span.tags-group-title=y.name
+- if (site.data.links.swiper !== false)
+    .tags-group-all.nowrapMove
+        .tags-group-wrapper
+            - const data = site.data.links.links
+                - var links = []
+                each x in data
+                    each y in x.link_list
+                        - links.push(y)
+                - if (links.length)
+                    - let originalLinks = links
+                    - while (links.length<20)
+                        - links = links.concat(originalLinks)
+                    each i in [1,2]
+                        - links = links.concat(links)
+                - var pairs = []
+                each link, index in links
+                    if (index % 2 === 0)
+                        - pairs.push([link])
+                    else
+                        - pairs[pairs.length - 1].push(link)
+                each pair in pairs
+                    .tags-group-icon-pair
+                        each y in pair
+                            a.tags-group-icon(href=url_for(y.link), title=y.name)
+                                img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
+                                span.tags-group-title=y.name
+- else
+    .tags-group-all(style="height:calc(3rem + 72px);")

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

@@ -56,9 +56,15 @@
                                     #qrcode
                                     .reward-dec=_p('post.share.qrcode')
                             script(pjax).
-                                typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), '!{path}');
+                                typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), {
+                                    text: '!{path}',
+                                    correctLevel : QRCode.CorrectLevel.L
+                                });
                                 window.addEventListener('DOMContentLoaded', () => {
-                                    new QRCode(document.getElementById("qrcode"), '!{path}');
+                                    new QRCode(document.getElementById("qrcode"), {
+                                        text: '!{path}',
+                                        correctLevel : QRCode.CorrectLevel.L
+                                    });
                                 });
 
     if copyright.enable || page.copyright

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

@@ -37,7 +37,7 @@
                 span.post-meta-position(title=_p('post.ip') + page.locate)
                     i.post-meta-icon.solitude.fas.fa-location-dot
                     span= page.locate
-            if theme.post.meta.pv
+            if theme.post.meta.pv && (theme.comment.use && theme.comment.pv || theme.busuanzi)
                 a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))
                     i.post-meta-icon.solitude.fa-solid.fa-fire-flame-curved
                     if theme.comment.use && theme.comment.pv

package/layout/includes/widgets/rightside/hide.pug

@@ -4,7 +4,7 @@
     if theme.rightside.hide.mode 
         button.mode(type='button' title=_p('rightside.hide.mode') onclick='sco.switchDarkMode()')
             i.fas.fa-circle-half-stroke
-    if theme.rightside.hide.aside
+    if theme.rightside.hide.aside && theme.console.enable
         button.aside.pc(type='button' title=_p('rightside.hide.aside') onclick='sco.switchHideAside()')
             i.fas.fa-arrows-alt-h
     if theme.keyboard.enable

package/layout/includes/widgets/sidebar/artalk.pug

@@ -0,0 +1,13 @@
+.length-num#artalk_allcount
+  i.solitude.fa-solid.fa-spinner.fa-spin
+
+- const { server, site } = theme.artalk
+
+script(pjax).
+  (async () => {
+    const searchParams = new URLSearchParams({'site_name': "!{site}", 'limit': '-1'})
+    await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`, {method: 'GET'}).then(async res => res.json())
+      .then(async data => {
+        document.querySelector('#artalk_allcount').innerHTML = data.length
+      })
+  })()

package/layout/includes/widgets/sidebar/comment.pug

@@ -0,0 +1,13 @@
+- const {use} = theme.comment
+
+case use[0]
+  when 'Twikoo'
+    !=partial('includes/widgets/sidebar/twikoo', {}, {cache: true})
+  when 'Waline'
+    !=partial('includes/widgets/sidebar/waline', {}, {cache: true})
+  when 'Valine'
+    !=partial('includes/widgets/sidebar/valine', {}, {cache: true})
+  when 'Artalk'
+    !=partial('includes/widgets/sidebar/artalk', {}, {cache: true})
+  when 'Giscus'
+    !=partial('includes/widgets/sidebar/giscus', {}, {cache: true})

package/layout/includes/widgets/sidebar/twikoo.pug

@@ -0,0 +1,19 @@
+.length-num#twikoo_allcount
+  i.solitude.fa-solid.fa-spinner.fa-spin
+
+- const {envId} = theme.twikoo
+
+script(pjax).
+  (async () => {
+    await fetch('!{envId}', {
+      method: "POST",
+      body: JSON.stringify({
+        "event": "GET_RECENT_COMMENTS",
+        "includeReply": true,
+        "pageSize": -1
+      }),
+      headers: {'Content-Type': 'application/json'}
+    }).then(res => res.json()).then(async ({data}) => {
+      document.querySelector('#twikoo_allcount').innerHTML = data.length
+    })
+  })()

package/layout/includes/widgets/sidebar/valine.pug

@@ -0,0 +1,18 @@
+.length-num#valine_allcount
+  i.solitude.fa-solid.fa-spinner.fa-spin
+
+- const { appId, appKey, serverURLs } = theme.valine
+
+script(pjax).
+  (async () => {
+    await fetch('!{serverURLs}/1.1/classes/Comment?limit=-1&order=-createdAt', {
+      method: "GET",
+      headers: {
+        "X-LC-Id": '!{appId}',
+        "X-LC-Key": '!{appKey}',
+        "Content-Type": "application/json"
+      }
+    }).then(async res => res.json()).then(async results => {
+      document.querySelector('#valine_allcount').innerHTML = results.length
+    })
+  })()

package/layout/includes/widgets/sidebar/waline.pug

@@ -0,0 +1,10 @@
+.length-num#waline_allcount
+  i.solitude.fa-solid.fa-spinner.fa-spin
+
+script(pjax).
+  (async () => {
+    await fetch('!{theme.waline.envId}/api/comment?type=recent&count=-1', {method: 'GET'}).then(async res => res.json())
+      .then(async data => {
+        document.querySelector('#waline_allcount').innerHTML = data.length
+      })
+  })()

package/package.json

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

package/plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch.umd.js
-  version: 5.14.2
+  version: 5.18.0
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.75.5
+  version: 4.75.6
 pjax:
   name: pjax
   file: pjax.min.js
@@ -18,16 +18,16 @@ waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 3.3.2
+  version: 3.4.2
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
-  version: 3.3.2
+  version: 3.4.2
   other_name: waline
 valine:
   name: valine
   file: dist/Valine.min.js
-  version: 1.5.2
+  version: 1.5.3
 artalk_css:
   name: artalk
   file: dist/Artalk.css
@@ -88,7 +88,7 @@ snackbar:
 fontawesome:
   name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
-  version: 6.7.1
+  version: 6.7.2
   other_name: font-awesome
 medium_zoom:
   name: medium-zoom
@@ -107,7 +107,7 @@ fancyapps_css:
 mermaid_js:
   name: mermaid
   file: dist/mermaid.js
-  version: 11.4.0
+  version: 11.4.1
 chart_js:
   name: chart.js
   file: dist/chart.umd.js
@@ -129,6 +129,6 @@ qrcode:
   other_name: qrcodejs
 color_thief:
   name: colorthief
-  file: color-thief.min.js
+  file: dist/color-thief.min.js
   version: 2.6.0
   other_name: color-thief

package/source/css/_global/animation.styl

@@ -216,6 +216,12 @@
   to
     transform translateX(-50%)
 
+@keyframes rowleft-quarter
+  from
+    transform translateX(-25%)
+  to
+    transform translateX(-75%)
+
 @keyframes gradient
   0%
     background-position 0 50%

package/source/css/_page/_about/skills.styl

@@ -15,7 +15,7 @@
       margin-top 40px
       display flex
       flex-wrap nowrap
-      animation rowleft 60s linear infinite
+      animation rowleft-quarter 30s linear infinite
 
     .skills-style-group
       position relative

package/source/css/_page/other.styl

@@ -100,7 +100,7 @@ div#banners
 
     .tags-group-wrapper
       margin-top: 7rem
-      animation: rowleft 120s linear infinite
+      animation: rowleft-quarter 30s linear infinite
       display flex
 
       +maxWidth768()

package/source/css/_post/tools.styl

@@ -148,6 +148,7 @@
                   box-shadow: var(--efu-shadow-lightblack)
                   border-radius: 12px
                   border: var(--style-border-always)
+                  image-rendering: pixelated
 
             .reward-main-btn
               background: var(--efu-secondbg)

package/source/js/covercolor/local.js

@@ -1,9 +1,10 @@
 const coverColor = () => {
     const pageColor = PAGE_CONFIG.color || document.getElementById("post-cover")?.src;
     if (pageColor) {
-        return localColor(pageColor);
+        localColor(pageColor);
+    } else {
+        setDefaultThemeColors();
     }
-    setDefaultThemeColors();
 }
 
 const setDefaultThemeColors = () => {
@@ -19,20 +20,20 @@ const setDefaultThemeColors = () => {
     initThemeColor();
 }
 
-const localColor = path => {
+const localColor = (path) => {
     const colorThief = new ColorThief();
     const img = new Image();
     img.crossOrigin = "Anonymous";
-    img.onload = () => setThemeColors(rgbToHex(colorThief.getColor(img)), ...colorThief.getColor(img));
+    img.onload = () => {
+        const color = colorThief.getColor(img);
+        setThemeColors(rgbToHex(color), ...color);
+    };
     img.onerror = () => console.error('Image Error');
     img.src = path;
 }
 
 const rgbToHex = ([r, g, b]) => {
-    return '#' + [r, g, b].map(x => {
-        const component = Math.floor(x * 0.8);
-        return component.toString(16).padStart(2, '0');
-    }).join('');
+    return '#' + [r, g, b].map(x => Math.floor(x * 0.8).toString(16).padStart(2, '0')).join('');
 }
 
 const setThemeColors = (value, r = null, g = null, b = null) => {
@@ -44,12 +45,13 @@ const setThemeColors = (value, r = null, g = null, b = null) => {
         '--efu-main-op-deep': value + 'dd',
         '--efu-main-none': value + '00'
     };
+    
     Object.entries(themeColors).forEach(([key, color]) => {
         document.documentElement.style.setProperty(key, color);
     });
 
-    if (r && g && b) {
-        const brightness = Math.round(((parseInt(r) * 299) + (parseInt(g) * 587) + (parseInt(b) * 114)) / 1000);
+    if (r !== null && g !== null && b !== null) {
+        const brightness = Math.round(((r * 299) + (g * 587) + (b * 114)) / 1000);
         if (brightness < 125) {
             adjustCardStyles();
             value = LightenDarkenColor(value, 50);
@@ -61,22 +63,32 @@ const setThemeColors = (value, r = null, g = null, b = null) => {
     initThemeColor();
 }
 
-function LightenDarkenColor(col, amt) {
-    var usePound = false;
+const LightenDarkenColor = (col, amt) => {
+    let usePound = false;
     if (col[0] === "#") {
         col = col.slice(1);
         usePound = true;
     }
+    let num = parseInt(col, 16);
+    let r = (num >> 16) + amt;
+    let g = ((num >> 8) & 0x00FF) + amt;
+    let b = (num & 0x0000FF) + amt;
+
+    r = Math.max(Math.min(r, 255), 0);
+    g = Math.max(Math.min(g, 255), 0);
+    b = Math.max(Math.min(b, 255), 0);
+
+    return (usePound ? "#" : "") + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
 }
 
 const adjustCardStyles = () => {
-    const cardContents = document.getElementsByClassName('card-content');
-    Array.from(cardContents).forEach(item => {
+    const cardContents = document.querySelectorAll('.card-content');
+    cardContents.forEach(item => {
         item.style.setProperty('--efu-card-bg', 'var(--efu-white)');
     });
 
-    const authorInfo = document.getElementsByClassName('author-info__sayhi');
-    Array.from(authorInfo).forEach(item => {
+    const authorInfo = document.querySelectorAll('.author-info__sayhi');
+    authorInfo.forEach(item => {
         item.style.setProperty('background', 'var(--efu-white-op)');
         item.style.setProperty('color', 'var(--efu-white)');
     });

package/source/js/main.js

@@ -698,7 +698,7 @@ class tabs {
     const ele = document.createElement('div');
     ele.className = 'expire';
     ele.innerHTML = `<i class="solitude fas fa-circle-exclamation"></i>${expire.text_prev}${-(expire.time - ex)}${expire.text_next}`;
-    const articleContainer = document.getElementById('article-container');
+    const articleContainer = document.querySelector('.article-container');
     articleContainer.insertAdjacentElement(expire.position === 'top' ? 'afterbegin' : 'beforeend', ele);
   }
 }