hexo-theme-solitude 1.7.7 → 1.7.9

package/README.md

@@ -4,10 +4,12 @@
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-  <h1 align="center">Hexo Theme Solitude</h1>
+   <h1>Hexo Theme Solitude</h1>
 
-  <p align="center">An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.</p>
+   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)
@@ -44,7 +46,7 @@
 ## Features
 
 - Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline)
+- Comments(Twikoo、Waline、Valine、Discuss)
 - ColorMode
 - Lightbox(medium-zoom、fancybox)
 - Mathematical formulas(Latex)
@@ -70,12 +72,14 @@
 
 Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
 
-## Contributors
+## Sponsors
 
-<a href="https://github.com/valor-x/hexo-theme-solitude/graphs/contributors">
-  <img alt="contributors" src="https://contrib.rocks/image?repo=valor-x/hexo-theme-solitude" />
-</a>
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg'/>
+  </a>
+</p>
 
-**Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!**
+## License
 
-> You are welcome to contribute to this topic! [Contribution Guide](/CONTRIBUTING.md)
+[MIT](./LICENSE) License &copy; 2023-PRESENT [Efu](https://github.com/efuo)

package/README_zh-cn.md

@@ -4,9 +4,11 @@
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-   <h1 align="center">Hexo Theme Solitude</h1>
+   <h1>Hexo Theme Solitude</h1>
 
-   <p align="center">一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。</p>
+   一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。
+   
+   主题由 [@张洪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)
@@ -44,7 +46,7 @@
 ## 特性
 
 - 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline)
+- 评论(Twikoo、Waline、Valine、Discuss)
 - 显示切换(ColorMode)
 - 灯箱(medium-zoom、fancybox)
 - 数学公式(Latex)
@@ -70,12 +72,14 @@
    
 前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
 
-## 贡献者
+## 赞助者
 
-<a href="https://github.com/valor-x/hexo-theme-solitude/graphs/contributors">
-  <img alt="contributors" src="https://contrib.rocks/image?repo=valor-x/hexo-theme-solitude" />
-</a>
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg'/>
+  </a>
+</p>
 
-**主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
+## 版权
 
-> 欢迎你对本主题做出贡献！[贡献指南](/CONTRIBUTING.md)
+[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/efuo)

package/README_zh-tw.md

@@ -4,9 +4,11 @@
   
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-  <h1 align="center">Hexo Theme Solitude</h1>
+  <h1>Hexo Theme Solitude</h1>
 
-  <p align="center">一款優雅的 Hexo 主題，支援懶載入、PWA、Latex以及多種評論系統。</p>
+  一款優雅的 Hexo 主題，支援懶載入、PWA、Latex以及多種評論系統。
+
+  主題由 [@张洪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)
@@ -44,7 +46,7 @@
 ## 特性
 
 - 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 
-- 評論（Twikoo、Waline） 
+- 評論(Twikoo、Waline、Valine、Discuss)
 - 顯示切換（ColorMode） 
 - 燈箱（medium-zoom、fancybox） 
 - 數學公式（Latex） 
@@ -70,12 +72,14 @@
 
 前往 [文檔](https://solitude-docs.efu.me) 獲取更多資訊。
 
-## 貢獻者
+## 贊助者
 
-<a href="https://github.com/valor-x/hexo-theme-solitude/graphs/contributors">
-  <img alt="contributors" src="https://contrib.rocks/image?repo=valor-x/hexo-theme-solitude" />
-</a>
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg'/>
+  </a>
+</p>
 
-**主題由 [@张洪Heo](https://github.com/zhheo) 全權授權、設計！**
+## 版權
 
-> 歡迎你對本主題做出貢獻！[貢獻指南](/CONTRIBUTING.md)
+[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/efuo)

package/_config.yml

@@ -138,11 +138,11 @@ hometop:
     # Shadow color
     color: "none"
 
-## banner
-## 推荐文章banner
+# carousel
+# 顶部推荐轮播图
 # 使用方法：在文章的front matter中添加“recommend: true”
 # tip：建议开了这个就不要开hometop，其功能类似
-banner: false
+carousel: false
 
 # --------------------------------------
 # Aside Settings
@@ -510,8 +510,7 @@ music:
 # 音乐胶囊
 # capsule music
 capsule:
-  enable:
-    false
+  enable: false
   # 歌单id / playlist id
   id: 8407304077
   # 播放列表的服务商。netease：网易云 / tencent：腾讯 / kugou：酷狗 / xiami：小米 / baidu：百度
@@ -577,7 +576,7 @@ keyboard:
 copy:
   enable: true
   copyright: # Turn on Link copyright information after copying.（开启后将在默认增加版权信息）
-    enable: false
+    enable: true
     limit: 50 # word count. （字数）
 
 # 懒加载
@@ -627,7 +626,7 @@ fancybox: false
 # mediumZoom
 mediumZoom: false
 
-# mermaid
+# mermaid tags plugin
 # https://mermaid.js.org/
 mermaid: false
 
@@ -808,6 +807,35 @@ google_adsense:
   # Only when auto ads are turned off, you need to fill in the slot id, which can be obtained after creating an ad space in the Google Adsense background according to the ad unit
   slot: # 4236388782
 
+# 自定义右键菜单 (Custom Right Menu)
+right_menu:
+  enable: false
+  commentBarrage: false # 是否显示热评开关 / Whether to display the hot comment switch.
+  translate: # 翻译功能（仅支持简繁）/ Translation function (Simplified and Traditional Chinese only)
+    enable: false
+    defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
+    translateDelay: 0 # 翻译迟疑时间
+  # 自定义菜单项列表 / Customize the list of menu items.
+  custom_list:
+  #  - name: 随机短文
+  #    url:
+  #    click: toRandomPost()
+  #    id: menu-randomPost
+  #    class:
+  #    icon: st-signal-tower-fill
+  #  - name: 全部分类
+  #    url: /categories/
+  #    click:
+  #    id:
+  #    class:
+  #    icon: st-checkbox-multiple-blank-fill
+  #  - name: 全部标签
+  #    url: /tags/
+  #    click:
+  #    id:
+  #    class:
+  #    icon: st-price-tag-fill
+
 # CDN
 # Don't modify the following settings unless you know how they work
 # 非必要请不要修改
@@ -844,7 +872,6 @@ CDN:
     # aplayer_js:
     # meting_js:
     # pace_js:
-    # lunr_js:
     # swiper_css:
     # swiper_js:
     # busuanzi_js:

package/languages/en.yml

@@ -2,6 +2,7 @@ more: More
 star: Behold, those who found delight in this piece also perused
 random: Around
 upload: 'datetime: '
+totalk: You don't need to delete blank lines, just type in your comments.
 
 theme:
   dark: dark
@@ -142,4 +143,28 @@ comment:
 commentBarrage:
   title: Hot
 
-f12: Developer mode is turned on, please follow the GPL.
+f12: Developer mode is turned on, please follow the GPL.
+
+right_menu:
+  copy: Copy
+  paste: Paste
+  comment: ToTalk
+  new: Open
+  link: Copy
+  img: Copy
+  downloadImg: Download
+  search: Search
+  dark: Light
+  light: Dark
+  chs_to_cht: 轉為繁體
+  cht_to_chs: 转为简体
+  img_error: This image cannot be copied or downloaded.
+  barrage:
+    open: OpenBarrage
+    close: CloseBarrage
+  music:
+    start: Play
+    stop: Pause
+    back: Back
+    forward: Forward
+    copyMusicName: CopyName

package/languages/zh-CN.yml

@@ -2,6 +2,7 @@ more: 更多
 star: 喜欢这篇的人也看了
 random: 随便逛逛
 upload: 发布时间：
+totalk: 无需删除空行，直接输入评论即可
 
 # Language: 简体中文
 theme:
@@ -144,4 +145,28 @@ comment:
 commentBarrage:
   title: 热评
 
-f12: 开发者模式已打开，请遵循GPL协议。
+f12: 开发者模式已打开，请遵循GPL协议。
+
+right_menu:
+  copy: 复制选中文本
+  paste: 粘贴文本
+  comment: 引用到评论
+  new: 新窗口打开
+  link: 复制链接地址
+  img: 复制此图片
+  downloadImg: 下载此图片
+  search: 站内搜索
+  dark: 浅色模式
+  light: 深色模式
+  chs_to_cht: 轉為繁體
+  cht_to_chs: 转为简体
+  img_error: 此图片无法复制与下载
+  barrage:
+    open: 显示热评
+    close: 关闭热评
+  music:
+    start: 播放音乐
+    stop: 暂停音乐
+    back: 切换到上一首
+    forward: 切换到下一首
+    copyMusicName: 复制歌名

package/languages/zh-TW.yml

@@ -2,6 +2,7 @@ more: 更多
 star: 喜歡這篇的人也看了
 random: 随便逛逛
 upload: 發佈時間：
+totalk: 無需刪除空行，直接輸入評論即可
 
 # Language: 繁體中文 (台灣)
 theme:
@@ -144,4 +145,28 @@ comment:
 commentBarrage:
   title: 熱評
 
-f12: 開發者模式已打開，請遵循GPL協定。
+f12: 開發者模式已打開，請遵循GPL協定。
+
+right_menu:
+  copy: 複製選中文本
+  paste: 粘貼文本
+  comment: 引用到評論
+  new: 新窗口打開
+  link: 複製連結位址
+  img: 複製此圖片
+  downloadImg: 下載此圖片
+  search: 站內搜索
+  dark: 淺色模式
+  light: 深色模式
+  chs_to_cht: 轉為繁體
+  cht_to_chs: 转为简体
+  img_error: 此圖片無法複製與下載
+  barrage:
+    open: 顯示熱評
+    close: 關閉熱評
+  music:
+    start: 播放音樂
+    stop: 暫停音樂
+    back: 切換到上一首
+    forward: 切換到下一首
+    copyMusicName: 複製歌名

package/layout/includes/head/config.pug

@@ -105,6 +105,7 @@
             month: _p('time.month')
         },
         f12: _p('f12'),
+        totalk: _p('totalk')
     }
 
     if (theme.search.enable) {
@@ -122,6 +123,35 @@
         }
     }
 
+    let rightMenu = false
+    if (theme.right_menu.enable) {
+        rightMenu = {
+            mode: {
+                dark: _p('right_menu.light'),
+                light: _p('right_menu.dark'),
+            },
+            img_error: _p('right_menu.img_error')
+        }
+        if (theme.capsule.enable) {
+            rightMenu.music = {
+                start: _p('right_menu.music.start'),
+                stop: _p('right_menu.music.stop'),
+            }
+        }
+        if(theme.comment.enable && theme.comment.commentBarrage){
+            rightMenu.barrage = {
+                open: _p('right_menu.barrage.open'),
+                close: _p('right_menu.barrage.close')
+            }
+        }
+        if(theme.right_menu.translate.enable){
+            rightMenu.translate = {
+                translateDelay: theme.right_menu.translate.translateDelay,
+                defaultEncoding: theme.right_menu.translate.defaultEncoding
+            }
+        }
+    }
+
 script.
     const GLOBAL_CONFIG = {
         root: '!{config.root}',
@@ -157,5 +187,6 @@ script.
         },
         comment: !{comment},
         lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
-        post_ai: !{post_ai}
+        post_ai: !{post_ai},
+        right_menu: !{rightMenu ? JSON.stringify(rightMenu) : false},
     };

package/layout/includes/inject/body.pug

@@ -26,8 +26,8 @@ div
         script.
             dark()
 
-    if theme.translate.enable
-        script(src=url_for(theme.cdn.translate))
+    if theme.right_menu.translate.enable
+        script(src=url_for(theme.cdn.translate_js))
 
     if theme.katex && theme.katex.enable
         if theme.katex.per_page && (is_post() || is_page())
@@ -44,7 +44,7 @@ div
             script(src=url_for(theme.cdn.medium_zoom))
         if theme.fancybox
             script(src=url_for(theme.cdn.fancyapps_ui))
-    if theme.says.home_mini
+    if (theme.says.home_mini && theme.says.enable) || theme.carousel
         script(src=url_for(theme.cdn.swiper_js))
 
     if theme.post_ai.enable
@@ -90,13 +90,12 @@ div
     if theme.loading.pace
         script(src=url_for(theme.cdn.pace_js))
 
-    if theme.search.enable
-        case theme.search.type
-            when 'algolia'
-                script(src=url_for(theme.cdn.instantsearch))
-                script(src=url_for(theme.cdn.algolia_search))
-            when 'local'
-                script(src=url_for(theme.cdn.lunr_js))
+    if theme.search.enable && theme.search.type === "algolia"
+        script(src=url_for(theme.cdn.instantsearch))
+        script(src=url_for(theme.cdn.algolia_search))
+
+    if theme.right_menu.enable
+        script(src=url_for(theme.cdn.right_menu_js))
 
     if theme.extends.body
         each item in theme.extends.body
@@ -106,20 +105,11 @@ div#js-pjax
     if theme.mermaid
         script.
             mermaid.run();
-    if is_home() && theme.says.home_mini
-        script.
-            sco.initbbtalk();
-    if is_home() && theme.banner && site.posts.data.filter(item => item.recommend === true).slice(0,6) || false
+    if is_home() && theme.carousel && site.posts.data.filter(item => item.recommend === true).slice(0, 6) || false
         script.
-            banner_swiper()
+            carousel_swiper()
     if page.type === 'says' && theme.says.enable
         script.
-            window.addEventListener('resize', utils.throttle(function () {
-                if (document.getElementById('waterfall')) {
-                    sco.reflashEssayWaterFall();
-                }
-            }), 500);
-            sco.reflashEssayWaterFall();
             GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
             sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
     if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
@@ -128,7 +118,7 @@ div#js-pjax
     script#config-diff.
         var PAGE_CONFIG = {
             is_post: !{is_post()},
-            is_page: !{is_page()},
+            is_page: !{!is_post() && !is_home()},
             is_home: !{is_home()},
             page: '!{page.type}',
             toc: !{!!page.toc},

package/layout/includes/inject/head.pug

@@ -8,7 +8,7 @@ if theme.capsule.enable || theme.music.enable
     link(rel="stylesheet", href=url_for(theme.cdn.aplayer_css))
 
 // swiper
-if theme.says.home_mini
+if (theme.says.home_mini && theme.says.enable) || theme.carousel
     link(rel="stylesheet", href=url_for(theme.cdn.swiper_css))
 
 if theme.lightbox && theme.fancybox
@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.7",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.9",
         "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;"

package/layout/includes/layout.pug

@@ -35,6 +35,10 @@ html(lang=config.language, data-theme="light")
                 .error#body-wrap
                     block content
 
+        // right_menu
+        if theme.right_menu.enable
+            include rightmenu
+
         // inject body
         include ./inject/body.pug
 

package/layout/includes/rightmenu.pug

@@ -0,0 +1,80 @@
+- let custom_list = theme.right_menu.custom_list || []
+
+div#rightMenu
+    div.rightMenu-group.rightMenu-small
+        div.rightMenu-item#menu-backward
+            i.solitude.st-arrow-left-line
+        div.rightMenu-item#menu-forward
+            i.solitude.st-arrow-right-line
+        div.rightMenu-item#menu-refresh
+            i.solitude.st-restart-line
+        div.rightMenu-item#menu-top
+            i.solitude.st-arrow-up-line
+    div.rightMenu-group.rightMenu-line.rightMenuPlugin
+        div.rightMenu-item#menu-copytext
+            i.solitude.st-copy-fill
+            span= _p('right_menu.copy')
+        div.rightMenu-item#menu-pastetext
+            i.solitude.st-clipboard-fill
+            span= _p('right_menu.paste')
+        if theme.comment.enable
+            div.rightMenu-item#menu-commenttext
+                i.solitude.st-chat-new-fill
+                span= _p('right_menu.comment')
+        div.rightMenu-item#menu-newwindow
+            i.solitude.st-window-fill
+            span= _p('right_menu.new')
+        div.rightMenu-item#menu-copylink
+            i.solitude.st-link-line
+            span= _p('right_menu.link')
+        div.rightMenu-item#menu-copyimg
+            i.solitude.st-copy-fill
+            span= _p('right_menu.img')
+        div.rightMenu-item#menu-downloadimg
+            i.solitude.st-download-cloud-fill
+            span= _p('right_menu.downloadImg')
+        if theme.search.enable
+            div.rightMenu-item#menu-search
+                i.solitude.st-search-line
+                span= _p('right_menu.search')
+        if theme.capsule.enable
+            div.rightMenu-item#menu-music-toggle
+                i.solitude.st-play-fill
+                span= _p('right_menu.music.start')
+            div.rightMenu-item#menu-music-back
+                i.solitude.st-skip-back-fill
+                span= _p('right_menu.music.back')
+            div.rightMenu-item#menu-music-forward
+                i.solitude.st-skip-forward-fill
+                span= _p('right_menu.music.forward')
+            div.rightMenu-item#menu-music-copyMusicName
+                i.solitude.st-copy-fill
+                span= _p('right_menu.music.copyMusicName')
+    div.rightMenu-group.rightMenu-line.rightMenuOther
+        each item,index in custom_list
+            a.rightMenu-item(id=item.id class=item.class href=item.href onclick=item.click)
+                i.solitude(class=item.icon)
+                span= item.name
+    div.rightMenu-group.rightMenu-line.rightMenuOther
+        if theme.right_menu.commentBarrage && theme.comment.enable && theme.comment.commentBarrage
+            div.rightMenu-item#menu-commentBarrage(onclick="sco.switchCommentBarrage()")
+                i.solitude.st-chat-fill
+                span.menu-commentBarrage-text= _p('right_menu.barrage.open')
+        div.rightMenu-item#menu-darkmode(onclick="sco.switchDarkMode()")
+            i.solitude.st-moon-clear-fill
+            case theme.display_mode.type
+                when 'auto'
+                when 'light'
+                    span.menu-darkmode-text= _p('right_menu.light')
+                when 'dark'
+                    span.menu-darkmode-text= _p('right_menu.dark')
+        if theme.right_menu.translate.enable
+            div.rightMenu-item#menu-translate
+                case theme.right_menu.translate.defaultEncoding
+                    when 2
+                        i.solitude.st-panben-line
+                        span= _p('right_menu.chs_to_cht')
+                    when 1
+                        i.solitude.st-jianben-line
+                        span= _p('right_menu.cht_to_chs')
+div#rightmenu-mask

package/layout/index.pug

@@ -1,9 +1,9 @@
 extends includes/layout
 
 block content
-    if theme.hometop.enable || theme.says.home_mini
+    if theme.hometop.enable || (theme.says.home_mini && theme.says.enable)
         #home_top
-            if theme.says.home_mini
+            if theme.says.home_mini && theme.says.enable
                 include ./includes/widgets/home/bbTimeList
             if theme.hometop.enable && is_home_first_page()
                 include ./includes/widgets/home/hometop

package/package.json

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

package/plugins.yml

@@ -66,10 +66,6 @@ pace_js:
   other_name: pace
   file: pace.min.js
   version: 1.2.4
-lunr_js:
-  name: lunr.js
-  file: lunr.min.js
-  version: 2.3.9
 swiper_css:
   name: Swiper
   file: swiper-bundle.min.css

package/scripts/event/cdn.js

@@ -49,7 +49,12 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/music.js',
             version
         },
-        translate:{
+        right_menu_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/right_menu.js',
+            version
+        },
+        translate_js:{
             name: 'hexo-theme-solitude',
             file: 'js/tw_cn.js',
             version