hexo-theme-solitude 1.7.13 → 1.8.0

package/README.md

@@ -1,4 +1,4 @@
-[简体中文](README_zh-cn.md)丨[繁体中文](README_zh-tw.md)丨English
+简体中文丨[繁体中文](README_zh-tw.md)丨[English](README_en.md)
 
 <div align="center">
 
@@ -6,10 +6,10 @@
 
    <h1>Hexo Theme Solitude</h1>
 
-   An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.
+   一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。
+   
+   主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！
 
-   Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!
-  
 ![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)
@@ -29,7 +29,7 @@
 [![pwa](https://img.shields.io/badge/pwa-red?logo=pwa)](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps)
 
 [![twiter](https://img.shields.io/badge/@efu__oo-gray?logo=x)](https://twitter.com/efu_oo)
-[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/efuome)
+[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/solitudePro)
 
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains)
 ![DuoLingo](https://img.shields.io/badge/duolingo-support-black?logo=duolingo&logoColor=white)
@@ -37,42 +37,42 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[Preview](https://efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
+[预览](https://efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## Features
+## 特性
 
-- Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline、Valine、Discuss)
-- 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
-- Article features: AI summary, code highlighting
+- 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
+- 评论(Twikoo、Waline、Valine、Artalk)，支持双评论
+- 显示切换(ColorMode)
+- 灯箱(medium-zoom、fancybox)
+- 数学公式(Latex)
+- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
+- 文章功能：AI 摘要、代码高亮
 
 ## Todo
 
-- [x] Support Waline
-- [ ] Tags plugin
-- [ ] Album reconstruction(Removed, to be refactored)
+- [x] Waline 评论支持
+- [ ] Tags plugin 插件化
+- [ ] 相册页重构（已移除，待重构）
 
-## Setup
+## 应用
 
-1. Use the NPM package
+1. 使用 NPM 包进行安装
       ```bash
       npm i hexo-theme-solitude
       ```
-2. Apply
+2. 应用主题
       ```yaml
       theme: solitude
       ```
+   
+前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
 
-Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
-
-## Sponsors
+## 赞助者
 
 <p align="center">
   <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
@@ -80,6 +80,6 @@ Check out the [Documentation](https://solitude-docs.efu.me/) for more informatio
   </a>
 </p>
 
-## License
+## 版权
 
-[MIT](./LICENSE) License &copy; 2023-PRESENT [Efu](https://github.com/efuo)
+[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/efuo)

package/{README_zh-cn.md → README_en.md}

@@ -1,4 +1,4 @@
-简体中文丨[繁体中文](README_zh-tw.md)丨[English](README.md)
+[简体中文](README.md)丨[繁体中文](README_zh-tw.md)丨English
 
 <div align="center">
 
@@ -6,10 +6,10 @@
 
    <h1>Hexo Theme Solitude</h1>
 
-   一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。
-   
-   主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！
+   An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.
 
+   Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!
+  
 ![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)
@@ -29,7 +29,7 @@
 [![pwa](https://img.shields.io/badge/pwa-red?logo=pwa)](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps)
 
 [![twiter](https://img.shields.io/badge/@efu__oo-gray?logo=x)](https://twitter.com/efu_oo)
-[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/efuome)
+[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/solitudePro)
 
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains)
 ![DuoLingo](https://img.shields.io/badge/duolingo-support-black?logo=duolingo&logoColor=white)
@@ -37,42 +37,42 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[预览](https://efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[Preview](https://efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## 特性
+## Features
 
-- 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline、Valine、Discuss)
-- 显示切换(ColorMode)
-- 灯箱(medium-zoom、fancybox)
-- 数学公式(Latex)
-- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
-- 文章功能：AI 摘要、代码高亮
+- 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
+- Article features: AI summary, code highlighting
 
 ## Todo
 
-- [x] Waline 评论支持
-- [ ] Tags plugin 插件化
-- [ ] 相册页重构（已移除，待重构）
+- [x] Support Waline
+- [ ] Tags plugin
+- [ ] Album reconstruction(Removed, to be refactored)
 
-## 应用
+## Setup
 
-1. 使用 NPM 包进行安装
+1. Use the NPM package
       ```bash
       npm i hexo-theme-solitude
       ```
-2. 应用主题
+2. Apply
       ```yaml
       theme: solitude
       ```
-   
-前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
 
-## 赞助者
+Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
+
+## Sponsors
 
 <p align="center">
   <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
@@ -80,6 +80,6 @@
   </a>
 </p>
 
-## 版权
+## License
 
-[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/efuo)
+[MIT](./LICENSE) License &copy; 2023-PRESENT [Efu](https://github.com/efuo)

package/README_zh-tw.md

@@ -1,4 +1,4 @@
-[简体中文](README_zh-cn.md)丨繁体中文丨[English](README.md)
+[简体中文](README.md)丨繁体中文丨[English](README_en.md)
 
 <div align="center">
   
@@ -29,7 +29,7 @@
 [![pwa](https://img.shields.io/badge/pwa-red?logo=pwa)](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps)
 
 [![twiter](https://img.shields.io/badge/@efu__oo-gray?logo=x)](https://twitter.com/efu_oo)
-[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/efuome)
+[![TG](https://img.shields.io/badge/efuome-gray?logo=Telegram&logoColor=white)](https://t.me/solitudePro)
 
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains)
 ![DuoLingo](https://img.shields.io/badge/duolingo-support-black?logo=duolingo&logoColor=white)
@@ -46,7 +46,7 @@
 ## 特性
 
 - 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 
-- 評論(Twikoo、Waline、Valine、Discuss)
+- 評論(Twikoo、Waline、Valine、Artalk)，支援雙評論
 - 顯示切換（ColorMode） 
 - 燈箱（medium-zoom、fancybox） 
 - 數學公式（Latex） 

package/_config.yml

@@ -64,7 +64,6 @@ nav:
   right:
     random: false # 随机文章跳转 / random post button
     console: false #控制台 / console
-    top: false # 进度球 / Progress Ball
     # 自定义按钮
     # custom button
     # 左至右
@@ -709,38 +708,50 @@ katex:
 
 # 评论
 # comment
+# getting start: http://solitude-docs.efu.me/comments/comment
 comment:
-  enable: false
-  type: # waline, twikoo
+  use: # waline, twikoo, valine, artalk
   commentBarrage: false # 热评开关 / Hot comment switch
-  lazyload: true # 懒加载
-  count: true # 评论数展示
+  lazyload: false # 懒加载
+  count: false # 评论数展示
   avatar: https://cravatar.cn # Gravatar link
   newest_comment:
     enable: false
-    storage: .5 # 缓存时间 1: 1天 / .5 : 半天
-  # twikoo 配置信息
-  # twikoo settings
-  twikoo: # https://twikoo.js.org/
-    envId: # url: https://twikoo.sondy.top/
-    lang: "zh-CN" # 语言
-    accessToken: # accessToken
-  # waline 配置信息
-  # waline settings
-  waline: # https://waline.js.org/
-    envId:  # url: https://waline.wzsco.top
-    pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics
-    option: # waline配置项 / waline configuration item
-  # valine 配置信息
-  # valine settings
-  valine:
-    appId: # leancloud application app id
-    appKey: # leancloud application app key
-    serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
-    avatar:
-    visitor: false
-    option: # options list
-
+    storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day
+
+# twikoo 配置信息
+# twikoo settings
+twikoo: # https://twikoo.js.org/
+  envId: # url: https://twikoo.sondy.top/
+  region: # 环境地域，默认为 ap-shanghai，腾讯云环境填 ap-shanghai 或 ap-guangzhou；Vercel 环境不填
+  style: true # Use custom styles when turned on / 开启后使用自定义样式
+  accessToken: # AccessToken
+  option: # twikoo option
+
+# waline 配置信息
+# waline settings
+waline: # https://waline.js.org/
+  envId:  # url: https://waline.wzsco.top
+  pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics
+  option: # waline配置项 / waline configuration item
+
+# valine 配置信息
+# valine settings
+valine:
+  appId: # leancloud application app id
+  appKey: # leancloud application app key
+  serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
+  avatar: # https://valine.js.org/avatar.html
+  visitor: false
+  style: true # Use custom styles when turned on / 开启后使用自定义样式
+  option: # options list
+
+# artalk 配置信息
+# artalk settings
+artalk:
+  server: # server url / 后端地址
+  site: # site name / 站点名
+  option: # options
 
 # 中控台扩展 ： 最新评论 + 标签 + 文章
 console_plus: false
@@ -814,7 +825,7 @@ right_menu:
   commentBarrage: false # 是否显示热评开关 / Whether to display the hot comment switch.
   # 翻译功能（仅支持简繁）
   # Translation function (Simplified and Traditional Chinese only)
-  translate: 
+  translate:
     enable: false
     defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
     translateDelay: 0 # 首次加载翻译迟疑时间
@@ -852,7 +863,7 @@ CDN:
   internal: local
   # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
   # option: jsdelivr/unpkg/cdnjs/custom
-  third_party: custom
+  third_party: cdnjs
 
   # Add version number to url, true or false
   version: true

package/languages/en.yml

@@ -101,6 +101,10 @@ console:
   switch_keyboard: Keyboard operation
   switch_music: Music switch
   archive_unit: Posts
+  newest_comment:
+    image: Image
+    link: Link
+    code: Code
 
 sidebar:
   function: Function

package/languages/zh-CN.yml

@@ -103,6 +103,10 @@ console:
   switch_keyboard: 键盘快捷键
   switch_music: 音乐开关
   archive_unit: 篇
+  newest_comment:
+    image: 图片
+    link: 链接
+    code: 代码
 
 sidebar:
   function: 功能

package/languages/zh-TW.yml

@@ -103,6 +103,10 @@ console:
   switch_keyboard: 鍵盤快捷鍵
   switch_music: 音樂開關
   archive_unit: 篇
+  newest_comment:
+    image: 圖片
+    link: 連結
+    code: 代碼
 
 sidebar:
   function: 功能

package/layout/includes/body/mode.pug

@@ -3,7 +3,7 @@ case theme.display_mode.type
         script.
             initTheme = () => {
                 let isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-                const cachedMode = saveToLocal.get('theme');
+                const cachedMode = utils.saveToLocal.get('theme');
                 if (cachedMode === undefined) {
                     const nowMode =
                         isDarkMode ? 'dark' : 'light'
@@ -11,25 +11,28 @@ case theme.display_mode.type
                 } else {
                     document.documentElement.setAttribute('data-theme', cachedMode);
                 }
+                right_menu && rm.mode(cachedMode === 'dark' && isDarkMode)
             }
             initTheme()
     when "dark"
         script.
             initTheme = () => {
-                const cachedMode = saveToLocal.get('theme');
+                const cachedMode = utils.saveToLocal.get('theme');
                 if (cachedMode === undefined)
                     document.documentElement.setAttribute('data-theme', 'dark');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
+                right_menu && rm.mode(cachedMode === undefined || cachedMode === 'dark')
             }
             initTheme()
     when "light"
         script.
             initTheme = () => {
-                const cachedMode = saveToLocal.get('theme');
+                const cachedMode = utils.saveToLocal.get('theme');
                 if (cachedMode === undefined)
                     document.documentElement.setAttribute('data-theme', 'light');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
+                right_menu && rm.mode(cachedMode === 'dark')
             }
             initTheme()

package/layout/includes/head/config.pug

@@ -31,34 +31,6 @@
             avatar: theme.comment.avatar,
             commentBarrage: theme.comment.commentBarrage,
         }
-        switch (theme.comment.type) {
-            case "twikoo":
-                comment.url = theme.comment.twikoo.envId
-                comment.accessToken = theme.comment.twikoo.accessToken
-                comment.owo = {
-                    body: '.OwO-body',
-                    item: '.OwO-items li'
-                }
-                break
-            case "waline":
-                comment.url = theme.comment.waline.envId
-                comment.owo = {
-                    body: '.wl-emoji-popup',
-                    item: '.wl-tab-wrapper button'
-                }
-                break
-            case "valine":
-                comment.url = theme.comment.valine.serverURLs
-                comment.appId = theme.comment.valine.appId
-                comment.appKey = theme.comment.valine.appKey
-                comment.owo = {
-                    body: '.vwrap',
-                    item: '.vemojis i'
-                }
-                break
-            default:
-                break
-        }
     }
 
     let post_ai = false

package/layout/includes/head/page_config.pug

@@ -0,0 +1,9 @@
+script#config-diff.
+    var PAGE_CONFIG = {
+        is_post: !{is_post()},
+        is_page: !{!is_post() && !is_home()},
+        is_home: !{is_home()},
+        page: '!{page.type}',
+        toc: !{!!page.toc},
+        comment: !{!!page.comment},
+    }

package/layout/includes/head.pug

@@ -26,4 +26,7 @@ link(rel="stylesheet", href=url_for(theme.cdn.main_css))
 include ./inject/head.pug
 
 // global head
-include ./head/config.pug
+include ./head/config.pug
+
+// page-config head
+include ./head/page_config

package/layout/includes/inject/body.pug

@@ -11,15 +11,9 @@ mixin katex
                 })();
 
 div
-    script(src=url_for(theme.cdn.main))
-    script(src=url_for(theme.cdn.utils))
     script(src=url_for(theme.cdn.waterfall))
     script(src=url_for(theme.cdn.pjax))
 
-    if theme.comment.enable && theme.comment.type === 'valine'
-        // md5
-        script(src=url_for(theme.cdn.blueimp_md5))
-
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
 
@@ -65,23 +59,10 @@ div
                 script.
                     const coverColorConfig = {
                         api: '!{theme.post.covercolor.api}',
-                        time: !{theme.post.covercolor.time},
+                        time: !{theme.post.covercolor.time}
                     }
                 script(src=url_for(theme.cdn.cover_api))
 
-    if theme.comment.enable
-        case theme.comment.type
-            when 'twikoo'
-                script(src=url_for(theme.cdn.twikoo))
-        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))
-                when 'valine'
-                    script(src=url_for(theme.cdn.valine_commentBarrage))
-
     if theme.music.enable
         script(src=url_for(theme.cdn.music_js))
 
@@ -113,15 +94,6 @@ div#js-pjax
     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 = {
-            is_post: !{is_post()},
-            is_page: !{!is_post() && !is_home()},
-            is_home: !{is_home()},
-            page: '!{page.type}',
-            toc: !{!!page.toc},
-            comment: !{!!page.comment},
-        }
 
 if theme.footer.randomlink
     include ../widgets/randomlink.pug

package/layout/includes/inject/head.pug

@@ -11,9 +11,11 @@ if theme.capsule.enable || theme.music.enable
 if (theme.says.home_mini && theme.says.enable) || theme.carousel
     link(rel="stylesheet", href=url_for(theme.cdn.swiper_css))
 
+// fancybox ui
 if theme.lightbox && theme.fancybox
     link(rel="stylesheet", href=url_for(theme.cdn.fancyapps_css))
 
+// katex
 if theme.katex && theme.katex.enable
     link(rel="stylesheet", href=url_for(theme.cdn.katex))
 
@@ -25,97 +27,19 @@ if theme.pwa.enable
     include ../head/pwa.pug
 
 script.
-    (win => {
-            win.saveToLocal = {
-                set: function setWithExpiry(key, value, ttl) {
-                    if (ttl === 0)
-                        return
-                    const now = new Date()
-                    const expiryDay = ttl * 86400000
-                    const item = {
-                        value: value,
-                        expiry: now.getTime() + expiryDay
-                    }
-                    localStorage.setItem(key, JSON.stringify(item))
-                },
-
-                get: function getWithExpiry(key) {
-                    const itemStr = localStorage.getItem(key)
-
-                    if (!itemStr) {
-                        return undefined
-                    }
-                    const item = JSON.parse(itemStr)
-                    const now = new Date()
-
-                    if (now.getTime() > item.expiry) {
-                        localStorage.removeItem(key)
-                        return undefined
-                    }
-                    return item.value
-                }
-            }
-
-            const DarkModeStatus = localStorage.getItem('theme')
-            if (DarkModeStatus !== null) {
-                if (DarkModeStatus === 'dark') {
-                    document.documentElement.setAttribute('data-theme', 'dark')
-                } else {
-                    document.documentElement.setAttribute('data-theme', 'light')
-                }
-            }
-
-            const asideStatus = saveToLocal.get('aside-status')
-            if (asideStatus !== undefined) {
-                if (asideStatus === 'hide') {
-                    document.documentElement.classList.add('hide-aside')
-                } else {
-                    document.documentElement.classList.remove('hide-aside')
-                }
-            }
-
-            win.getCSS = (url, id = false) => new Promise((resolve, reject) => {
-                const link = document.createElement('link')
-                link.rel = 'stylesheet'
-                link.href = url
-                if (id) link.id = id
-                link.onerror = reject
-                link.onload = link.onreadystatechange = function () {
-                    const loadState = this.readyState
-                    if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-                    link.onload = link.onreadystatechange = null
-                    resolve()
-                }
-                document.head.appendChild(link)
-            })
-
-            win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
-                const script = document.createElement('script')
-                script.src = url
-                script.async = true
-                script.onerror = reject
-                script.onload = script.onreadystatechange = function () {
-                    const loadState = this.readyState
-                    if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-                    script.onload = script.onreadystatechange = null
-                    resolve()
-                }
-
-                Object.keys(attr).forEach(key => {
-                    script.setAttribute(key, attr[key])
-                })
-
-                document.head.appendChild(script)
-            })
-        }
-    )(window)
-
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.13",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.0",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"
     );
+
 if theme.extends.head
     each item in theme.extends.head
-        != item
+        != item
+
+script(src=url_for(theme.cdn.utils))
+script(src=url_for(theme.cdn.main))
+
+if theme.comment.use.includes('Valine')
+    script(src=url_for(theme.cdn.blueimp_md5))