koishi-plugin-ll-mc 2.1.0 → 2.2.0

package/index.js

@@ -1,15 +1,18 @@
 'use strict'
 
-// koishi-plugin-ll-mc v2.1.0（照抄 astrbot_plugin_message_stats 功能 + 新增群排行）
+// koishi-plugin-ll-mc v2.2.0（照抄 astrbot_plugin_message_stats 功能 + 新增群排行）
 // 参考：https://github.com/xiaoruange39/astrbot_plugin_message_stats
 // 移植到 Koishi 的功能：
-//   - 发言榜（今日/昨日/本周/本月/本年/去年/总榜，文字或图片）
+//   - 发言榜（今日/昨日/本周/本月/本年/去年/总榜，文字或图片，5套主题卡片）
 //   - 群发言榜（新增：跨群排行，群名正确）
 //   - 我的发言 / 发言榜帮助
 //   - 设置发言榜数量 / 设置发言榜图片 / 清除发言榜单
 //   - 定时推送（自动 + 手动）
 // 官机（官方QQ）适配：昵称取消息自带，群名走 getGuild + groupNameMap 手动指定兜底
+// 排行图片：移植原版 templates/*.html（Jinja2 → 本地迷你渲染器），puppeteer 截图
 
+const fs = require('fs')
+const path = require('path')
 const { Schema, h } = require('koishi')
 
 exports.name = 'll-mc'
@@ -51,6 +54,13 @@ const Config = Schema.object({
     Schema.const('text').description('始终文字'),
     Schema.const('image').description('始终图片（无服务时降级文字）'),
   ]).default('auto').description('排行显示模式'),
+  rankTheme: Schema.union([
+    Schema.const('default').description('默认（浅蓝卡片）'),
+    Schema.const('cartoon_dark').description('卡通深色'),
+    Schema.const('cartoon_light').description('卡通浅色'),
+    Schema.const('liquid_glass').description('液态玻璃（浅）'),
+    Schema.const('liquid_glass_dark').description('液态玻璃（深）'),
+  ]).default('default').description('排行图片主题'),
   ignoredGroups: Schema.array(String)
     .default([])
     .description('不统计的群（填群ID，官机填 openid）'),
@@ -84,7 +94,7 @@ const Config = Schema.object({
 
 exports.Config = Config
 
-exports.inject = { required: ['database'] }
+exports.inject = { required: ['database'], optional: ['puppeteer'] }
 
 function apply(ctx, config) {
   const logger = ctx.logger('ll-mc')
@@ -94,6 +104,7 @@ function apply(ctx, config) {
     channelId: 'string',
     userId: 'string',
     nick: 'string',
+    avatar: 'string',
     date: 'string',
     count: 'unsigned',
   }, { primary: ['channelId', 'userId', 'date'] })
@@ -286,8 +297,9 @@ function apply(ctx, config) {
       const rows = await ctx.database.get('ll_mc_stats', { channelId: guildId, userId, date })
       const count = (rows[0]?.count || 0) + 1
       const nick = await resolveNick(session, userId)
+      const avatar = session.author?.avatar || rows[0]?.avatar || ''
       await ctx.database.upsert('ll_mc_stats', [{
-        channelId: guildId, userId, date, nick, count,
+        channelId: guildId, userId, date, nick, avatar, count,
       }], ['channelId', 'userId', 'date'])
       if (config.verbose) logger.info(`[ll-mc] ${guildId} ${userId} +1 (${count})`)
     }
@@ -309,47 +321,212 @@ function apply(ctx, config) {
     const map = new Map()
     for (const row of rows) {
       const key = groupBy === 'user' ? `${row.channelId}:${row.userId}` : row.channelId
-      const item = map.get(key) || { count: 0, nick: row.nick }
+      const item = map.get(key) || { count: 0, nick: '', avatar: '', lastDate: '' }
       item.count += row.count || 0
       if (row.nick) item.nick = row.nick
+      if (row.avatar) item.avatar = row.avatar
+      if (row.date > item.lastDate) item.lastDate = row.date
       map.set(key, item)
     }
     return [...map.entries()].map(([key, item]) => ({ key, ...item }))
       .sort((a, b) => b.count - a.count)
   }
 
-  // ===== 图片渲染（puppeteer，可选） =====
-  async function renderRankImage(title, subtitle, rows) {
+  // ===== 迷你 Jinja2 渲染器（原版模板用 Jinja2 语法） =====
+  function renderJinja(tpl, ctx) {
+    tpl = tpl.replace(/\{% raw %\}([\s\S]*?)\{% endraw %\}/g, '$1')
+    const out = []
+    let i = 0
+    while (i < tpl.length) {
+      const open = tpl.indexOf('{%', i)
+      const expr = tpl.indexOf('{{', i)
+      if (open === -1 && expr === -1) { out.push(tpl.slice(i)); break }
+      let next, isBlock
+      if (open !== -1 && (expr === -1 || open < expr)) { next = open; isBlock = true }
+      else { next = expr; isBlock = false }
+      out.push(tpl.slice(i, next))
+      if (isBlock) {
+        const close = tpl.indexOf('%}', next)
+        if (close === -1) { out.push(tpl.slice(next)); break }
+        const tag = tpl.slice(next + 2, close).trim()
+        const m = tag.match(/^(\w+)\s*([\s\S]*)$/)
+        const kind = m[1]
+        const rest = (m[2] || '').trim()
+        if (kind === 'if') {
+          const endIdx = findEndif(tpl, close + 2)
+          if (endIdx === -1) { out.push(tpl.slice(next)); break }
+          const body = tpl.slice(close + 2, endIdx)
+          const branches = splitIfBranches(rest, body)
+          for (const [cond, branchBody] of branches) {
+            if (cond === null || evalExpr(cond, ctx)) {
+              out.push(renderJinja(branchBody, ctx))
+              break
+            }
+          }
+          i = endIdx + 8
+          continue
+        }
+        if (kind === 'for') {
+          const endIdx = tpl.indexOf('{% endfor %}', close)
+          if (endIdx === -1) { out.push(tpl.slice(next)); break }
+          const body = tpl.slice(close + 2, endIdx)
+          const fm = rest.match(/^(\w+)\s+in\s+(\w+)$/)
+          const arr = fm ? (ctx[fm[2]] || []) : []
+          for (const it of arr) {
+            out.push(renderJinja(body, { ...ctx, [fm[1]]: it }))
+          }
+          i = endIdx + 12
+          continue
+        }
+        if (kind === 'set') {
+          const sm = rest.match(/^(\w+)\s*=\s*([\s\S]+)$/)
+          if (sm) ctx[sm[1]] = evalExpr(sm[2], ctx)
+          i = close + 2
+          continue
+        }
+        i = close + 2
+        continue
+      }
+      else {
+        const close = tpl.indexOf('}}', next)
+        if (close === -1) { out.push(tpl.slice(next)); break }
+        const ex = tpl.slice(next + 2, close).trim()
+        out.push(String(evalExpr(ex, ctx)))
+        i = close + 2
+      }
+    }
+    return out.join('')
+  }
+  function findEndif(tpl, from) {
+    let depth = 1
+    const re = /\{%\s*(if(?:\s+[\s\S]*?)?|endif)\s*%\}/g
+    re.lastIndex = from
+    let m
+    while ((m = re.exec(tpl))) {
+      if (m[1].startsWith('if')) depth++
+      else { depth--; if (depth === 0) return m.index }
+    }
+    return -1
+  }
+  function splitIfBranches(firstCond, body) {
+    const branches = [[firstCond, '']]
+    const re = /\{%\s*elif\s+([\s\S]*?)\s*%\}|\{%\s*else\s*%\}/g
+    let last = 0
+    let m
+    while ((m = re.exec(body))) {
+      branches[branches.length - 1][1] = body.slice(last, m.index)
+      if (m[1] !== undefined) branches.push([m[1].trim(), ''])
+      else branches.push([null, ''])
+      last = re.lastIndex
+    }
+    branches[branches.length - 1][1] = body.slice(last)
+    return branches
+  }
+  function resolvePath(ctx, p) {
+    const parts = p.replace(/\[(\d+)\]/g, '.$1').split('.')
+    let v = ctx
+    for (const part of parts) {
+      if (v == null) return undefined
+      v = v[part]
+    }
+    return v
+  }
+  function evalExpr(expr, ctx) {
+    expr = expr.trim()
+    if (expr.startsWith('(') && expr.endsWith(')')) expr = expr.slice(1, -1).trim()
+    // | format 过滤器： "%.2f"|format(x)
+    const fmt = expr.match(/^"([^"]*)"\s*\|\s*format\(([\s\S]*)\)$/)
+    if (fmt) {
+      const v = evalExpr(fmt[2], ctx)
+      const fm = fmt[1].match(/%\.(\d+)f/)
+      return fm ? Number(v).toFixed(parseInt(fm[1], 10)) : String(v)
+    }
+    if (expr.endsWith('| safe')) expr = expr.slice(0, -6).trim()
+    // 三元：A if COND else B
+    const ternary = expr.match(/^([\s\S]*?)\s+if\s+([\s\S]+?)\s+else\s+([\s\S]+)$/)
+    if (ternary) return evalExpr(ternary[2], ctx) ? evalExpr(ternary[1], ctx) : evalExpr(ternary[3], ctx)
+    // 拼接 A + B（在 or 之前处理，支持 (a or b) + 'x'）
+    const plus = expr.match(/^([\s\S]*?)\s*\+\s*([\s\S]+)$/)
+    if (plus) return String(evalExpr(plus[1], ctx)) + String(evalExpr(plus[2], ctx))
+    // or 回退
+    const orM = expr.match(/^([\s\S]*?)\s+or\s+([\s\S]+)$/)
+    if (orM) return evalExpr(orM[1], ctx) || evalExpr(orM[2], ctx)
+    // in 子串
+    const inM = expr.match(/^([\s\S]*?)\s+in\s+([\s\S]+)$/)
+    if (inM) return String(evalExpr(inM[2], ctx)).includes(String(evalExpr(inM[1], ctx)))
+    // 比较
+    const cmp = expr.match(/^([\s\S]*?)\s*(==|!=|>=|<=|>|<)\s*([\s\S]+)$/)
+    if (cmp) {
+      const a = evalExpr(cmp[1], ctx)
+      const b = evalExpr(cmp[3], ctx)
+      switch (cmp[2]) {
+        case '==': return a == b
+        case '!=': return a != b
+        case '>=': return a >= b
+        case '<=': return a <= b
+        case '>': return a > b
+        case '<': return a < b
+      }
+    }
+    // 字符串字面量
+    const str = expr.match(/^(['"])([\s\S]*?)\1$/)
+    if (str) return str[2]
+    // 方法调用：title.split(']', 1)
+    const call = expr.match(/^([\w$]+(?:\.[\w$]+)*)\(([\s\S]*)\)$/)
+    if (call) {
+      const dot = call[1].lastIndexOf('.')
+      const method = dot === -1 ? '' : call[1].slice(dot + 1)
+      const objPath = dot === -1 ? call[1] : call[1].slice(0, dot)
+      const base = resolvePath(ctx, objPath)
+      const args = call[2].split(',').map(a => evalExpr(a.trim(), ctx))
+      if (method === 'split') {
+        const parts = String(base).split(args[0])
+        const maxsplit = args.length > 1 ? parseInt(args[1], 10) : undefined
+        if (maxsplit > 0 && parts.length > maxsplit) {
+          return parts.slice(0, maxsplit).concat([parts.slice(maxsplit).join(args[0])])
+        }
+        return parts
+      }
+      return ''
+    }
+    // 数字
+    if (/^-?\d+$/.test(expr)) return parseInt(expr, 10)
+    // 路径/裸变量
+    return resolvePath(ctx, expr) ?? ''
+  }
+
+  // ===== 模板加载 + 图片渲染（puppeteer，可选） =====
+  const templateCache = new Map()
+  function loadTemplate(theme) {
+    const name = theme === 'default' ? 'rank_template' : `rank_template_${theme}`
+    const cached = templateCache.get(name)
+    if (cached) return cached
+    try {
+      const html = fs.readFileSync(path.join(__dirname, 'templates', `${name}.html`), 'utf8')
+      templateCache.set(name, html)
+      return html
+    }
+    catch (e) {
+      logger.warn(`[ll-mc] 模板 ${name} 加载失败，回退默认:`, e?.message)
+      return null
+    }
+  }
+  async function renderRankImage(theme, data) {
     try {
       if (typeof ctx.puppeteer?.page !== 'function') return null
+      const tpl = loadTemplate(theme)
+      if (!tpl) return null
+      const html = renderJinja(tpl, data)
       const page = await ctx.puppeteer.page()
-      const body = rows.map((r, i) => `
-        <div class="row">
-          <div class="no">${i + 1}</div>
-          <div class="name">${escapeHtml(r.name)}${r.mark ? ' <span class="star">★</span>' : ''}</div>
-          <div class="bar"><div class="fill" style="width:${r.percent}%"></div></div>
-          <div class="count">${r.count} 条</div>
-        </div>`).join('')
-      await page.setContent(`<!DOCTYPE html><html><head><meta charset="utf-8"><style>
-        body{margin:0;background:linear-gradient(135deg,#1a1a2e,#16213e);font-family:sans-serif;color:#fff;padding:24px;width:900px}
-        .title{font-size:28px;font-weight:bold;margin-bottom:4px}
-        .sub{font-size:14px;color:#8a94b8;margin-bottom:16px}
-        .row{display:flex;align-items:center;background:rgba(255,255,255,.06);border-radius:10px;padding:10px 14px;margin-bottom:8px}
-        .no{width:36px;font-size:18px;font-weight:bold;color:#ffd166;flex-shrink:0}
-        .name{width:220px;font-size:16px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;flex-shrink:0}
-        .star{color:#ffd166}
-        .bar{flex:1;height:10px;background:rgba(255,255,255,.12);border-radius:5px;margin:0 12px;overflow:hidden}
-        .fill{height:100%;background:linear-gradient(90deg,#06b6d4,#3b82f6);border-radius:5px}
-        .count{width:80px;text-align:right;font-size:15px;color:#a5f3fc;flex-shrink:0}
-      </style></head><body>
-        <div class="title">${escapeHtml(title)}</div>
-        <div class="sub">${escapeHtml(subtitle)}</div>
-        ${body}
-      </body></html>`, { waitUntil: 'networkidle0' })
-      await page.waitForSelector('.title')
-      const buf = await page.screenshot({ type: 'png' })
-      await page.close().catch(() => {})
-      return buf
+      try {
+        await page.setContent(html, { waitUntil: 'networkidle0', timeout: 20000 })
+      }
+      catch { /* 图片加载超时等，用当前内容截图 */ }
+      await page.waitForSelector('.rank-card').catch(() => {})
+      const buf = await page.screenshot({ type: 'png', fullPage: true })
+      // 官机适配器只支持 data:image 内联图片；h.image(Buffer) 会生成 base64:// 协议导致发送失败
+      const src = `data:image/png;base64,${buf.toString('base64')}`
+      return { src, close: () => page.close().catch(() => {}) }
     }
     catch (e) {
       logger.warn('[ll-mc] 排行图片渲染失败，降级文字:', e?.message)
@@ -361,6 +538,10 @@ function apply(ctx, config) {
       '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;',
     }[c]))
   }
+  // 默认头像（灰色圆形 SVG）
+  const PLACEHOLDER_AVATAR = 'data:image/svg+xml;base64,' + Buffer.from(
+    '<svg xmlns="http://www.w3.org/2000/svg" width="75" height="75"><circle cx="37.5" cy="37.5" r="37.5" fill="#cbd5e1"/><text x="37.5" y="46" font-size="28" text-anchor="middle" fill="#64748b">?</text></svg>'
+  ).toString('base64')
 
   // ===== 命令：发言榜（成员） =====
   async function memberRanking(session, period, limit) {
@@ -376,15 +557,43 @@ function apply(ctx, config) {
     const groupRows = await ctx.database.get('ll_mc_stats', { channelId: session.guildId })
     const totalAll = groupRows.reduce((s, r) => s + (r.count || 0), 0)
     const totalRange = inGroup.reduce((s, x) => s + x.count, 0)
+    const groupName = await getGroupName(session.guildId)
 
     const title = `${range.label}发言排行 TOP ${Math.min(n, inGroup.length)}`
     const subtitle = `本群${range.label}共 ${totalRange} 条 · 历史累计 ${totalAll} 条`
-    const rows = top.map(x => {
-      const isMine = x.key === `${session.guildId}:${session.userId}`
-      return { name: x.nick || x.key.split(':')[1], count: x.count, percent: Math.max(top[0].count ? Math.round(x.count / top[0].count * 100) : 0, 2), mark: isMine }
+    // 当前用户不在榜单内时，追加一行（带分隔线）
+    const items = top.map((x, i) => ({
+      rank: i + 1,
+      nickname: x.nick || x.key.split(':')[1],
+      avatar_url: x.avatar || PLACEHOLDER_AVATAR,
+      total: x.count,
+      percentage: totalRange ? (x.count / totalRange * 100) : 0,
+      last_date: x.lastDate || '未知',
+      is_current_user: x.key === `${session.guildId}:${session.userId}`,
+      is_separator: false,
+      title: '',
+      title_color: '',
+    }))
+    if (mine && !items.some(it => it.is_current_user)) {
+      items.push({
+        rank: inGroup.indexOf(mine) + 1,
+        nickname: mine.nick || session.userId,
+        avatar_url: mine.avatar || PLACEHOLDER_AVATAR,
+        total: mine.count,
+        percentage: totalRange ? (mine.count / totalRange * 100) : 0,
+        last_date: mine.lastDate || '未知',
+        is_current_user: true,
+        is_separator: true,
+        title: '',
+        title_color: '',
+      })
+    }
+    const img = await renderRankImage(config.rankTheme, {
+      title, group_name: groupName, group_id: session.guildId, show_group_id: false,
+      total_messages: totalRange, current_time: new Date().toLocaleString('zh-CN'),
+      user_items: items, llm_token_info: '', custom_font_css: '',
     })
-    const buf = await renderRankImage(title, subtitle, rows)
-    if (buf) return h.image(buf)
+    if (img) { img.close(); return h.image(img.src) }
     const lines = [`📊 ${title}`]
     top.forEach((x, i) => {
       const mark = x.key === `${session.guildId}:${session.userId}` ? ' ★' : ''
@@ -404,15 +613,31 @@ function apply(ctx, config) {
     const list = await aggregateStats(range, 'group')
     const top = list.slice(0, n)
     const current = session.guildId
-    const rows = []
-    for (const x of top) {
+    const items = []
+    for (let i = 0; i < top.length; i++) {
+      const x = top[i]
       const name = await getGroupName(x.key)
-      rows.push({ name, count: x.count, percent: Math.max(top[0].count ? Math.round(x.count / top[0].count * 100) : 0, 2), mark: x.key === current })
+      items.push({
+        rank: i + 1,
+        nickname: name,
+        avatar_url: groupAvatarUrl(x.key) || PLACEHOLDER_AVATAR,
+        total: x.count,
+        percentage: top[0]?.count ? (x.count / top[0].count * 100) : 0,
+        last_date: x.lastDate || '未知',
+        is_current_user: x.key === current,
+        is_separator: false,
+        title: '',
+        title_color: '',
+      })
     }
     const title = `群${range.label}发言排行 TOP ${Math.min(n, top.length)}`
-    const subtitle = '跨群排行 · 群名来自 getGuild（需"获取群信息"权限）或 groupNameMap'
-    const buf = await renderRankImage(title, subtitle, rows)
-    if (buf) return h.image(buf)
+    const img = await renderRankImage(config.rankTheme, {
+      title, group_name: '跨群排行', group_id: '', show_group_id: false,
+      total_messages: top.reduce((s, x) => s + x.count, 0),
+      current_time: new Date().toLocaleString('zh-CN'),
+      user_items: items, llm_token_info: '', custom_font_css: '',
+    })
+    if (img) { img.close(); return h.image(img.src) }
     const lines = [`🏆 ${title}`]
     for (let i = 0; i < top.length; i++) {
       const x = top[i]
@@ -420,9 +645,16 @@ function apply(ctx, config) {
       const mark = x.key === current ? ' ★当前群' : ''
       lines.push(`${i + 1}. ${name} · ${x.count}条${mark}`)
     }
-    lines.push(`—— ${subtitle}`)
+    lines.push('—— 群名来自 getGuild（需"获取群信息"权限）或 groupNameMap')
     return lines.join('\n')
   }
+  // 群头像：数字群号走 p.qlogo；openid 尝试 qqapp；失败用占位
+  function groupAvatarUrl(guildId) {
+    if (/^\d+$/.test(guildId)) return `https://p.qlogo.cn/gh/${guildId}/${guildId}/100`
+    const qqBot = (ctx.bots || []).find(b => b.platform === 'qq' && b.config?.id)
+    if (qqBot?.config?.id) return `https://q.qlogo.cn/qqapp/${qqBot.config.id}/${guildId}/640`
+    return PLACEHOLDER_AVATAR
+  }
 
   // ===== 命令：我的发言 =====
   async function myStats(session) {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "koishi-plugin-ll-mc",
   "description": "消息统计插件（重做版）：群成员发言排行 + 跨群发言排行，官方QQ机器人原生适配",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "main": "index.js",
   "files": [
-    "index.js"
+    "index.js",
+    "templates"
   ],
   "koishi": {
     "description": {