hexo-theme-solitude 1.3.1 → 1.4.0

package/layout/includes/widgets/rightside/index.pug

@@ -15,9 +15,10 @@ div#rightMenu
         div.rightMenu-item#menu-pastetext
             i.scoicon.sco-clipboard-fill
             span 粘贴文本
-        a.rightMenu-item#menu-commenttext
-            i.scoicon.sco-chat-new-fill
-            span 引用到评论
+        if theme.comment.enable
+            a.rightMenu-item#menu-commenttext
+                i.scoicon.sco-chat-new-fill
+                span 引用到评论
         div.rightMenu-item#menu-newwindow
             i.scoicon.sco-window-fill
             span 新窗口打开
@@ -45,7 +46,7 @@ div#rightMenu
         div.rightMenu-item#menu-music-forward
             i.scoicon.sco-skip-forward-fill
             span 切换到下一首
-        div.rightMenu-item#menu-music-playlist(onclick=`window.open('${theme.thirdparty.aplayer.server === 'tencent' ? `https://y.qq.com/n/ryqq/playlist/${theme.thirdparty.aplayer.id}` : `https://music.163.com/#/playlist?id=${theme.thirdparty.aplayer.id}`}', '_blank');`)
+        div.rightMenu-item#menu-music-playlist(onclick=`window.open('${theme.capsule.server === 'tencent' ? `https://y.qq.com/n/ryqq/playlist/${theme.capsule.id}` : `https://music.163.com/#/playlist?id=${theme.capsule.id}`}', '_blank');`)
             i.scoicon.sco-play-list-2-line
             span 查看所有歌曲
         div.rightMenu-item#menu-music-copyMusicName
@@ -71,5 +72,5 @@ div#rightMenu
                 span.menu-commentBarrage-text 关闭热评
         div.rightMenu-item#menu-darkmode
             i.scoicon.sco-moon-clear-fill
-            span.menu-darkmode-text 浅色模式
+            span.menu-darkmode-text 深色模式
 div#rightmenu-mask

package/layout/includes/widgets/third-party/comments/comment.pug

@@ -1,4 +1,4 @@
-#post-comment(view-image)
+#post-comment
     .comment-head
         .comment-headline
             i.scoicon.sco-chat-fill
@@ -13,9 +13,5 @@
         case theme.comment.type
             when 'twikoo'
                 include ./twikoo.pug
-            when 'gitalk'
-                include ./gitalk.pug
-            when 'valine'
-                include ./valine.pug
             when 'waline'
                 include ./waline.pug

package/layout/includes/widgets/third-party/comments/twikoo.pug

@@ -5,7 +5,7 @@ script.
             {
                 el: '#comment',
                 onCommentLoaded: function () {
-                    GLOBAL_CONFIG.lightbox && sco.lightbox('#article-container img, #twikoo .tk-content img:not(.tk-owo-emotion)')
+                    GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
                 },
                 lang: '#{theme.comment.twikoo.lang}',
             }

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -2,15 +2,13 @@
 
 script.
     async function initComment() {
-        (() => {
-            Waline.init(Object.assign({
-                el: '#comment',
-                serverURL: '!{envId}',
-                pageview: !{theme.post.meta.pv},
-                dark: 'html[data-theme="dark"]',
-                path: window.location.pathname,
-                search: false,
-                comment: #{theme.post.meta.comment && is_post()},
-            }, !{JSON.stringify(option)}))
-        })()
+        Waline.init(Object.assign({
+            el: '#comment',
+            serverURL: '!{envId}',
+            pageview: !{theme.post.meta.pv},
+            dark: 'html[data-theme="dark"]',
+            path: window.location.pathname,
+            search: false,
+            comment: #{theme.post.meta.comment && is_post()},
+        }, !{JSON.stringify(option)}))
     }

package/layout/includes/widgets/third-party/music.pug

@@ -1,3 +1,3 @@
 div.needEndHide#nav-music(onclick="sco.musicToggle()")
     div#nav-music-hoverTips=__('music.hit')
-    meting-js(id=theme.thirdparty.aplayer.id, server=theme.thirdparty.aplayer.server, type="playlist", mutex="true", preload="none", data-lrctype="0", order="random", theme="var(--sco-main)")
+    meting-js(id=theme.capsule.id, server=theme.capsule.server, type="playlist", mutex="true", preload="none", data-lrctype="0", order="random", theme="var(--sco-main)")

package/layout/includes/widgets/third-party/news-comment/newest-comment.pug

@@ -0,0 +1,6 @@
+if theme.comment.enable && theme.comment.newComment
+    case theme.comment.type
+        when 'twikoo'
+            include twikoo
+        when 'waline'
+            include waline

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -0,0 +1,70 @@
+script.
+    window.addEventListener('load', () => {
+        const changeContent = (content) => {
+            if (content === '') return content;
+
+            const replacements = [
+                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[图片]'},
+                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[链接]'},
+                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '[代码]'},
+                {regex: /<[^>]+>/g, replacement: ""}
+            ];
+
+            content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
+
+            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+        }
+
+        const getComment = () => {
+            const $dom = document.querySelector('#card-newest-comments .aside-list')
+
+            const runTwikoo = () => {
+                twikoo.getRecentComments({
+                    envId: GLOBAL_CONFIG.comment.twikoo.url,
+                    region: '',
+                    pageSize: 6,
+                    includeReply: true
+                }).then(function (res) {
+                    const twikooArray = res.map(e => ({
+                        'content': changeContent(e.comment),
+                        'avatar': e.avatar,
+                        'nick': e.nick,
+                        'url': `${e.url}#${e.id}`,
+                        'date': new Date(e.created).toISOString()
+                    }))
+                    generateHtml(twikooArray)
+                }).catch(function (err) {
+                    $dom.innerHTML = "无法获取评论，请确认相关配置是否正确"
+                })
+            }
+            runTwikoo()
+        }
+
+        const generateHtml = array => {
+            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            $dom.innerHTML = array.length ? array.map(item => `
+                <div class='aside-list-item'>
+                  <a href='${item.url}' class='thumbnail'>
+                    <img src='${item.avatar}' alt='${item.nick}'>
+                    <div class='name'><span>${item.nick}</span></div>
+                  </a>
+                  <div class='content'>
+                    <a class='comment' href='${item.url}'>${item.content}</a>
+                    <time class="datetime" datetime="${item.date}"></time>
+                  </div>
+                </div>
+              `).join('') : '没有评论'
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+            window.pjax && window.pjax.refresh($dom)
+            changeTimeFormat()
+        }
+
+        const newestCommentInit = () => {
+            const $asideList = document.querySelector('#card-newest-comments .aside-list')
+            if ($asideList) {
+                getComment()
+            }
+        }
+
+        newestCommentInit()
+    })

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -0,0 +1,64 @@
+script.
+    window.addEventListener('load', () => {
+        const changeContent = (content) => {
+            if (content === '') return content;
+
+            const replacements = [
+                {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[图片]'},
+                {regex: /<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[链接]'},
+                {regex: /<pre><code>.*?<\/pre>/gi, replacement: '[代码]'},
+                {regex: /<[^>]+>/g, replacement: ""}
+            ];
+
+            content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
+
+            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+        }
+
+        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const newestCommentInit = () => {
+            if ($asideList) {
+                getComment()
+            }
+        }
+        const getComment = () => {
+            Waline.RecentComments(
+                options = {
+                    serverURL: GLOBAL_CONFIG.comment.waline.url,
+                    count: 6,
+                }
+            ).then(function (res) {
+                const walineArray = res.comments.map(item => ({
+                    'content': changeContent(item.comment),
+                    'avatar': item.avatar,
+                    'nick': item.nick,
+                    'url': `${item.url}#${item.objectId}`,
+                    'date': new Date(item.insertedAt).toISOString()
+                }))
+                generateHtml(walineArray)
+            }).catch(
+                $asideList.innerHTML = "无法获取评论，请确认相关配置是否正确"
+            )
+        }
+
+        const generateHtml = array => {
+            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            $dom.innerHTML = array.length ? array.map(item => `
+                <div class='aside-list-item'>
+                  <a href='${item.url}' class='thumbnail'>
+                    <img src='${item.avatar}' alt='${item.nick}'>
+                    <div class='name'><span>${item.nick}</span></div>
+                  </a>
+                  <div class='content'>
+                    <a class='comment' href='${item.url}'>${item.content}</a>
+                    <time class="datetime" datetime="${item.date}"></time>
+                  </div>
+                </div>
+              `).join('') : '没有评论'
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+            window.pjax && window.pjax.refresh($dom)
+            changeTimeFormat()
+        }
+
+        newestCommentInit()
+    })

package/layout/includes/widgets/third-party/search/index.pug

@@ -1,7 +1,8 @@
-if theme.thirdparty.search.enable
-    if theme.thirdparty.search.type==="algolia"
-        include ./algolia-search.pug
-        script(src=cdn_url_for("/js/extend/search/algolia-search.js"))
-    else if theme.thirdparty.search.type === "local"
-        include ./local-search.pug
-        script(src=cdn_url_for("/js/extend/search/local-search.js"))
+if theme.search.enable
+    case theme.search.type
+        when 'algolia'
+            include algolia-search
+            script(src=url_for(theme.cdn.algolia_js))
+        when 'local'
+            include local-search
+            script(src=url_for(theme.cdn.local_search))

package/layout/index.pug

@@ -2,9 +2,9 @@ extends includes/layout.pug
 
 block content
     #home_top
-        if(theme.says.home_mini)
-            include ./includes/widgets/home/bbTimeList.pug
-        if(theme.hometop.banner.enable)
+        if theme.says.home_mini
+            include ./includes/widgets/home/bbTimeList
+        if theme.hometop.banner.enable && is_home_first_page()
             include ./includes/widgets/home/hometop.pug
     main.layout#content-inner
         .recent-posts#recent-posts

package/layout/page.pug

@@ -18,10 +18,6 @@ block content
                     include includes/page/says
                 when 'equipment'
                     include includes/page/equipment
-                when 'moments'
-                    include includes/page/moments
-                when 'echarts'
-                    include includes/page/echarts
                 when 'rss'
                     include includes/page/rss
                 when 'douban'

package/layout/post.pug

@@ -3,8 +3,8 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #post
-            if theme.thirdparty.ai.enable
-                include includes/widgets/third-party/ai/index
+            if theme.post_ai.enable
+                include includes/widgets/post/post-ai
             article.post-content#article-container!= page.content
             include includes/widgets/post/copyright
             .post-tools-right

package/package.json

@@ -1,23 +1,32 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
+  "main": "package.json",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/DuoSco/hexo-theme-solitude.git"
-  },
   "keywords": [
     "hexo",
     "theme",
+    "solitude",
+    "Card UI Design",
+    "Wleelw",
     "hexo-theme-solitude"
   ],
-  "author": "Hexo-Theme-Solitude<wzsco@qq.com>",
-  "license": "GNU",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wleelw/hexo-theme-solitude.git"
+  },
+  "dependencies": {
+    "hexo-renderer-stylus": "^3.0.0",
+    "hexo-renderer-pug": "^3.0.0"
+  },
   "bugs": {
-    "url": "https://github.com/DuoSco/Hexo-theme-solitude/issues"
+    "url": "https://github.com/wleelw/hexo-theme-solitude/issues",
+    "email": "me@wzsco.top"
   },
-  "homepage": "https://github.com/DuoSco/hexo-theme-solitude#readme"
+  "homepage": "https://blog.wzsco.top/",
+  "author": "Hexo-Theme-Solitude<me@wzsco.top>",
+  "license": "GNU"
 }

package/plugins.yml

@@ -0,0 +1,109 @@
+algolia_search:
+  name: algoliasearch
+  file: dist/algoliasearch-lite.umd.js
+  version: 4.22.0
+instantsearch:
+  name: instantsearch.js
+  file: dist/instantsearch.production.min.js
+  version: 4.63.0
+pjax:
+  name: pjax
+  file: pjax.min.js
+  version: 0.2.8
+twikoo:
+  name: twikoo
+  file: dist/twikoo.all.min.js
+  version: 1.6.29
+waline_js:
+  name: '@waline/client'
+  file: dist/waline.js
+  other_name: waline
+  version: 2.15.8
+waline_css:
+  name: '@waline/client'
+  file: dist/waline.css
+  other_name: waline
+  version: 2.15.8
+sharejs:
+  name: butterfly-extsrc
+  file: sharejs/dist/js/social-share.min.js
+  version: 1.1.3
+sharejs_css:
+  name: butterfly-extsrc
+  file: sharejs/dist/css/share.min.css
+  version: 1.1.3
+katex:
+  name: katex
+  file: dist/katex.min.css
+  other_name: KaTeX
+  version: 0.16.9
+katex_copytex:
+  name: katex
+  file: dist/contrib/copy-tex.min.js
+  other_name: KaTeX
+  version: 0.16.9
+lazyload:
+  name: vanilla-lazyload
+  file: dist/lazyload.iife.min.js
+  version: 17.8.5
+aplayer_css:
+  name: aplayer
+  file: dist/APlayer.min.css
+  version: 1.10.1
+aplayer_js:
+  name: aplayer
+  file: dist/APlayer.min.js
+  version: 1.10.1
+meting_js:
+  name: meting
+  file: Meting.min.js
+  version: 2.0.1
+pace_js:
+  name: pace-js
+  other_name: pace
+  file: pace.min.js
+  version: 1.2.4
+lunr_js:
+  name: lunr
+  file: lunr.min.js
+  version: 2.3.9
+swiper_css:
+  name: Swiper
+  file: swiper-bundle.min.css
+  version: 11.0.5
+swiper_js:
+  name: Swiper
+  file: swiper-bundle.min.js
+  version: 11.0.5
+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
+  version: 0.1.16
+scoicon_css:
+  name: solitude-source
+  file: icon/scoicon.min.css
+  version: 1.0.3
+waterfall:
+  name: solitude-source
+  file: js/waterfall.min.js
+  version: 1.0.3
+medium_zoom:
+  name: medium-zoom
+  file: dist/medium-zoom.min.js
+  version: 1.1.0
+fancyapps_ui:
+  name: fancyapps-ui
+  file: dist/fancybox/fancybox.umd.js
+  version: 5.0.33
+fancyapps_css:
+  name: fancyapps-ui
+  file: dist/fancybox/fancybox.min.css
+  version: 5.0.33

package/scripts/event/cdn.js

@@ -0,0 +1,129 @@
+/**
+ * Solitude
+ * Merge CDN
+ */
+
+'use strict'
+
+const { version } = require('../../package.json')
+const path = require('path')
+
+hexo.extend.filter.register('before_generate', () => {
+    const themeConfig = hexo.theme.config
+    const { CDN } = themeConfig
+
+    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
+    const internalSrc = {
+        main: {
+            name: 'hexo-theme-solitude',
+            file: 'js/main.js',
+            version
+        },
+        utils: {
+            name: 'hexo-theme-solitude',
+            file: 'js/utils.js',
+            version
+        },
+        local_search: {
+            name: 'hexo-theme-solitude',
+            file: 'js/search/local.js',
+            version
+        },
+        algolia_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/search/algolia.js',
+            version
+        },
+        cover_local: {
+            name: 'hexo-theme-solitude',
+            file: 'js/covercolor/local.js',
+            version
+        },
+        cover_api: {
+            name: 'hexo-theme-solitude',
+            file: 'js/covercolor/api.js',
+            version
+        },
+        rightside_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/rightside.js',
+            version
+        },
+        music_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/music.js',
+            version
+        },
+        sco_ai_js: {
+            name: 'hexo-theme-solitude',
+            file: 'js/sco-ai.min.js',
+            version
+        },
+        twikoo_commentBarrage: {
+            name: 'hexo-theme-solitude',
+            file: 'js/comment/twikoo_commentBarrage.js',
+            version
+        },
+        waline_commentBarrage: {
+            name: 'hexo-theme-solitude',
+            file: 'js/comment/waline_commentBarrage.js',
+            version
+        },
+    }
+
+    const minFile = file => {
+        return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
+    }
+
+    const createCDNLink = (data, type, cond = '') => {
+        Object.keys(data).forEach(key => {
+            let { name, version, file, other_name } = data[key]
+            const cdnjs_name = other_name || name
+            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
+            const min_cdnjs_file = minFile(cdnjs_file)
+            if (cond === 'internal') file = `source/${file}`
+            const min_file = minFile(file)
+            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
+
+            const value = {
+                version,
+                name,
+                file,
+                cdnjs_file,
+                min_file,
+                min_cdnjs_file,
+                cdnjs_name
+            }
+
+            const cdnSource = {
+                local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
+                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]),
+                custom_cdn: `${CDN.custom_cdn + cdnjs_file}`,
+                cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
+            }
+
+            data[key] = cdnSource[type]
+        })
+
+        if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
+        return data
+    }
+
+    // delete null value
+    const deleteNullValue = obj => {
+        if (!obj) return
+        for (const i in obj) {
+            obj[i] === null && delete obj[i]
+        }
+        return obj
+    }
+
+    themeConfig.cdn = Object.assign(
+        createCDNLink(internalSrc, CDN.internal, 'internal'),
+        createCDNLink(thirdPartySrc, CDN.third_party),
+        deleteNullValue(CDN.option)
+    )
+})

package/scripts/event/page.js

@@ -1,11 +1,10 @@
-
+// generate 404 Page
 hexo.extend.generator.register('404', function (locals) {
   if(!this.theme.config.page.error)return
   return {
     path: '404.html',
     layout: ['404'],
     data: {
-      title: '404',
       type: '404',
       comment: false
     }
@@ -15,12 +14,10 @@ hexo.extend.generator.register('404', function (locals) {
 // generate tags Page
 hexo.extend.generator.register('tags', function(locals) {
   if(!this.theme.config.page.tags)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
   return {
     path: 'tags/index.html',
     layout: ['page'],
     data: {
-      title: lang["page.tag"],
       type: 'tags',
       comment: false
     }
@@ -30,29 +27,12 @@ hexo.extend.generator.register('tags', function(locals) {
 // generate categories Page
 hexo.extend.generator.register('categories', function(locals) {
   if(!this.theme.config.page.categories)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
   return {
     path: 'categories/index.html',
     layout: ['page'],
     data: {
-      title: lang["page.category"],
       type: 'categories',
       comment: false
     }
   };
-});
-
-// generate echarts Page
-hexo.extend.generator.register('echarts', function(locals) {
-  if(!this.theme.config.about.echarts && !this.theme.config.about.enable)return
-  const lang = hexo.theme.i18n.get(this.config.language || 'zh-CN')
-  return {
-    path: 'echart/index.html',
-    layout: ['page'],
-    data: {
-      title: lang["page.echarts"],
-      type: 'echarts',
-      comment: false
-    }
-  };
 });

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  主题链接：https://github.com/DuoSco/Hexo-theme-solitude
+  主题链接：https://github.com/wleelw/Hexo-theme-solitude
   `)
 })

package/scripts/filter/lazyload.js

@@ -8,4 +8,4 @@ hexo.extend.filter.register('after_render:html', function (data) {
         /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi,
         `$1 "${bg}" data-lazy-src=`
     )
-})
+})