koishi-plugin-ll-mc 1.0.1 → 1.0.2

package/lib/index.js

@@ -51,6 +51,84 @@ exports.inject = {
     optional: ["markdownToImage", "puppeteer", "canvas"],
 };
 const logger = new koishi_1.Logger("mc");
+// ===== 官方QQ平台 群名/群昵称 修复补丁 =====
+const nameCache = { channel: new Map(), member: new Map() };
+const NAME_CACHE_TTL = 60 * 60 * 1000; // 缓存 1 小时，避免官方接口限频
+function cacheGet(map, key) {
+    const item = map.get(key);
+    return item && Date.now() - item.t < NAME_CACHE_TTL ? item.v : undefined;
+}
+function cacheSet(map, key, value) {
+    map.set(key, { v: value, t: Date.now() });
+}
+async function resolveUsername(session, userId) {
+    const author = session.author;
+    if (author?.nick)
+        return author.nick; // OneBot：昵称在这
+    if (author?.name)
+        return author.name;
+    // 官方QQ平台：群消息原始事件自带 member.nick，零 API 调用
+    const raw = session.event?._data?.d;
+    if (raw?.member?.nick)
+        return raw.member.nick;
+    if (raw?.author?.username)
+        return raw.author.username;
+    // 兜底：调用 getGuildMember（官方 adapter 已实现）
+    const guildId = session.guildId || session.channelId;
+    const key = `${guildId}:${userId}`;
+    const cached = cacheGet(nameCache.member, key);
+    if (cached)
+        return cached;
+    if (guildId && typeof session.bot?.getGuildMember === "function") {
+        try {
+            const member = await session.bot.getGuildMember(guildId, userId);
+            const name = member?.name || member?.user?.name;
+            if (name) {
+                cacheSet(nameCache.member, key, name);
+                return name;
+            }
+        }
+        catch (e) {
+            logger.warn(`[mc] 获取成员昵称失败 ${userId}:`, e);
+        }
+    }
+    return userId;
+}
+async function resolveChannelName(session) {
+    if (session.event?.channel?.name)
+        return session.event.channel.name; // OneBot 走这里
+    const channelId = session.channelId;
+    const cached = cacheGet(nameCache.channel, channelId);
+    if (cached)
+        return cached;
+    const bot = session.bot;
+    if (typeof bot?.getChannel === "function") {
+        try {
+            const ch = await bot.getChannel(channelId);
+            if (ch?.name) {
+                cacheSet(nameCache.channel, channelId, ch.name);
+                return ch.name;
+            }
+        }
+        catch { /* 官方QQ对群无效，继续走 getGuild */ }
+    }
+    // 官方QQ平台：群信息走 getGuild（内部 getGuildInfo 返回群名）
+    const guildId = session.guildId || channelId;
+    if (guildId && typeof bot?.getGuild === "function") {
+        try {
+            const g = await bot.getGuild(guildId);
+            if (g?.name) {
+                cacheSet(nameCache.channel, channelId, g.name);
+                return g.name;
+            }
+        }
+        catch (e) {
+            logger.warn(`[mc] 获取群名失败 ${guildId}:`, e);
+        }
+    }
+    return channelId;
+}
+// ===== 补丁结束 =====
 // --- 定义字体选项常量 ---
 const FONT_OPTIONS = {
     TITLE: "HarmonyOS_Sans_Medium",
@@ -503,12 +581,10 @@ async function apply(ctx, config) {
             return next();
         session[PROCESSED] = true;
         const { userId, channelId, author } = session;
-        let sessionChannelName = session.event.channel.name;
-        const username = author?.nick || author?.name || userId;
+        const username = await resolveUsername(session, userId);
         const userAvatar = author?.avatar;
         try {
-            const channelName = sessionChannelName ||
-                (channelId ? await getChannelName(session.bot, channelId) : channelId);
+            const channelName = channelId ? await resolveChannelName(session) : channelId;
             await ctx.database.upsert("message_counter_records", (row) => [
                 {
                     channelId,
@@ -536,16 +612,13 @@ async function apply(ctx, config) {
             if (!session.channelId)
                 return;
             const { channelId, bot } = session;
-            let sessionChannelName = session.event.channel.name;
             const botUser = bot.user;
             if (!botUser) {
                 logger.warn("Bot user is undefined, skipping bot message tracking.");
                 return;
             }
             try {
-                const channelName = sessionChannelName ||
-                    (await getChannelName(bot, channelId)) ||
-                    channelId;
+                const channelName = (await resolveChannelName(session)) || channelId;
                 await ctx.database.upsert("message_counter_records", (row) => [
                     {
                         channelId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ll-mc",
   "description": "消息统计插件（克隆自 message-counter），支持排除指定群聊",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [