hexo-theme-shokax 0.3.7 → 0.3.9

package/README.md

@@ -1,3 +1,6 @@
+# 公告
+[关于ShokaX markdown扩展特性的讨论](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/177) \
+[关于删除部分评论系统的讨论](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/175)
 # hexo-theme-shokaX
 ![LICENSE](	https://img.shields.io/github/license/theme-shoka-x/hexo-theme-shokaX)
 ![stars](https://img.shields.io/github/stars/theme-shoka-x/hexo-theme-shokaX)
@@ -83,4 +86,4 @@ AGPL许可证主要目的是限制修改后的分发行为，避免未经许可
 [<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="25%">](https://jb.gg/OpenSourceSupport)
 
 ## 其他信息
-![Star history chart](https://api.star-history.com/svg?repos=theme-shoka-x/hexo-theme-shokaX&type=Date)
+![Star history chart](https://api.star-history.com/svg?repos=theme-shoka-x/hexo-theme-shokaX&type=Date)

package/UsageRestrictions.md

@@ -14,7 +14,7 @@
 2. ShokaX 项目组不会制作收费版或高级版的项目，ShokaX及其子项目有且只有社区版 (仅为声明)
 
 ## 处理方式
-如果您违反了上述使用限制和GPLv3的任何规定，ShokaX 项目组保留采取以下措施之一或多个的权利：
+如果您违反了上述使用限制和AGPLv3的任何规定，ShokaX 项目组保留采取以下措施之一或多个的权利：
 - 发出警告通知并要求立即纠正违规行为；(根据`AGPLv3 八`)
 - 暂停或终止您对 ShokaX 及其子项目的使用权限并取消GPLv3授予您的权利；(根据`AGPLv3 八`)
 - 取消您获取 ShokaX 社区支持和进行协作的权利；(社区管理)

package/_config.yml

@@ -140,16 +140,16 @@ iconfont: "1832207_igi8uaupcus"
 
 menu:
   home: / || home
-  about:
-    default: / || user
-    aboutsite: /about/  || user
-    admiration: /admiration/ || coffee
-  posts:
-    default: / || feather
-    archives: /archives/ || list-alt
-    categories: /categories/ || th
-    tags: /tags/ || tags
-  friends: /friends/ || heart
+  # about:
+  #   default: / || user
+  #   aboutsite: /about/  || user
+  #   admiration: /admiration/ || coffee
+  # posts:
+  #   default: / || feather
+  #   archives: /archives/ || list-alt
+  #   categories: /categories/ || th
+  #   tags: /tags/ || tags
+  # friends: /friends/ || heart
 
 # https://twikoo.js.org
 twikoo:
@@ -224,7 +224,7 @@ summary:
 # Value before `||` delimiter is the target permalink,
 # secend value is the name of Font icon.
 social:
-  github: https://github.com/name || github || "#191717"
+  # github: https://github.com/name || github || "#191717"
   #google: https://plus.google.com/yourname || google
   #twitter: https://twitter.com/yourname || twitter || "#00aff0"
   #zhihu: https://www.zhihu.com/people/yourname || zhihu || "#1e88e5"

package/languages/zh-HK.yml

@@ -133,7 +133,7 @@ symbols_count_time:
   count_total: 站點總字數
   time: 閱讀時長
   time_total: 站點閱讀時長
-  time_minutes: 分鍾
+  time_minutes: 分鐘
   word: 字
   view: 次
 

package/layout/_partials/sidebar/overview.pug

@@ -30,10 +30,11 @@ nav(class="state")
                     != __('state.tags')
 
 div(class="social")
-    each link, name  in theme.social
-        - var sidebarURL = link.split('||')[0].trim()
-        - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
-        != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
+    if theme.social
+        each link, name  in theme.social
+            - var sidebarURL = link.split('||')[0].trim()
+            - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
+            != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
 
 != shokax_inject('sidebar')
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.7",
+    "version": "0.3.9",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -18,27 +18,28 @@
         "@types/js-yaml": "^4.0.9",
         "@types/lozad": "^1.16.4",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.10.0",
-        "@typescript-eslint/eslint-plugin": "^6.12.0",
-        "@typescript-eslint/parser": "^6.12.0",
+        "@types/node": "^20.10.2",
+        "@typescript-eslint/eslint-plugin": "^6.13.1",
+        "@typescript-eslint/parser": "^6.13.1",
         "chai": "^4.3.10",
-        "eslint": "^8.54.0",
+        "eslint": "^8.55.0",
         "eslint-config-standard": "~17",
         "eslint-plugin-chai-friendly": "^0.7.2",
         "eslint-plugin-import": "^2.29.0",
         "eslint-plugin-n": "^16.3.1",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.18.1",
+        "eslint-plugin-vue": "^9.19.2",
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.1.0",
         "instantsearch.js": "^4.60.0",
+        "jsdom": "^23.0.1",
         "mocha": "^10.2.0",
         "typescript": "^5.3.2",
-        "vue": "^3.3.9",
-        "jsdom": "^22.1.0"
+        "vue": "^3.3.9"
     },
     "dependencies": {
-        "esbuild": "^0.19.7",
+        "esbuild": "^0.19.8",
+        "hexo": "^7.0.0",
         "js-yaml": "^4.1.0",
         "lozad": "^1.16.0",
         "theme-shokax-anime": "^0.0.4",

package/scripts/filters/post.js

@@ -1,13 +1,3 @@
 hexo.extend.filter.register('after_post_render', (data) => {
-    const { config } = hexo;
     data.content = data.content.replace(/(<img[^>]*) src=/img, '$1 data-src=');
-    const siteHost = new URL(config.url).hostname || config.url;
-    data.content = data.content.replace(/<a[^>]* href="([^"]+)"[^>]*>([^<]*)<\/a>/img, (match, href, html) => {
-        if (!href)
-            return match;
-        const link = new URL(href, config.url);
-        if (!link.protocol || link.hostname === siteHost)
-            return match;
-        return `<span class="exturl" data-url="${Buffer.from(href).toString('base64')}">${html}</span>`;
-    });
 }, 0);

package/scripts/generaters/config.js

@@ -30,7 +30,7 @@ hexo.extend.filter.register('before_generate', () => {
             hexo.theme.config.style[style] = path_1.default.resolve(hexo.base_dir, custom_file);
         }
     }
-    if (data.images && data.images.length >= 6) {
+    if (data.images && data.images.length > 0) {
         hexo.theme.config.image_list = data.images;
     }
     else {
@@ -40,6 +40,6 @@ hexo.extend.filter.register('before_generate', () => {
         hexo.theme.config.index_images = js_yaml_1.default.load(node_fs_1.default.readFileSync(path_1.default.join(__dirname, '../../_images_index.yml'), { encoding: 'utf-8' }));
     }
     else {
-        hexo.theme.config.index_images = [];
+        hexo.theme.config.index_images = data.index_images || [];
     }
 });

package/scripts/generaters/pages.js

@@ -1,16 +1,17 @@
-'use strict';
-hexo.extend.generator.register('pages', function (locals) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+hexo.extend.generator.register('pages', function () {
     const config = hexo.config;
     return [
         {
             path: config.category_dir + '/index.html',
             data: { type: 'categories' },
-            layout: ['page']
+            layout: 'page'
         },
         {
             path: config.tag_dir + '/index.html',
             data: { type: 'tags' },
-            layout: ['page']
+            layout: 'page'
         }
     ];
 });

package/scripts/helpers/engine.js

@@ -27,8 +27,11 @@ const randomBG = function (count = 1, image_server = null, image_list = []) {
         }
     };
     if (count && count > 1) {
-        const shuffled = image_list.slice(0);
-        i = image_list.length;
+        let shuffled = image_list.slice(0);
+        while (shuffled.length <= 6) {
+            shuffled = shuffled.concat(image_list.slice(0));
+        }
+        i = shuffled.length;
         const min = i - count;
         let temp;
         let index;
@@ -48,43 +51,14 @@ hexo.extend.helper.register('_url', function (path, text, options = {}) {
     if (!path) {
         return;
     }
-    const { config } = this;
-    const data = new URL(path, hexo.config.url);
-    const siteHost = new URL(config.url).hostname || config.url;
-    const theme = hexo.theme.config;
-    let exturl = '';
     let tag = 'a';
     let attrs = { href: hexo_util_1.url_for.call(this, path), class: undefined, external: undefined, rel: undefined, 'data-url': undefined };
-    if (theme.exturl && data.protocol && data.hostname !== siteHost) {
-        tag = 'span';
-        exturl = 'exturl';
-        const encoded = Buffer.from(path).toString('base64');
-        attrs = {
-            class: exturl,
-            'data-url': encoded
-        };
-    }
     for (const key in options) {
-        if (exturl !== '' && key === 'class') {
-            attrs[key] += ' ' + options[key];
-        }
-        else {
-            attrs[key] = options[key];
-        }
+        attrs[key] = options[key];
     }
     if (attrs.class && Array.isArray(attrs.class)) {
         attrs.class = attrs.class.join(' ');
     }
-    if (data.protocol && data.hostname !== siteHost) {
-        attrs.external = null;
-        if (!theme.exturl) {
-            attrs.rel = 'noopener';
-            attrs.target = '_blank';
-        }
-        else {
-            attrs.rel = null;
-        }
-    }
     return (0, hexo_util_1.htmlTag)(tag, attrs, decodeURI(text), false);
 });
 hexo.extend.helper.register('_image_url', function (img, path = '') {

package/scripts/helpers/list_categories.js

@@ -1,6 +1,4 @@
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("hexo-fs");
 const prepareQuery = (categories, parent) => {
     const query = {
         parent: undefined
@@ -47,32 +45,6 @@ hexo.extend.helper.register('_list_categories', function (depth = 0) {
     };
     return hierarchicalList(0);
 });
-hexo.extend.helper.register('_categories', function () {
-    const categories = this.site.categories;
-    if (!categories || !categories.length)
-        return '';
-    const pangu = {
-        spacing: data => {
-            return data;
-        }
-    };
-    const result = {};
-    categories.forEach((cat, i) => {
-        const child = prepareQuery(categories, cat._id);
-        const cover = 'source/_posts' + cat.path.replace(this.config.category_dir, '') + 'cover.jpg';
-        if (fs.existsSync(cover)) {
-            const className = cat.slug.split('/');
-            className.pop();
-            cat.class = className.join(' ');
-            cat.name = pangu.spacing(cat.name);
-            if (child.length !== 0) {
-                cat.child = child;
-            }
-            result[cat._id] = cat;
-        }
-    });
-    return result;
-});
 hexo.extend.helper.register('_category_prev', function (name) {
     const categories = this.site.categories;
     if (!categories || !categories.length)

package/scripts/plugin/check.js

@@ -1,6 +1,6 @@
 let findProblem = false;
 hexo.on('generateBefore', function () {
-    if (hexo.config.highlight.enable || hexo.config.prismjs.enable) {
+    if (hexo.config.syntax_highlighter) {
         findProblem = true;
         hexo.log.error('[SXEC 101] Highlight.js or Prismjs enabled. The code block will render incomplete');
     }

package/scripts/tags/links.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,47 +14,29 @@ function linkGrid(args, content) {
     if (args[0]) {
         const filepath = node_path_1.default.join(hexo.source_dir, args[0]);
         if (node_fs_1.default.existsSync(filepath)) {
-            content = node_fs_1.default.readFileSync(filepath);
+            content = node_fs_1.default.readFileSync(filepath, { encoding: 'utf-8' });
         }
     }
     if (!content) {
         return;
     }
-    const siteHost = new URL(hexo.config.url).hostname || hexo.config.url;
     const list = js_yaml_1.default.load(content);
     let result = '';
     list.forEach((item) => {
         if (!item.url || !item.site) {
             return;
         }
-        let urlparam = {
-            protocol: undefined,
-            hostname: undefined
-        };
-        if (item.url) {
-            urlparam = new URL(item.url, hexo.config.url);
-        }
         let item_image = item.image || theme.assets + '/404.png';
         if (!item_image.startsWith('//') && !item_image.startsWith('http')) {
             item_image = theme.statics + item_image;
         }
         item.color = item.color ? ` style="--block-color:${item.color};"` : '';
         result += `<div class="item" title="${item.owner || item.site}"${item.color}>`;
-        if (urlparam.protocol && urlparam.hostname !== siteHost) {
-            const durl = Buffer.from(item.url).toString('base64');
-            result += `<span class="exturl image" data-url="${durl}" data-background-image="${item_image}"></span>
-          <div class="info">
-          <span class="exturl title" data-url="${durl}">${item.site}</span>
-          <p class="desc">${item.desc || item.url}</p>
-          </div></div>`;
-        }
-        else {
-            result += `<a href="${item.url}" class="image" data-background-image="${item_image}"></a>
-          <div class="info">
-          <a href="${item.url}" class="title">${item.site}</a>
-          <p class="desc">${item.desc || item.url}</p>
-          </div></div>`;
-        }
+        result += `<a href="${item.url}" class="image" data-background-image="${item_image}"></a>
+        <div class="info">
+        <a href="${item.url}" class="title">${item.site}</a>
+        <p class="desc">${item.desc || item.url}</p>
+        </div></div>`;
     });
     return `<div class="links">${result}</div>`;
 }

package/source/js/_app/page/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerExtURL = exports.cardActive = void 0;
+exports.cardActive = void 0;
 const dom_1 = require("../library/dom");
 const cardActive = () => {
     if (!(0, dom_1.$dom)('.index.wrap')) {
@@ -43,21 +43,3 @@ const cardActive = () => {
     });
 };
 exports.cardActive = cardActive;
-const registerExtURL = () => {
-    dom_1.$dom.each('span.exturl', (element) => {
-        const link = document.createElement('a');
-        link.href = decodeURIComponent(window.atob(element.dataset.url).split('').map((c) => {
-            return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-        }).join(''));
-        link.rel = 'noopener external nofollow noreferrer';
-        link.target = '_blank';
-        link.className = element.className;
-        link.title = element.title || element.innerText;
-        link.innerHTML = element.innerHTML;
-        if (element.dataset.backgroundImage) {
-            link.dataset.backgroundImage = element.dataset.backgroundImage;
-        }
-        element.parentNode.replaceChild(link, element);
-    });
-};
-exports.registerExtURL = registerExtURL;

package/source/js/_app/pjax/refresh.js

@@ -43,7 +43,6 @@ const siteRefresh = (reload) => {
     (0, sidebar_1.menuActive)();
     (0, sidebar_1.sideBarTab)();
     (0, sidebar_1.sidebarTOC)();
-    (0, common_1.registerExtURL)();
     (0, post_1.postBeauty)();
     (0, tab_1.tabFormat)();
     if (typeof player_1.mediaPlayer !== 'undefined') {