mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-04-16 20:30:53 +08:00
5.0
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
- const avatarDefault = (option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)) || ''
|
- const avatarDefault = (option !== null && option.gravatar && (option.gravatar.params || option.gravatar.default)) || ''
|
||||||
|
|
||||||
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
!= partial("includes/third-party/newest-comments/common.pug", {}, { cache: true })
|
||||||
|
|
||||||
script.
|
script.
|
||||||
window.addEventListener('load', () => {
|
window.addEventListener('load', () => {
|
||||||
const keyName = 'artalk-newest-comments'
|
const keyName = 'artalk-newest-comments'
|
||||||
@@ -40,18 +41,9 @@ script.
|
|||||||
try {
|
try {
|
||||||
const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`)
|
const res = await fetch(`!{server}/api/v2/stats/latest_comments?${searchParams}`)
|
||||||
const result = await res.json()
|
const result = await res.json()
|
||||||
<<<<<<< HEAD
|
|
||||||
const avatarStr = await getSetting()
|
|
||||||
const { mirror, params, default:defaults } = avatarStr.frontend_conf.gravatar
|
|
||||||
const avatarCdn = '!{avatarCdn}' || mirror
|
|
||||||
let avatarDefault = '!{avatarDefault}' || params || defaults
|
|
||||||
avatarDefault = avatarDefault.startsWith('d=') ? avatarDefault : `d=${avatarDefault}`
|
|
||||||
const artalk = result.data.map(function (e) {
|
|
||||||
=======
|
|
||||||
const { avatarCdn, avatarDefault } = await getAvatarValue()
|
const { avatarCdn, avatarDefault } = await getAvatarValue()
|
||||||
const artalk = result.data.map(e => {
|
const artalk = result.data.map(e => {
|
||||||
const avatar = avatarCdn && e.email_encrypted ? `${avatarCdn}${e.email_encrypted}?${avatarDefault}` : ''
|
const avatar = avatarCdn && e.email_encrypted ? `${avatarCdn}${e.email_encrypted}?${avatarDefault}` : ''
|
||||||
>>>>>>> dev
|
|
||||||
return {
|
return {
|
||||||
'avatar': avatar,
|
'avatar': avatar,
|
||||||
'content': changeContent(e.content_marked),
|
'content': changeContent(e.content_marked),
|
||||||
|
|||||||
Reference in New Issue
Block a user