koishi-plugin-ll-mc 1.0.2 → 1.0.4

package/lib/index.js

@@ -54,6 +54,7 @@ const logger = new koishi_1.Logger("mc");
 // ===== 官方QQ平台 群名/群昵称 修复补丁 =====
 const nameCache = { channel: new Map(), member: new Map() };
 const NAME_CACHE_TTL = 60 * 60 * 1000; // 缓存 1 小时，避免官方接口限频
+const warnThrottle = new Map(); // key -> lastWarnTime
 function cacheGet(map, key) {
     const item = map.get(key);
     return item && Date.now() - item.t < NAME_CACHE_TTL ? item.v : undefined;
@@ -61,6 +62,15 @@ function cacheGet(map, key) {
 function cacheSet(map, key, value) {
     map.set(key, { v: value, t: Date.now() });
 }
+// 同类警告 10 分钟内只打一次，避免刷屏
+function throttledWarn(key, message) {
+    const now = Date.now();
+    const last = warnThrottle.get(key) || 0;
+    if (now - last < 10 * 60 * 1000)
+        return;
+    warnThrottle.set(key, now);
+    logger.warn(message);
+}
 async function resolveUsername(session, userId) {
     const author = session.author;
     if (author?.nick)
@@ -73,13 +83,15 @@ async function resolveUsername(session, userId) {
         return raw.member.nick;
     if (raw?.author?.username)
         return raw.author.username;
-    // 兜底：调用 getGuildMember（官方 adapter 已实现）
-    const guildId = session.guildId || session.channelId;
+    // 兜底：调用 getGuildMember（仅限群聊；私聊没有群，直接返回 userId）
+    const guildId = session.guildId;
+    if (!guildId || session.isDirect)
+        return userId;
     const key = `${guildId}:${userId}`;
     const cached = cacheGet(nameCache.member, key);
     if (cached)
         return cached;
-    if (guildId && typeof session.bot?.getGuildMember === "function") {
+    if (typeof session.bot?.getGuildMember === "function") {
         try {
             const member = await session.bot.getGuildMember(guildId, userId);
             const name = member?.name || member?.user?.name;
@@ -89,7 +101,7 @@ async function resolveUsername(session, userId) {
             }
         }
         catch (e) {
-            logger.warn(`[mc] 获取成员昵称失败 ${userId}:`, e);
+            throttledWarn(`member:${key}`, `[mc] 获取成员昵称失败 ${userId}: ${e?.message}（若为 11253 应用无接口访问权限，请到 QQ 开放平台申请"获取群成员信息"权限）`);
         }
     }
     return userId;
@@ -98,6 +110,9 @@ async function resolveChannelName(session) {
     if (session.event?.channel?.name)
         return session.event.channel.name; // OneBot 走这里
     const channelId = session.channelId;
+    // 私聊或没有群上下文：不调用群接口（官机 C2C 的 channelId 是用户 openid，不是群）
+    if (session.isDirect || !session.guildId)
+        return channelId;
     const cached = cacheGet(nameCache.channel, channelId);
     if (cached)
         return cached;
@@ -113,8 +128,8 @@ async function resolveChannelName(session) {
         catch { /* 官方QQ对群无效，继续走 getGuild */ }
     }
     // 官方QQ平台：群信息走 getGuild（内部 getGuildInfo 返回群名）
-    const guildId = session.guildId || channelId;
-    if (guildId && typeof bot?.getGuild === "function") {
+    const guildId = session.guildId;
+    if (typeof bot?.getGuild === "function") {
         try {
             const g = await bot.getGuild(guildId);
             if (g?.name) {
@@ -123,7 +138,7 @@ async function resolveChannelName(session) {
             }
         }
         catch (e) {
-            logger.warn(`[mc] 获取群名失败 ${guildId}:`, e);
+            throttledWarn(`guild:${guildId}`, `[mc] 获取群名失败 ${guildId}: ${e?.message}（若为 11253/11255，请到 QQ 开放平台申请"获取群信息"权限，或确认机器人仍在该群）`);
         }
     }
     return channelId;
@@ -1943,11 +1958,31 @@ async function apply(ctx, config) {
                 (channelInfo[channelId]?.channelName || `群聊${channelId}`),
             // 使用 channelId 作为 RankingData 的 userId 和头像源
             userId: channelId,
-            avatar: `https://p.qlogo.cn/gh/${channelId === "#" ? "426230045" : channelId}/${channelId === "#" ? "426230045" : channelId}/100`, // QQ群头像URL格式
+            avatar: groupAvatarUrl(channelId),
             count,
             percentage: calculatePercentage(count, totalCount),
         }));
     }
+    /**
+     * 群头像 URL：
+     * - "#"：占位群号
+     * - 数字群号（OneBot/NapCat）：p.qlogo.cn/gh/{群号}
+     * - 官机 openid（32位十六进制）：官方 API 不提供群头像，尝试与成员头像同源的 qqapp 端点；
+     *   若无效，下载失败会走内置默认头像兜底
+     */
+    function groupAvatarUrl(channelId) {
+        if (channelId === "#" || !channelId) {
+            return `https://p.qlogo.cn/gh/426230045/426230045/100`;
+        }
+        if (/^\d+$/.test(channelId)) {
+            return `https://p.qlogo.cn/gh/${channelId}/${channelId}/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}/${channelId}/640`;
+        }
+        return `https://p.qlogo.cn/gh/426230045/426230045/100`;
+    }
     // --- 辅助函数：图表生成 ---
     /**
      * 生成图表的静态 CSS 样式。

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "koishi-plugin-ll-mc",
-  "description": "消息统计插件（克隆自 message-counter），支持排除指定群聊",
-  "version": "1.0.2",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "assets"
-  ],
-  "koishi": {
-    "description": {
-      "zh": "消息统计插件：发言排行榜、群排行榜，支持排除指定群聊"
-    },
-    "service": {
-      "required": [
-        "database",
-        "cron"
-      ],
-      "optional": [
-        "markdownToImage",
-        "puppeteer",
-        "canvas"
-      ]
-    }
-  },
-  "author": "lee",
-  "license": "MIT",
-  "keywords": [
-    "koishi",
-    "koishi-plugin",
-    "message-counter",
-    "rank"
-  ],
-  "peerDependencies": {
-    "koishi": "^4.18.9"
-  },
-  "devDependencies": {
-    "koishi": "^4.18.11",
-    "koishi-plugin-cron": "^3.1.0",
-    "koishi-plugin-markdown-to-image-service": "^1.3.6",
-    "koishi-plugin-puppeteer": "^3.9.0",
-    "typescript": "^5.4.0"
-  }
-}
+{
+    "name":  "koishi-plugin-ll-mc",
+    "description":  "消息统计插件（克隆自 message-counter），支持排除指定群聊",
+    "version":  "1.0.4",
+    "main":  "lib/index.js",
+    "typings":  "lib/index.d.ts",
+    "files":  [
+                  "lib",
+                  "assets"
+              ],
+    "koishi":  {
+                   "description":  {
+                                       "zh":  "消息统计插件：发言排行榜、群排行榜，支持排除指定群聊"
+                                   },
+                   "service":  {
+                                   "required":  [
+                                                    "database",
+                                                    "cron"
+                                                ],
+                                   "optional":  [
+                                                    "markdownToImage",
+                                                    "puppeteer",
+                                                    "canvas"
+                                                ]
+                               }
+               },
+    "author":  "lee",
+    "license":  "MIT",
+    "keywords":  [
+                     "koishi",
+                     "koishi-plugin",
+                     "message-counter",
+                     "rank"
+                 ],
+    "peerDependencies":  {
+                             "koishi":  "^4.18.9"
+                         },
+    "devDependencies":  {
+                            "koishi":  "^4.18.11",
+                            "koishi-plugin-cron":  "^3.1.0",
+                            "koishi-plugin-markdown-to-image-service":  "^1.3.6",
+                            "koishi-plugin-puppeteer":  "^3.9.0",
+                            "typescript":  "^5.4.0"
+                        }
+}