diff --git a/README.md b/README.md index b19ac7e9..05fa1f85 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude) [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude) -[Preview](https://solitude-demo.efu.me/) 丨 [Documentation](https://solitude-docs.efu.me/) +[Preview](https://efu.me/) 丨 [Documentation](https://solitude-docs.efu.me/) diff --git a/README_zh-cn.md b/README_zh-cn.md index 82b4ed93..c071b0f6 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -35,7 +35,7 @@ [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude) [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude) -[预览](https://solitude-demo.efu.me/) 丨 [文档](https://solitude-docs.efu.me/) +[预览](https://efu.me/) 丨 [文档](https://solitude-docs.efu.me/) diff --git a/README_zh-tw.md b/README_zh-tw.md index 1a0efd0a..9a3e393e 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -35,7 +35,7 @@ [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude) [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude) -[預覽](https://solitude-demo.efu.me/) 丨 [文档](https://solitude-docs.efu.me/) +[預覽](https://efu.me/) 丨 [文档](https://solitude-docs.efu.me/) diff --git a/SECURITY.md b/SECURITY.md index 70fbe5be..44664b22 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,9 +1,9 @@ -# 安全策略 +# Security Policy -## 报告漏洞 +## Report a vulnerability -要报告漏洞，请在正确的 GitHub 存储库上 [通过安全选项卡私下报告](https://github.com/valor-x/hexo-theme-solitude/security/advisories/new)（请参阅 [文档](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)）。如果无法报告，请随时发送电子邮件至 **o@efu.me**。 +To report a vulnerability, please [report privately via security tab](https://github.com/valor-x/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at o@efu.me. -所有安全漏洞都将得到及时验证和解决。 +All security vulnerabilities will be verified and resolved in a timely manner. -虽然发现新漏洞的情况很少见，但建议始终使用最新版本的主题和其他依赖项，通过维护锁定文件（`yarn.lock`、`package-lock.json`），以保证尽可能安全。 +While it is rare for new vulnerabilities to be discovered, it is recommended to always use the latest version of the theme and other dependencies by maintaining locked files (`yarn.lock`, `package-lock.json`) to ensure that they are as secure as possible. \ No newline at end of file diff --git a/_config.yml b/_config.yml index 0985ad78..abcf0afb 100644 --- a/_config.yml +++ b/_config.yml @@ -295,7 +295,7 @@ aside: # Configure information on the home page index_post_list: direction: column # row / column - content: 3 # 1: post.description / 2: 自动获取description或截取内容(Automatically get descriptions or screenshots) / 3: 只使用截取内容(Use only screenshots) / false: 不显示内容(No content is displayed) + content: false # 1: post.description / 2: 自动获取description或截取内容(Automatically get descriptions or screenshots) / 3: 只使用截取内容(Use only screenshots) / false: 不显示内容(No content is displayed) length: 500 # 截取内容的长度 : The length of the screenshot content cover: both # left: 在左侧 : left / right: 在右侧 : right / both: 两侧 : both @@ -568,6 +568,14 @@ keyboard: # key: L # url: "/links/" +# 复制 +# Copy +copy: + enable: true + copyright: # Turn on Link copyright information after copying.（开启后将在默认增加版权信息） + enable: false + limit: 50 # word count. （字数） + # 懒加载 # lazyload lazyload: @@ -701,17 +709,11 @@ comment: enable: false type: # waline, twikoo commentBarrage: false # 热评开关 / Hot comment switch - newComment: false # 最新评论开关 / Latest comment switch - # 匿名评论前部分随机信息 / Anonymous comment front random information - randomInfoStart: - - "聪敏的" - - "可爱的" - - "美丽的" - # 匿名评论后部分随机信息 / Anonymous comment after random information - randomInfoEnd: - - "白菜" - - "小可爱" - - "小仙女" + lazyload: true # 懒加载 + count: true # 评论数展示 + newest_comment: + enable: false + storage: 421000 # 缓存时间 # twikoo 配置信息 # twikoo settings twikoo: # https://twikoo.js.org/ @@ -722,8 +724,21 @@ comment: # waline settings waline: # https://waline.js.org/ envId: # url: https://waline.wzsco.top - pageview: true # 是否开启页面访问量统计 / Whether to enable page access statistics + pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics option: # waline配置项 / waline configuration item + # valine 配置信息 + # valine settings + valine: + appId: # leancloud application app id + appKey: # leancloud application app key + serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in) + avatar: + visitor: false + option: # options list + + +# 中控台扩展 ： 最新评论 + 标签 + 文章 +console_plus: false # 站点验证 # Site verification @@ -748,8 +763,8 @@ 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"' + font-family: 'PingFang SC,Hiragino Sans GB,Microsoft YaHei' + code-font-family: 'monospace, monospace' # 插入代码到头部 之前 和 底部 之前 # Insert code before and before diff --git a/languages/en.yml b/languages/en.yml index 042bb9de..68e1b0ca 100755 --- a/languages/en.yml +++ b/languages/en.yml @@ -1,4 +1,6 @@ more: More +star: Behold, those who found delight in this piece also perused +random: Around theme: dark: dark @@ -130,4 +132,16 @@ link: random: You are about to ⌈ ${name} ⌋ , security unknown. keyboard: - title: Blog shortcuts \ No newline at end of file + title: Blog shortcuts + +newest_comment: + error: Unable to get a comment, please confirm that the relevant configuration is correct. + zero: No comments. + +comment: + title: ' Comment' + +commentBarrage: + title: Hot + +f12: Developer mode is turned on, please follow the GPL. \ No newline at end of file diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index dcc7bbf6..e8f9a67e 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -1,4 +1,6 @@ more: 更多 +star: 喜欢这篇的人也看了 +random: 随便逛逛 # Language: 简体中文 theme: @@ -9,6 +11,12 @@ copy: success: 复制成功 error: 复制失败 +copy_copyright: + author: 作者 + link: 链接 + source: 来源 + info: 著作权归作者所有。 商业转载请联系作者获得授权，非商业转载请注明出处。 + lately: second: 秒 minute: 分钟 @@ -125,4 +133,16 @@ link: random: 您即将前往 ⌈ ${name} ⌋ , 安全性未知 keyboard: - title: 博客快捷键 \ No newline at end of file + title: 博客快捷键 + +newest_comment: + error: 无法获取评论，请确认相关配置是否正确。 + zero: 没有评论 + +comment: + title: 评论 + +commentBarrage: + title: 热评 + +f12: 开发者模式已打开，请遵循GPL协议。 \ No newline at end of file diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index eb9d7f7c..a632e9f6 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -1,4 +1,6 @@ more: 更多 +star: 喜歡這篇的人也看了 +random: 随便逛逛 # Language: 繁體中文 (台灣) theme: @@ -9,6 +11,12 @@ copy: success: 複製成功 error: 複製失敗 +copy_copyright: + author: 作者 + link: 連結 + source: 來源 + info: 著作權歸作者所有。 商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。 + lately: second: 秒 minute: 分鐘 @@ -125,4 +133,16 @@ link: random: 您即將前往 ⌈ ${name} ⌋ ， 安全性未知 keyboard: - title: 博客快捷鍵 \ No newline at end of file + title: 博客快捷鍵 + +newest_comment: + error: 無法獲取評論，請確認相關配置是否正確。 + zero: 沒有評論 + +comment: + title: 評論 + +commentBarrage: + title: 熱評 + +f12: 開發者模式已打開，請遵循GPL協定。 \ No newline at end of file diff --git a/layout/category.pug b/layout/category.pug index dfd5d14d..db13b97e 100644 --- a/layout/category.pug +++ b/layout/category.pug @@ -6,7 +6,7 @@ block content #category-bar include includes/widgets/home/categoryBar .recent-posts#recent-posts - each post in page.posts.find({ parent: { $exists: false } }).data + each post,index in page.posts.find({ parent: { $exists: false } }).data include includes/widgets/home/postList include includes/mixins/pagination include includes/widgets/aside/aside \ No newline at end of file diff --git a/layout/includes/console.pug b/layout/includes/console.pug index 2a95997c..314d212c 100644 --- a/layout/includes/console.pug +++ b/layout/includes/console.pug @@ -1,14 +1,15 @@ div#console div.close-btn(onclick="sco.hideConsole()") i.solitude.st-close-fill - if theme.comment.newComment + if theme.console_plus div.console-card-group - 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') - div.aside-list + if theme.console_plus && theme.comment.newest_comment.enable + 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') + div.aside-list div.console-card-group-right div.console-card.tags(onclick="sco.hideConsole()") diff --git a/layout/includes/head/config.pug b/layout/includes/head/config.pug index 3da1c373..9411a493 100644 --- a/layout/includes/head/config.pug +++ b/layout/includes/head/config.pug @@ -22,30 +22,69 @@ } } - let translate = 'undefined'; - if (theme.translate && theme.translate.enable) { - translate = JSON.stringify({ - defaultEncoding: theme.translate.defaultEncoding, - translateDelay: theme.translate.translateDelay, - }); + const sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || []; + + let comment = false + + if (theme.comment.type === 'twikoo') { + comment = JSON.stringify({ + avatar: theme.comment.avatar, + url: theme.comment.twikoo.envId, + commentBarrage: theme.comment.enable, + accessToken: theme.comment.twikoo.accessToken, + owo: { + body: '.OwO-body', + item: '.OwO-items li' + } + }) } - let copyright = 'undefined'; - if (theme.copy.enable && theme.copy.copyright.enable) { - copyright = JSON.stringify({ - limitCount: theme.copy.copyright.limit_count, - languages: { - author: _p("copy_copyright.author") + ': ' + config.author, - link: _p("copy_copyright.link") + ': ', - source: _p("copy_copyright.source") + ': ' + config.title, - info: _p("copy_copyright.info") + if (theme.comment.type === 'waline') { + comment = JSON.stringify({ + avatar: theme.comment.avatar, + url: theme.comment.waline.envId, + commentBarrage: theme.comment.enable, + owo: { + body: '.wl-emoji-popup', + item: '.wl-tab-wrapper button' } }) } - const commentInfoStart = theme.comment.randomInfoStart.map(item => `"${item}"`) || []; - const commentInfoEnd = theme.comment.randomInfoEnd.map(item => `"${item}"`) || []; - const sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || []; + if (theme.comment.type === 'valine') { + comment = JSON.stringify({ + avatar: theme.comment.avatar, + url: theme.comment.valine.serverURLs, + commentBarrage: theme.comment.enable, + appId: theme.comment.valine.appId, + appKey: theme.comment.valine.appKey, + owo: { + body: '.vwrap', + item: '.vemojis i' + } + }) + } + + let post_ai = false + + if (theme.post_ai.enable) { + post_ai = JSON.stringify({ + key: theme.post_ai.key, + talk: theme.post_ai.talk, + randomPost: theme.post_ai.randomPost, + }) + } + + let copyright = false; + if (theme.copy.enable && theme.copy.copyright.enable) { + copyright = JSON.stringify({ + limit: theme.copy.copyright.limit, + author: _p("copy_copyright.author") + ': ' + config.author, + link: _p("copy_copyright.link") + ': ', + source: _p("copy_copyright.source") + ': ' + config.title, + info: _p("copy_copyright.info") + }) + } script. const GLOBAL_CONFIG = { @@ -57,6 +96,7 @@ script. enable: !{theme.lazyload.enable}, error: '!{theme.lazyload.errorimg}' }, + copyright: !{copyright}, highlight: { enable: !{theme.highlight.enable}, limit: !{theme.highlight.limit}, @@ -64,7 +104,7 @@ script. copy: !{theme.highlight.copy}, syntax: '!{config.syntax_highlighter}' }, - randomlinks: !{theme.footer.randomlink}, + randomlink: !{theme.footer.randomlink}, lang: { theme: { dark: '!{_p('theme.dark')}', @@ -93,7 +133,11 @@ script. chs: { chs_to_cht: '!{_p('chs.chs_tw')}', cht_to_chs: '!{_p('chs.chs_cn')}', - } + }, + barrage: { + title: '!{_p('commentBarrage.title')}', + }, + f12: '!{_p('f12')}', }, aside: { sayhello: { @@ -108,25 +152,7 @@ script. covercolor: { enable: !{theme.post.covercolor.enable} }, - comment: { - enable: !{theme.comment.enable}, - type: '!{theme.comment.type}', - commentBarrage: !{theme.comment.commentBarrage && theme.comment.enable}, - randomInfoStart: [!{commentInfoStart}], - randomInfoEnd: [!{commentInfoEnd}], - twikoo: { - url: '!{theme.comment.twikoo.envId}', - accessToken: '!{theme.comment.twikoo.accessToken}' - }, - waline: { - url: '!{theme.comment.waline.envId}', - } - }, + comment: !{comment}, lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}', - ai: { - enable: !{theme.post_ai.enable}, - key: '!{theme.post_ai.key}', - talk: "!{theme.post_ai.talk}", - randomPost: !{theme.post_ai.randomPost}, - } + post_ai: !{post_ai} }; \ No newline at end of file diff --git a/layout/includes/inject/body.pug b/layout/includes/inject/body.pug index d5f85414..d09b6759 100644 --- a/layout/includes/inject/body.pug +++ b/layout/includes/inject/body.pug @@ -14,6 +14,10 @@ div script(src=url_for(theme.cdn.main)) script(src=url_for(theme.cdn.utils)) + if theme.comment.enable && theme.comment.type === 'valine' + // md5 + script(src=url_for(theme.cdn.blueimp_md5)) + // lately script(src=url_for(theme.cdn.lately_js)) @@ -47,7 +51,7 @@ div script(src=url_for(theme.cdn.swiper_js)) if theme.post_ai.enable - script(src=url_for(theme.cdn.sco_ai_js)) + script(src=url_for(theme.cdn.efu_ai)) if theme.capsule.enable || theme.music.enable script(src=url_for(theme.cdn.aplayer_js)) @@ -74,14 +78,14 @@ div case theme.comment.type when 'twikoo' script(src=url_for(theme.cdn.twikoo)) - when 'waline' - script(src=url_for(theme.cdn.waline_js)) if theme.comment.commentBarrage case theme.comment.type when 'twikoo' script(src=url_for(theme.cdn.twikoo_commentBarrage)) when 'waline' script(src=url_for(theme.cdn.waline_commentBarrage)) + when 'valine' + script(src=url_for(theme.cdn.valine_commentBarrage)) if theme.music.enable script(src=url_for(theme.cdn.music_js)) diff --git a/layout/includes/inject/head.pug b/layout/includes/inject/head.pug index dfab01b3..db4ea881 100644 --- a/layout/includes/inject/head.pug +++ b/layout/includes/inject/head.pug @@ -73,11 +73,45 @@ script. document.documentElement.classList.remove('hide-aside') } } + + win.getCSS = (url, id = false) => new Promise((resolve, reject) => { + const link = document.createElement('link') + link.rel = 'stylesheet' + link.href = url + if (id) link.id = id + link.onerror = reject + link.onload = link.onreadystatechange = function () { + const loadState = this.readyState + if (loadState && loadState !== 'loaded' && loadState !== 'complete') return + link.onload = link.onreadystatechange = null + resolve() + } + document.head.appendChild(link) + }) + + win.getScript = (url, attr = {}) => new Promise((resolve, reject) => { + const script = document.createElement('script') + script.src = url + script.async = true + script.onerror = reject + script.onload = script.onreadystatechange = function () { + const loadState = this.readyState + if (loadState && loadState !== 'loaded' && loadState !== 'complete') return + script.onload = script.onreadystatechange = null + resolve() + } + + Object.keys(attr).forEach(key => { + script.setAttribute(key, attr[key]) + }) + + document.head.appendChild(script) + }) } )(window) console.log( - "%c Program: Hexo %c Theme: Solitude %c Version: v1.6.1", + "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.0", "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;", "padding: 5px 10px;color:white;background:#3e9f50;", "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;" diff --git a/layout/includes/widgets/post/postMeta.pug b/layout/includes/widgets/post/postMeta.pug index 4e1249da..48beeca3 100644 --- a/layout/includes/widgets/post/postMeta.pug +++ b/layout/includes/widgets/post/postMeta.pug @@ -48,6 +48,10 @@ when "waline" span.waline-pageview-count i.solitude.st-loading-line + when "valine" + span.leancloud_visitors(id=url_for(page.path)) + span.leancloud-visitors-count + i.solitude.st-loading-line else if theme.busuanzi span#busuanzi_value_page_pv i.solitude.st-loading-line @@ -62,5 +66,8 @@ when "waline" span.waline-comment-count i.solitude.st-loading-line + when "valine" + span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount") + i.solitude.st-loading-line include ./wave \ No newline at end of file diff --git a/layout/includes/widgets/third-party/comments/comment.pug b/layout/includes/widgets/third-party/comments/comment.pug index fb9ae570..01bd0f3c 100644 --- a/layout/includes/widgets/third-party/comments/comment.pug +++ b/layout/includes/widgets/third-party/comments/comment.pug @@ -2,16 +2,14 @@ .comment-head .comment-headline i.solitude.st-chat-fill - span 评论 + span=_p('comment.title') span - .comment-randomInfo - a(onclick="sco.addRandomCommentInfo()", href="javascript:void(0)") 匿名评论 - .comment-tips#comment-tips - span ✅ 你无需删除空行，直接评论以获取最佳展示效果 .comment-wrap #comment case theme.comment.type when 'twikoo' - include ./twikoo.pug + !=partial('includes/widgets/third-party/comments/twikoo',{}, {cache: true}) when 'waline' - include ./waline.pug \ No newline at end of file + !=partial('includes/widgets/third-party/comments/waline',{}, {cache: true}) + when 'valine' + !=partial('includes/widgets/third-party/comments/valine',{}, {cache: true}) \ No newline at end of file diff --git a/layout/includes/widgets/third-party/comments/valine.pug b/layout/includes/widgets/third-party/comments/valine.pug new file mode 100644 index 00000000..10151a2b --- /dev/null +++ b/layout/includes/widgets/third-party/comments/valine.pug @@ -0,0 +1,44 @@ +- const { lazyload, count } = theme.comment +- const { appId, appKey, avatar, serverURLs, visitor, option } = theme.comment.valine +- let emojiMaps = '""' + +if site.data.valine + - emojiMaps = JSON.stringify(site.data.valine) + +script. + async function initComment() { + const initValine = () => { + const valine = new Valine(Object.assign({ + el: '#comment', + appId: '#{appId}', + appKey: '#{appKey}', + avatar: '#{avatar}', + serverURLs: '#{serverURLs}', + emojiMaps: !{emojiMaps}, + path: window.location.pathname, + visitor: #{visitor}, + ...!{JSON.stringify(option)} + })) + + if (GLOBAL_CONFIG.lightbox) { + utils.lightbox(document.querySelectorAll('#comment .vcontent img:not(.vemoji)')); + } + + sco.owoBig(); + } + + const loadValine = async () => { + if (typeof Valine === 'function') initValine() + else { + await getScript('!{url_for(theme.cdn.valine)}') + initValine() + } + } + + if (!!{lazyload}) { + if (!{lazyload}) utils.loadComment(document.getElementById('comment'), loadValine) + else setTimeout(loadValine, 0) + } else { + await loadValine() + } + } \ No newline at end of file diff --git a/layout/includes/widgets/third-party/comments/waline.pug b/layout/includes/widgets/third-party/comments/waline.pug index 24d8bd28..c1dc4313 100644 --- a/layout/includes/widgets/third-party/comments/waline.pug +++ b/layout/includes/widgets/third-party/comments/waline.pug @@ -1,17 +1,45 @@ -- const { envId, option } = theme.comment.waline +- const { envId, option ,pageview } = theme.comment.waline +- const { lazyload, count } = theme.comment 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)})) + const isLazyLoad = !!{lazyload}; + let walineInitFunction = window.walineFn || null; - GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)')) - sco.owoBig() + async function initWaline(Fn) { + const walineOptions = { + el: '#comment', + serverURL: '!{envId}', + pageview: !isLazyLoad, + dark: 'html[data-theme="dark"]', + path: window.location.pathname, + comment: !isLazyLoad, + ...!{JSON.stringify(option)} + }; + const walineInstance = Fn(walineOptions); + + utils.addGlobalFn('pjax', () => walineInstance.destroy(), 'destroyWaline'); + } + + async function loadWalineCSSAndJS() { + if (!walineInitFunction) { + await getCSS('!{url_for(theme.cdn.waline_css)}'); + const {init} = await import('!{url_for(theme.cdn.waline_js)}'); + walineInitFunction = init || Waline.init; + window.walineFn = walineInitFunction; + } + initWaline(walineInitFunction); + } + + if (isLazyLoad) { + utils.loadComment(document.getElementById('comment'),loadWalineCSSAndJS); + } else { + await loadWalineCSSAndJS(); + } + + if (GLOBAL_CONFIG.lightbox) { + utils.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)')); + } + + sco.owoBig(); } \ No newline at end of file diff --git a/layout/includes/widgets/third-party/news-comment/newest-comment.pug b/layout/includes/widgets/third-party/news-comment/newest-comment.pug index 0e405d9d..caaa858b 100644 --- a/layout/includes/widgets/third-party/news-comment/newest-comment.pug +++ b/layout/includes/widgets/third-party/news-comment/newest-comment.pug @@ -1,6 +1,8 @@ -if theme.comment.enable && theme.comment.newComment +if theme.comment.enable && theme.console_plus && theme.comment.newest_comment.enable case theme.comment.type when 'twikoo' - include twikoo + !=partial('includes/widgets/third-party/news-comment/twikoo',{}, {cache: true}) when 'waline' - include waline \ No newline at end of file + !=partial('includes/widgets/third-party/news-comment/waline',{}, {cache: true}) + when 'valine' + !=partial('includes/widgets/third-party/news-comment/valine',{}, {cache: true}) \ No newline at end of file diff --git a/layout/includes/widgets/third-party/news-comment/twikoo.pug b/layout/includes/widgets/third-party/news-comment/twikoo.pug index d4b22d4b..c08f2891 100644 --- a/layout/includes/widgets/third-party/news-comment/twikoo.pug +++ b/layout/includes/widgets/third-party/news-comment/twikoo.pug @@ -15,12 +15,12 @@ script. return content.length > 150 ? content.substring(0, 150) + '...' : content; } - const getComment = () => { - const $dom = document.querySelector('#card-newest-comments .aside-list') + const $asideList = document.querySelector('#card-newest-comments .aside-list') + const getComment = () => { const runTwikoo = () => { twikoo.getRecentComments({ - envId: GLOBAL_CONFIG.comment.twikoo.url, + envId: GLOBAL_CONFIG.comment.url, region: '', pageSize: 6, includeReply: true @@ -32,18 +32,18 @@ script. 'url': `${e.url}#${e.id}`, 'date': new Date(e.created).toISOString() })) + saveToLocal.set('twikoo-newest-comment', JSON.stringify(twikooArray), !{theme.comment.newest_comment.storage}/(60*24)) generateHtml(twikooArray) }).catch(function (err) { console.error(err) - $dom.innerHTML = "无法获取评论，请确认相关配置是否正确" + $asideList.textContent = "!{_p('newest_comment.error')}" }) } runTwikoo() } const generateHtml = array => { - const $dom = document.querySelector('#card-newest-comments .aside-list') - $dom.innerHTML = array.length ? array.map(item => ` + $asideList.innerHTML = array.length ? array.map(item => `
${item.nick} @@ -54,15 +54,17 @@ script.
- `).join('') : '没有评论' + `).join('') : "!{_p('newest_comment.zero')}" window.lazyLoadInstance && window.lazyLoadInstance.update() - window.pjax && window.pjax.refresh($dom) + window.pjax && window.pjax.refresh() utils && utils.changeTimeFormat() } const newestCommentInit = () => { - const $asideList = document.querySelector('#card-newest-comments .aside-list') - if ($asideList) { + const data = saveToLocal.get('twikoo-newest-comment') + if (data) { + generateHtml(JSON.parse(data)) + } else { getComment() } } diff --git a/layout/includes/widgets/third-party/news-comment/valine.pug b/layout/includes/widgets/third-party/news-comment/valine.pug new file mode 100644 index 00000000..a0a60e87 --- /dev/null +++ b/layout/includes/widgets/third-party/news-comment/valine.pug @@ -0,0 +1,79 @@ +script. + window.addEventListener('load', () => { + const changeContent = (content) => { + if (content === '') return content; + + const replacements = [ + {regex: /]+>/ig, replacement: '[Image]'}, + {regex: /]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, replacement: '[URL]'}, + {regex: /```[\s\S]*?```/g, replacement: '[Code]'}, + {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 = () => { + const data = saveToLocal.get('valine-newest-comment') + if (data) { + generateHtml(JSON.parse(data)) + } else { + getComment() + } + } + + const getComment = async () => { + try { + const settings = { + "method": "GET", + "headers": { + "X-LC-Id": '!{theme.comment.valine.appId}', + "X-LC-Key": '!{theme.comment.valine.appKey}', + "Content-Type": "application/json" + }, + } + + const res = await fetch('!{theme.comment.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 => { + return { + 'content': changeContent(e.comment), + 'avatar': '!{theme.comment.avatar}' + '/avatar/' + md5(e.mail.toLowerCase()), + 'nick': e.nick, + 'url': e.url + '#' + e.objectId, + 'date': e.updatedAt || e.createdAt + } + }) + saveToLocal.set('valine-newest-comment', JSON.stringify(valineArray), !{theme.comment.newest_comment.storage} / (60 * 24)) + generateHtml(valineArray) + } catch (err) { + console.error(err) + $asideList.textContent = "!{_p('newest_comment.error')}" + } + } + + const generateHtml = array => { + const $dom = document.querySelector('#card-newest-comments .aside-list') + $dom.innerHTML = array.length ? array.map(item => ` +
+ + ${item.nick} +
${item.nick}
+ +
+ ${item.content} + +
+
+ `).join('') : "!{_p('newest_comment.zero')}" + window.lazyLoadInstance && window.lazyLoadInstance.update() + window.pjax && window.pjax.refresh() + utils && utils.changeTimeFormat() + } + + newestCommentInit() + }) \ No newline at end of file diff --git a/layout/includes/widgets/third-party/news-comment/waline.pug b/layout/includes/widgets/third-party/news-comment/waline.pug index fbbedf13..b9a5eb94 100644 --- a/layout/includes/widgets/third-party/news-comment/waline.pug +++ b/layout/includes/widgets/third-party/news-comment/waline.pug @@ -17,28 +17,33 @@ script. const $asideList = document.querySelector('#card-newest-comments .aside-list') const newestCommentInit = () => { - if ($asideList) { + const data = saveToLocal.get('waline-newest-comment') + if (data) { + generateHtml(JSON.parse(data)) + } else { 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() - })) + + const getComment = async () => { + try { + const res = await fetch('!{theme.comment.waline.envId}/api/comment?type=recent&count=8', {method: 'GET'}) + const result = await res.json() + const walineArray = result.data.map(e => { + return { + 'content': changeContent(e.comment), + 'avatar': e.avatar, + 'nick': e.nick, + 'url': e.url + '#' + e.objectId, + 'date': e.time || e.insertedAt + } + }) + saveToLocal.set('waline-newest-comment', JSON.stringify(walineArray), !{theme.comment.newest_comment.storage} / (60 * 24)) generateHtml(walineArray) - }).catch( - $asideList.innerHTML = "无法获取评论，请确认相关配置是否正确" - ) + } catch (err) { + console.error(err) + $asideList.textContent = "!{_p('newest_comment.error')}" + } } const generateHtml = array => { @@ -54,9 +59,9 @@ script. - `).join('') : '没有评论' + `).join('') : "!{_p('newest_comment.zero')}" window.lazyLoadInstance && window.lazyLoadInstance.update() - window.pjax && window.pjax.refresh($dom) + window.pjax && window.pjax.refresh() utils && utils.changeTimeFormat() } diff --git a/layout/page.pug b/layout/page.pug index fd06fc83..e00482a3 100644 --- a/layout/page.pug +++ b/layout/page.pug @@ -25,6 +25,9 @@ block content != page.content when 'music' include includes/page/music + when 'banner' + include includes/widgets/page/banner + include includes/page/default default include includes/page/default if page.comment diff --git a/layout/tag.pug b/layout/tag.pug index faebfbc6..7ae23b6f 100644 --- a/layout/tag.pug +++ b/layout/tag.pug @@ -10,7 +10,7 @@ block content | #{tag.name} span.tagsPageCount #{tag.length} .recent-posts#recent-posts - each post in page.posts.find({ parent: { $exists: false } }).data + each post,index in page.posts.find({ parent: { $exists: false } }).data include includes/widgets/home/postList include includes/mixins/pagination include includes/widgets/aside/aside \ No newline at end of file diff --git a/package.json b/package.json index c9bd9913..1b3401a6 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-solitude", - "version": "1.6.1", + "version": "1.7.0", "description": "A beautiful, powerful, and efficient Hexo theme developed by the wleelw", "main": "package.json", "scripts": { diff --git a/plugins.yml b/plugins.yml index be117548..e7b12a84 100644 --- a/plugins.yml +++ b/plugins.yml @@ -15,10 +15,18 @@ twikoo: file: dist/twikoo.all.min.js version: 1.6.31 waline_js: - name: '@waline/client' + name: 'waline' file: dist/waline.js other_name: waline - version: 2.15.8 + version: 3.1.3 +waline_css: + name: 'waline' + file: dist/waline.css + version: 3.1.3 +valine: + name: valine + file: dist/Valine.min.js + version: 1.5.1 sharejs: name: butterfly-extsrc file: sharejs/dist/js/social-share.min.js @@ -97,4 +105,8 @@ fancyapps_css: mermaid_js: name: mermaid file: dist/mermaid.min.js - version: 10.8.0 \ No newline at end of file + version: 10.8.0 +blueimp_md5: + name: blueimp-md5 + file: js/md5.min.js + version: 2.19.0 \ No newline at end of file diff --git a/scripts/event/cdn.js b/scripts/event/cdn.js index b46950a1..734893e3 100644 --- a/scripts/event/cdn.js +++ b/scripts/event/cdn.js @@ -54,9 +54,9 @@ hexo.extend.filter.register('before_generate', () => { file: 'js/tw_cn.js', version }, - sco_ai_js: { + efu_ai: { name: 'hexo-theme-solitude', - file: 'js/third_party/sco-ai.min.js', + file: 'js/third_party/efu_ai.min.js', version }, twikoo_commentBarrage: { @@ -69,6 +69,11 @@ hexo.extend.filter.register('before_generate', () => { file: 'js/commentBarrage/waline.js', version }, + valine_commentBarrage: { + name: 'hexo-theme-solitude', + file: 'js/commentBarrage/valine.js', + version + }, waterfall: { name: 'hexo-theme-solitude', file: 'js/third_party/waterfall.min.js', diff --git a/scripts/event/init.js b/scripts/event/init.js index 8d62119c..ef3f4010 100644 --- a/scripts/event/init.js +++ b/scripts/event/init.js @@ -5,13 +5,15 @@ hexo.extend.filter.register('before_generate', () => { const logger = hexo.log; const config = hexo.config; - if (hexoVer < 6.3) { - logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！'); + if (hexoVer < 7.0) { + logger.error('请把 Hexo 升级到 V7.0.0 或更高的版本！'); + logger.error('Please upgrade your Hexo to V7.0.0 or higher!'); process.exit(-1); } if (Number(majorVer) < 14) { logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！'); + logger.error('Please upgrade Node.js to v14.0.0 or later!'); process.exit(-1); } }); \ No newline at end of file diff --git a/scripts/event/merge_config.js b/scripts/event/merge_config.js index 35083cd3..e50ecc98 100644 --- a/scripts/event/merge_config.js +++ b/scripts/event/merge_config.js @@ -129,7 +129,8 @@ hexo.extend.filter.register('before_generate', () => { randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js' }, keyboard: { enable: false, list: [] - }, lazyload: { + } + ,lazyload: { enable: false, field: 'site', placeholder: '/img/loading.gif', errorimg: '/img/error_load.png' }, loading: { fullpage: false, pace: true, @@ -150,7 +151,7 @@ hexo.extend.filter.register('before_generate', () => { enable: true, copyright: { enable: false, - limit_count: 50 + limit: 50 } } , post_ai: { @@ -164,7 +165,7 @@ hexo.extend.filter.register('before_generate', () => { enable: false, per_page: false, copytex: false, }, comment: { enable: false, - type: 'twikoo', + type: '', commentBarrage: false, newComment: false, randomInfoStart: [`baby's`, `little`, `my`,], @@ -180,8 +181,8 @@ hexo.extend.filter.register('before_generate', () => { font: { 'font-size': '16px', 'code-font-size': '16px', - 'font-family': '"PingFang SC","Hiragino Sans GB","Microsoft YaHei"', - 'code-font-family': '"monospace", "monospace"', + 'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei', + 'code-font-family': 'monospace, monospace', }, extends: { head: [], body: [], diff --git a/scripts/helper/related_post.js b/scripts/helper/related_post.js index c52db6af..fc98a43a 100644 --- a/scripts/helper/related_post.js +++ b/scripts/helper/related_post.js @@ -5,7 +5,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { const config = hexo.theme.config const limitNum = config.related_post.limit || 6 const dateType = config.related_post.date_type || 'created' - const headlineLang = this._p('喜欢这篇的人也看了') + const headlineLang = this._p('star') currentPost.tags.forEach(function (tag) { allPosts.forEach(function (post) { @@ -36,7 +36,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { relatedPosts.sort(compare('weight', dateType)) let result = '
' - result += `
${headlineLang}
随便逛逛
` + result += `
${headlineLang}
${this._p('random')}
` result += '
' for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { diff --git a/scripts/tags/tabs.js b/scripts/tags/tabs.js index 22ff1f65..3202aecd 100644 --- a/scripts/tags/tabs.js +++ b/scripts/tags/tabs.js @@ -1,6 +1,6 @@ /** * Tabs - * from butterfly + * from solitude */ 'use strict' diff --git a/source/css/_comments/index.styl b/source/css/_comments/comment.styl similarity index 82% rename from source/css/_comments/index.styl rename to source/css/_comments/comment.styl index ad1a5579..9120496e 100644 --- a/source/css/_comments/index.styl +++ b/source/css/_comments/comment.styl @@ -72,21 +72,6 @@ div#post-comment a:hover color var(--efu-main) - .comment-tips - background-color rgba(103, 194, 58, 0.13) - border var(--style-border-always) - border-color var(--efu-green) - color var(--efu-green) - border-radius 8px - padding 8px 12px - margin-top 0.5rem - display none - width 100% - - &.show - display flex - font-weight 700 - blockquote background var(--efu-secondbg) border var(--style-border) @@ -104,14 +89,6 @@ div#post-comment flex-wrap wrap position relative -.comment-randomInfo - margin-left auto - font-size 13px - - &:hover - a - color var(--efu-theme) - #owo-big position fixed align-items center @@ -123,4 +100,7 @@ div#post-comment transform translate(0, -105%) overflow hidden animation owoIn .3s cubic-bezier(.42,0,.3,1.11) - padding 1rem \ No newline at end of file + padding 1rem + +@import 'twikoo.styl' when hexo-config('comment.type') == 'twikoo' +@import 'valine.styl' when hexo-config('comment.type') == 'valine' \ No newline at end of file diff --git a/source/css/_comments/valine.styl b/source/css/_comments/valine.styl new file mode 100644 index 00000000..e48cdc0b --- /dev/null +++ b/source/css/_comments/valine.styl @@ -0,0 +1,245 @@ +#comment + .vcount + display none !important + + .vpreview-btn + display none + + .vemoji-btn + position absolute + bottom 4.5px + left 50px + + .vpanel + display flex + flex-direction column + position relative + + .vemojis + display: none; + position: absolute; + left: 0; + right: 0; + max-width: 500px; + color: #4a4a4a; + border: 1px solid rgba(144, 147, 153, 0.31); + top: 6.7rem + z-index: 1000; + animation: .3s ease .1s 1 normal both running donate_effcet + width: 500px; + border: var(--style-border-always) + border-radius: 8px !important; + overflow: hidden; + background-color: var(--efu-maskbg) + backdrop-filter: saturate(180%) blur(10px); + transform: translateZ(0); + overflow-y: auto; + padding: 10px; + + .vwrap + flex 1 + display flex + border none !important + padding 0 + overflow: inherit; + flex-direction column-reverse + + .vheader + display flex + margin .5rem 0 + position relative + width calc(100% - 5.5rem) + gap .5rem + + +maxWidth768() + flex-direction column + + input + border-radius 12px + width calc((100% - 1rem) / 3) + flex 1 + position relative + font-size 13px + background var(--efu-secondbg) + border var(--style-border-always) + padding 6px 10px + line-height 1 + + +maxWidth768() + width 100% + + .vquote + + .vcard + background: var(--efu-card-bg); + border none + border-top: var(--style-border-dashed); + border-radius: 12px; + transition: .3s; + padding: 1rem 0 0; + margin-top: 0; + box-shadow: none; + + .vreply-wrapper + + .vrow .vcol:first-child + bottom 78px + + +maxWidth768() + bottom 164px + + .vrow .vcol.text-right:not(.vctrl) + bottom 31px + + +maxWidth768() + bottom 117px + + .cancel-reply + display flex !important + flex-direction row + justify-content center + margin 0 + + .cancel-reply-btn + position inherit + + .vrow + padding 0 + + .vcol + position absolute + + &:first-child + bottom 56px + left 20px + width auto + + +maxWidth768() + bottom 141px + + &.text-right:not(.vctrl) + bottom 9px + right 0 + transition .3s + border 0 solid var(--efu-main) + width 5rem + margin-left .5rem + border-radius 12px + height 34px + + +maxWidth768() + bottom 94px + + button + background-color var(--efu-fontcolor) + width 100% + height 100% + color var(--efu-card-bg) + border-radius 12px + opacity .2 + + +maxWidth768() + height 119px + + svg + width 18px + height 18px + + #veditor + display block + padding 16px 16px 40px 16px + line-height 1.5 + width 100% + font-size 14px + background var(--efu-secondbg) + color var(--efu-fontcolor) + border-radius 12px + min-height 121px + border var(--style-border-always) + + &:focus + border var(--style-border-hover-always) + box-shadow var(--efu-shadow-main) + + .vcard + margin-top: 0 + margin-bottom: .5rem + background: var(--efu-card-bg); + transition: .3s; + border-radius: 12px; + padding: 0; + padding-top: .5rem; + border: none; + border-top: var(--style-border-dashed); + display: flex; + flex-direction: row; + word-break: break-all; + + +maxWidth768() + padding: 1rem; + border: var(--style-border-always); + box-shadow: var(--efu-shadow-border) + + .vimg + width 32px + height 32px + border-radius 32px + cursor pointer + margin-right 16px + + &:hover + transform: rotate(360deg) + + .vh + flex 1 + padding 0 + border 0 + + .vhead + display flex + align-items center + gap: 5px; + + .vnick + font-size 1rem + line-height 32px + margin-right 0 + + .vsys + background: var(--efu-card-bg); + border: var(--style-border-always); + padding: 3px 5px + border-radius: 8px; + color: var(--efu-secondtext) + display: inline + font-size: .5rem; + + .vat + display: flex; + align-items: center; + color: var(--efu-lighttext) + padding: 3px 12px + transition: all .3s; + border-radius: 8px; + background-color: var(--efu-secondbg); + border: var(--style-border-always); + position: absolute; + right: 0; + bottom: 18px + + &:hover + background-color: var(--efu-lighttext) + color: var(--efu-card-bg) + + .vquote + border-left none + + .vicon.actived + fill var(--efu-main) + +#page + .vcard + padding: 1rem 1rem 1.5rem; + border: var(--style-border); + border-top: var(--style-border); + box-shadow: var(--efu-shadow-border); \ No newline at end of file diff --git a/source/css/_comments/waline.styl b/source/css/_comments/waline.styl deleted file mode 100644 index 3fd90590..00000000 --- a/source/css/_comments/waline.styl +++ /dev/null @@ -1,455 +0,0 @@ -// 用了记得给我的主题点个star喔😍 -#comment - .wl-comment - position relative - - .wl-panel - flex 1 - display flex - flex-direction column - - .wl-editor - order 0 - transition all .3s ease 0s - position relative - display inline-block - width 100% - vertical-align bottom - font-size 14px - min-height 8.75em - background-color var(--efu-card-bg) - resize vertical - line-height 1.5 - box-sizing border-box - background var(--efu-secondbg) - color var(--efu-fontcolor) - border-radius 12px - padding 16px 16px 40px 16px - border var(--style-border-always) - box-shadow none - - &:focus - outline none - border var(--style-border-hover-always) - box-shadow var(--efu-shadow-main) - - .wl-footer - position relative - margin 0 - justify-content space-around - - .wl-emoji-popup - display none - position absolute - left 0 - right 0 - overflow hidden - max-width 500px - color #4a4a4a - top .5rem - z-index 1000 - border var(--style-border-always) - border-radius 8px !important - background-color var(--efu-maskbg) - backdrop-filter saturate(180%) blur(10px) - transform translateZ(0) - animation 0.3s ease 0.1s 1 normal both running donate_effcet - - button - font-size 20px - line-height 19px - list-style-type none - padding 5px 10px - border-radius 5px - display inline-block - transition .3s - text-align center - - &.display - display block - - .wl-tab-wrapper - max-height 197px - padding 10px - padding-right 0 - overflow auto - font-size 0 - margin 12px 8px - min-height 197px - - .wl-tabs - margin 0 - padding 0 - font-size 0 - background var(--efu-background) - padding-left 8px - - - .wl-actions - flex 1 - display flex - align-items center - position absolute - top -34px - left 17px - transition all .3s ease 0s - - .wl-action - display none - cursor pointer - - &:hover - svg - opacity .8 - - &:nth-child(2) - display flex - margin-right 10px - - &:nth-child(4) - display flex - - .upload - display none - - .wl-gif-popup - display none - - .wl-info - position relative - - .wl-text-number - color var(--efu-secondtext) - -webkit-user-select none - position absolute - font-size 12px - bottom 5px - right 10px - - .wl-close - display none - - .wl-quote - .wl-card-item - padding 1rem 0 0 - - .wl-reply-wrapper - order 2 - width 100% - - .wl-header - order 1 - width calc(100% - 5.5rem) - display flex - align-items center - justify-content space-between - flex-direction row - margin .5rem 0 - gap .5rem - - +maxWidth899() - flex-direction column - - .wl-header-item - width calc((100% - 1rem) / 3) - border-radius 12px - background var(--efu-secondbg) - border var(--style-border-always) - display inline-table - line-height normal - font-size 13px - border-collapse separate - border-spacing 0 - - +maxWidth899() - width 100% - - label - -webkit-user-select none - border-radius 10px 0 0 10px - background-clip padding-box - padding 0 1rem - vertical-align middle - display table-cell - position relative - background var(--efu-card-bg) - - input - width 100% - vertical-align middle - display table-cell - height 32px - line-height 32px - border-radius 12px - padding 8px - padding-left 16px - border-left-width 0 - font-size inherit - background var(--efu-secondbg) - border none - color var(--efu-fontcolor) - - &:focus - outline none - border none - - .wl-btn - border-color var(--efu-fontcolor) - border-radius 12px - box-shadow var(--efu-shadow-black) - transition .3s - width 5rem - position absolute - margin-left 0.5rem - height 34px - background-color var(--efu-fontcolor) - border 0 solid var(--efu-main) - color var(--efu-background) - top 10px - right 0 - opacity .2 - - +maxWidth899() - height 122px - - &:hover - background var(--efu-main) - color var(--efu-white) - - .wl-power - padding 0.5em 0 - color var(--efu-gray) - font-size 0.8em - text-align end - - a - color var(--efu-fontcolor) - - .wl-count - display none - - .wl-sort - display flex - justify-content flex-start - align-items center - flex-direction row - gap 0.5rem - margin-bottom .5rem - - li - cursor pointer - background var(--efu-secondbg) - transition 0.3s - border var(--style-border-always) - border-radius 8px - font-size 14px - line-height 1 - padding 8px 16px - display flex - justify-content center - align-items center - color var(--efu-fontcolor) - - &:hover - background var(--efu-main) - color var(--efu-white) - transition 0.3s - border var(--style-border-hover-always) - - &.active - background var(--efu-lighttext) - color var(--efu-background) - - .wl-card-item - display flex - flex-direction row - word-break break-all - margin-top 0 - margin-bottom 0.5rem - background var(--efu-card-bg) - transition .3s - border-radius 12px - border-top var(--style-border-dashed) - padding 1rem 1rem 1.5rem - overflow hidden - - .wl-user - flex-shrink 0 - text-align center - box-shadow var(--efu-shadow-border) - margin-right 16px - width 32px - height 32px - border-radius 32px - background-color rgba(144, 147, 153, 0.13) - cursor pointer - position relative - - .verified-icon - position absolute - bottom -2px - right -5px - - img - border-radius 32px - - &:hover - img - transform rotate(360deg) - - .wl-head - display flex - align-items center - - .wl-nick - font-weight 700 - color var(--efu-lighttext) - text-decoration none - font-size 1rem - line-height 32px - - .wl-badge - color #67c23a - display inline-block - padding 0 0.5em - border-radius 4px - border 0 solid #e1f3d8 - font-size .5rem - margin-left 4px - background-color #c0c23a21 - - .wl-time - color var(--efu-secondtext) - font-size .6rem - margin-left 0.5rem - - .wl-comment-actions - display flex - align-items center - position absolute - right 40px - gap 0.5rem - - button - color var(--efu-lighttext) - -webkit-user-select none - padding 0 12px 0 12px - transition .3s - border-radius 8px - background-color var(--efu-secondbg) - border var(--style-border-always) - display flex - justify-content center - align-items center - - &:hover - background-color var(--efu-lighttext) - color var(--efu-card-bg) - - &.wl-like - +maxWidth768() - display none - - .wl-card - width 100% - display flex - flex-direction column - - .wl-meta - order 2 - margin .5rem 0 - - span - background var(--efu-secondbg) - border var(--style-border-always) - padding 1px 5px 1px 2px - border-radius 8px - margin-right 4px - color var(--efu-secondtext) - display inline - font-size .5rem - line-height 1 - - .wl-content - order 1 - margin-top 0.5rem - overflow auto - max-height 500px - - p - margin 0 - - img - max-width 300px - max-height 300px - vertical-align middle - - pre - code - kbd - samp - font-family ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace - - pre - background var(--efu-secondbg) - padding .5rem - margin 0.5rem 0 - overflow auto - border-radius 0.5em - - +maxWidth768() - max-width 90% - - .wl-quote - order 3 - - +maxWidth768() - max-width 90% - - .wl-operation - width 100% - - .wl-btn - top 0 - margin 0 - width 100% - position relative - bottom 52px - left 0 - cursor pointer - padding 0.75em - transition all 0.5s - font-size 0.75em - background var(--efu-card-bg) - color var(--efu-fontcolor) - border var(--style-border-always) - box-shadow var(--efu-shadow-border) - border-radius 12px - opacity 1 - height auto - line-height 2 - - &:hover - background var(--efu-lighttext) - color var(--efu-card-bg) - - .wl-loading - display flex - justify-content center - align-items center - - .wl-emoji - height 32px - margin 0 0.2rem - - .wl-empty - display flex - justify-content center - align-items center - color var(--efu-lighttext) - -#page .wl-cards > .wl-card-item - padding 1rem 1rem 1.5rem - border var(--style-border) - border-top var(--style-border) - box-shadow var(--efu-shadow-border) \ No newline at end of file diff --git a/source/css/_global/index.styl b/source/css/_global/index.styl index 57923eca..a6ce3fb3 100644 --- a/source/css/_global/index.styl +++ b/source/css/_global/index.styl @@ -66,6 +66,9 @@ body line-height 2 -webkit-tap-highlight-color transparent margin 0 + if !hexo-config('copy.enable') + user-select none + -webkit-user-select none * box-sizing border-box diff --git a/source/css/_highlight/highlight/index.styl b/source/css/_highlight/highlight/index.styl index 9e0f46d2..c6981115 100644 --- a/source/css/_highlight/highlight/index.styl +++ b/source/css/_highlight/highlight/index.styl @@ -28,7 +28,7 @@ figure color var(--efu-secondtext) background var(--efu-secondbg) border-right var(--style-border-always) - text-align right + text-align center &.code width 100% diff --git a/source/css/_page/index.styl b/source/css/_page/index.styl index c00a06a3..6bba6417 100644 --- a/source/css/_page/index.styl +++ b/source/css/_page/index.styl @@ -31,7 +31,4 @@ if hexo-config('music.enable') @import "share.styl" if hexo-config('google_adsense.enable') - @import "google.styl" - -if hexo-config('message.enable') - @import "message/index.styl" \ No newline at end of file + @import "google.styl" \ No newline at end of file diff --git a/source/css/_post/content.styl b/source/css/_post/content.styl index 59259763..1a9ae2d0 100644 --- a/source/css/_post/content.styl +++ b/source/css/_post/content.styl @@ -9,15 +9,20 @@ a color var(--efu-fontcolor) - padding 0 4px border-radius 4px 4px 0 0 - &:not(.fancybox):hover - border 0 - text-decoration none - color var(--efu-white) - border-radius 4px - background var(--efu-main) + border-bottom 2px dotted var(--efu-lighttext) + font-weight 700 + + &:not(.fancybox) + padding 0 4px + + &:hover + border 0 + text-decoration none + color var(--efu-white) + border-radius 4px + background var(--efu-main) .table-wrap margin 1rem 0 @@ -62,6 +67,7 @@ img margin auto + a &:not(.fancybox) text-decoration none diff --git a/source/css/index.styl b/source/css/index.styl index 07a3e24c..4300010f 100644 --- a/source/css/index.styl +++ b/source/css/index.styl @@ -27,6 +27,4 @@ if hexo-config('search.enable') // comment if hexo-config('comment.enable') - @import '_comments/index.styl' - @import '_comments/twikoo.styl' when hexo-config('comment.type') == 'twikoo' - @import '_comments/waline.styl' when hexo-config('comment.type') == 'waline' \ No newline at end of file + @import '_comments/comment.styl' \ No newline at end of file diff --git a/source/js/commentBarrage/twikoo.js b/source/js/commentBarrage/twikoo.js index 28c4768d..32ca0945 100644 --- a/source/js/commentBarrage/twikoo.js +++ b/source/js/commentBarrage/twikoo.js @@ -3,9 +3,9 @@ function initializeCommentBarrage() { const e = { maxBarrage: 1, barrageTime: 8e3, - twikooUrl: GLOBAL_CONFIG.comment.twikoo.url, + twikooUrl: GLOBAL_CONFIG.comment.url, pageUrl: window.location.pathname, - accessToken: GLOBAL_CONFIG.comment.twikoo.accessToken, + accessToken: GLOBAL_CONFIG.comment.accessToken, }; class CommentBarrage { @@ -79,9 +79,9 @@ function initializeCommentBarrage() { commentBarrageItem.className = "comment-barrage-item"; commentBarrageItem.innerHTML = `
- 热评 + ${GLOBAL_CONFIG.lang.barrage.title}
${comment.nick}
- +
${commentContent} diff --git a/source/js/commentBarrage/valine.js b/source/js/commentBarrage/valine.js new file mode 100644 index 00000000..e155e4a2 --- /dev/null +++ b/source/js/commentBarrage/valine.js @@ -0,0 +1,156 @@ +function initializeCommentBarrage() { + window.commentBarrageInitialized = !0; + let config = { + maxBarrage: 1, + barrageTime: 8e3, + valineUrl: GLOBAL_CONFIG.comment.url, + pageUrl: window.location.pathname, + } + new class { + commentInterval = null + + constructor(config) { + this.config = { + ...config, + barrageTimer: [], + barrageList: [], + barrageIndex: 0, + dom: document.querySelector(".comment-barrage") + }; + this.commentInterval = null; + this.hoverOnCommentBarrage = false; + this.init(); + } + + async fetchComments() { + const url = new URL(`${this.config.valineUrl}/1.1/classes/Comment`); + const params = { + url: this.config.pageUrl, + order: '-createdAt' + }; + + for (const [key, value] of Object.entries(params)) { + url.searchParams.append(key, value); + } + + try { + const response = await fetch(url, { + method: "GET", + headers: { + "X-LC-Id": GLOBAL_CONFIG.comment.appId, + "X-LC-Key": GLOBAL_CONFIG.comment.appKey, + "Content-Type": "application/json" + }, + }); + + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + + const data = await response.json(); + return data.results.filter(item => item.url === this.config.pageUrl) + } catch (error) { + console.error("An error occurred while fetching comments: ", error); + } + } + + commentLinkFilter(comments) { + return comments.flatMap(comment => this.getCommentReplies(comment)); + } + + getCommentReplies(comment) { + window.comment = comment + if (!comment.replies) { + return [comment]; + } + return [comment, ...comment.replies.flatMap(reply => this.getCommentReplies(reply))]; + } + + processCommentContent(comment) { + const processed = comment.replace(/```[\s\S]*?```|]*>[\s\S]*?<\/blockquote>|<[^>]*>|\n|`([^`]{1,9})`:/g, "").trim(); + return processed ? `

${processed}

` : ""; + } + + createCommentBarrage(comment) { + const content = this.processCommentContent(comment.comment).trim(); + if (!content) { + return false; + } + + const element = document.createElement("div"); + element.classList.add("comment-barrage-item"); + element.innerHTML = ` +
+ ${GLOBAL_CONFIG.lang.barrage.title} +
${comment.nick}
+ + + + +
+ ${comment.comment} + `; + + this.config.dom.appendChild(element); + this.config.barrageTimer.push(element); + + return true; + } + + removeCommentBarrage(element) { + element.className = "comment-barrage-item out"; + setTimeout(() => { + this.config.dom.removeChild(element); + }, 1000); + } + + async initCommentBarrage() { + const commentBarrage = document.querySelector(".comment-barrage"); + const menuCommentBarrageText = document.querySelector(".menu-commentBarrage-text"); + const consoleCommentBarrage = document.querySelector("#consoleCommentBarrage"); + + if (localStorage.getItem("commentBarrageSwitch") != null) { + commentBarrage.style.display = "flex"; + consoleCommentBarrage.classList.add("on"); + } else { + commentBarrage.style.display = "none"; + consoleCommentBarrage.classList.remove("on"); + } + + const comments = await this.fetchComments(); + this.config.barrageList = this.commentLinkFilter(comments); + this.config.dom.innerHTML = ""; + clearInterval(this.commentInterval); + this.commentInterval = null; + + const createOrRemoveBarrage = () => { + if (this.config.barrageList.length && !this.hoverOnCommentBarrage) { + if (!this.createCommentBarrage(this.config.barrageList[this.config.barrageIndex])) { + this.config.barrageIndex = (this.config.barrageIndex + 1) % this.config.barrageList.length; + return createOrRemoveBarrage(); + } + this.config.barrageIndex = (this.config.barrageIndex + 1) % this.config.barrageList.length; + } + if (this.config.barrageTimer.length > (this.config.barrageList.length > this.config.maxBarrage ? this.config.maxBarrage : this.config.barrageList.length) && !this.hoverOnCommentBarrage) { + this.removeCommentBarrage(this.config.barrageTimer.shift()); + } + }; + + setTimeout(() => { + createOrRemoveBarrage(); + if (this.commentInterval) { + clearInterval(this.commentInterval); + } + this.commentInterval = setInterval(createOrRemoveBarrage, this.config.barrageTime); + }, 3000); + } + + async init() { + await this.initCommentBarrage(); + const commentBarrage = document.querySelector(".comment-barrage"); + commentBarrage.addEventListener('mouseover', () => this.hoverOnCommentBarrage = true); + commentBarrage.addEventListener('mouseout', () => this.hoverOnCommentBarrage = false); + } + } + (config) +} \ No newline at end of file diff --git a/source/js/commentBarrage/waline.js b/source/js/commentBarrage/waline.js index 29d3014d..cdffbe71 100644 --- a/source/js/commentBarrage/waline.js +++ b/source/js/commentBarrage/waline.js @@ -3,7 +3,7 @@ function initializeCommentBarrage() { let config = { maxBarrage: 1, barrageTime: 8e3, - walineUrl: GLOBAL_CONFIG.comment.waline.url, + walineUrl: GLOBAL_CONFIG.comment.url, pageUrl: window.location.pathname, } new class { @@ -78,9 +78,9 @@ function initializeCommentBarrage() { element.classList.add("comment-barrage-item"); element.innerHTML = `
- 热评 + ${GLOBAL_CONFIG.lang.barrage.title}
${comment.nick}
- + diff --git a/source/js/main.js b/source/js/main.js index 4a167119..531b813c 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -74,7 +74,7 @@ const percent = () => { if ((document.getElementById("post-comment") || document.getElementById("footer")).offsetTop < viewportBottom || scrollPercent > 90) { document.querySelector("#nav-totop").classList.add("long") - percentElement.innerHTML = "返回顶部" + percentElement.innerHTML = GLOBAL_CONFIG.lang.backtop } else { document.querySelector("#nav-totop").classList.remove("long") if (scrollPercent >= 0) { @@ -346,10 +346,6 @@ let sco = { el.setSelectionRange(-1, -1) } } - const commentTips = document.querySelector("#comment-tips"); - if (commentTips) { - commentTips.classList.add("show"); - } }, initbbtalk: function () { if (document.querySelector('#bber-talk')) { @@ -586,31 +582,8 @@ let sco = { document.getElementById("toPageButton").href = targetPageUrl; } }, - addRandomCommentInfo: function () { - const e = `${GLOBAL_CONFIG.comment.randomInfoStart[Math.floor(Math.random() * GLOBAL_CONFIG.comment.randomInfoStart.length)]}${GLOBAL_CONFIG.comment.randomInfoEnd[Math.floor(Math.random() * GLOBAL_CONFIG.comment.randomInfoEnd.length)]}`; - - const nameSelectors = ["#author", "input[name='comname']", "#inpName", "input[name='author']", "#ds-dialog-name", "#name", "input[name='nick']", "#comment_author"]; - const emailSelectors = ["#mail", "#email", "input[name='commail']", "#inpEmail", "input[name='email']", "#ds-dialog-email", "input[name='mail']", "#comment_email"]; - - const nameElements = nameSelectors.map(selector => document.querySelector(selector)).filter(Boolean); - const emailElements = emailSelectors.map(selector => document.querySelector(selector)).filter(Boolean); - - nameElements.forEach(element => { - element.value = e; - element.dispatchEvent(new Event("input")); - }); - - emailElements.forEach(element => { - element.value = "donotreply@examp.com"; - element.dispatchEvent(new Event("input")); - }); - }, owoBig() { - const type = GLOBAL_CONFIG.comment.type; - const owoSelectors = { - body: type === 'twikoo' ? '.OwO-body' : '.wl-emoji-popup', - item: type === 'twikoo' ? '.OwO-items li' : '.wl-tab-wrapper button' - }; + const owoSelectors = GLOBAL_CONFIG.comment.owo let owoBig = document.getElementById('owo-big'); if (!owoBig) { @@ -762,6 +735,25 @@ const addHighlight = () => { } } +const addCopyright = () => { + if (!GLOBAL_CONFIG.copyright) return + const {limit, author, link, source, info} = GLOBAL_CONFIG.copyright + const handleCopy = (e) => { + e.preventDefault() + const copyText = window.getSelection(0).toString() + let text = copyText + if (copyText.length > limit) { + text = `${copyText}\n\n${author}\n${link}${window.location.href}\n${source}\n${info}` + } + if (e.clipboardData) { + return e.clipboardData.setData('text', text) + } else { + return window.clipboardData.setData('text', text) + } + } + document.body.addEventListener('copy', handleCopy) +} + class tabs { static init() { this.clickFnOfTabs() @@ -815,17 +807,18 @@ window.refreshFn = () => { utils.changeTimeFormat() GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg() GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar)")) - GLOBAL_CONFIG.randomlinks && randomLinksList() + GLOBAL_CONFIG.randomlink && randomLinksList() PAGE_CONFIG.comment && initComment() PAGE_CONFIG.toc && toc.init(); (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((addHighlight()) || tabs.init()) + addCopyright() PAGE_CONFIG.is_home && showTodayCard() GLOBAL_CONFIG.covercolor.enable && coverColor() sco.initConsoleState() GLOBAL_CONFIG.comment.commentBarrage && PAGE_CONFIG.comment && initializeCommentBarrage() document.body.setAttribute('data-type', PAGE_CONFIG.page) PAGE_CONFIG.page === "music" && scoMusic.init() - GLOBAL_CONFIG.ai.enable && PAGE_CONFIG.page === "post" && ScoAI.init() + GLOBAL_CONFIG.post_ai && PAGE_CONFIG.page === "post" && efu_ai.init() } document.addEventListener('DOMContentLoaded', function () { @@ -833,6 +826,8 @@ document.addEventListener('DOMContentLoaded', function () { }) window.onkeydown = function (e) { - (123 === e.keyCode || (17 === e.ctrlKey && 16 === e.shiftKey && 67 === e.keyCode)) && utils.snackbarShow("开发者模式已打开，请遵循GPL协议", !1, 3e3); + (123 === e.keyCode || (17 === e.ctrlKey && 16 === e.shiftKey && 67 === e.keyCode)) && utils.snackbarShow(GLOBAL_CONFIG.lang.f12, !1, 3e3); (27 === e.keyCode) && sco.hideConsole(); -} \ No newline at end of file +} + +document.addEventListener('copy', () => utils.snackbarShow(GLOBAL_CONFIG.lang.copy.success,false,3e3)) \ No newline at end of file diff --git a/source/js/third_party/efu_ai.min.js b/source/js/third_party/efu_ai.min.js new file mode 100644 index 00000000..2ce8f622 --- /dev/null +++ b/source/js/third_party/efu_ai.min.js @@ -0,0 +1,6 @@ +/** + * author: Efu AI + * email: o@efu.me + * website: https://efu.me + */ +class efuAI{constructor(){this.root="https://summary.tianli0.top",this.aiTalkMode=!1,this.aiPostExplanation="",this.config=GLOBAL_CONFIG.post_ai,this.scoGPTIsRunning=!1}init(){this.generate(),this.AIEngine()}getTitleAndContent(){const e=document.getElementById("article-container"),t=document.title,n=e.getElementsByTagName("p"),i=e.querySelectorAll("h1, h2, h3, h4, h5");return(t+" "+Array.from(i).concat(Array.from(n)).map((e=>e.innerText.replace(/https?:\/\/[^\s]+/g,""))).join(" ")).slice(0,1e3)}async generate(){this.aiShowAnimation(this.fetch(document.title,this.getTitleAndContent(),this.config.key))}async fetch(e,t,n){const i=`${this.root}/?content=${encodeURIComponent(t)}&title=${e}&key=${encodeURIComponent(n)}&url=${encodeURIComponent(window.location.href)}`,s=await fetch(i),o=await s.json();return s.ok?(this.aiPostExplanation=o.summary,o.summary):(console.error("Request failed:",o.err_msg),o.err_msg)}aiShowAnimation(e,t=!1){const n=document.querySelector(".ai-explanation"),i=document.querySelector(".ai-tag");if(!n||this.scoGPTIsRunning)return;this.scoGPTIsRunning=!0,this.cleanSuggestions(),i.classList.add("loadingAI"),n.style.display="block",n.innerHTML='生成中...';let s,o,a=!0,c=0,r=!0;const l=new IntersectionObserver((e=>{a=e[0].isIntersecting,a&&requestAnimationFrame(o)}),{threshold:0});e.then((e=>{s=performance.now(),o=()=>{if(c=(u?100*Math.random()+100:m?10:25)&&(n.innerText=e.slice(0,c+1),s=r,c++,c':(n.innerHTML=e,n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect(),t&&this.createSuggestions())),a&&requestAnimationFrame(o)}},a&&r&&setTimeout((()=>{requestAnimationFrame(o),r=!1}),3e3),l.observe(n)})).catch((e=>{console.error("检索信息失败：",e),n.innerHTML="检索信息失败",n.style.display="block",this.scoGPTIsRunning=!1,i.classList.remove("loadingAI"),l.disconnect()}))}AIEngine(){const e=document.querySelector(".ai-tag");e&&e.addEventListener("click",(()=>{this.scoGPTIsRunning||(this.aiTalkMode=!0,this.aiShowAnimation(Promise.resolve(this.config.talk),!0))}))}cleanSuggestions(){const e=document.querySelector(".ai-suggestions");e?e.innerHTML="":console.error("没有这个元素：'ai-suggestions'")}createSuggestions(){this.aiTalkMode&&(this.cleanSuggestions(),this.createSuggestionItemWithAction("这篇文章讲了什么？",(()=>{""===this.aiPostExplanation?this.generate():this.aiShowAnimation(Promise.resolve(this.aiPostExplanation),!0)})),this.config.randomPost&&this.createSuggestionItemWithAction("带我去看看其他文章",(()=>toRandomPost())),this.aiTalkMode=!0)}createSuggestionItemWithAction(e,t){const n=document.querySelector(".ai-suggestions");if(!n)return void console.error("无法找到具有class为ai-suggestions的元素");const i=document.createElement("div");i.classList.add("ai-suggestions-item"),i.textContent=e,i.addEventListener("click",t),n.appendChild(i)}}const efu_ai=new efuAI; \ No newline at end of file diff --git a/source/js/third_party/sco-ai.min.js b/source/js/third_party/sco-ai.min.js deleted file mode 100755 index bfb3f10d..00000000 --- a/source/js/third_party/sco-ai.min.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @name ScoAI - * @description 一个基于AI的文章摘要生成器 - * @version 1.0.0 - * @author 王卓Sco - * @license GNU General Public License v3.0 - */ -var ScoAI={root:"https://summary.tianli0.top",aiTalkMode:!1,aiPostExplanation:"",config:GLOBAL_CONFIG.ai,init(){this.scoGPTIsRunning=!1,this.generate(),this.AIEngine()},getTitleAndContent(){const e=document.title,t=document.getElementById("article-container"),n=t.getElementsByTagName("p"),o=t.querySelectorAll("h1, h2, h3, h4, h5");let i="";for(let e of o)i+=e.innerText+" ";for(let e of n)i+=e.innerText.replace(/https?:\/\/[^\s]+/g,"");return(e+" "+i).slice(0,1e3)},generate(){this.aiShowAnimation(this.fetch(this.getTitleAndContent(),this.config.key))},async fetch(e, t){const n=`${this.root}/?content=${encodeURIComponent(e)}&key=${encodeURIComponent(t)}&url=${encodeURIComponent(window.location.href)}`;try{const e=new AbortController,t=await fetch(n,{signal:e.signal});if(t.ok){const e=await t.json();return this.aiPostExplanation=e.summary,e.summary}throw Error("Request failed")}catch(e){return"AbortError"===e.name?console.error("Request timed out"):console.error("Request failed:",e),"获取文章摘要超时。当你出现这个问题时，可能是因为文章过长导致的AI运算量过大， 您可以稍等一下然后重新尝试。"}},aiShowAnimation(e, t=!1){const n=document.querySelector(".ai-explanation"),o=document.querySelector(".ai-tag");if(!n||this.scoGPTIsRunning)return;this.scoGPTIsRunning=!0,this.cleanSuggestions(),o.classList.add("loadingAI"),n.style.display="block",n.innerHTML='生成中...';let i,s,r=!0,a=0,c=!0;const l=new IntersectionObserver((e=>{r=e[0].isIntersecting,r&&requestAnimationFrame(s)}),{threshold:0});e.then((e=>{i=performance.now(),s=()=>{if(a=(h?100*Math.random()+100:u?10:25)&&(n.innerText=e.slice(0,a+1),i=c,a++,a':(n.innerHTML=e,n.style.display="block",this.scoGPTIsRunning=!1,o.classList.remove("loadingAI"),l.disconnect(),t&&this.createSuggestions())),r&&requestAnimationFrame(s)}},r&&c&&setTimeout((()=>{requestAnimationFrame(s),c=!1}),3e3),l.observe(n)})).catch((e=>{console.error("检索信息失败：",e),n.innerHTML="检索信息失败",n.style.display="block",this.scoGPTIsRunning=!1,o.classList.remove("loadingAI"),l.disconnect()}))},AIEngine(){const e=document.querySelector(".ai-tag");e&&e.addEventListener("click",(()=>{this.scoGPTIsRunning||(this.aiTalkMode=!0,this.aiShowAnimation(Promise.resolve(this.config.talk),!0))}))},cleanSuggestions(){const e=document.querySelector(".ai-suggestions");e?e.innerHTML="":console.error("没有这个元素：'ai-suggestions'")},createSuggestions(){this.aiTalkMode&&this.cleanSuggestions(),this.createSuggestionItemWithAction("这篇文章讲了什么？",(()=>{this.aiShowAnimation(Promise.resolve(this.aiPostExplanation),!0)})),this.config.randomPost&&this.createSuggestionItemWithAction("带我去看看其他文章",(()=>toRandomPost())),this.aiTalkMode=!0},createSuggestionItemWithAction(e, t){const n=document.querySelector(".ai-suggestions");if(!n)return void console.error("无法找到具有class为ai-suggestions的元素");const o=document.createElement("div");o.classList.add("ai-suggestions-item"),o.textContent=e,o.addEventListener("click",t),n.appendChild(o)}}; \ No newline at end of file diff --git a/source/js/utils.js b/source/js/utils.js index 19a18acc..279a7097 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -229,5 +229,18 @@ const utils = { target: 'time', lang: GLOBAL_CONFIG.lang.lately, }) - } + }, + loadComment: (dom, callback) => { + if ('IntersectionObserver' in window) { + const observerItem = new IntersectionObserver((entries) => { + if (entries[0].isIntersecting) { + callback() + observerItem.disconnect() + } + }, { threshold: [0] }) + observerItem.observe(dom) + } else { + callback() + } + }, } \ No newline at end of file