mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-10-04 14:22:01 +08:00
feat: add wordcount helpers, waline lightbox, and extensive bug fixes
- wordcount/min2read/totalcount built-in helpers (replaces hexo-wordcount) - cloudTags random sort support - waline lightbox via MutationObserver - subtitle: seq guard prevents stale API response race - newest-comments: escapeHtml XSS fix, unified fetchAndRender with cache fallback - katex: try/catch asset load, encrypt re-render - chartjs: destroy charts on pjax, fix theme property check - mathjax: DOMContentLoaded instead of load - mermaid: clean stale error elements - medium-zoom: single instance, detach on pjax - getScrollPercent: WeakMap cache with resize invalidation - overflowPaddingR: avoid stale DOM refs - readmode: dedupe button, pjax cleanup - hexo-blog-decrypt: null-guard translateFn and encryptFn - tw_cn: expand skipped translate tags - localStorage: try/catch setItem - cdn.js: fix [lib|dist]* character class regex bug - findArchivesTitle: support custom archive_dir - shuoshuoFN: guard moment.tz when timezone empty - umami: no-store cache, error handling, path param - artalk: vote config option - bump version 5.7.1.260810
This commit is contained in:
myw committed
1 parent
51d36ef83a
commit
79e16a5cdd
25 files changed
+726
-624
No files matched your search
+60
-67
@@ -1,67 +1,60 @@
|
||||
- const { server, site, option } = theme.artalk
|
||||
- const avatarCdn = (option !== null && option.gravatar && option.gravatar.mirror) || ''
|
||||
- const avatarDefault = (option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)) || ''
|
||||
|
||||
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
||||
|
||||
script.
|
||||
window.addEventListener('load', () => {
|
||||
const keyName = 'artalk-newest-comments'
|
||||
const { changeContent, generateHtml, run } = window.newestComments
|
||||
|
||||
const getAvatarValue = async () => {
|
||||
const predefinedAvatarCdn = '!{avatarCdn}'
|
||||
const predefinedAvatarDefault = '!{avatarDefault}'
|
||||
|
||||
const avatarDefaultFormat = e => e.startsWith('d=') ? e : `d=${e}`
|
||||
|
||||
if (predefinedAvatarCdn && predefinedAvatarDefault) {
|
||||
return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch('!{server}/api/v2/conf')
|
||||
const result = await res.json()
|
||||
const { mirror, params, default: defaults } = result.frontend_conf.gravatar
|
||||
const avatarCdn = predefinedAvatarCdn || mirror
|
||||
let avatarDefault = avatarDefaultFormat(predefinedAvatarDefault || params || defaults)
|
||||
return { avatarCdn, avatarDefault}
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
|
||||
}
|
||||
}
|
||||
|
||||
const searchParams = new URLSearchParams({
|
||||
'site_name': '!{site}',
|
||||
'limit': '!{newestCommentsLimit * 2}', // Fetch more comments to filter pending comments
|
||||
})
|
||||
|
||||
const getComment = async (ele) => {
|
||||
try {
|
||||
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
|
||||
.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) {
|
||||
console.log(e)
|
||||
ele.textContent= "!{_p('aside.card_newest_comments.error')}"
|
||||
}
|
||||
}
|
||||
|
||||
run(keyName, getComment)
|
||||
})
|
||||
- const { server, site, option } = theme.artalk
|
||||
- const avatarCdn = (option !== null && option.gravatar && option.gravatar.mirror) || ''
|
||||
- const avatarDefault = (option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)) || ''
|
||||
|
||||
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
||||
|
||||
script.
|
||||
window.newestComments.ready(() => {
|
||||
const keyName = 'artalk-newest-comments'
|
||||
const { changeContent, run } = window.newestComments
|
||||
|
||||
const getAvatarValue = async () => {
|
||||
const predefinedAvatarCdn = '!{avatarCdn}'
|
||||
const predefinedAvatarDefault = '!{avatarDefault}'
|
||||
|
||||
const avatarDefaultFormat = e => e.startsWith('d=') ? e : `d=${e}`
|
||||
|
||||
if (predefinedAvatarCdn && predefinedAvatarDefault) {
|
||||
return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch('!{server}/api/v2/conf')
|
||||
const result = await res.json()
|
||||
const { mirror, params, default: defaults } = result.frontend_conf.gravatar
|
||||
const avatarCdn = predefinedAvatarCdn || mirror
|
||||
const avatarDefault = avatarDefaultFormat(predefinedAvatarDefault || params || defaults)
|
||||
return { avatarCdn, avatarDefault }
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
return { avatarCdn: predefinedAvatarCdn, avatarDefault: avatarDefaultFormat(predefinedAvatarDefault) }
|
||||
}
|
||||
}
|
||||
|
||||
const searchParams = new URLSearchParams({
|
||||
'site_name': '!{site}',
|
||||
'limit': '!{newestCommentsLimit * 2}', // Fetch more comments to filter pending comments
|
||||
})
|
||||
|
||||
const getComment = async () => {
|
||||
const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`)
|
||||
const result = await res.json()
|
||||
const { avatarCdn, avatarDefault } = await getAvatarValue()
|
||||
return 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,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
run(keyName, getComment)
|
||||
})
|
||||
+97
-61
@@ -1,61 +1,97 @@
|
||||
script.
|
||||
window.newestComments = {
|
||||
changeContent: content => {
|
||||
if (content === '') return content
|
||||
|
||||
content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
|
||||
content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
|
||||
content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
|
||||
content = content.replace(/<code>.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
|
||||
content = content.replace(/<[^>]+>/g, "") // remove html tag
|
||||
|
||||
if (content.length > 150) {
|
||||
content = content.substring(0, 150) + '...'
|
||||
}
|
||||
return content
|
||||
},
|
||||
|
||||
generateHtml: (array, ele) => {
|
||||
let result = ''
|
||||
|
||||
if (array.length) {
|
||||
for (let i = 0; i < array.length; i++) {
|
||||
result += '<div class="aside-list-item">'
|
||||
|
||||
if (!{theme.aside.card_newest_comments.avatar} && array[i].avatar) {
|
||||
const imgAttr = '!{theme.lazyload.enable && !theme.lazyload.native ? "data-lazy-src" : "src"}'
|
||||
const lazyloadNative = '!{theme.lazyload.enable && theme.lazyload.native ? "loading=\"lazy\"" : ""}'
|
||||
result += `<a href="${array[i].url}" class="thumbnail"><img ${imgAttr}="${array[i].avatar}" alt="${array[i].nick}" ${lazyloadNative}></a>`
|
||||
}
|
||||
|
||||
result += `<div class="content">
|
||||
<a class="comment" href="${array[i].url}" title="${array[i].content}">${array[i].content}</a>
|
||||
<div class="name"><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
|
||||
</div></div>`
|
||||
}
|
||||
} else {
|
||||
result += '!{_p("aside.card_newest_comments.zero")}'
|
||||
}
|
||||
|
||||
ele.innerHTML = result
|
||||
window.lazyLoadInstance && window.lazyLoadInstance.update()
|
||||
window.pjax && window.pjax.refresh(ele)
|
||||
},
|
||||
|
||||
newestCommentInit: (name, getComment) => {
|
||||
const $dom = document.querySelector('#card-newest-comments .aside-list')
|
||||
if ($dom) {
|
||||
const data = btf.saveToLocal.get(name)
|
||||
if (data) {
|
||||
newestComments.generateHtml(JSON.parse(data), $dom)
|
||||
} else {
|
||||
getComment($dom)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
run: (name, getComment) => {
|
||||
newestComments.newestCommentInit(name, getComment)
|
||||
btf.addGlobalFn('pjaxComplete', () => newestComments.newestCommentInit(name, getComment), name)
|
||||
}
|
||||
}
|
||||
script.
|
||||
window.newestComments = {
|
||||
ready: fn => {
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', fn, { once: true })
|
||||
} else {
|
||||
fn()
|
||||
}
|
||||
},
|
||||
|
||||
escapeHtml: str => {
|
||||
return String(str)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''')
|
||||
},
|
||||
|
||||
changeContent: content => {
|
||||
if (!content) return ''
|
||||
|
||||
content = content.replace(/<img[^>]*>/gis, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
|
||||
content = content.replace(/<pre><code>[\s\S]*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code block
|
||||
content = content.replace(/<a[^>]+?>[\s\S]*?<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
|
||||
content = content.replace(/<code[^>]*?>[\s\S]*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
|
||||
content = content.replace(/<[^>]+>/g, '') // remove html tag
|
||||
|
||||
if (content.length > 150) {
|
||||
content = Array.from(content).slice(0, 150).join('') + '...'
|
||||
}
|
||||
|
||||
return content
|
||||
},
|
||||
|
||||
generateHtml: (array, ele) => {
|
||||
const { escapeHtml } = window.newestComments
|
||||
let result = ''
|
||||
|
||||
if (array.length) {
|
||||
result = array.map(item => {
|
||||
let html = '<div class="aside-list-item">'
|
||||
|
||||
if (!{theme.aside.card_newest_comments.avatar} && item.avatar) {
|
||||
const imgAttr = '!{theme.lazyload.enable && !theme.lazyload.native ? "data-lazy-src" : "src"}'
|
||||
const lazyloadNative = '!{theme.lazyload.enable && theme.lazyload.native ? "loading=\"lazy\"" : ""}'
|
||||
html += `<a href="${escapeHtml(item.url)}" class="thumbnail"><img ${imgAttr}="${escapeHtml(item.avatar)}" alt="${escapeHtml(item.nick)}" ${lazyloadNative}></a>`
|
||||
}
|
||||
|
||||
html += `<div class="content">
|
||||
<a class="comment" href="${escapeHtml(item.url)}" title="${escapeHtml(item.content)}">${escapeHtml(item.content)}</a>
|
||||
<div class="name"><span>${escapeHtml(item.nick)} / </span><time datetime="${escapeHtml(item.date)}">${btf.diffDate(item.date, true)}</time></div>
|
||||
</div></div>`
|
||||
|
||||
return html
|
||||
}).join('')
|
||||
} else {
|
||||
result += '!{_p("aside.card_newest_comments.zero")}'
|
||||
}
|
||||
|
||||
ele.innerHTML = result
|
||||
window.lazyLoadInstance && window.lazyLoadInstance.update()
|
||||
window.pjax && window.pjax.refresh(ele)
|
||||
},
|
||||
|
||||
fetchAndRender: (keyName, ele, getComment) => {
|
||||
Promise.resolve(getComment(ele)).then(array => {
|
||||
btf.saveToLocal.set(keyName, JSON.stringify(array), !{theme.aside.card_newest_comments.storage}/(60*24))
|
||||
newestComments.generateHtml(array, ele)
|
||||
}).catch(e => {
|
||||
console.error(e)
|
||||
const data = btf.saveToLocal.get(keyName)
|
||||
if (data) {
|
||||
newestComments.generateHtml(JSON.parse(data), ele)
|
||||
} else {
|
||||
ele.textContent = '!{_p("aside.card_newest_comments.error")}'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
newestCommentInit: (name, getComment) => {
|
||||
const $dom = document.querySelector('#card-newest-comments .aside-list')
|
||||
if ($dom) {
|
||||
const data = btf.saveToLocal.get(name)
|
||||
if (data) {
|
||||
newestComments.generateHtml(JSON.parse(data), $dom)
|
||||
} else {
|
||||
newestComments.fetchAndRender(name, $dom, getComment)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
run: (name, getComment) => {
|
||||
newestComments.newestCommentInit(name, getComment)
|
||||
btf.addGlobalFn('pjaxComplete', () => newestComments.newestCommentInit(name, getComment), name)
|
||||
}
|
||||
}
|
||||
+23
-34
@@ -1,34 +1,23 @@
|
||||
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
||||
|
||||
script.
|
||||
window.addEventListener('load', () => {
|
||||
const keyName = 'disqus-newest-comments'
|
||||
const { changeContent, generateHtml, run } = window.newestComments
|
||||
|
||||
const getComment = ele => {
|
||||
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 => {
|
||||
return {
|
||||
'avatar': item.author.avatar.cache,
|
||||
'content': changeContent(item.message),
|
||||
'nick': item.author.name,
|
||||
'url': item.url,
|
||||
'date': item.createdAt
|
||||
}
|
||||
})
|
||||
|
||||
btf.saveToLocal.set(keyName, JSON.stringify(disqusArray), !{theme.aside.card_newest_comments.storage}/(60*24))
|
||||
generateHtml(disqusArray, ele)
|
||||
}).catch(e => {
|
||||
console.error(e)
|
||||
ele.textContent= "!{_p('aside.card_newest_comments.error')}"
|
||||
})
|
||||
}
|
||||
|
||||
run(keyName, getComment)
|
||||
})
|
||||
|
||||
|
||||
|
||||
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
||||
|
||||
script.
|
||||
window.newestComments.ready(() => {
|
||||
const keyName = 'disqus-newest-comments'
|
||||
const { changeContent, run } = window.newestComments
|
||||
|
||||
const getComment = () => {
|
||||
return 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 => data.response.map(item => {
|
||||
return {
|
||||
'avatar': item.author.avatar.cache,
|
||||
'content': changeContent(item.message),
|
||||
'nick': item.author.name,
|
||||
'url': item.url,
|
||||
'date': item.createdAt
|
||||
}
|
||||
}))
|
||||
}
|
||||
|
||||
run(keyName, getComment)
|
||||
})
|
||||
Loaded 3 of 25 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user