biss/hexo-theme-butterfly
1
0
Fork 0
mirror of https://github.com/jerryc127/hexo-theme-butterfly.git synced 2026-04-16 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 更新 plugins.yml 中的依賴版本至最新

Browse Source 
feat: 優化 aside_archives ，改進性能和可讀性
feat: 改善 inlineImg 和 timeline 標籤的文檔，優化時間線邏輯
feat: 更新 gallery 標籤以支持額外參數，優化圖片顯示邏輯
improvement: 優化隨機封面過濾器邏輯, 避免連續重複
feat: 最新評論限制顯示 1-10 條之間
fix: artalk 的最新評論顯示待定或者封禁的評論的 bug
This commit is contained in:
myw
2024-12-10 20:35:58 +08:00
Unverified
parent 247c1b664d
commit 0d0001c808
21 changed files with 373 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/includes/sidebar.pug
View File

@@ -3,16 +3,16 @@ if theme.menu
#menu-mask
#sidebar-menus
.avatar-img.text-center
img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.flink)}'` alt="avatar")
.site-data.text-center
a(href=url_for(config.archive_dir) + '/')
a(href=`${url_for(config.archive_dir)}/`)
.headline= _p('aside.articles')
.length-num= site.posts.length
a(href=url_for(config.tag_dir) + '/' )
a(href=`${url_for(config.tag_dir)}/`)
.headline= _p('aside.tags')
.length-num= site.tags.length
a(href=url_for(config.category_dir) + '/')
a(href=`${url_for(config.category_dir)}/`)
.headline= _p('aside.categories')
.length-num= site.categories.length
!=partial('includes/header/menu_item', {}, {cache: true})
!= partial('includes/header/menu_item', {}, { cache: true })

25
layout/includes/third-party/newest-comments/artalk.pug vendored
View File

@@ -34,7 +34,7 @@ script.
const searchParams = new URLSearchParams({
'site_name': '!{site}',
'limit': '!{theme.aside.card_newest_comments.limit}',
'limit': '!{newestCommentsLimit * 2}', // Fetch more comments to filter pending comments
})
const getComment = async (ele) => {
@@ -42,16 +42,19 @@ script.
const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`)
const result = await res.json()
const { avatarCdn, avatarDefault } = await getAvatarValue()
const artalk = result.data.map(e => {
const avatar = avatarCdn && e.email_encrypted ? `${avatarCdn}${e.email_encrypted}?${avatarDefault}` : ''
return {
'avatar': avatar,
'content': changeContent(e.content_marked),
'nick': e.nick,
'url': e.page_url,
'date': e.date,
}
})
const artalk = result.data
.filter(e => !e.is_pending) // Filter pending comments
.slice(0, !{newestCommentsLimit}) // Limit the number of comments
.map(e => {
const avatar = avatarCdn && e.email_encrypted ? `${avatarCdn}${e.email_encrypted}?${avatarDefault}` : ''
return {
'avatar': avatar,
'content': changeContent(e.content_marked),
'nick': e.nick,
'url': e.page_url,
'date': e.date,
}
})
btf.saveToLocal.set(keyName, JSON.stringify(artalk), !{theme.aside.card_newest_comments.storage}/(60*24))
generateHtml(artalk, ele)
} catch (e) {

2
layout/includes/third-party/newest-comments/disqus-comment.pug vendored
View File

@@ -6,7 +6,7 @@ script.
const { changeContent, generateHtml, run } = window.newestComments
const getComment = ele => {
fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{forum}&related=thread&limit=!{theme.aside.card_newest_comments.limit}&api_key=!{apiKey}')
fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{forum}&related=thread&limit=!{newestCommentsLimit}&api_key=!{apiKey}')
.then(response => response.json())
.then(data => {
const disqusArray = data.response.map(item => {

2
layout/includes/third-party/newest-comments/github-issues.pug vendored
View File

@@ -32,7 +32,7 @@ script.
}
const getComment = ele => {
fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.aside.card_newest_comments.limit}&page=1',{
fetch('https://api.github.com/repos/!{userRepo}/issues/comments?sort=updated&direction=desc&per_page=!{newestCommentsLimit}&page=1',{
"headers": {
Accept: 'application/vnd.github.v3.html+json'
}

6
layout/includes/third-party/newest-comments/index.pug vendored
View File

@@ -1,7 +1,11 @@
- let { use } = theme.comments
if use
- let forum,apiKey,userRepo
-
let forum,apiKey,userRepo
let { limit:newestCommentsLimit } = theme.aside.card_newest_comments
if (newestCommentsLimit > 10 || newestCommentsLimit < 1) newestCommentsLimit = 6
case use[0]
when 'Valine'
include ./valine.pug

2
layout/includes/third-party/newest-comments/remark42.pug vendored
View File

@@ -7,7 +7,7 @@ script.
const { changeContent, generateHtml, run } = window.newestComments
const getComment = ele => {
fetch('!{host}/api/v1/last/!{theme.aside.card_newest_comments.limit}?site=!{siteId}')
fetch('!{host}/api/v1/last/!{newestCommentsLimit}?site=!{siteId}')
.then(response => response.json())
.then(data => {
const remark42 = data.map(e => {

2
layout/includes/third-party/newest-comments/twikoo-comment.pug vendored
View File

@@ -10,7 +10,7 @@ script.
twikoo.getRecentComments({
envId: '!{theme.twikoo.envId}',
region: '!{theme.twikoo.region}',
pageSize: !{theme.aside.card_newest_comments.limit},
pageSize: !{newestCommentsLimit},
includeReply: true
}).then(res => {
const twikooArray = res.map(e => {

2
layout/includes/third-party/newest-comments/valine.pug vendored
View File

@@ -27,7 +27,7 @@ script.
},
}
fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.aside.card_newest_comments.limit}&order=-createdAt`,settings)
fetch(`${serverURL}/1.1/classes/Comment?limit=!{newestCommentsLimit}&order=-createdAt`,settings)
.then(response => response.json())
.then(data => {
const valineArray = data.results.map(e => {

2
layout/includes/third-party/newest-comments/waline.pug vendored
View File

@@ -9,7 +9,7 @@ script.
const getComment = async (ele) => {
try {
const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{theme.aside.card_newest_comments.limit}', { method: 'GET' })
const res = await fetch('!{serverURL}/api/comment?type=recent&count=!{newestCommentsLimit}')
const result = await res.json()
const walineArray = result.data.map(e => {
return {

21
layout/includes/widget/card_webinfo.pug
View File

@@ -6,40 +6,39 @@ if theme.aside.card_webinfo.enable
.webinfo
if theme.aside.card_webinfo.post_count
.webinfo-item
.item-name= _p('aside.card_webinfo.article_name') + " :"
.item-name= `${_p('aside.card_webinfo.article_name')} :`
.item-count= site.posts.length
if theme.aside.card_webinfo.runtime_date
.webinfo-item
.item-name= _p('aside.card_webinfo.runtime.name') + " :"
.item-name= `${_p('aside.card_webinfo.runtime.name')} :`
.item-count#runtimeshow(data-publishDate=date_xml(theme.aside.card_webinfo.runtime_date))
i.fa-solid.fa-spinner.fa-spin
if theme.wordcount.enable && theme.wordcount.total_wordcount
.webinfo-item
.item-name=_p('aside.card_webinfo.site_wordcount') + " :"
.item-count=totalcount(site)
.item-name= `${_p('aside.card_webinfo.site_wordcount')} :`
.item-count= totalcount(site)
if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.site_uv
.webinfo-item
.item-name= _p('aside.card_webinfo.site_uv_name') + " :"
.item-name= `${_p('aside.card_webinfo.site_uv_name')} :`
.item-count#umami-site-uv
i.fa-solid.fa-spinner.fa-spin
else if theme.busuanzi.site_uv
.webinfo-item
.item-name= _p('aside.card_webinfo.site_uv_name') + " :"
.item-name= `${_p('aside.card_webinfo.site_uv_name')} :`
.item-count#busuanzi_value_site_uv
i.fa-solid.fa-spinner.fa-spin
if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.site_pv
.webinfo-item
.item-name= _p('aside.card_webinfo.site_pv_name') + " :"
.item-name= `${_p('aside.card_webinfo.site_pv_name')} :`
.item-count#umami-site-pv
i.fa-solid.fa-spinner.fa-spin
else if theme.busuanzi.site_pv
.webinfo-item
.item-name= _p('aside.card_webinfo.site_pv_name') + " :"
.item-name= `${_p('aside.card_webinfo.site_pv_name')} :`
.item-count#busuanzi_value_site_pv
i.fa-solid.fa-spinner.fa-spin
if theme.aside.card_webinfo.last_push_date
.webinfo-item
.item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
.item-name= `${_p('aside.card_webinfo.last_push_date.name')} :`
.item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
i.fa-solid.fa-spinner.fa-spin
i.fa-solid.fa-spinner.fa-spin