hexo-theme-solitude 1.5.4 → 1.5.6

package/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,7 @@
 name: Bug 报告 🐛
 description: 本项目仅对最新版本进行维护，使用老版本出现问题的，请先升级到最新版本或使用dev版本，升级完后如果发现bug依然存在，请继续填写此issue。
 labels: ['status: needs check']
+title: "[Bug]: "
 body:
   - type: markdown
     attributes:
@@ -10,18 +11,18 @@ body:
         2. 查询主题使用文档的相关内容和正确配置
         3. 使用的是Solitude主题最新版本
         4. 执行`npm ls -dept 0`检查是否已安装对应插件
-        5. [FAQS](https://docs.wzsco.top/FAQ.html) 中无类似问题
+        5. [FAQS](https://solitude-docs.efu.me/faq) 中无类似问题
   - type: checkboxes
     attributes:
       label: 前置确认
       options:
-        - label: 我确认我运行的是最新版本的主题，并且安装了所需的依赖，在[FAQS](https://docs.wzsco.top/FAQ.html)中也未找到类似问题。
+        - label: 我确认我运行的是最新版本的主题，并且安装了所需的依赖，在[FAQS](https://solitude-docs.efu.me/faq)中也未找到类似问题。
           required: true
   - type: checkboxes
     attributes:
       label: ⚠️ 搜索issues中是否已存在类似问题
       description: >
-        请在 [历史issue](https://github.com/DuoSco/Hexo-theme-solitude/issues) 中清空输入框，搜索你的问题
+        请在 [历史issue](https://github.com/valor-x/hexo-theme-solitude/issues) 中清空输入框，搜索你的问题
         或相关日志的关键词来查找是否存在类似问题。
       options:
         - label: 我已经搜索过issues和disscussions，没有跟我遇到的问题相关的issue
@@ -37,7 +38,7 @@ body:
         请选择你运行程序的操作系统类型。
       options:
         - Windows
-        - MacOS
+        - Mac/Linux
     validations:
       required: true
   - type: dropdown
@@ -67,6 +68,7 @@ body:
     attributes:
       label: 问题描述 😯
       description: 详细描述出现的问题，或提供有关截图。
+      placeholder: "e.g., 我在...出现..."
   - type: textarea
     attributes:
       label: 终端日志 📒
@@ -103,5 +105,4 @@ body:
             at Array.reduce (<anonymous>)
         INFO  Hexo is running at http://localhost:4000/ . Press Ctrl+C to stop.
         </details>
-      value: |
-        <此处粘贴终端日志>
+      placeholder: "e.g., <此处粘贴终端日志>"

package/.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: 功能新增✨
 description: 为这个项目提出一个想法
-title: "[想法]: "
+title: "[Feature]: "
 labels: ["增强"]
 body:
   - type: markdown

package/README.md

@@ -1,12 +1,12 @@
-简体中文丨[繁体中文](README_zh-tw.md)丨[English](README_EN.md)
+[简体中文](README_zh-cn.md)丨[繁体中文](README_zh-tw.md)丨English
 
 <div align="center">
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-   <h1 align="center">Hexo Theme Solitude</h1>
+  <h1 align="center">Hexo Theme Solitude</h1>
 
-   <p align="center">一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。</p>
+  <p align="center">An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.</p>
 
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff)
@@ -15,47 +15,47 @@
 [![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
 [![GitHub all releases](https://img.shields.io/github/downloads/valor-x/hexo-theme-solitude/total)](https://github.com/valor-x/hexo-theme-solitude/releases/latest)
 
-[预览](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[Preview](https://solitude-demo.efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## 特性
+## Features
 
-- 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline)
-- 显示切换(ColorMode)
-- 灯箱(medium-zoom、fancybox)
-- 数学公式(Latex)
-- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
-- 文章功能：AI 摘要、代码高亮
+- Pjax、LazyLoad、PWA
+- Comments(Twikoo、Waline)
+- 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.
+
+## Contributors
 
 <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>
 
-**主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
+**Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!**
 
-> 欢迎你对本主题做出贡献！[贡献指南](/CONTRIBUTING.md)
+> You are welcome to contribute to this topic! [Contribution Guide](/CONTRIBUTING.md)

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

@@ -1,12 +1,12 @@
-[简体中文](README.md)丨[繁体中文](README_zh-tw.md)丨English
+简体中文丨[繁体中文](README_zh-tw.md)丨[English](README.md)
 
 <div align="center">
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-  <h1 align="center">Hexo Theme Solitude</h1>
+   <h1 align="center">Hexo Theme Solitude</h1>
 
-  <p align="center">An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.</p>
+   <p align="center">一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。</p>
 
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff)
@@ -15,47 +15,47 @@
 [![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
 [![GitHub all releases](https://img.shields.io/github/downloads/valor-x/hexo-theme-solitude/total)](https://github.com/valor-x/hexo-theme-solitude/releases/latest)
 
-[Preview](https://solitude-demo.efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
+[预览](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## Features
+## 特性
 
-- Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline)
-- 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)
+- 显示切换(ColorMode)
+- 灯箱(medium-zoom、fancybox)
+- 数学公式(Latex)
+- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
+- 文章功能：AI 摘要、代码高亮
 
 ## Todo
 
-- [x] Support Waline
-- [ ] Tags plugin
-- [ ] Album reconstruction
+- [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.
-
-## Contributors
+## 贡献者
 
 <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>
 
-**Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!**
+**主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
 
-> You are welcome to contribute to this topic! [Contribution Guide](/CONTRIBUTING.md)
+> 欢迎你对本主题做出贡献！[贡献指南](/CONTRIBUTING.md)

package/README_zh-tw.md

@@ -1,4 +1,4 @@
-[简体中文](README.md)丨繁体中文丨[English](README_EN.md)
+[简体中文](README_zh-cn.md)丨繁体中文丨[English](README.md)
 
 <div align="center">
   
@@ -35,7 +35,7 @@
 
 - [x] Waline 評論支援
 - [ ] Tags plugin 外掛程式化
-- [ ] 相冊頁重構
+- [ ] 相冊頁重構（已移除，待重構）
 
 ## 應用
 

package/_config.yml

@@ -53,7 +53,6 @@ nav:
     #   友情链接: /links/ || st-group-fill
     #   宝藏博主: javascript:travelling() || st-gift-fill
     # 我的:
-    #   相册集: /gallery/ || st-image-fill
     #   装备: /equipment/ || st-laptop-line
     #   工具箱: /tlink/ || st-tools-fill
     #   音乐馆: /music/ || st-disc-fill
@@ -321,11 +320,6 @@ post:
       enable: true
       license: CC BY-NC-SA 4.0
       licenurl: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh
-      # 是否使用移轴动画头像
-      # Whether to use the shift animation avatar
-      author:
-        enable: false
-        author_back: https://7.isyangs.cn/34/65f2e52b2d91e-34.png # 底部头像背景 / Bottom avatar background
   # 顶部文章简介
   # Top article introduction
   meta:
@@ -542,12 +536,6 @@ moments:
   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
 
-# 相册
-# album
-album:
-  enable: false # 是否开启相册 / Whether to enable album
-  limit: 6 # 单行显示图片数量 / Number of pictures displayed in a single line
-
 # 快捷菜单你
 # quick menu
 keyboard:

package/languages/en.yml

@@ -6,12 +6,15 @@ copy:
   success: Copied
   error: Copied failed
 
-time:
-  recent: Recent
-  yesterday: Yesterday
-  berforeyesterday: TDBY
-  daybefore: Days ago
-  runtime: days
+lately:
+  second: second
+  minute: minute
+  hour: hour
+  day: day
+  month: month
+  year: year
+  ago: ago
+  error: NaN
 
 chs:
   chs_tw: Traditional Chinese

package/languages/zh-CN.yml

@@ -7,12 +7,15 @@ copy:
   success: 复制成功
   error: 复制失败
 
-time:
-  recent: 最近
-  yesterday: 昨天
-  berforeyesterday: 前天
-  daybefore: 天前
-  runtime:  天
+lately:
+  second: 秒
+  minute: 分钟
+  hour: 小时
+  day: 天
+  month: 个月
+  year: 年
+  ago: 前
+  error: NaN
 
 chs:
   chs_tw: 繁體中文

package/languages/zh-TW.yml

@@ -7,12 +7,15 @@ copy:
   success: 複製成功
   error: 複製失敗
 
-time:
-  recent: 最近
-  yesterday: 昨天
-  berforeyesterday: 前天
-  daybefore: 天前
-  runtime: 天
+lately:
+  second: 秒
+  minute: 分鐘
+  hour: 小時
+  day: 天
+  month: 个月
+  year: 年
+  ago: 前
+  error: NaN
 
 chs:
   chs_tw: 繁體中文

package/layout/includes/head/config.pug

@@ -61,12 +61,15 @@ script.
                 error: '!{_p('copy.error')}',
             },
             backtop: '!{_p('nav.backtop')}',
-            time: {
-                recent: '!{_p('time.recent')}',
-                yesterday: '!{_p('time.yesterday')}',
-                berforeyesterday: '!{_p('time.berforeyesterday')}',
-                daybefore: '!{_p('time.daybefore')}',
-                runtime: '!{_p('time.runtime')}',
+            lately: {
+                second: '!{_p('lately.second')}',
+                minute: '!{_p('lately.minute')}',
+                hour: '!{_p('lately.hour')}',
+                day: '!{_p('lately.day')}',
+                month: '!{_p('lately.month')}',
+                year: '!{_p('lately.year')}',
+                ago: '!{_p('lately.ago')}',
+                error: '!{_p('lately.error')}',
             },
             search: {
                 empty: '!{_p('search.empty')}',

package/layout/includes/inject/body.pug

@@ -14,12 +14,12 @@ div
     script(src=url_for(theme.cdn.main))
     script(src=url_for(theme.cdn.utils))
 
+    // lately
+    script(src=url_for(theme.cdn.lately_js))
+
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
 
-    if theme.album.enable
-        script(src=url_for(theme.cdn.macy_js))
-
     if theme.rightside.enable
         include ../widgets/rightside/index
         script(src=url_for(theme.cdn.rightside_js))
@@ -106,12 +106,13 @@ div
             != item
 
 div#js-pjax
+    case config.lang
+        when 'en'
+            script.
+                utils.changeTimeFormat()
     if theme.mermaid
         script.
             mermaid.run();
-    if page.type === 'album' && theme.album.enable
-        script.
-            initGallery()
     if is_home() && theme.says.home_mini
         script.
             sco.initbbtalk();

package/layout/includes/inject/head.pug

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

@@ -1,16 +1,6 @@
 if theme.music.enable
     #Music-bg
     #Music-page
+        meting-js(id=theme.music.id, server=theme.music.server, type=theme.music.type, mutex=theme.music.mutex, volume=theme.music.volume, preload="none", data-lrctype="0", order="random")
     .Music-loading
-        div APlayer加载中...
-
-    script.
-        if (!window.musicConfig) {
-            window.musicConfig = {
-                userId: '#{theme.music.id}',
-                userServer: "#{theme.music.server}",
-                userType: "#{theme.music.type}",
-                volume: #{theme.music.volume},
-                mutex: #{theme.music.mutex}
-            }
-        }
+        div APlayer加载中...

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

@@ -7,7 +7,7 @@ if personalities
             span.author-content-item-title= personalities.title
             .title2(style=`color:${personalities.color}`)= personalities.type
             .image
-                img(src=personalities.image)
+                img.nolazyload(src=personalities.image)
             .post-tips
                 | 在
                 a(href="https://www.16personalities.com/")= personalities.linkText

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

@@ -1,8 +1,6 @@
 .post-copyright
     .post-copyright__author_group
         a.post-copyright__author_img(href="/about/")
-            if theme.post.default.copyright.author.enable
-                img.post-copyright__author_img_back(src=theme.post.default.copyright.author.author_back)
             img.post-copyright__author_img_front(src=theme.site.icon)
         .post-copyright__author_name= config.title
         .post-copyright__author_desc= config.subtitle

package/layout/page.pug

@@ -25,10 +25,6 @@ block content
                     include includes/page/default
                 when 'music'
                     include includes/page/music
-                when 'gallery'
-                    include includes/page/gallery
-                when 'album'
-                    include includes/page/album
                 default
                     include includes/page/default
             if page.comment

package/package.json

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

package/plugins.yml

@@ -98,10 +98,6 @@ fancyapps_css:
   name: fancyapps-ui
   file: dist/fancybox/fancybox.min.css
   version: 5.0.33
-macy_js:
-  name: macy
-  file: dist/macy.min.js
-  version: 2.5.1
 mermaid_js:
   name: mermaid
   file: dist/mermaid.min.js

package/scripts/event/cdn.js

@@ -83,7 +83,12 @@ hexo.extend.filter.register('before_generate', () => {
             name: 'hexo-theme-solitude',
             file: 'js/universe.min.js',
             version
-        }
+        },
+        lately_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/lately.min.js',
+            version
+        },
     }
 
     const minFile = file => {

package/scripts/tags/button.js

@@ -15,7 +15,7 @@ function btn(args) {
     option = option.trim();
 
     return `<button class="btn-sco ${option}" onclick="location.href = '${urlFor(url)}'" 
-  title="${text}">${icon.length ? `<i class="${icon}"></i>` : ""}${text.length ? `<span>${text}</span>` : ""}</button>`;
+  title="${text}">${icon.length ? `<i class="solitude ${icon}"></i>` : ""}${text.length ? `<span>${text}</span>` : ""}</button>`;
 }
 
 hexo.extend.tag.register("btn", btn, { ends: false });

package/scripts/tags/bvideo.js

@@ -1,7 +1,7 @@
 'use strict'
 
 function bilibili(args) {
-  return `<iframe class="bvideo" src="${args}"></iframe>`
+  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>`
 }
 
-hexo.extend.tag.register('bilibili', bilibili, { ends: false })
+hexo.extend.tag.register('bvideo', bilibili, {ends: false})

package/scripts/tags/gallery.js

@@ -0,0 +1,54 @@
+'use strict';
+
+function galleryGroup(args, content) {
+    const title = args[0];
+    const description = args[1];
+    const link = args[2];
+    const image = args[3];
+
+    return `<div class="gallery-item" onclick="pjax.loadUrl('/${link}/')">
+                <img class="cover" src="${image}" />
+                <span class="title">${title}</span>
+                <span class="desc">${description}</span>
+                </div>`;
+}
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+const gallery = (args, content) => {
+    args = args.join(' ').split(',')
+    let button = false
+    let type = 'data'
+    let dataStr = ''
+
+    if (args[0] === 'url') {
+        [type, dataStr, button] = args // url,[link],[lazyload]
+    } else {
+        [button] = args // [lazyload]
+        const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
+        let m
+        const arr = []
+        while ((m = regex.exec(content)) !== null) {
+            if (m.index === regex.lastIndex) {
+                regex.lastIndex++
+            }
+            arr.push({
+                url: m[2],
+                alt: m[1],
+                title: m[3]
+            })
+        }
+
+        dataStr = JSON.stringify(arr)
+    }
+
+    return `<div class="gallery-container" data-type="${type}" data-button="${button}">
+      <div class="gallery-data">${dataStr}</div>
+      <div class="gallery-items">
+      </div>
+    </div>`
+}
+
+hexo.extend.tag.register('gallery', gallery, {ends: true});
+
+hexo.extend.tag.register('galleryGroup',galleryGroup, {ends: false});

package/scripts/tags/image.js

@@ -1,7 +1,7 @@
 'use strict';
 
 hexo.extend.tag.register('image', function(args) {
-    args = args.join(' ').split(', ');
+    args = args.join(' ').split(',');
     let url = args[0].trim();
     let alt = '';
     let bg = '';

package/scripts/tags/link.js

@@ -1,17 +1,20 @@
 'use strict'
 
 function link(args) {
+    args = args.join(' ').split(',');
     let urlNoProtocol = args[2].replace(/^https?\:\/\//i, "");
     let imgUrl = "https://api.iowen.cn/favicon/" + urlNoProtocol + ".png";
-    return `<a class="tag-Link" target="_blank" href="${args[2]}">
+    return `<a class="tag-link" target="_blank" href="${args[2]}">
     <div class="tag-link-tips">引用站外地址</div>
     <div class="tag-link-bottom">
-        <div class="tag-link-left" style="background-image: url(${imgUrl});"></div>
+        <div class="tag-link-left" style="background-image: url(${imgUrl});">
+            <i class="solitude st-link-m-line"></i>
+        </div>
         <div class="tag-link-right">
             <div class="tag-link-title">${args[0]}</div>
             <div class="tag-link-sitename">${args[1]}</div>
         </div>
-        <i class="fa-solid fa-angle-right"></i>
+        <i class="solitude st-arrow-right-bold"></i>
     </div>
     </a>`
 }

package/scripts/tags/note.js

@@ -1,3 +1,9 @@
+/**
+ * note.js
+ * transplant from hexo-theme-next
+ * modified by @efu
+ */
+
 hexo.extend.tag.register('note', function (types, content) {
     let type = ""
     for (let i = 0; i < types.length; i++) {

package/source/css/_global/function.styl

@@ -58,6 +58,10 @@ minWidth1200()
   @media screen and (min-width: 1200px)
     {block}
 
+minWidth1201()
+  @media screen and (min-width: 1201px)
+    {block}
+
 maxWidth1024()
   @media screen and (max-width: 1024px)
     {block}