hexo-theme-solitude 1.5.9 → 1.5.11

package/.github/workflows/issue_close_question.yml

@@ -0,0 +1,25 @@
+name: Close need info
+
+on:
+  schedule:
+    - cron: "0 0 */1 * *"
+  workflow_dispatch:
+
+jobs:
+  close-need-info:
+    runs-on: ubuntu-latest
+    steps:
+      - name: close-issues
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "close-issues"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "question"
+          inactive-day: 60
+          close-reason: "not_planned"
+          body: |
+            Hi there! This issue has been automatically closed because it has not had any activity for 60 days. We label issues as "questions" in hopes of community or maintainer input, and it seems this issue has gone stale.
+          
+            If you still need assistance or believe this closure is a mistake, please feel free to reopen the issue or create a new one with updated details. We're here to help!
+          
+            Thank you for your contributions to our project!

package/.github/workflows/issue_invalid.yml

@@ -0,0 +1,18 @@
+name: Issue Invalid
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  lock-issue:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'invalid'
+    steps:
+      - name: Lock issue
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: "lock-issue"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          lock-reason: "off-topic"

package/.github/workflows/issue_question.yml

@@ -0,0 +1,30 @@
+name: Issue Question
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  create-comment:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'question'
+    steps:
+      - name: Create comment
+        uses: actions-cool/issues-helper@v2.0.0
+        with:
+          actions: "create-comment"
+          token: ${{ secrets.ISSUSE_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello! 👋
+            
+            Thank you for submitting your question. To ensure we can provide the best answer possible, could you please confirm you've provided the following details:
+            - A clear and concise description of your question.
+            - Any relevant code snippets or links to your project.
+            - What you've tried so far in attempting to solve your issue.
+            
+            In the meantime, you might find the answer to your question in our [FAQs](https://solitude-docs.efu.me/faq) or [documentation](https://solitude-docs.efu.me/).
+            
+            We aim to respond to questions within 48 hours. If your question is urgent, please consider reaching out through our support channels.
+            
+            Thanks again for reaching out, and we look forward to assisting you!

package/.github/workflows/issue_wontfix.yml

@@ -0,0 +1,29 @@
+name: Issue Wontfix
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  handle-wontfix:
+    runs-on: ubuntu-latest
+    if: github.event.label.name == 'wontfix'
+    steps:
+      - name: Create comment for wontfix
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-comment"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hi there! This issue has been marked as 'wontfix'. It means we've reviewed the issue but have chosen not to pursue it for reasons that may vary (e.g., aligning with the project's current priorities, outside of project scope, etc.).
+
+            We understand this might not be the outcome you were hoping for. If you believe this decision should be reconsidered, please provide any additional context or reasoning that was not previously considered.
+
+            Thank you for your understanding and for contributing to the project. Your efforts are greatly appreciated!
+      - name: Close issue after wontfix
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "close-issue"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}

package/_config.yml

@@ -274,7 +274,7 @@ aside:
     postcount: true
     # 总字数
     # The number of words on the web site
-    wordcount: true
+    wordcount: false
     # 访问量
     # PV
     pv: true
@@ -310,7 +310,7 @@ post:
     # 文章默认图片
     # default cover
     cover:
-      # - /img/default.png # 默认图片 / default cover
+      # -  # 默认图片 / default cover
     # 文章发布默认地址
     # default post locate
     locate: 衡阳
@@ -585,19 +585,17 @@ loading:
 
 #代码高亮增强
 # code highlight
-hightlight:
-  enable: false
-  # 代码块行高限制
-  # Code block line height limit
-  hightlimit: 200
+highlight:
+  enable: true
+  limit: 200 # 代码行高限制 / Code line limit
   copy: true # 是否开启复制按钮 / Whether to enable the copy button
-  expand: false # 是否默认展开 / Whether to expand by default
+  expand: true # 是否默认展开 / Whether to expand by default
   # 代码块样式
   # Code block style
   theme: default # default: 默认 / mac : apple terminal
   # 代码配色
   # Code color
-  color: default # default: 默认  / vscode / solarized-dark / solarized-light / dracula / monokai
+  color: default # default: 默认  / dark / funky / okaidia / tomorrow / twilight / darcula / solarized-dark / solarized-light / material / github
 
 # 图片灯箱
 # image lightbox

package/layout/includes/head/config.pug

@@ -44,11 +44,12 @@ script.
             enable: !{theme.lazyload.enable},
             error: '!{theme.lazyload.errorimg}'
         },
-        hightlight: {
-            enable: !{theme.hightlight.enable},
-            limit: !{theme.hightlight.hightlimit},
-            expand: !{theme.hightlight.expand},
-            copy: !{theme.hightlight.copy},
+        highlight: {
+            enable: !{theme.highlight.enable},
+            limit: !{theme.highlight.limit},
+            expand: !{theme.highlight.expand},
+            copy: !{theme.highlight.copy},
+            syntax: '!{config.syntax_highlighter}'
         },
         randomlinks: !{theme.footer.randomlink},
         lang: {

package/layout/includes/inject/head.pug

@@ -78,7 +78,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.9",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.11",
         "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/page/says.pug

@@ -31,7 +31,7 @@ if theme.says.enable
                                 if item.video.player
                                     video(src=item.video.player controls="controls" style="object-fit: cover;")
                                 if item.video.bilibili
-                                    iframe(src='//player.bilibili.com/player.html?auto-play=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
+                                    iframe(src='//player.bilibili.com/player.html?autoplay=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
 
                         if theme.says.style === 1
                             hr
@@ -51,4 +51,4 @@ if theme.says.enable
                 if theme.says.strip === -1
                     | - 已展开所有短文 -
                 else
-                    | - 只展示最近 #{theme.says.strip} 条短文 -
+                    | - 只展示最近 #{theme.says.strip} 条短文 -

package/package.json

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

package/plugins.yml

@@ -51,7 +51,7 @@ aplayer_js:
   version: 1.10.1
 meting_js:
   name: meting
-  file: Meting.min.js
+  file: dist/Meting.min.js
   version: 2.0.1
 pace_js:
   name: pace-js

package/scripts/event/cdn.js

@@ -120,8 +120,7 @@ hexo.extend.filter.register('before_generate', () => {
                 jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
                 unpkg: `https://unpkg.com/${name}${verType}/${file}`,
                 cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
-                custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1]),
-                cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
+                custom: (CDN.custom_format || '').replace(/\$\{(.+?)}/g, (match, $1) => value[$1]),
             }
 
             data[key] = cdnSource[type]

package/scripts/event/init.js

@@ -10,13 +10,8 @@ hexo.extend.filter.register('before_generate', () => {
         process.exit(-1);
     }
 
-    if (config.prismjs.enable) {
-        logger.error('主题尚未支持 prismjs 请使用 highlightjs ！');
-        process.exit(-1);
-    }
-
     if (Number(majorVer) < 14) {
         logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
         process.exit(-1);
     }
-});
+});

package/scripts/event/merge_config.js

@@ -0,0 +1,203 @@
+hexo.extend.filter.register('before_generate', () => {
+    const defaultConfig = {
+        site: {
+            name: {
+                class: 'text', custom: 'Solitude'
+            }, siteIcon: '/img/logo.png', icon: 'icon'
+        }, nav: {
+            group: null, menu: null, right: {
+                random: false, console: false, custom: [],
+            }
+        }, hometop: {
+            enable: false, banner: {
+                title: 'Solitude', url: 'A simple theme for Hexo', icon: null,
+            }, group: null, recommendList: {
+                sup: 'Recommend',
+                title: 'Solitude Docs',
+                url: 'https://solitude-docs.efu.me/',
+                img: '/img/default.png',
+                color: 'none',
+            }
+        }, aside: {
+            home: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, post: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, page: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, card: {
+                author: {
+                    img: '/img/logo.png', sticker: '/img/happy-sticker.png',
+                },
+                url: '/about/',
+                content1: 'Solitude',
+                content2: 'A simple theme for Hexo',
+                sayhello: {
+                    morning: 'Good Morning',
+                    noon: 'Good Noon',
+                    afternoon: 'Good Afternoon',
+                    night: 'Good Night',
+                    goodnight: 'Good Night',
+                },
+                sayhello2: ['Welcome to Solitude', 'A simple theme for Hexo', 'Enjoy your time', 'Have a nice day', 'Good luck'],
+                information: null,
+            }, flip: {
+                favicon: '', face: '', backface: '', backcolor: 'var(--efu-blue)'
+            }, toc: {
+                post: true, page: false, vague: true,
+            }, tags: {
+                enable: true, limit: 20, highlight: false, list: [],
+            }, archive: {
+                enable: true, type: 'month'
+            }, siteinfo: {
+                postcount: true,
+                wordcount: false,
+                pv: true,
+                uv: true,
+                updatetime: true,
+                runtimeenable: true,
+                runtime: "2023-04-20 00:00:00",
+            },
+        }, page: {
+            error: true, tags: true, categories: true, default: {
+                cover: ['/img/default.png'],
+            }
+        }, post: {
+            default: {
+                cover: ['/img/default.png'], locate: 'China, Changsha', copyright: {
+                    enable: true,
+                    license: 'CC BY-NC-SA 4.0',
+                    licenurl: 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
+                }
+            }, meta: {
+                date: false,
+                updated: false,
+                locate: false,
+                wordcount: false,
+                readtime: false,
+                pv: false,
+                uv: false,
+                comment: false,
+            }, award: {
+                enable: false,
+                wechat: 'https://7.isyangs.cn/34/65f2e5814db1a-34.png',
+                alipay: 'https://7.isyangs.cn/34/65f2e5a6d2ef5-34.png',
+                url: '/about/',
+            }, rss: null, covercolor: {
+                enable: false, mode: 'local', api: 'https://api.qjqq.cn/api/Imgcolor?img=', time: 43200000,
+            }
+        }, theme_color: {
+            dark: "#ffc848",
+            dark_op: "#f2b94b23",
+            dark_op_deep: "#f2b94bdd",
+            dark_none: "#f2b94b00",
+            light: "#425AEF",
+            light_op: "#4259ef23",
+            light_op_deep: "#4259efdd",
+            light_none: "#4259ef01"
+        }, display_mode: {
+            type: 'auto', universe: false
+        }, related_post: {
+            enable: false, limit: 2, date_type: 'created'
+        }, footer: {
+            information: {
+                left: null, right: null,
+            }, group: null, randomlink: false, privacy: null, license: null, links: [{
+                name: 'Solitude', url: 'https://github.com/valor-x/hexo-theme-solitude',
+            }]
+        }, errorpage: {
+            img: 'https://7.isyangs.cn/34/65f2e65eae32a-34.png', text: '404 Not Found', recommendList: true
+        }, says: {
+            enable: false, home_mini: false, style: 1, strip: 30
+        }, meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r", music: {
+            enable: false, id: '8407304077', server: 'netease', type: 'playlist', volume: 0.8, mutex: true,
+        }, capsule: {
+            enable: false, id: '8407304077', server: 'netease', type: 'playlist',
+        }, moments: {
+            enable: false,
+            api: '',
+            error_img: '/img/logo.png',
+            sort_rule: 'created',
+            expire_days: 1,
+            page_init_number: 10,
+            page_turning_number: 5,
+            angle: false,
+            appjs: 'https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js',
+            bundlejs: 'https://cdn.cbd.int/st-source/js/moment/bundle.min.js',
+            randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
+        }, keyboard: {
+            enable: false, list: []
+        }, lazyload: {
+            enable: false, placeholder: '/img/loading.gif', errorimg: '/img/error_load.png'
+        }, loading: {
+            fullpage: false, pace: true,
+        }, highlight: {
+            enable: true, limit: 200, copy: true, expand: true, theme: 'default', color: 'default',
+        }, lightbox: false, fancybox: false, mediumZoom: false, mermaid: false, translate: {
+            enable: false, defaultEncoding: 2, translateDelay: 0,
+        }, opengraph: {
+            enable: false, options: null
+        }, wordcount: false, busuanzi: false, search: {
+            enable: false, type: 'local', tags: [], algolia: null, local: {
+                preload: false, CDN: null,
+            }
+        }, rightside: {
+            enable: false
+        }, post_ai: {
+            enable: false,
+            modelName: 'GPT 3',
+            key: 'your key',
+            talk: 'I am a AI.',
+            randomPost: false,
+            tips: 'AI is not perfect, please use it with caution.'
+        }, katex: {
+            enable: false, per_page: false, copytex: false,
+        }, comment: {
+            enable: false,
+            type: 'twikoo',
+            commentBarrage: false,
+            newComment: false,
+            randomInfoStart: [`baby's`, `little`, `my`,],
+            randomInfoEnd: [`home`, `world`, `heart`,],
+            twikoo: {
+                envId: 'your envId', lang: 'zh-CN', accessToken: null,
+            },
+            waline: {
+                envId: 'your envId', pageview: true, option: null,
+            },
+            verify_site: [],
+            css_prefix: false,
+            extends: {
+                head: [], body: [],
+            },
+            pwa: {
+                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'
+            },
+            google_adsense: {
+                enable: false,
+                auto_ads: false,
+                enable_page_level_ads: true,
+                js: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+                client: '',
+                slot: '',
+            },
+            CDN: {
+                internal: 'local',
+                third_party: 'cdnjs',
+                version: true,
+                custom_format: 'https://cdn.staticfile.net/${cdnjs_name}/${version}/${min_cdnjs_file}',
+                option: {
+                    solitude_css: 'https://cdn2.codesign.qq.com/icons/7pOrz0WXB5ZWJPX/latest/iconfont.css',
+                }
+            }
+        }
+    }
+    hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+}, 1)

package/scripts/filter/default.js

@@ -1,24 +1,23 @@
 'use strict';
 
 hexo.extend.filter.register('after_post_render', function (data) {
-    const config = hexo.theme.config
-    data.title = data.title || '无标题';
+    data.title = data.title || 'Untitled';
+    const {config} = hexo.theme;
     if (data.layout === 'post') {
-        data.locate = data.locate || config.post.default.locate
-        data.cc = data.cc || config.post.default.copyright
-        data.cover = data.cover || config.post.default.cover[getRandomInt(0, config.post.default.cover.length)] || '/img/default.png'
+        const {copyright, locate, cover} = hexo.theme.config.post.default
+        data.locate = data.locate || locate
+        data.cc = data.cc || copyright
+        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.description || data.excerpt
-        if (config.aside.toc.post && data.toc !== false) data.toc = true
-        else data.toc = false
+        data.toc = !!(config.aside.toc.post && data.toc !== false);
     }
     if (data.layout === 'page') {
-        data.cover = data.cover || config.page.default.cover[getRandomInt(0, config.post.default.cover.length)] || '/img/default.png'
+        const {cover} = hexo.theme.config.page.default
+        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.title
-        if (config.aside.toc.page && data.toc !== false && data.aside) data.toc = true
-        else data.toc = false
+        data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);
     }
-    if (config.comment.enable && data.comment !== false) data.comment = true
-    else data.comment = false
+    data.comment = !!(config.comment.enable && data.comment !== false);
     return data;
 });
 

package/scripts/filter/lazyload.js

@@ -1,5 +1,3 @@
-const urlFor = require('hexo-util').url_for.bind(hexo)
-
 hexo.extend.filter.register('after_render:html', function (data) {
     if (!hexo.theme.config.lazyload.enable) return
     return data.replace(

package/scripts/filter/randomPosts.js

@@ -1,8 +1,5 @@
 hexo.extend.filter.register('after_render:html', function (data) {
-    const posts = []
-    hexo.locals.get('posts').map(function (post) {
-      if (post.random !== false) posts.push(post.path)
-    })
-    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); };</script>`
-    return data
-})
+    const posts = hexo.locals.get('posts').filter(post => post.random !== false).map(post => post.path);
+    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); };</script>`;
+    return data;
+});

package/scripts/helper/stylus.js

@@ -23,6 +23,22 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('about', data && data.about ? Object.keys(data.about) : []);
 
     initGroupColor(theme.config.hometop.group,style);
+
+    // highlight
+    const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
+    let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
+    let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
+
+    // for hexo > 7.0
+    if (syntaxHighlighter) {
+        highlightEnable = syntaxHighlighter === 'highlight.js'
+        prismjsEnable = syntaxHighlighter === 'prismjs'
+    }
+
+    style.define('$highlight_enable', highlightEnable)
+    style.define('$highlight_line_number', highlightLineNumber)
+    style.define('$prismjs_enable', prismjsEnable)
+    style.define('$prismjs_line_number', prismjsLineNumber)
 });
 
 function initGroupColor(gg,style) {

package/scripts/tags/bvideo.js

@@ -1,7 +1,7 @@
 'use strict'
 
 function bilibili(args) {
-  return `<iframe class="bvideo" width="100%" height="600" src="//player.bilibili.com/player.html?aid=1351697032&bvid=${args}&p=1" border="0" frameBorder="no" framespacing="0" allowFullScreen="true"></iframe>`
+  return `<iframe class="bvideo" width="100%" height="600" src="//player.bilibili.com/player.html?autoplay=0&bvid=${args}" border="0" frameBorder="no" framespacing="0" allowFullScreen="true"></iframe>`
 }
 
-hexo.extend.tag.register('bvideo', bilibili, {ends: false})
+hexo.extend.tag.register('bvideo', bilibili, {ends: false})

package/source/css/_global/var.styl

@@ -11,15 +11,16 @@ $light_theme_none = hexo-config('theme_color.light_none')
 
 $todayCardColor = convert(hexo-config('hometop.recommendList.color'))
 
-// highlight code
-if hexo-config('hightlight.theme') == 'default'
+// code
+if hexo-config('highlight.theme') == 'default'
   $hl_bg_light = #fff
   $hltools_bg_light = #f7f7f9
   $hl_bg_dark = #1b1c20
   $hltools_bg_dark = #21232a
-
-else if hexo-config('hightlight.theme') == 'mac'
+else if hexo-config('highlight.theme') == 'mac'
   $hl_bg_light = #FFFFFF
   $hltools_bg_light = #E7E7E7
   $hl_bg_dark = #1C1E1E
-  $hltools_bg_dark = #2A282A
+  $hltools_bg_dark = #454a50
+
+$line-height-code-block = 1.6