hexo-theme-solitude 1.5.10 → 1.6.0

package/layout/page.pug

@@ -22,7 +22,7 @@ block content
                     include includes/page/moment
                 when 'douban'
                     include includes/widgets/page/banner
-                    include includes/page/default
+                    != page.content
                 when 'music'
                     include includes/page/music
                 default

package/package.json

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

package/plugins.yml

@@ -74,10 +74,6 @@ busuanzi_js:
   name: busuanzi
   file: bsz.pure.mini.js
   version: 2.3.0
-snackbar_css:
-  name: node-snackbar
-  file: dist/snackbar.min.css
-  version: 0.1.16
 snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js

package/scripts/event/cdn.js

@@ -61,7 +61,7 @@ hexo.extend.filter.register('before_generate', () => {
         },
         sco_ai_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/sco-ai.min.js',
+            file: 'js/third_party/sco-ai.min.js',
             version
         },
         twikoo_commentBarrage: {
@@ -76,17 +76,17 @@ hexo.extend.filter.register('before_generate', () => {
         },
         waterfall: {
             name: 'hexo-theme-solitude',
-            file: 'js/waterfall.min.js',
+            file: 'js/third_party/waterfall.min.js',
             version
         },
         universe_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/universe.min.js',
+            file: 'js/third_party/universe.min.js',
             version
         },
         lately_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/lately.min.js',
+            file: 'js/third_party/lately.min.js',
             version
         },
     }

package/scripts/event/merge_config.js

@@ -0,0 +1,211 @@
+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",
+            },
+        }, index_post_list: {
+            direction: 'column', content: false, length: 500, cover: 'both'
+        }, 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, field: 'site', 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,
+            font: {
+                'font-size': '16px',
+                'code-font-size': '16px',
+                'font-family': '"PingFang SC","Hiragino Sans GB","Microsoft YaHei"',
+                'code-font-family': '"monospace", "monospace"',
+            },
+            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/event/welcome.js

@@ -1,6 +1,6 @@
 hexo.on('ready', () => {
-  const { version } = require('../../package.json')
-  hexo.log.info(`
+    const {version} = require('../../package.json')
+    hexo.log.info(`
   ===================================================================
        #####  ####  #     #####  ###### #     # ######   ######
       #      #    # #       #      #    #     # #      # #

package/scripts/filter/checkThemeConfig.js

@@ -4,12 +4,12 @@ hexo.extend.filter.register('before_post_render', () => {
         const data = hexo.locals.get('data');
         const logger = hexo.log;
         const theme = hexo.theme.config;
-        if (theme.hometop.banner.enable && !theme.hometop.banner.icon) {
+        if (theme.hometop.enable && !theme.hometop.banner.icon) {
             logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
             logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
             process.exit(-1);
         }
-        if (theme.says.enable && theme.says.mode === 'local' && !data.essay) {
+        if (theme.says.enable && !data.essay) {
             logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
             logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
             process.exit(-1);

package/scripts/filter/default.js

@@ -2,18 +2,20 @@
 
 hexo.extend.filter.register('after_post_render', function (data) {
     data.title = data.title || 'Untitled';
-    const { config } = hexo.theme;
+    const {config} = hexo.theme;
     if (data.layout === 'post') {
-        const { copyright, locate,cover } = hexo.theme.config.post.default
+        let {copyright, locate, cover} = hexo.theme.config.post.default
+        cover = cover !== null ? cover : ['/img/default.png']
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
-        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] : '/img/default.png'
+        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.description || data.excerpt
         data.toc = !!(config.aside.toc.post && data.toc !== false);
     }
     if (data.layout === 'page') {
-        const { cover } = hexo.theme.config.page.default
-        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] :'/img/default.png'
+        let {cover} = hexo.theme.config.page.default
+        cover = cover !== null ? cover : ['/img/default.png']
+        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.title
         data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);
     }

package/scripts/filter/lazyload.js

@@ -1,7 +1,20 @@
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+const lazyload = (content, img) => {
+    return content.replace(/(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi, `$1 "${img}" data-lazy-src=`)
+}
+
 hexo.extend.filter.register('after_render:html', function (data) {
-    if (!hexo.theme.config.lazyload.enable) return
-    return data.replace(
-        /(<img(?!.*?class\t*=\t*['"].*?nolazyload.*?['"]).*?)( src=)/gi,
-        `$1 data-lazy-src=`
-    )
+    const { enable, placeholder ,field } = hexo.theme.config.lazyload
+    if (!enable || field !== 'site') return;
+    return lazyload(data, urlFor(placeholder))
+})
+
+hexo.extend.filter.register('after_post_render', data => {
+    const { enable, placeholder, field } = hexo.theme.config.lazyload
+    if (!enable || field !== 'post') return
+    data.content = lazyload(data.content, urlFor(placeholder))
+    return data
 })

package/scripts/filter/randomPosts.js

@@ -1,5 +1,5 @@
 hexo.extend.filter.register('after_render:html', function (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>`;
+    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

@@ -7,14 +7,7 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
         style.define('highlightTags', array);
     }
 
-    const aside = [
-        theme.config.aside.home.noSticky,
-        theme.config.aside.home.Sticky,
-        theme.config.aside.post.noSticky,
-        theme.config.aside.post.Sticky,
-        theme.config.aside.page.Sticky,
-        theme.config.aside.page.noSticky
-    ].join(',').split(',');
+    const aside = [theme.config.aside.home.noSticky, theme.config.aside.home.Sticky, theme.config.aside.post.noSticky, theme.config.aside.post.Sticky, theme.config.aside.page.Sticky, theme.config.aside.page.noSticky].join(',').split(',');
     const uniqueArr = [...new Set(aside)];
     if (uniqueArr.length > 0) {
         style.define('aside', uniqueArr);
@@ -22,12 +15,12 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
 
     style.define('about', data && data.about ? Object.keys(data.about) : []);
 
-    initGroupColor(theme.config.hometop.group,style);
+    initGroupColor(theme.config.hometop.group, style);
 
-    // hightlight
-    const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
-    let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
-    let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
+    // 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) {
@@ -41,8 +34,8 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$prismjs_line_number', prismjsLineNumber)
 });
 
-function initGroupColor(gg,style) {
-    if(gg === null || gg === undefined) {
+function initGroupColor(gg, style) {
+    if (gg === null || gg === undefined) {
         style.define('banner_group', [])
         return;
     }
@@ -63,5 +56,6 @@ function initGroupColor(gg,style) {
         });
         return color;
     }
+
     style.define('getGroupColor', getGroupColor);
 }