koishi-plugin-group-analysis-mx 1.2.3 → 1.2.5

package/lib/service/analysis.js

@@ -15,6 +15,8 @@ class AnalysisService extends koishi_1.Service {
     personaCache = new Map();
     personaProcessing = new Set();
     groupAnalysisCache = new Map();
+    // 群昵称缓存：官方 bot 消息作者名是个人昵称，群名片需通过 getGuildMember 获取
+    _groupNicknameCache = new Map();
     constructor(ctx, config) {
         super(ctx, 'group_analysis', true);
         this.config = config;
@@ -702,6 +704,31 @@ class AnalysisService extends koishi_1.Service {
         }
         await session.send(message);
     }
+    async resolveGroupNickname(bot, guildId, userId) {
+        if (!bot?.getGuildMember || !guildId || !userId)
+            return null;
+        const key = `${bot.selfId}:${guildId}:${userId}`;
+        const cached = this._groupNicknameCache.get(key);
+        if (cached) {
+            if (cached.expireAt > Date.now())
+                return cached.name;
+            this._groupNicknameCache.delete(key);
+        }
+        try {
+            const info = await bot.getGuildMember(guildId, userId);
+            const name = (info?.name || info?.user?.name || '').trim();
+            this._groupNicknameCache.set(key, {
+                name: name || null,
+                expireAt: Date.now() + (name ? 3600_000 : 60_000)
+            });
+            return name || null;
+        }
+        catch (error) {
+            // 无权限或调用失败，缓存失败状态 60 秒，避免反复请求
+            this._groupNicknameCache.set(key, { name: null, expireAt: Date.now() + 60_000 });
+            return null;
+        }
+    }
     async lookupUserProfileFromMessages(platform, selfId, userId) {
         try {
             const records = await this.ctx.database
@@ -806,9 +833,23 @@ class AnalysisService extends koishi_1.Service {
         });
         // Final statistics
         const sortedUsers = users.sort((a, b) => b.messageCount - a.messageCount);
+        // 群名片解析：官方 QQ bot 消息作者名是"个人昵称"，群名片需通过 getGuildMember 获取。
+        // 只对活跃的 top 用户调用，且带缓存避免重复请求。
+        const botForAvatar = this._getBot(selfId);
+        const guildIdForNick = target?.guildId;
+        const groupNicknameMap = new Map();
+        if (botForAvatar?.getGuildMember && guildIdForNick) {
+            const topUsers = sortedUsers.slice(0, Math.max(this.config.maxUsersInReport * 2, 20));
+            await Promise.all(topUsers.map(async (u) => {
+                const gname = await this.resolveGroupNickname(botForAvatar, guildIdForNick, String(u.userId));
+                if (gname)
+                    groupNicknameMap.set(String(u.userId), gname);
+            }));
+            if (groupNicknameMap.size)
+                this.ctx.logger.info(`已获取 ${groupNicknameMap.size} 个群成员的群名片。`);
+        }
         // 为用户补全真实头像：优先消息记录中的头像，其次按平台生成头像 URL。
         // 官方 QQ 机器人等平台下 userId 为 openid，不能直接使用 QQ 号头像接口。
-        const botForAvatar = this._getBot(selfId);
         const avatarMap = new Map();
         for (const user of sortedUsers) {
             if (!user.avatar) {
@@ -816,23 +857,26 @@ class AnalysisService extends koishi_1.Service {
             }
             avatarMap.set(String(user.userId), user.avatar || '');
         }
-        // 昵称 → 原始昵称 / 头像 映射（金句、称号用），并对 emoji/空白做归一化以增强匹配。
-        // LLM 返回的 sender/name 常丢失 emoji，这里用真实昵称（含 emoji）替换显示。
+        // 昵称映射：统一用群名片作为显示名。LLM 生成的 sender/name 很可能是"个人昵称"，
+        // 这里把个人昵称（含/不含 emoji）归一化后映射到群名片。
         const nicknameAvatarMap = new Map();
         const nicknameMap = new Map();
         for (const user of sortedUsers) {
-            if (user.nickname) {
-                const normalized = (0, utils_1.normalizeNickname)(user.nickname);
-                if (!nicknameMap.has(user.nickname))
-                    nicknameMap.set(user.nickname, user.nickname);
-                if (normalized && !nicknameMap.has(normalized))
-                    nicknameMap.set(normalized, user.nickname);
-                if (user.avatar) {
-                    nicknameAvatarMap.set(user.nickname, user.avatar);
-                    if (normalized && !nicknameAvatarMap.has(normalized))
-                        nicknameAvatarMap.set(normalized, user.avatar);
-                }
-            }
+            const rawName = user.nickname;
+            const displayName = groupNicknameMap.get(String(user.userId)) || rawName;
+            if (rawName) {
+                const normRaw = (0, utils_1.normalizeNickname)(rawName);
+                nicknameMap.set(normRaw || rawName, displayName);
+                nicknameMap.set((0, utils_1.normalizeNickname)(displayName) || displayName, displayName);
+            }
+            if (user.avatar) {
+                nicknameAvatarMap.set(rawName, user.avatar);
+                const normRaw = (0, utils_1.normalizeNickname)(rawName);
+                if (normRaw)
+                    nicknameAvatarMap.set(normRaw, user.avatar);
+            }
+            // 排行榜显示名使用群名片
+            user.nickname = displayName;
         }
         // 用户称号：用真实昵称替换 LLM 生成的 name（保留 emoji），并补全头像
         if (Array.isArray(userTitles)) {

package/lib/service/renderer.js

@@ -29,6 +29,10 @@ class RendererService extends koishi_1.Service {
         return path_1.default.resolve(this.templateDir, skin, filename);
     }
     async imageToBase64(url) {
+        // 已内联的 data URI 直接返回，无需再下载
+        if (typeof url === 'string' && url.startsWith('data:')) {
+            return url;
+        }
         try {
             this.ctx.logger.debug(`转换图片为 Base64: ${url}`);
             const response = await fetch(url);
@@ -191,6 +195,15 @@ class RendererService extends koishi_1.Service {
         // 等待字体加载完成
         await page.evaluate(() => document.fonts.ready);
         this.ctx.logger.info('字体加载完成。');
+        // 等待页面内图片加载完成（避免截图像素缺失/头像空白），最多等待 8 秒
+        await Promise.race([
+            page.evaluate(() => Promise.all(Array.from(document.images)
+                .filter((img) => !img.complete)
+                .map((img) => new Promise((resolve) => {
+                    img.onload = img.onerror = resolve;
+                })))),
+            new Promise((resolve) => setTimeout(resolve, 8000))
+        ]).catch(() => { });
         // 设置 3 分钟后自动删除临时文件
         this.ctx.setTimeout(async () => {
             try {
@@ -259,12 +272,15 @@ class RendererService extends koishi_1.Service {
         catch (err) {
             this.ctx.logger.debug(`等待字体加载超时: ${err}`);
         }
-        // 等待图片加载完成（头像等）
-        await page.evaluate(() => Promise.all(Array.from(document.images)
-            .filter((img) => !img.complete)
-            .map((img) => new Promise((resolve) => {
-            img.onload = img.onerror = resolve;
-        })))).catch(() => { });
+        // 等待图片加载完成（头像等），最多等待 8 秒
+        await Promise.race([
+            page.evaluate(() => Promise.all(Array.from(document.images)
+                .filter((img) => !img.complete)
+                .map((img) => new Promise((resolve) => {
+                    img.onload = img.onerror = resolve;
+                })))),
+            new Promise((resolve) => setTimeout(resolve, 8000))
+        ]).catch(() => { });
         this.ctx.setTimeout(async () => {
             try {
                 await fs_1.promises.unlink(outTemplateHtmlPath);
@@ -298,20 +314,33 @@ class RendererService extends koishi_1.Service {
                 : (t.contributors || '')
         }));
         // 用户称号：原项目子模板使用 title.avatar_data / title.name / title.title / title.mbti / title.reason
-        const titles = (data.userTitles || []).map((t) => ({
+        // 头像统一转成 base64 内联，避免外网加载失败导致头像空白
+        const avatarBase64Cache = new Map();
+        const toBase64 = async (url) => {
+            if (!url)
+                return '';
+            if (url.startsWith('data:'))
+                return url;
+            if (avatarBase64Cache.has(url))
+                return avatarBase64Cache.get(url);
+            const b64 = await this.imageToBase64(url);
+            avatarBase64Cache.set(url, b64);
+            return b64;
+        };
+        const titles = await Promise.all((data.userTitles || []).map(async (t) => ({
             name: t.name || '',
             title: t.title || '',
             mbti: t.mbti || '',
             reason: t.reason || '',
-            avatar_data: t.avatar || ''
-        }));
+            avatar_data: t.avatar ? await toBase64(t.avatar) : ''
+        })));
         // 金句：原项目子模板使用 quote.avatar_url / quote.sender / quote.content / quote.reason
-        const quotes = (data.goldenQuotes || []).map((q) => ({
+        const quotes = await Promise.all((data.goldenQuotes || []).map(async (q) => ({
             sender: q.sender || '',
             content: q.content || '',
             reason: q.reason || '',
-            avatar_url: q.avatar || ''
-        }));
+            avatar_url: q.avatar ? await toBase64(q.avatar) : ''
+        })));
         // 渲染子模板为 HTML 字符串
         let topicsHtml = '';
         let titlesHtml = '';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koishi-plugin-group-analysis-mx",
     "description": "群聊分析插件 - 生成精美群聊统计报告，支持 AI 话题总结（独立版，不依赖 ChatLuna）",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "main": "lib/index.js",
     "module": "lib/index.mjs",
     "typings": "lib/index.d.ts",