hexo-theme-solitude 1.7.14 → 1.8.0

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

@@ -1,10 +1,10 @@
-if theme.comment.enable && theme.console_plus && theme.comment.newest_comment.enable
-    case theme.comment.type
-        when 'twikoo'
+if theme.console_plus && theme.comment.newest_comment.enable
+    case theme.comment.use[0]
+        when 'Twikoo'
             !=partial('includes/widgets/third-party/news-comment/twikoo',{}, {cache: true})
-        when 'waline'
+        when 'Waline'
             !=partial('includes/widgets/third-party/news-comment/waline',{}, {cache: true})
-        when 'valine'
+        when 'Valine'
             !=partial('includes/widgets/third-party/news-comment/valine',{}, {cache: true})
-        when 'artalk'
+        when 'Artalk'
             !=partial('includes/widgets/third-party/news-comment/artalk',{}, {cache: true})

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

@@ -1,8 +1,7 @@
 script.
     window.addEventListener('load', () => {
         const changeContent = (content) => {
-            if (content === '') return content;
-
+            if (!content) return '';
             const replacements = [
                 {regex: /<img.*?src="(.*?)"?[^\>]+>/ig, replacement: '[!{_p("console.newest_comment.image")}]'},
                 {
@@ -11,65 +10,59 @@ script.
                 },
                 {regex: /<pre><code>.*?<\/pre>/gi, replacement: '[!{_p("console.newest_comment.code")}]'},
                 {regex: /<[^>]+>/g, replacement: ''}
-            ];
-            content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
-
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            ]
+            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 getComment = () => {
+        const generateHtml = (array) => {
+            const html = array.map(item => `
+                <div class='aside-list-item'>
+                    <a onclick='pjax.loadUrl("${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' onclick='pjax.loadUrl("${item.url}")'>${item.content}</a>
+                        <time class="datetime" datetime="${item.date}"></time>
+                    </div>
+                </div>
+            `).join('')
+            document.querySelector('#card-newest-comments .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
+            window.lazyLoadInstance?.update()
+            window.pjax?.refresh()
+            sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
+        }
+        const getComment = async () => {
             const runTwikoo = () => {
                 twikoo.getRecentComments({
-                    envId: GLOBAL_CONFIG.comment.url,
+                    envId: '!{theme.twikoo.envId}',
                     region: '',
                     pageSize: 6,
                     includeReply: true
-                }).then(function (res) {
+                }).then(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()
+                        content: changeContent(e.comment),
+                        avatar: e.avatar,
+                        nick: e.nick,
+                        url: `${e.url}#${e.id}`,
+                        date: new Date(e.created).toString()
                     }))
-                    saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
+                    utils.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
-                }).catch(function (err) {
-                    console.error(err)
-                    $asideList.textContent = "!{_p('newest_comment.error')}"
+                }).catch((err) => {
+                    console.error(err);
+                    document.querySelector('#card-newest-comments .aside-list').textContent = "!{_p('newest_comment.error')}"
                 })
             }
-            runTwikoo()
-        }
-
-        const generateHtml = array => {
-            $asideList.innerHTML = array.length ? array.map(item => `
-                <div class='aside-list-item'>
-                  <a onclick='pjax.loadUrl("${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' onclick='pjax.loadUrl("${item.url}")'>${item.content}</a>
-                    <time class="datetime" datetime="${item.date}"></time>
-                  </div>
-                </div>
-              `).join('') : "!{_p('newest_comment.zero')}"
-            window.lazyLoadInstance && window.lazyLoadInstance.update()
-            window.pjax && window.pjax.refresh()
-            sco && sco.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
-        }
-
-        const newestCommentInit = () => {
-            const data = saveToLocal.get('twikoo-newest-comment')
-            if (data) {
-                generateHtml(data)
+            if (typeof twikoo === 'object') {
+                runTwikoo()
             } else {
-                getComment()
+                utils.getScript('!{url_for(theme.cdn.twikoo)}').then(runTwikoo)
             }
         }
-
+        const newestCommentInit = () => {
+            const data = utils.saveToLocal.get('twikoo-newest-comment')
+            data ? generateHtml(data) : getComment()
+        }
         newestCommentInit()
     })

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

@@ -17,7 +17,7 @@ script.
 
         const $asideList = document.querySelector('#card-newest-comments .aside-list')
         const newestCommentInit = () => {
-            const data = saveToLocal.get('valine-newest-comment')
+            const data = utils.saveToLocal.get('valine-newest-comment')
             if (data) {
                 generateHtml(data)
             } else {
@@ -30,13 +30,13 @@ script.
                 const settings = {
                     "method": "GET",
                     "headers": {
-                        "X-LC-Id": '!{theme.comment.valine.appId}',
-                        "X-LC-Key": '!{theme.comment.valine.appKey}',
+                        "X-LC-Id": '!{theme.valine.appId}',
+                        "X-LC-Key": '!{theme.valine.appKey}',
                         "Content-Type": "application/json"
                     },
                 }
 
-                const res = await fetch('!{theme.comment.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings)
+                const res = await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings)
                 const result = await res.json()
                 window.res = result
                 const valineArray = result.results.map(e => {
@@ -48,7 +48,7 @@ script.
                         'date': e.updatedAt || e.createdAt
                     }
                 })
-                saveToLocal.set('valine-newest-comment', valineArray, !{theme.comment.newest_comment.storage})
+                utils.saveToLocal.set('valine-newest-comment', valineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(valineArray)
             } catch (err) {
                 console.error(err)

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

@@ -17,7 +17,7 @@ script.
 
         const $asideList = document.querySelector('#card-newest-comments .aside-list')
         const newestCommentInit = () => {
-            const data = saveToLocal.get('waline-newest-comment')
+            const data = utils.saveToLocal.get('waline-newest-comment')
             if (data) {
                 generateHtml(data)
             } else {
@@ -27,7 +27,7 @@ script.
 
         const getComment = async () => {
             try {
-                const res = await fetch('!{theme.comment.waline.envId}/api/comment?type=recent&count=8', {method: 'GET'})
+                const res = await fetch('!{theme.waline.envId}/api/comment?type=recent&count=8', {method: 'GET'})
                 const result = await res.json()
                 const walineArray = result.data.map(e => {
                     return {
@@ -38,7 +38,7 @@ script.
                         'date': e.time || e.insertedAt
                     }
                 })
-                saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
+                utils.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(walineArray)
             } catch (err) {
                 console.error(err)

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

@@ -6,6 +6,7 @@ script.
         'meta[name="description"]',
         '#js-pjax',
         'meta[property^="og:"]',
+        '#config-diff'
     ]
 
     const pjax = new Pjax({

package/package.json

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

package/plugins.yml

@@ -29,11 +29,11 @@ valine:
   version: 1.5.1
 artalk_css:
   name: artalk
-  file: Artalk.css
+  file: dist/Artalk.css
   version: 2.8.4
 artalk_js:
   name: artalk
-  file: Artalk.js
+  file: dist/Artalk.js
   version: 2.8.4
 katex:
   name: katex