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

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

View File

@@ -3,7 +3,7 @@
* galleryGroup and gallery
* {% galleryGroup [name] [descr] [url] [img] %}
*
* {% gallery [button] %}
* {% gallery [button],[limit],[firstLimit] %}
* {% gallery url,[url],[button] %}
*/
@@ -11,54 +11,66 @@
const urlFor = require('hexo-util').url_for.bind(hexo)
const gallery = (args, content) => {
args = args.join(' ').split(',')
let button = false
let type = 'data'
let dataStr = ''
const DEFAULT_LIMIT = 10
const DEFAULT_FIRST_LIMIT = 10
const IMAGE_REGEX = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
if (args[0] === 'url') {
[type, dataStr, button] = args // url,[link],[lazyload]
dataStr = urlFor(dataStr)
} else {
[button] = args // [lazyload]
const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
let m
const arr = []
while ((m = regex.exec(content)) !== null) {
if (m.index === regex.lastIndex) {
regex.lastIndex++
}
arr.push({
url: m[2],
alt: m[1],
title: m[3]
})
}
// Helper functions
const parseGalleryArgs = args => {
const [type, ...rest] = args.join(' ').split(',').map(arg => arg.trim())
return {
isUrl: type === 'url',
params: type === 'url' ? rest : [type, ...rest]
}
}
dataStr = JSON.stringify(arr)
const parseImageContent = content => {
const images = []
let match
while ((match = IMAGE_REGEX.exec(content)) !== null) {
images.push({
url: match[2],
alt: match[1] || '',
title: match[3] || ''
})
}
return `<div class="gallery-container" data-type="${type}" data-button="${button}">
<div class="gallery-items">${dataStr}</div>
</div>`
return images
}
const createGalleryHTML = (type, dataStr, button, limit, firstLimit) => {
return `<div class="gallery-container" data-type="${type}" data-button="${button}" data-limit="${limit}" data-first="${firstLimit}">
<div class="gallery-items">${dataStr}</div>
</div>`
}
const gallery = (args, content) => {
const { isUrl, params } = parseGalleryArgs(args)
if (isUrl) {
const [dataStr, button = false, limit = DEFAULT_LIMIT, firstLimit = DEFAULT_FIRST_LIMIT] = params
return createGalleryHTML('url', urlFor(dataStr), button, limit, firstLimit)
}
const [button = false, limit = DEFAULT_LIMIT, firstLimit = DEFAULT_FIRST_LIMIT] = params
const images = parseImageContent(content)
return createGalleryHTML('data', JSON.stringify(images), button, limit, firstLimit)
}
const galleryGroup = args => {
const [name, descr, url, img] = args
const imgUrl = urlFor(img)
const urlLink = urlFor(url)
const [name = '', descr = '', url = '', img = ''] = args.map(arg => arg.trim())
return `<figure class="gallery-group">
<img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
<figcaption>
<div class="gallery-group-name">${name}</div>
<p>${descr}</p>
<a href='${urlLink}'></a>
</figcaption>
</figure>
`
<img class="gallery-group-img no-lightbox" src='${urlFor(img)}' alt="Group Image Gallery">
<figcaption>
<div class="gallery-group-name">${name}</div>
<p>${descr}</p>
<a href='${urlFor(url)}'></a>
</figcaption>
</figure>`
}
// Register tags
hexo.extend.tag.register('gallery', gallery, { ends: true })
hexo.extend.tag.register('galleryGroup', galleryGroup)

View File

@@ -1,9 +1,9 @@
/**
* inlineImg 圖片
* @param {Array} args 圖片名稱和高度
* @param {string} args[0] 圖片名稱
* @param {number} args[1] 圖片高度
* @returns {string} 圖片標籤
* inlineImg
* @param {Array} args - Image name and height
* @param {string} args[0] - Image name
* @param {number} args[1] - Image height
* @returns {string} - Image tag
*/
'use strict'

View File

@@ -10,7 +10,7 @@ const { escapeHTML } = require('hexo-util')
const mermaid = (args, content) => {
return `<div class="mermaid-wrap"><pre class="mermaid-src" hidden>
${escapeHTML(content)}
${escapeHTML(content)}
</pre></div>`
}

View File

@@ -1,41 +1,50 @@
/**
* timeline
* by Jerry
* Timeline tag for Hexo
* Syntax:
* {% timeline [headline],[color] %}
* <!-- timeline [title] -->
* [content]
* <!-- endtimeline -->
* <!-- timeline [title] -->
* [content]
* <!-- endtimeline -->
* {% endtimeline %}
*/
'use strict'
const timeLineFn = (args, content) => {
const tlBlock = /<!--\s*timeline (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtimeline\s*-->/g
// Use named capture groups for better readability
const tlBlock = /<!--\s*timeline\s*(?<title>.*?)\s*-->\n(?<content>[\s\S]*?)<!--\s*endtimeline\s*-->/g
let result = ''
let color = ''
let text = ''
if (args.length) {
[text, color] = args.join(' ').split(',')
const mdContent = hexo.render.renderSync({ text, engine: 'markdown' })
result += `<div class='timeline-item headline'><div class='timeline-item-title'><div class='item-circle'>${mdContent}</div></div></div>`
}
// Pre-compile markdown render function
const renderMd = text => hexo.render.renderSync({ text, engine: 'markdown' })
const matches = []
let match
// Parse arguments more efficiently
const [text, color = ''] = args.length ? args.join(' ').split(',') : []
while ((match = tlBlock.exec(content)) !== null) {
matches.push(match[1])
matches.push(match[2])
}
// Build initial headline if text exists
const headline = text
? `<div class='timeline-item headline'>
<div class='timeline-item-title'>
<div class='item-circle'>${renderMd(text)}</div>
</div>
</div>`
: ''
for (let i = 0; i < matches.length; i += 2) {
const tlChildTitle = hexo.render.renderSync({ text: matches[i], engine: 'markdown' })
const tlChildContent = hexo.render.renderSync({ text: matches[i + 1], engine: 'markdown' })
// Match all timeline blocks in one pass and transform
const items = Array.from(content.matchAll(tlBlock))
.map(({ groups: { title, content } }) =>
`<div class='timeline-item'>
<div class='timeline-item-title'>
<div class='item-circle'>${renderMd(title)}</div>
</div>
<div class='timeline-item-content'>${renderMd(content)}</div>
</div>`
)
.join('')
const tlTitleHtml = `<div class='timeline-item-title'><div class='item-circle'>${tlChildTitle}</div></div>`
const tlContentHtml = `<div class='timeline-item-content'>${tlChildContent}</div>`
result += `<div class='timeline-item'>${tlTitleHtml + tlContentHtml}</div>`
}
return `<div class="timeline ${color || ''}">${result}</div>`
return `<div class="timeline ${color}">${headline}${items}</div>`
}
hexo.extend.tag.register('timeline', timeLineFn, { ends: true })