koishi-plugin-group-verification 1.0.38 → 1.0.39

package/lib/index.js

@@ -449,17 +449,30 @@ async function handleGuildMemberRequestEvent(ctx, session) {
   {
     const isId = /* @__PURE__ */ __name((s) => !s || s === userId, "isId");
     let resolvedName;
-    const evUser = session.event?.user;
-    if (!isId(evUser?.name)) resolvedName = evUser.name;
-    else if (!isId(evUser?.nick)) resolvedName = evUser.nick;
+    const authorUser = session.author?.user;
+    if (!isId(authorUser?.name)) resolvedName = authorUser.name;
+    else if (!isId(authorUser?.nick)) resolvedName = authorUser.nick;
     if (!resolvedName) {
       const author = session.author;
       if (!isId(author?.name)) resolvedName = author.name;
       else if (!isId(author?.nick)) resolvedName = author.nick;
     }
+    if (!resolvedName) {
+      const evUser = session.event?.user;
+      if (!isId(evUser?.name)) resolvedName = evUser?.name;
+      else if (!isId(evUser?.nick)) resolvedName = evUser?.nick;
+    }
     if (!resolvedName && !isId(session.username)) {
       resolvedName = session.username;
     }
+    if (!resolvedName) {
+      try {
+        const member = await session.bot.getGuildMember(guildId, userId);
+        const n = member?.user?.name || member?.name || member?.nick;
+        if (!isId(n)) resolvedName = n;
+      } catch (_) {
+      }
+    }
     if (!resolvedName) {
       try {
         const userInfo = await session.bot.getUser(userId);
@@ -469,7 +482,7 @@ async function handleGuildMemberRequestEvent(ctx, session) {
       }
     }
     session.username = resolvedName || userId;
-    clogV(`昵称解析: userId=${userId} resolved="${session.username}" evUser=${JSON.stringify(evUser)} author=${JSON.stringify(session.author)}`);
+    clogV(`昵称解析: userId=${userId} resolved="${session.username}" authorUser=${JSON.stringify(authorUser)} author=${JSON.stringify(session.author)} event.user=${JSON.stringify(session.event?.user)}`);
   }
   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.38",
+  "version": "1.0.39",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/index.ts

@@ -610,34 +610,50 @@ export async function handleGuildMemberRequestEvent(ctx: Context, session: any)
   }
 
   // 解析用户昵称优先级：
-  // 1) event 原始数据（NapCat/OneBot 入群申请事件本身携带昵称）
-  // 2) session.author.name / session.author.nick
-  // 3) session.username（若非 userId）
-  // 4) getUser() API
-  // 5) 最终 fallback：userId
+  // 1) session.author.user.name  — Koishi GuildMember.user.name（官方标准字段）
+  // 2) session.author.name / .nick — 群昵称
+  // 3) event 原始 user 字段
+  // 4) session.username（若非 userId）
+  // 5) getGuildMember() API（申请人尚未入群，通常失败）→ getUser() API
+  // 6) 最终 fallback：userId
   {
     const isId = (s: string | undefined) => !s || s === userId
 
     let resolvedName: string | undefined
 
-    // 优先级1：event 原始数据
-    const evUser = (session.event as any)?.user
-    if (!isId(evUser?.name))  resolvedName = evUser.name
-    else if (!isId(evUser?.nick)) resolvedName = evUser.nick
+    // 优先级1：GuildMember.user.name — OneBot 适配器将申请人 User 对象放在 author.user
+    const authorUser = (session.author as any)?.user
+    if (!isId(authorUser?.name)) resolvedName = authorUser.name
+    else if (!isId(authorUser?.nick)) resolvedName = authorUser.nick
 
-    // 优先级2：author 字段
+    // 优先级2：author 自身的 name/nick（群昵称）
     if (!resolvedName) {
       const author = session.author as any
-      if (!isId(author?.name))     resolvedName = author.name
+      if (!isId(author?.name))      resolvedName = author.name
       else if (!isId(author?.nick)) resolvedName = author.nick
     }
 
-    // 优先级3：session.username
+    // 优先级3：event 原始 user 字段
+    if (!resolvedName) {
+      const evUser = (session.event as any)?.user
+      if (!isId(evUser?.name))      resolvedName = evUser?.name
+      else if (!isId(evUser?.nick)) resolvedName = evUser?.nick
+    }
+
+    // 优先级4：session.username
     if (!resolvedName && !isId(session.username)) {
       resolvedName = session.username
     }
 
-    // 优先级4：API 拉取（get_stranger_info）
+    // 优先级5：API 拉取
+    if (!resolvedName) {
+      try {
+        // 先尝试 getGuildMember（申请人未入群时会 throw，正常）
+        const member = await session.bot.getGuildMember(guildId, userId)
+        const n = member?.user?.name || member?.name || (member as any)?.nick
+        if (!isId(n)) resolvedName = n
+      } catch (_) {}
+    }
     if (!resolvedName) {
       try {
         const userInfo = await session.bot.getUser(userId)
@@ -647,7 +663,7 @@ export async function handleGuildMemberRequestEvent(ctx: Context, session: any)
     }
 
     session.username = resolvedName || userId
-    clogV(`昵称解析: userId=${userId} resolved="${session.username}" evUser=${JSON.stringify(evUser)} author=${JSON.stringify((session as any).author)}`)
+    clogV(`昵称解析: userId=${userId} resolved="${session.username}" authorUser=${JSON.stringify(authorUser)} author=${JSON.stringify((session as any).author)} event.user=${JSON.stringify((session.event as any)?.user)}`)
   }
 
   const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session);