koishi-plugin-group-verification 1.0.37 → 1.0.38

package/lib/index.js

@@ -447,16 +447,29 @@ async function handleGuildMemberRequestEvent(ctx, session) {
     logger.warn("黑名单检查失败", e);
   }
   {
+    const isId = /* @__PURE__ */ __name((s) => !s || s === userId, "isId");
     let resolvedName;
-    try {
-      const userInfo = await session.bot.getUser(userId);
-      if (userInfo?.name) resolvedName = userInfo.name;
-    } catch (_) {
-    }
-    if (!resolvedName && session.username && session.username !== userId) {
+    const evUser = session.event?.user;
+    if (!isId(evUser?.name)) resolvedName = evUser.name;
+    else if (!isId(evUser?.nick)) resolvedName = evUser.nick;
+    if (!resolvedName) {
+      const author = session.author;
+      if (!isId(author?.name)) resolvedName = author.name;
+      else if (!isId(author?.nick)) resolvedName = author.nick;
+    }
+    if (!resolvedName && !isId(session.username)) {
       resolvedName = session.username;
     }
+    if (!resolvedName) {
+      try {
+        const userInfo = await session.bot.getUser(userId);
+        const n = userInfo?.name || userInfo?.nickname;
+        if (!isId(n)) resolvedName = n;
+      } catch (_) {
+      }
+    }
     session.username = resolvedName || userId;
+    clogV(`昵称解析: userId=${userId} resolved="${session.username}" evUser=${JSON.stringify(evUser)} author=${JSON.stringify(session.author)}`);
   }
   const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session);
   clogV(`验证结果 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);

package/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/LHDyx/koishi-plugin-group-verification/issues"
   },
-  "version": "1.0.37",
+  "version": "1.0.38",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/index.ts

@@ -609,17 +609,45 @@ export async function handleGuildMemberRequestEvent(ctx: Context, session: any)
     logger.warn('黑名单检查失败', e);
   }
 
-  // 解析用户昵称优先级：1) API拉取昵称 2) session.username（若非userId） 3) userId
+  // 解析用户昵称优先级：
+  // 1) event 原始数据（NapCat/OneBot 入群申请事件本身携带昵称）
+  // 2) session.author.name / session.author.nick
+  // 3) session.username（若非 userId）
+  // 4) getUser() API
+  // 5) 最终 fallback：userId
   {
+    const isId = (s: string | undefined) => !s || s === userId
+
     let resolvedName: string | undefined
-    try {
-      const userInfo = await session.bot.getUser(userId)
-      if (userInfo?.name) resolvedName = userInfo.name
-    } catch (_) {}
-    if (!resolvedName && session.username && session.username !== userId) {
+
+    // 优先级1：event 原始数据
+    const evUser = (session.event as any)?.user
+    if (!isId(evUser?.name))  resolvedName = evUser.name
+    else if (!isId(evUser?.nick)) resolvedName = evUser.nick
+
+    // 优先级2：author 字段
+    if (!resolvedName) {
+      const author = session.author as any
+      if (!isId(author?.name))     resolvedName = author.name
+      else if (!isId(author?.nick)) resolvedName = author.nick
+    }
+
+    // 优先级3：session.username
+    if (!resolvedName && !isId(session.username)) {
       resolvedName = session.username
     }
+
+    // 优先级4：API 拉取（get_stranger_info）
+    if (!resolvedName) {
+      try {
+        const userInfo = await session.bot.getUser(userId)
+        const n = (userInfo as any)?.name || (userInfo as any)?.nickname
+        if (!isId(n)) resolvedName = n
+      } catch (_) {}
+    }
+
     session.username = resolvedName || userId
+    clogV(`昵称解析: userId=${userId} resolved="${session.username}" evUser=${JSON.stringify(evUser)} author=${JSON.stringify((session as any).author)}`)
   }
 
   const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session);