hexo-theme-solitude 1.11.3 → 1.12.1

package/languages/zh-CN.yml

@@ -68,9 +68,22 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  share:
+    qq: 分享到QQ
+    weibo: 分享到微博
+    telegram: 分享到Telegram
+    twitter: 分享到Twitter
+    linkedin: 分享到LinkedIn
+    facebook: 分享到Facebook
+    link: 复制文章链接
+    qrcode: 使用手机扫码阅读这篇文章
+    whatsapp: 分享到WhatsApp
   ai:
     title: 文章摘要
     tip: 投诉
+  nav:
+    next: 下一篇
+    prev: 上一篇
 
 award:
   thanks: 致谢
@@ -100,6 +113,7 @@ aside:
   back: 欢迎再次回来，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累计文章数:'
     tags: '标签总数:'

package/languages/zh-TW.yml

@@ -68,9 +68,22 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  share:
+    qq: 分享到QQ
+    weibo: 分享到微博
+    telegram: 分享到Telegram
+    twitter: 分享到Twitter
+    linkedin: 分享到LinkedIn
+    facebook: 分享到Facebook
+    link: 复制文章链接
+    qrcode: 使用手机扫码阅读这篇文章
+    whatsapp: 分享到WhatsApp
   ai:
     title: 文章摘要
     tip: 投訴
+  nav:
+    next: 下一篇
+    prev: 上一篇
 
 award:
   thanks: 致謝
@@ -100,6 +113,7 @@ aside:
   back: 歡迎再次回來，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'

package/layout/includes/body/mode.pug

@@ -11,7 +11,7 @@ case theme.display_mode.type
                 } else {
                     document.documentElement.setAttribute('data-theme', cachedMode);
                 }
-                is_rm && rm.mode(cachedMode === 'dark' && isDarkMode)
+                typeof rm === 'object' && rm.mode(cachedMode === 'dark' && isDarkMode)
             }
             initTheme()
     when "dark"
@@ -22,7 +22,7 @@ case theme.display_mode.type
                     document.documentElement.setAttribute('data-theme', 'dark');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                is_rm && rm.mode(cachedMode === undefined || cachedMode === 'dark')
+                typeof rm === 'object' && rm.mode(cachedMode === undefined || cachedMode === 'dark')
             }
             initTheme()
     when "light"
@@ -33,6 +33,6 @@ case theme.display_mode.type
                     document.documentElement.setAttribute('data-theme', 'light');
                 else
                     document.documentElement.setAttribute('data-theme', cachedMode);
-                is_rm && rm.mode(cachedMode === 'dark')
+                typeof rm === 'object' && rm.mode(cachedMode === 'dark')
             }
             initTheme()

package/layout/includes/console.pug

@@ -3,17 +3,18 @@ div#console
         i.solitude.st-close-fill
     if theme.console_plus
         div.console-card-group
-            if theme.console_plus && theme.comment.newest_comment.enable
+            if theme.recent_comments.enable && theme.recent_comments.img
                 div.console-card-group-left
                     div.console-card#card-newest-comments(onclick="sco.hideConsole()")
                         div.card-content
                             div.author-content-item-tips= _p('console.comment_tip')
                             div.author-content-item-title
                                 | #{_p('console.comment_title')}
-                                if theme.recent_comments.enable && theme.recent_comments.console
+                                if theme.recent_comments.enable
                                     a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
                                         i.solitude.st-right-btn-fill
-                        div.aside-list
+                        a.recent-comment-image(href=url_for(theme.recent_comments.page))
+                            img(src=theme.recent_comments.img)
 
             div.console-card-group-right
                 div.console-card.tags(onclick="sco.hideConsole()")

package/layout/includes/inject/body.pug

@@ -18,6 +18,8 @@ div
 
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
+    if theme.post.share.enable && theme.post.share.list && theme.post.share.list.includes('qrcode')
+        script(src=url_for(theme.cdn.qrcode))
 
     if theme.display_mode.universe
         script(src=url_for(theme.cdn.universe_js))
@@ -105,9 +107,6 @@ div
 if theme.footer.randomlink
     include ../widgets/randomlink.pug
 
-// newest comment
-include ../widgets/third-party/news-comment/newest-comment.pug
-
 // pjax
 != partial("includes/widgets/third-party/pjax", {}, {cache: true})
 

package/layout/includes/inject/head.pug

@@ -1,6 +1,7 @@
 each item in theme.verify_site || []
     meta(name=item.name, content=item.content)
 
+link(rel="canonical" href=urlNoIndex())
 link(rel="stylesheet", href=url_for(theme.cdn.solitude_css))
 
 // aplayer
@@ -27,7 +28,7 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.11.3",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.12.1",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "padding: 5px 10px;color:white;background:#0084ff;border-radius:0 5px 5px 0",
@@ -39,7 +40,7 @@ if theme.memorial.enable
         mdate = (mdate.split(","));
         let ndate = new Date();
         for (let i of mdate) {
-            if (i == (ndate.getMonth()+1) + "-" + (ndate.getDate())) {
+            if (i === (ndate.getMonth()+1) + "-" + (ndate.getDate())) {
                 document.documentElement.classList.add('memorial');
             }
         }

package/layout/includes/widgets/aside/asideNewstComments.pug

@@ -0,0 +1,9 @@
+.card-widget.card-recent-comment
+    .item-headline
+        i.solitude.st-chat-fill
+        span= _p('aside.newcomment')
+        if theme.recent_comments.enable
+            a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
+                i.solitude.st-right-btn-fill
+    .aside-list
+    include ../third-party/news-comment/newest-comment.pug

package/layout/includes/widgets/aside/asideSwitch.pug

@@ -9,6 +9,8 @@ case item
         include ./asideAllInfo.pug
     when 'ads'
         include ./asideAdsense.pug
+    when 'newest_comment'
+        include ./asideNewstComments.pug
     default
         - const custom = site.data?.aside?.find((i) => i.name === item)
         if custom

package/layout/includes/widgets/home/carousel.pug

@@ -10,7 +10,24 @@ if recommends
                             img(src=item.cover, alt=item.title)
                         .blog-slider__content
                             span.blog-slider__title=item.title
-                            span.blog-slider__desc=item.description
+                            case theme.index_post_list.content
+                                when false
+                                    break
+                                when 1
+                                    span.blog-slider__desc= item.description
+                                when 2
+                                    if item.description
+                                        span.blog-slider__desc= item.description
+                                    else
+                                        - const content = strip_html(item.content)
+                                        - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
+                                        - content.length > theme.index_post_list.length ? expert += ' ...' : ''
+                                        .span.blog-slider__desc= expert
+                                default
+                                    - const content = strip_html(item.content)
+                                    - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
+                                    - content.length > theme.index_post_list.length ? expert += ' ...' : ''
+                                    .span.blog-slider__desc= expert
                             div.article-meta-wrap
                                 span.article-meta.tags
                                     each tag in item.tags.data

package/layout/includes/widgets/home/postList.pug

@@ -29,12 +29,12 @@ mixin info
                 .content!= post.description
             else
                 - const content = strip_html(post.content)
-                - let expert = content.substring(0, theme.index_post_list.length)
+                - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
                 - content.length > theme.index_post_list.length ? expert += ' ...' : ''
                 .content!= expert
         default
             - const content = strip_html(post.content)
-            - let expert = content.substring(0, theme.index_post_list.length)
+            - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
             - content.length > theme.index_post_list.length ? expert += ' ...' : ''
             .content!= expert
 
@@ -73,8 +73,9 @@ div.recent-post-item(onclick="pjax.loadUrl('" + url_for(post.path) + "')")
 
 
 if theme.google_adsense && theme.google_adsense.enable && theme.google_adsense.auto_ads === false && theme.google_adsense.post_card
+    - var ads_height = theme.index_post_list.direction === 'column' ? '401px;' : '280px;'
     if (index + 1) % 3 === 0
         div.recent-post-item.google-ads-warp
-            ins.adsbygoogle(style="display:block; text-align:center; min-width: 100%; height:220px", data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
+            ins.adsbygoogle(style="display:block; text-align:center; min-width: 100%; height:" + ads_height, data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
             script.
                 (adsbygoogle = window.adsbygoogle || []).push({});

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

@@ -15,6 +15,52 @@
                     a.reward-link-button(href=url_for(theme.post.rss))
                         i.solitude.st-plant-fill
                         = _p('footer.rss')
+    if theme.post.share.enable
+        .social-share
+            -  const path = config.url + url_for(page.path);
+            -  const encodedPath = encodeURIComponent(path);
+            -  const encodedTitle = encodeURIComponent(page.title);
+            -  const encodedDescription = encodeURIComponent(page.description);
+            -  const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
+            each item in theme.post.share.list || []
+                case item
+                    when 'qq'
+                        a.social-share-ico.icon-qq(href=`https://connect.qq.com/widget/shareqq/index.html?url=${encodedPath}&title=${encodedTitle}&desc=${encodedDescription}&summary=${encodedDescription}&site=${encodedTitle}&pics=${encodedIcon}` title=_p('post.share.qq'))
+                            i.solitude.st-qq-fill
+                    when 'weibo'
+                        a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title=_p('post.share.weibo'))
+                            i.solitude.st-weibo-fill
+                    when 'telegram'
+                        a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.telegram'))
+                            i.solitude.st-telegram-fill
+                    when 'whatsapp'
+                        a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title=_p('post.share.whatsapp'))
+                            i.solitude.st-whatsapp-fill
+                    when 'linkedin'
+                        a.social-share-ico.icon-linkedin(href=`https://www.linkedin.com/shareArticle?mini=true&url=${encodedPath}&title=${encodedTitle}&summary=${encodedDescription}&source=${encodedTitle}` title=_p('post.share.linkedin'))
+                            i.solitude.st-linkedin-box-fill
+                    when 'facebook'
+                        a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title=_p('post.share.facebook'))
+                            i.solitude.st-facebook-fill
+                    when 'twitter'
+                        a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title=_p('post.share.twitter'))
+                            i.solitude.st-twitter-x-fill
+                    when 'link'
+                        .social-share-ico.icon-link(onclick=`utils.copy("${path}")` title=_p('post.share.link'))
+                            i.solitude.st-links-line
+                    when 'qrcode'
+                        .social-share-ico.icon-qrcode(title=_p('post.share.qrcode'))
+                            i.solitude.st-qr-code-fill
+                            .share-main
+                                .share-main-all
+                                    #qrcode
+                                    .reward-dec=_p('post.share.qrcode')
+                            script(pjax).
+                                typeof QRCode === 'function' && new QRCode(document.getElementById("qrcode"), '!{path}');
+                                window.addEventListener('DOMContentLoaded', () => {
+                                    new QRCode(document.getElementById("qrcode"), '!{path}');
+                                });
+
     if copyright.enable || page.copyright
         .post-copyright__notice
             span.post-copyright-info

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

@@ -78,7 +78,7 @@
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
                                     i.solitude.st-loading-line
                             when 'Artalk'
-                                span#ArtalkCount.artalk-count
+                                span.artalk-count
                                     i.solitude.st-loading-line
 
 include ./wave

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

@@ -3,23 +3,23 @@ nav.needEndHide.pagination-post#pagination
         .prev-post.pull-left
             a(href=url_for(page.prev.path))
                 .pagination-info
-                    .label 上一篇
+                    .label=_p('post.nav.prev')
                     .prev_info= page.prev.title
         .next-post.pull-right
             a(href=url_for(page.next.path))
                 .pagination-info
-                    .label 下一篇
+                    .label=_p('post.nav.next')
                     .next_info= page.next.title
     else
         if !page.prev && page.next
             .next-post.pull-full
                 a(href=url_for(page.next.path))
                     div.pagination-info
-                        .label 下一篇
+                        .label=_p('post.nav.next')
                         .next_info= page.next.title
         if !page.next && page.prev
             .prev-post.pull-full
                 a(href=url_for(page.prev.path))
                     .pagination-info
-                        .label 上一篇
+                        .label=_p('post.nav.prev')
                         .prev_info= page.prev.title

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

@@ -39,4 +39,6 @@
                 when 'Waline'
                     #waline-wrap
                 when 'Artalk'
-                    #artalk-wrap
+                    #artalk-wrap
+                when 'Giscus'
+                    #giscus-wrap

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

@@ -0,0 +1,60 @@
+- const { repo, repo_id, category_id, theme:themes, option } = theme.giscus
+- const giscusUrl = theme.cdn.giscus || 'https://giscus.app/client.js'
+- const giscusOriginUrl = new URL(giscusUrl).origin
+- const { use, lazyload } = theme.comment
+
+script.
+    (()=>{
+        const getGiscusTheme = theme => {
+            return theme === 'dark' ? '!{themes.dark}' : '!{themes.light}'
+        }
+
+        const loadGiscus = () => {
+            const config = Object.assign({
+                src: '!{giscusUrl}',
+                'data-repo': '!{repo}',
+                'data-repo-id': '!{repo_id}',
+                'data-category-id': '!{category_id}',
+                'data-mapping': 'pathname',
+                'data-theme': getGiscusTheme(document.documentElement.getAttribute('data-theme')),
+                'data-reactions-enabled': '1',
+                crossorigin: 'anonymous',
+                async: true
+            },!{JSON.stringify(option)})
+
+            const ele = document.createElement('script')
+            for (let key in config) {
+                ele.setAttribute(key, config[key])
+            }
+            document.getElementById('giscus-wrap').appendChild(ele)
+        }
+
+        const changeGiscusTheme = theme => {
+            const sendMessage = message => {
+                const iframe = document.querySelector('iframe.giscus-frame')
+                if (!iframe) return
+                iframe.contentWindow.postMessage({ giscus: message }, '!{giscusOriginUrl}')
+            }
+
+            sendMessage({
+                setConfig: {
+                    theme: getGiscusTheme(theme)
+                }
+            });
+        }
+
+        utils.addGlobalFn('themeChange', changeGiscusTheme, 'giscus')
+
+        if ('!{use[0]}' === 'Giscus' || !!{lazyload}) {
+            if (!{lazyload}) {
+                const giscusWrap = document.getElementById('giscus-wrap')
+                if (giscusWrap) {
+                    utils.loadComment(giscusWrap, loadGiscus)
+                }
+            } else {
+                loadGiscus()
+            }
+        } else {
+            window.loadOtherComment = loadGiscus
+        }
+    })()

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

@@ -9,4 +9,6 @@ each name in use
         when 'Valine'
             !=partial('includes/widgets/third-party/comments/valine', {}, {cache: true})
         when 'Artalk'
-            !=partial('includes/widgets/third-party/comments/artalk', {}, {cache: true})
+            !=partial('includes/widgets/third-party/comments/artalk', {}, {cache: true})
+        when 'Giscus'
+            !=partial('includes/widgets/third-party/comments/giscus', {}, {cache: true})

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

@@ -1,8 +1,8 @@
 - const { server, site, option } = theme.artalk
 - const avatarCdn = theme.comment.avatar
 
-script.
-    window.addEventListener('load', () => {
+script(pjax).
+    (() => {
         const changeContent = content => {
             if (content === '') return content;
             const replacements = [
@@ -24,15 +24,14 @@ script.
                 }
             ];
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         };
 
         const generateHtml = (array, asideList) => {
             asideList.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
-                    <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                    <div class='thumbnail'>
                         <img src='${item.avatar}' alt='${item.nick}'>
-                        <div class='name'><span>${item.nick}</span></div>
                     </div>
                     <div class='content'>
                         <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
@@ -68,7 +67,7 @@ script.
                     nick: e.nick,
                     url: e.page_key + `#atk-comment-${e.id}`,
                     date: e.date,
-                })).slice(0, 6);
+                })).slice(0, !{limit});
                 utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage});
                 generateHtml(artalk, asideList);
             }).catch(error => {
@@ -78,6 +77,7 @@ script.
         };
 
         const newestCommentInit = (asideList) => {
+            if (!asideList) return;
             const data = utils.saveToLocal.get('artalk-newest-comments');
             if (data) {
                 generateHtml(data, asideList);
@@ -86,9 +86,7 @@ script.
             }
         };
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list');
-        if ($asideList) {
-            newestCommentInit($asideList);
-            utils.addGlobalFn('pjaxComplete', () => newestCommentInit($asideList), 'artalk_newestComment');
-        }
-    });
+        const $asideList = document.querySelector('.card-recent-comment .aside-list');
+        window.addEventListener('DOMContentLoaded', () => newestCommentInit($asideList), false)
+        window.addEventListener('pjax:complete', () => newestCommentInit(document.querySelector('.card-recent-comment .aside-list')), false);
+    })();

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

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

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (!content) return '';
             const replacements = [
@@ -12,14 +12,13 @@ script.
                 {regex: /<[^>]+>/g, replacement: ''}
             ]
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content)
-            return content.length > 150 ? `${content.substring(0, 150)}...` : content
+            return content.length > 150 ? `${content.substring(0, 100)}...` : content
         }
         const generateHtml = (array) => {
             const html = array.map(item => `
                 <div class='aside-list-item'>
-                    <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                    <div class='thumbnail'>
                         <img src='${item.avatar}' alt='${item.nick}'>
-                        <div class='name'><span>${item.nick}</span></div>
                     </div>
                     <div class='content'>
                         <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
@@ -27,7 +26,7 @@ script.
                     </div>
                 </div>
             `).join('')
-            document.querySelector('#card-newest-comments .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
+            document.querySelector('.card-recent-comment .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
             window.pjax?.refresh()
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
@@ -37,7 +36,7 @@ script.
                 twikoo.getRecentComments({
                     envId: '!{theme.twikoo.envId}',
                     region: '',
-                    pageSize: 6,
+                    pageSize: !{limit},
                     includeReply: true
                 }).then(res => {
                     const twikooArray = res.map(e => ({
@@ -51,7 +50,7 @@ script.
                     generateHtml(twikooArray)
                 }).catch((err) => {
                     console.error(err);
-                    document.querySelector('#card-newest-comments .aside-list').textContent = "!{_p('newest_comment.error')}"
+                    document.querySelector('.card-recent-comment .aside-list').textContent = "!{_p('newest_comment.error')}"
                 })
             }
             if (typeof twikoo === 'object') {
@@ -61,8 +60,10 @@ script.
             }
         }
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('twikoo-newest-comment')
             data ? generateHtml(data) : getComment()
         }
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
         const changeContent = (content) => {
             if (content === '') return content;
@@ -16,11 +16,12 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('valine-newest-comment')
             if (data) {
                 generateHtml(data)
@@ -42,7 +43,7 @@ script.
             await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(res => res.json())
                 .then(async result => {
                     let ls = []
-                    for (const i of result.results.slice(0, 6)) {
+                    for (const i of result.results.slice(0, !{limit})) {
                         if (emojiReg.test(i.comment)) continue
                         ls.push({
                             content: changeContent(i.comment),
@@ -61,7 +62,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                         <div class='aside-list-item'>
                           <div onclick='pjax.loadUrl(\"${item.url}\")' class='thumbnail'>
@@ -79,5 +80,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (content === '') return content;
 
@@ -15,11 +15,12 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
+            if (!document.querySelector('.card-recent-comment')) return
             const data = utils.saveToLocal.get('waline-newest-comment')
             if (data) {
                 generateHtml(data)
@@ -29,7 +30,7 @@ script.
         }
 
         const getComment = async () => {
-            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=6', {method: 'GET'}).then(async res => {
+            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=!{limit}', {method: 'GET'}).then(async res => {
                 const result = await res.json()
                 const walineArray = result.data.map(e => {
                     return {
@@ -49,7 +50,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
                   <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
@@ -67,5 +68,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()