hexo-theme-solitude 1.11.3 → 1.12.0

package/CONTRIBUTING.md

@@ -33,7 +33,7 @@ $ git push
 * 定期使用项目仓库内容更新自己仓库内容。
 
 ```bash
-$ git remote add upstream https://github.com/valor-x/Hexo-theme-solitude
+$ git remote add upstream https://github.com/everfu/hexo-theme-solitude
 $ git fetch upstream
 $ git checkout dev
 $ git rebase upstream/dev

package/README.md

@@ -13,9 +13,8 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/everfu/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvalor-x%2Fhexo-theme-solitude?ref=badge_shield)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
 ![node version](https://img.shields.io/badge/node-14.0.0-white?logo=node.js&logoColor=white)
@@ -48,7 +47,7 @@
 ## 特性
 
 - 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline、Valine、Artalk)，支持双评论
+- 评论(Twikoo、Waline、Valine、Artalk、Giscus)，支持双评论
 - 昼夜切换(ColorMode)
 - 灯箱(medium-zoom、fancybox)
 - 数学公式(Latex)
@@ -63,7 +62,7 @@
 - [x] 弹幕留言页
 - [x] 首页顶部新样式 
 
-> 如有问题请提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> 如有问题请提 [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
 ## 应用
 

package/README_en-US.md

@@ -13,7 +13,7 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?color=blue&logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
@@ -46,13 +46,13 @@
 
 ## Features
 
-- Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline、Valine、Artalk), Can double comment
-- ColorMode
-- Lightbox(medium-zoom、fancybox)
-- Mathematical formulas(Latex)
-- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page, Barrage message page
-- Article features: AI summary, code highlighting
+- Pjax、LazyLoad、PWA.
+- Comments(Twikoo、Waline、Valine、Artalk、Giscus), Can double comment.
+- ColorMode.
+- Lightbox(medium-zoom、fancybox).
+- Mathematical formulas(Latex).
+- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page, Barrage message page.
+- Article features: AI summary, code highlighting.
 
 ## Todo
 
@@ -60,9 +60,9 @@
 - [x] Use double comment
 - [x] Album
 - [x] Barrage message page
-- [ ] New style at the top of the home page
+- [x] New style at the top of the home page
 
-> If you have any questions, please issue an [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> If you have any questions, please issue an [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
 ## Setup
 
@@ -87,4 +87,4 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## License
 
-[MIT](./LICENSE) License © 2023-PRESENT [EverFu](https://github.com/efuo)
+[MIT](./LICENSE) License © 2023-PRESENT [Ever Fu](https://github.com/everfu)

package/README_zh-Hant.md

@@ -13,7 +13,7 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?color=blue&logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
@@ -46,13 +46,13 @@
 
 ## 特性
 
-- 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 
-- 評論(Twikoo、Waline、Valine、Artalk)，支援雙評論
-- 晝夜切換（ColorMode） 
-- 燈箱（medium-zoom、fancybox） 
-- 數學公式（Latex） 
-- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁、留言彈幕頁
-- 文章功能：AI 摘要、代碼高亮
+- 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 。
+- 評論(Twikoo、Waline、Valine、Artalk、Giscus)，支援雙評論。
+- 晝夜切換（ColorMode） 。
+- 燈箱（medium-zoom、fancybox） 。
+- 數學公式（Latex） 。
+- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁、留言彈幕頁。
+- 文章功能：AI 摘要、代碼高亮。
 
 ## Todo
 
@@ -60,7 +60,7 @@
 - [x] 雙評論
 - [x] 相冊
 - [x] 留言彈幕頁
-- [ ] 首頁頂部新樣式 
+- [x] 首頁頂部新樣式 
 
 ## 應用
 
@@ -85,4 +85,4 @@
 
 ## 版權
 
-[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/efuo)
+[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/everfu)

package/SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Report a vulnerability
 
-To report a vulnerability, please [report privately via security tab](https://github.com/valor-x/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at o@efu.me.
+To report a vulnerability, please [report privately via security tab](https://github.com/everfu/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at o@efu.me.
 
 All security vulnerabilities will be verified and resolved in a timely manner.
 

package/_config.yml

@@ -1,7 +1,7 @@
 #---------------------------
 # Hexo Theme Solitude
-# Author: Valor Team
-# Github: https://github.com/valor-x/hexo-theme-solitude
+# Author: EverFu
+# Github: https://github.com/everfu/hexo-theme-solitude
 #
 # 配置指南: https://solitude.js.org/
 # 你可以从指南中获得更详细的说明
@@ -9,8 +9,8 @@
 # Guide: https://solitude.js.org/
 # You can get more detailed help from the guide
 #
-# 赞助：https://afdian.net/a/efu0u0
-# sponsor: https://afdian.net/a/efu0u0
+# 赞助：https://afdian.net/a/everfu
+# sponsor: https://github.com/sponsors/everfu
 #---------------------------
 
 # 站点设置
@@ -38,7 +38,7 @@ nav:
   # logo group
   group:
   # 项目: # 分类名称
-  #   Solitude: https://github.com/valor-x/hexo-theme-solitude || /img/pwa/favicon.ico # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
+  #   Solitude: https://github.com/everfu/hexo-theme-solitude || /img/pwa/favicon.ico # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
 
   # 中心菜单
   # center menu
@@ -133,7 +133,7 @@ hometop:
     url: https://solitude.js.org/
     # 显示背景图片
     # Display background image
-    img: /img/default.png
+    img: /img/default.avif
     # 阴影颜色
     # Shadow color
     color: "none"
@@ -180,7 +180,7 @@ aside:
     author:
       # 头像
       # Avatar
-      img: /img/avatar.png
+      img: /img/avatar.avif
       # 表情图片链接
       # Emoticon image link
       # tip: 26x26 size
@@ -210,19 +210,19 @@ aside:
     # 个人信息卡片顶部按钮的切换文字
     # Switching text of the button at the top of the personal information card
     sayhello2: # 样式为2时无效
-    #  - 🤖️ 数码科技爱好者
-    #  - 🔍 分享与热心帮助
-    #  - 🏠 智能家居小能手
-    #  - 🔨 设计开发一条龙
-    #  - 🤝 专修交互与设计
-    #  - 🏃 脚踏实地行动派
-    #  - 🧱 团队小组发动机
-    #  - 💢 壮汉人狠话不多
-    #  - 🎮 电竞游戏爱好者
+    # - 🤖️ 数码科技爱好者
+    # - 🔍 分享与热心帮助
+    # - 🏠 智能家居小能手
+    # - 🔨 设计开发一条龙
+    # - 🤝 专修交互与设计
+    # - 🏃 脚踏实地行动派
+    # - 🧱 团队小组发动机
+    # - 💢 壮汉人狠话不多
+    # - 🎮 电竞游戏爱好者
     # 个人信息卡片底部的小图标，按照例子填写
     information: # 样式为1时请不要超过4个
-    #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
-    #  Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
+    # Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
+    # Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
 
   # 二维码
   # Official account QR code
@@ -369,13 +369,13 @@ post:
   share:
     enable: false
     list:
-    #  - qq
-    #  - weibo
-    #  - twitter
-    #  - facebook
-    #  - telegram
-    #  - whatsapp
-    #  - linkedin
+    # - qq
+    # - weibo
+    # - twitter
+    # - facebook
+    # - telegram
+    # - whatsapp
+    # - linkedin
   # 版权中订阅按钮跳转链接，填写地址后开启
   # Subscription button jump link in copyright
   rss: # /atom.xml
@@ -443,11 +443,11 @@ footer:
   information:
     author: false # 是否显示 site_icon / enable site_icon in footer
     left: # 左侧显示图标
-    #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
-    #  Mail: mailto:o@efu.me || st-mail-line
+    # Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
+    # Mail: mailto:o@efu.me || st-mail-line
     right: # 右侧显示图标
-    #  Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
-    #  抖音: https://v.douyin.com/iJsLc8jt/ || st-douyin-fill
+    # Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
+    # 抖音: https://v.douyin.com/iJsLc8jt/ || st-douyin-fill
 
   # 底部导航栏
   # Bottom navigation bar
@@ -483,7 +483,7 @@ footer:
     # 为了主题能够得到更多的支持，建议保留主题链接
     # In order for the theme to get more support, it is recommended to keep the theme link
     - name: 主题
-      url: https://github.com/valor-x/hexo-theme-solitude
+      url: https://github.com/everfu/hexo-theme-solitude
     # - name: 订阅
     #   url: /atom.xml
 
@@ -491,7 +491,7 @@ footer:
 errorpage:
   # 图片
   # image
-  img: /img/404.webp
+  img: /img/404.avif
   # 文字
   # text
   text: =awa= 页面走丢了
@@ -620,10 +620,10 @@ lazyload:
   field: site # post, site
   # 加载中显示图片
   # Loading display image
-  placeholder: /img/loading.gif
+  placeholder: /img/loading.avif
   # 加载失败显示图片
   # Loading failed display image
-  errorimg: /img/error_load.webp
+  errorimg: /img/error_load.avif
 
 # 加载动画
 # loading animation
@@ -784,7 +784,7 @@ twikoo: # https://twikoo.js.org/
 # waline 配置信息
 # waline settings
 waline: # https://waline.js.org/
-  envId:  # url: https://waline.wzsco.top
+  envId: # url: https://waline.wzsco.top
   pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics
   option: # waline配置项 / waline configuration item
 
@@ -806,6 +806,18 @@ artalk:
   site: # site name / 站点名
   option: # options
 
+# giscus 配置信息
+# giscus settings
+# docs: https://giscus.app/
+giscus:
+  repo: # GitHub repository name
+  repo_id: # GitHub repository id
+  category_id: # GitHub repository category id
+  theme: 
+    light: light
+    dark: dark
+  option: # options
+
 # 中控台扩展 ： 最新评论 + 标签 + 文章
 console_plus: false
 
@@ -832,8 +844,8 @@ css_prefix: false
 font:
   font-size: 16px
   code-font-size: 16px
-  font-family: 'PingFang SC,Hiragino Sans GB,Microsoft YaHei'
-  code-font-family: 'monospace, monospace'
+  font-family: "PingFang SC,Hiragino Sans GB,Microsoft YaHei"
+  code-font-family: "monospace, monospace"
 
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 # Insert code before </head> and before </body>

package/languages/default.yml

@@ -98,6 +98,7 @@ aside:
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
+  newcomment: New comments
   card:
     posts: 'Posts:'
     tags: 'Tags:'

package/languages/en.yml

@@ -98,6 +98,7 @@ aside:
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
+  newcomment: New comments
   card:
     posts: 'Posts:'
     tags: 'Tags:'

package/languages/zh-CN.yml

@@ -100,6 +100,7 @@ aside:
   back: 欢迎再次回来，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累计文章数:'
     tags: '标签总数:'

package/languages/zh-TW.yml

@@ -100,6 +100,7 @@ aside:
   back: 歡迎再次回來，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'

package/layout/includes/console.pug

@@ -3,17 +3,18 @@ div#console
         i.solitude.st-close-fill
     if theme.console_plus
         div.console-card-group
-            if theme.console_plus && theme.comment.newest_comment.enable
+            if theme.recent_comments.enable && theme.recent_comments.img
                 div.console-card-group-left
                     div.console-card#card-newest-comments(onclick="sco.hideConsole()")
                         div.card-content
                             div.author-content-item-tips= _p('console.comment_tip')
                             div.author-content-item-title
                                 | #{_p('console.comment_title')}
-                                if theme.recent_comments.enable && theme.recent_comments.console
+                                if theme.recent_comments.enable
                                     a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
                                         i.solitude.st-right-btn-fill
-                        div.aside-list
+                        a.recent-comment-image(href=url_for(theme.recent_comments.page))
+                            img(src=theme.recent_comments.img)
 
             div.console-card-group-right
                 div.console-card.tags(onclick="sco.hideConsole()")

package/layout/includes/inject/body.pug

@@ -105,9 +105,6 @@ div
 if theme.footer.randomlink
     include ../widgets/randomlink.pug
 
-// newest comment
-include ../widgets/third-party/news-comment/newest-comment.pug
-
 // pjax
 != partial("includes/widgets/third-party/pjax", {}, {cache: true})
 

package/layout/includes/inject/head.pug

@@ -27,7 +27,7 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.11.3",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.12.0",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "padding: 5px 10px;color:white;background:#0084ff;border-radius:0 5px 5px 0",
@@ -39,7 +39,7 @@ if theme.memorial.enable
         mdate = (mdate.split(","));
         let ndate = new Date();
         for (let i of mdate) {
-            if (i == (ndate.getMonth()+1) + "-" + (ndate.getDate())) {
+            if (i === (ndate.getMonth()+1) + "-" + (ndate.getDate())) {
                 document.documentElement.classList.add('memorial');
             }
         }

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

@@ -0,0 +1,9 @@
+.card-widget.card-recent-comment
+    .item-headline
+        i.solitude.st-chat-fill
+        span= _p('aside.newcomment')
+        if theme.recent_comments.enable
+            a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
+                i.solitude.st-right-btn-fill
+    .aside-list
+    include ../third-party/news-comment/newest-comment.pug

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

@@ -9,6 +9,8 @@ case item
         include ./asideAllInfo.pug
     when 'ads'
         include ./asideAdsense.pug
+    when 'newest_comment'
+        include ./asideNewstComments.pug
     default
         - const custom = site.data?.aside?.find((i) => i.name === item)
         if custom

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

@@ -39,4 +39,6 @@
                 when 'Waline'
                     #waline-wrap
                 when 'Artalk'
-                    #artalk-wrap
+                    #artalk-wrap
+                when 'Giscus'
+                    #giscus-wrap

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

@@ -0,0 +1,60 @@
+- const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
+- const giscusUrl = theme.cdn.giscus || 'https://giscus.app/client.js'
+- const giscusOriginUrl = new URL(giscusUrl).origin
+- const { use, lazyload } = theme.comment
+
+script.
+    (()=>{
+        const getGiscusTheme = theme => {
+            return theme === 'dark' ? '!{themes.dark}' : '!{themes.light}'
+        }
+
+        const loadGiscus = () => {
+            const config = Object.assign({
+                src: '!{giscusUrl}',
+                'data-repo': '!{repo}',
+                'data-repo-id': '!{repo_id}',
+                'data-category-id': '!{category_id}',
+                'data-mapping': 'pathname',
+                'data-theme': getGiscusTheme(document.documentElement.getAttribute('data-theme')),
+                'data-reactions-enabled': '1',
+                crossorigin: 'anonymous',
+                async: true
+            },!{JSON.stringify(option)})
+
+            const ele = document.createElement('script')
+            for (let key in config) {
+                ele.setAttribute(key, config[key])
+            }
+            document.getElementById('giscus-wrap').appendChild(ele)
+        }
+
+        const changeGiscusTheme = theme => {
+            const sendMessage = message => {
+                const iframe = document.querySelector('iframe.giscus-frame')
+                if (!iframe) return
+                iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
+            }
+
+            sendMessage({
+                setConfig: {
+                    theme: getGiscusTheme(theme)
+                }
+            });
+        }
+
+        utils.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
+
+        if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
+            if (!{lazyload}) {
+                const giscusWrap = document.getElementById('giscus-wrap')
+                if (giscusWrap) {
+                    utils.loadComment(giscusWrap, loadGiscus)
+                }
+            } else {
+                loadGiscus()
+            }
+        } else {
+            window.loadOtherComment = loadGiscus
+        }
+    })()

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

@@ -9,4 +9,6 @@ each name in use
         when 'Valine'
             !=partial('includes/widgets/third-party/comments/valine', {}, {cache: true})
         when 'Artalk'
-            !=partial('includes/widgets/third-party/comments/artalk', {}, {cache: true})
+            !=partial('includes/widgets/third-party/comments/artalk', {}, {cache: true})
+        when 'Giscus'
+            !=partial('includes/widgets/third-party/comments/giscus', {}, {cache: true})

package/layout/includes/widgets/third-party/news-comment/artalk.pug

@@ -1,8 +1,8 @@
 - const { server, site, option } = theme.artalk
 - const avatarCdn = theme.comment.avatar
 
-script.
-    window.addEventListener('load', () => {
+script(pjax).
+    (() => {
         const changeContent = content => {
             if (content === '') return content;
             const replacements = [
@@ -24,15 +24,14 @@ script.
                 }
             ];
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         };
 
         const generateHtml = (array, asideList) => {
             asideList.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
-                    <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                    <div class='thumbnail'>
                         <img src='${item.avatar}' alt='${item.nick}'>
-                        <div class='name'><span>${item.nick}</span></div>
                     </div>
                     <div class='content'>
                         <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
@@ -68,7 +67,7 @@ script.
                     nick: e.nick,
                     url: e.page_key + `#atk-comment-${e.id}`,
                     date: e.date,
-                })).slice(0, 6);
+                })).slice(0, !{limit});
                 utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage});
                 generateHtml(artalk, asideList);
             }).catch(error => {
@@ -78,6 +77,7 @@ script.
         };
 
         const newestCommentInit = (asideList) => {
+            if (!asideList) return;
             const data = utils.saveToLocal.get('artalk-newest-comments');
             if (data) {
                 generateHtml(data, asideList);
@@ -86,9 +86,7 @@ script.
             }
         };
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list');
-        if ($asideList) {
-            newestCommentInit($asideList);
-            utils.addGlobalFn('pjaxComplete', () => newestCommentInit($asideList), 'artalk_newestComment');
-        }
-    });
+        const $asideList = document.querySelector('.card-recent-comment .aside-list');
+        window.addEventListener('DOMContentLoaded', () => newestCommentInit($asideList), false)
+        window.addEventListener('pjax:complete', () => newestCommentInit(document.querySelector('.card-recent-comment .aside-list')), false);
+    })();

package/layout/includes/widgets/third-party/news-comment/newest-comment.pug

@@ -1,10 +1,11 @@
-if theme.comment.use && theme.console_plus && theme.comment.newest_comment.enable
+- var limit = theme.aside.newest_comment.limit ? theme.aside.newest_comment.limit : 5
+if theme.comment.use
     case theme.comment.use[0]
         when 'Twikoo'
-            !=partial('includes/widgets/third-party/news-comment/twikoo', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/twikoo', {limit}, {cache: true})
         when 'Waline'
-            !=partial('includes/widgets/third-party/news-comment/waline', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/waline', {limit}, {cache: true})
         when 'Valine'
-            !=partial('includes/widgets/third-party/news-comment/valine', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/valine', {limit}, {cache: true})
         when 'Artalk'
-            !=partial('includes/widgets/third-party/news-comment/artalk', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/artalk', {limit}, {cache: true})

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (!content) return '';
             const replacements = [
@@ -12,14 +12,13 @@ script.
                 {regex: /<[^>]+>/g, replacement: ''}
             ]
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content)
-            return content.length > 150 ? `${content.substring(0, 150)}...` : content
+            return content.length > 150 ? `${content.substring(0, 100)}...` : content
         }
         const generateHtml = (array) => {
             const html = array.map(item => `
                 <div class='aside-list-item'>
-                    <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                    <div class='thumbnail'>
                         <img src='${item.avatar}' alt='${item.nick}'>
-                        <div class='name'><span>${item.nick}</span></div>
                     </div>
                     <div class='content'>
                         <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
@@ -27,7 +26,7 @@ script.
                     </div>
                 </div>
             `).join('')
-            document.querySelector('#card-newest-comments .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
+            document.querySelector('.card-recent-comment .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
             window.pjax?.refresh()
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
@@ -37,7 +36,7 @@ script.
                 twikoo.getRecentComments({
                     envId: '!{theme.twikoo.envId}',
                     region: '',
-                    pageSize: 6,
+                    pageSize: !{limit},
                     includeReply: true
                 }).then(res => {
                     const twikooArray = res.map(e => ({
@@ -51,7 +50,7 @@ script.
                     generateHtml(twikooArray)
                 }).catch((err) => {
                     console.error(err);
-                    document.querySelector('#card-newest-comments .aside-list').textContent = "!{_p('newest_comment.error')}"
+                    document.querySelector('.card-recent-comment .aside-list').textContent = "!{_p('newest_comment.error')}"
                 })
             }
             if (typeof twikoo === 'object') {
@@ -64,5 +63,6 @@ script.
             const data = utils.saveToLocal.get('twikoo-newest-comment')
             data ? generateHtml(data) : getComment()
         }
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

package/layout/includes/widgets/third-party/news-comment/valine.pug

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
         const changeContent = (content) => {
             if (content === '') return content;
@@ -16,10 +16,10 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             const data = utils.saveToLocal.get('valine-newest-comment')
             if (data) {
@@ -42,7 +42,7 @@ script.
             await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(res => res.json())
                 .then(async result => {
                     let ls = []
-                    for (const i of result.results.slice(0, 6)) {
+                    for (const i of result.results.slice(0, !{limit})) {
                         if (emojiReg.test(i.comment)) continue
                         ls.push({
                             content: changeContent(i.comment),
@@ -61,7 +61,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                         <div class='aside-list-item'>
                           <div onclick='pjax.loadUrl(\"${item.url}\")' class='thumbnail'>
@@ -79,5 +79,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (content === '') return content;
 
@@ -15,10 +15,10 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             const data = utils.saveToLocal.get('waline-newest-comment')
             if (data) {
@@ -29,7 +29,7 @@ script.
         }
 
         const getComment = async () => {
-            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=6', {method: 'GET'}).then(async res => {
+            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=!{limit}', {method: 'GET'}).then(async res => {
                 const result = await res.json()
                 const walineArray = result.data.map(e => {
                     return {
@@ -49,7 +49,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
                   <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
@@ -67,5 +67,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.11.3",
+  "version": "1.12.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -16,14 +16,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/valor-x/hexo-theme-solitude.git"
+    "url": "https://github.com/everfu/hexo-theme-solitude"
   },
   "dependencies": {
     "hexo-renderer-stylus": "^3.0.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "bugs": {
-    "url": "https://github.com/valor-x/hexo-theme-solitude/issues",
+    "url": "https://github.com/everfu/hexo-theme-solitude/issues",
     "email": "o@efu.me"
   },
   "homepage": "https://www.efu.me/",

package/scripts/event/merge_config.js

@@ -29,7 +29,7 @@ hexo.extend.filter.register('before_generate', () => {
                 sup: 'Recommend',
                 title: 'Solitude Docs',
                 url: 'https://solitude.js.org/',
-                img: '/img/default.png',
+                img: '/img/default.avif',
                 color: 'none',
             }
         },
@@ -50,7 +50,7 @@ hexo.extend.filter.register('before_generate', () => {
                 style: 0,
                 author: {
                     img: '/img/logo.png',
-                    sticker: '/img/happy-sticker.png',
+                    sticker: '/img/happy-sticker.avif',
                 },
                 url: '/about/',
                 background: null,
@@ -72,6 +72,11 @@ hexo.extend.filter.register('before_generate', () => {
                 backface: '',
                 backcolor: 'var(--efu-blue)'
             },
+            newest_comment: {
+                enable: false,
+                storage: .5,
+                limit: 5
+            },
             toc: {
                 post: true,
                 page: false,
@@ -108,12 +113,12 @@ hexo.extend.filter.register('before_generate', () => {
             tags: true,
             categories: true,
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
             }
         },
         post: {
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
                 locate: 'China, Changsha',
                 copyright: {
                     enable: true,
@@ -186,7 +191,7 @@ hexo.extend.filter.register('before_generate', () => {
             license: null,
             links: [{
                 name: 'Solitude',
-                url: 'https://github.com/valor-x/hexo-theme-solitude',
+                url: 'https://github.com/everfu/hexo-theme-solitude',
             }]
         },
         errorpage: {
@@ -236,8 +241,8 @@ hexo.extend.filter.register('before_generate', () => {
         lazyload: {
             enable: false,
             field: 'site',
-            placeholder: '/img/loading.gif',
-            errorimg: '/img/error_load.webp'
+            placeholder: '/img/loading.avif',
+            errorimg: '/img/error_load.avif'
         },
         loading: {
             fullpage: false,
@@ -300,10 +305,6 @@ hexo.extend.filter.register('before_generate', () => {
             lazyload: false,
             count: false,
             avatar: 'https://cravatar.cn',
-            newest_comment: {
-                enable: false,
-                storage: .2
-            }
         },
         twikoo: {
             envId: 'your envId',
@@ -347,11 +348,11 @@ hexo.extend.filter.register('before_generate', () => {
             enable: false,
             manifest: '/manifest.json',
             theme_color: "#006a73",
-            mask_icon: '/img/logo.png',
-            apple_touch_icon: '/img/logo.png',
-            bookmark_icon: '/img/logo.png',
-            favicon_32_32: '/img/logo.png',
-            favicon_16_16: '/img/logo.png'
+            mask_icon: '/img/pwa/favicon.ico',
+            apple_touch_icon: '/img/pwa/favicon.ico',
+            bookmark_icon: '/img/pwa/favicon.ico',
+            favicon_32_32: '/img/pwa/favicon_32.ico',
+            favicon_16_16: '/img/pwa/favicon_16.ico'
         },
         google_adsense: {
             enable: false,

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  GitHub: https://github.com/valor-x/hexo-theme-solitude
+  GitHub: https://github.com/everfu/hexo-theme-solitude
   `)
 })

package/scripts/filter/default.js

@@ -5,7 +5,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     const {config} = hexo.theme;
     if (data.layout === 'post') {
         let {copyright, locate, cover} = hexo.theme.config.post.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
@@ -15,7 +15,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     }
     if (data.layout === 'page') {
         let {cover} = hexo.theme.config.page.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.title
         data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);

package/source/css/_highlight/index.styl

@@ -86,7 +86,7 @@ figure
       border-top var(--style-border-always)
       position absolute
       bottom 0
-      z-index 10
+      z-index 1
       width 100%
       text-align center
       font-size 16px

package/source/css/_layout/aside.styl

@@ -631,9 +631,9 @@ if hexo-config('aside.card.style') == 2
     gap .5rem
     z-index 1
     if hexo-config('aside.position') == 0
-        right 1rem
-      else
-        left 1rem
+      right 1rem
+    else
+      left 1rem
 
     .headline
       color var(--efu-gray)
@@ -777,7 +777,7 @@ if hexo-config('aside.card.style') == 2
     hr
       display flex
       position relative
-      margin 1rem 0
+      margin .5rem 0
       border 1px dashed var(--efu-theme-op)
 
     .item-headline
@@ -1047,4 +1047,51 @@ backcolor = convert(hexo-config('aside.flip.backcolor'))
       background-size 100%
 
   .card-widget.card-adsense
-    padding 0
+    padding 0
+
+if hexo-config('aside.newest_comment.enable')
+  .card-recent-comment
+    .recent-comment-more
+      margin-left auto
+      margin-right .5rem
+      &:hover
+        color var(--efu-lighttext)
+        transition .3s
+    .aside-list-item
+      padding: .5rem
+      width: 100%
+      display: flex
+      flex-direction: row
+      height: 80px
+      transition: .3s
+      position: relative
+      &:not(:last-child)
+        border-bottom 1px dashed rgba(255, 255, 255, .1)
+
+      .thumbnail img
+        width: 60px
+        height: 60px
+        margin-right: 8px
+        border-radius: 12px
+
+      .content
+        max-width: calc(100% - 68px)
+        line-height 1.5
+
+        .comment
+          overflow hidden
+          text-overflow ellipsis
+          display -webkit-box
+          font-size 14px
+          -webkit-line-clamp 2
+          transition .3s
+          -webkit-box-orient vertical
+          cursor pointer
+          &:hover
+            color var(--efu-lighttext)
+            transition .3s
+
+        .datetime
+          font-size 12px
+          color var(--efu-secondtext)
+          margin-top auto

package/source/css/_layout/console.styl

@@ -116,50 +116,6 @@
     display flex
     align-items center
 
-  .aside-list-item
-    .thumbnail
-      display flex
-      align-items center
-
-    &:hover
-      .thumbnail
-        color var(--efu-white)
-
-    .content
-      display flex
-      flex-direction column
-      height 100%
-      margin-top .5rem
-
-      .comment
-        -webkit-line-clamp 2
-        display -webkit-box
-        overflow hidden
-        -webkit-box-orient vertical
-        line-height 24px
-        font-size 14px
-
-        &::before
-          content ''
-          width 100%
-          height 100%
-          position absolute
-          top 0
-          left 0
-
-      &:hover
-        .comment
-          color var(--efu-white)
-
-      time
-        font-size 12px
-        color var(--efu-secondtext)
-        margin-top auto
-
-      &:hover
-        time
-          color var(--efu-white)
-
   .aside-list
     display flex
     flex-wrap wrap
@@ -183,8 +139,10 @@
         [data-theme="dark"] &
           background var(--efu-orange)
           color var(--efu-white)
+
   .button-group
     gap .5rem
+
     .console-btn-item
       &:hover
         span
@@ -349,37 +307,4 @@
 
   #consoleHideAside
     +maxWidth768()
-      display none
-
-#card-newest-comments
-  .aside-list-item
-    background: var(--efu-card-bg)
-    border-radius: 12px
-    border: var(--style-border)
-    padding: 12px 16px
-    width: 49%
-    display: flex
-    flex-direction: column
-    height: 150px
-    transition: .3s
-    position: relative
-    cursor pointer
-
-    &:hover
-      background: var(--efu-main)
-      color: var(--efu-white)
-
-    &:not(:last-child)
-      margin-bottom: .5rem
-
-    .thumbnail img
-      width: 20px
-      height: 20px
-      margin-right: 8px
-      border-radius: 20px
-
-    .name
-      text-overflow: ellipsis
-      overflow: hidden
-      white-space: nowrap
-      font-weight: 700
+      display none

package/source/css/_page/message.styl

@@ -59,5 +59,6 @@
             overflow hidden
             text-overflow ellipsis
 
-.hide
+#barrage.hide
+    z-index -1
     opacity 0

package/source/css/_post/meta.styl

@@ -248,35 +248,25 @@
             display: flex
             align-items center
             line-height 1
+            margin 0 .5rem
 
             +maxWidth768()
               line-height 1.5
 
           > span:first-child
-            margin-right .8rem
+            margin-left 0
+            
 
           .post-meta-date
-            margin-right .8rem
             opacity .6
 
           .post-meta-wordcount
             opacity .6
-            margin-right 20px
-
-            +maxWidth768()
-              margin-left 0
-
-            > span.word-count
-              font-weight 800
-
-            > span:nth-child(7)
-              font-weight 800
 
           .post-meta-separator
-            margin 0 10px
+            margin 0 1rem 0 0
 
           .post-meta-position
-            margin-right 12px
             opacity .6
 
           .post-meta-pv

package/source/css/_post/tools.styl

@@ -236,6 +236,11 @@
             box-shadow var(--efu-shadow-main)
             color var(--efu-white)
 
+            span.tagsPageCount
+              color var(--efu-lighttext)
+              background var(--efu-maskbgdeep)
+              transition all .2s ease-in-out 0s
+
           span.tags-punctuation
             font-size 12px
             margin-right 1px
@@ -244,14 +249,14 @@
 
           .tagsPageCount, /  #tag-page-tags .tagsPageCount
             padding 2px
-            background var(--efu-card-bg)
+            background var(--efu-fontcolor)
             border var(--style-border-always)
             min-width 22.5px
             display inline-block
             border-radius 4px
             text-align center
             font-size .6rem
-            color var(--efu-fontcolor)
+            color var(--efu-card-bg)
             margin-left 4px
     if hexo-config('post.share.enable')
       /.social-share *