koishi-plugin-group-verification 1.0.25 → 1.0.27

package/lib/index.d.ts

@@ -34,6 +34,7 @@ export interface PendingVerification {
     userId: string;
     userName: string;
     requestMessage: string;
+    requestId?: string;
     applyTime: string | Date;
 }
 export interface Config {

package/lib/index.js

@@ -443,14 +443,19 @@ async function verifyApplication(config, message, session) {
       requiredThreshold = "null";
       break;
     case 1:
-      isValid = matchedCount >= (config.reviewParameters || 1);
-      requiredThreshold = `${config.reviewParameters || 1}`;
+      {
+        const thresholdNum = config.reviewParameters !== void 0 && config.reviewParameters !== null ? config.reviewParameters : 0;
+        isValid = matchedCount >= thresholdNum;
+        requiredThreshold = `${thresholdNum}`;
+      }
       break;
     case 2:
-      const ratio = matchedCount / config.keywords.length;
-      const requiredRatio = (config.reviewParameters || 100) / 100;
-      isValid = ratio >= requiredRatio;
-      requiredThreshold = `${config.reviewParameters || 100}%`;
+      {
+        const thresholdPct = config.reviewParameters !== void 0 && config.reviewParameters !== null ? config.reviewParameters : 100;
+        const ratio = matchedCount / config.keywords.length;
+        isValid = ratio >= thresholdPct / 100;
+        requiredThreshold = `${thresholdPct}%`;
+      }
       break;
     case 3:
       isValid = false;
@@ -485,11 +490,14 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
     groupName = guild.name || groupName;
   } catch (error) {
   }
+  const requestId = session.event?.requestId || session.messageId || "";
+  await ctx.database.remove("group_verification_pending", { groupId: guildId, userId });
   await ctx.database.create("group_verification_pending", {
     groupId: guildId,
     userId,
     userName: username,
     requestMessage: message,
+    requestId,
     applyTime: (/* @__PURE__ */ new Date()).toISOString()
   });
   if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === "") {
@@ -507,10 +515,18 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
       await session.bot.broadcast([target], reminderMsg);
     } catch (err) {
       logger.warn("bot.broadcast failed, fallback to ctx.broadcast", err);
-      await ctx.broadcast([target], reminderMsg);
+      if (typeof ctx.broadcast === "function") {
+        await ctx.broadcast([target], reminderMsg);
+      } else {
+        logger.info("ctx.broadcast 不可用，跳过发送");
+      }
     }
   } else {
-    await ctx.broadcast([target], reminderMsg);
+    if (typeof ctx.broadcast === "function") {
+      await ctx.broadcast([target], reminderMsg);
+    } else {
+      logger.info("ctx.broadcast 不可用，跳过发送");
+    }
   }
 }
 __name(handleFailedVerification, "handleFailedVerification");
@@ -556,12 +572,18 @@ function apply(ctx, config) {
     userId: "string",
     userName: "string",
     requestMessage: "string",
+    // store the raw requestId if provided by OneBot event; used for approving/rejecting
+    requestId: "string",
     // record full timestamp as string to keep time component
     applyTime: "string"
   }, {
     primary: "id",
     autoInc: true
   });
+  ctx.on("guild-member-request", async (session) => {
+    logger.info("收到 guild-member-request 事件，转发给处理函数");
+    await handleGuildMemberRequestEvent(ctx, session);
+  });
   ctx.on("guild-member-added", async (session) => {
     const groupId = session.guildId;
     const userId = session.userId;
@@ -578,8 +600,10 @@ function apply(ctx, config) {
     });
     if (pendingRecords.length > 0) {
       await updateStats(ctx, groupId, "autoApproved");
-      await ctx.database.remove("group_verification_pending", { id: pendingRecords[0].id });
-      logger.info(`用户 ${userId} 通过验证加入群 ${groupId}，统计已更新`);
+      for (const rec of pendingRecords) {
+        await ctx.database.remove("group_verification_pending", { id: rec.id });
+      }
+      logger.info(`用户 ${userId} 通过验证加入群 ${groupId}，已清理 ${pendingRecords.length} 条待审核记录，统计已更新`);
     } else {
       await updateStats(ctx, groupId, "manuallyApproved");
       logger.info(`用户 ${userId} 被手动邀请加入群 ${groupId}，手动批准统计已更新`);
@@ -894,7 +918,7 @@ ${debugInfo}`];
     const methodMap = { 0: "全部同意", 1: "按数量", 2: "按比例", 3: "全部拒绝" };
     feedbackMessage += `审核方式: ${methodMap[reviewMethod]}
 `;
-    if (reviewParameters !== 0) {
+    if (reviewMethod === 1 || reviewMethod === 2) {
       const thresholdDisplay = reviewMethod === 2 ? `${reviewParameters}%` : reviewParameters.toString();
       feedbackMessage += `阈值: ${thresholdDisplay}
 `;
@@ -956,7 +980,11 @@ ${debugInfo}`];
         let approvedCount = 0;
         for (const request2 of pendingRequests2) {
           try {
+            if (request2.requestId) {
+              await session.bot.handleGuildMemberRequest(request2.requestId, true);
+            }
             await ctx.database.remove("group_verification_pending", { id: request2.id });
+            await updateStats(ctx, groupId, "manuallyApproved");
             approvedCount++;
           } catch (error) {
             logger.warn(`处理申请 ${request2.id} 时出错:`, error);
@@ -964,21 +992,25 @@ ${debugInfo}`];
         }
         return `已处理 ${approvedCount} 个加群申请`;
       } else {
-        const recentRequest = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName"]);
-        if (recentRequest.length === 0) {
+        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime"]);
+        if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
-        const request2 = recentRequest[0];
+        pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
+        const request2 = pending[0];
         try {
-          await session.bot.handleGuildMemberRequest(request2.userId, true);
-          await ctx.database.remove("group_verification_pending", { id: request2.id });
+          if (request2.requestId) {
+            await session.bot.handleGuildMemberRequest(request2.requestId, true);
+          }
+          await ctx.database.remove("group_verification_pending", { groupId, userId: request2.userId });
+          await updateStats(ctx, groupId, "manuallyApproved");
           return `已同意用户 ${request2.userName}(${request2.userId}) 的加群申请`;
         } catch (error) {
           return `处理申请时出错: ${error.message}`;
         }
       }
     }
-    const pendingRequests = await ctx.database.get("group_verification_pending", {
+    let pendingRequests = await ctx.database.get("group_verification_pending", {
       groupId,
       userId
     });
@@ -987,8 +1019,11 @@ ${debugInfo}`];
     }
     const request = pendingRequests[0];
     try {
-      await session.bot.handleGuildMemberRequest(request.userId, true);
-      await ctx.database.remove("group_verification_pending", { id: request.id });
+      if (request.requestId) {
+        await session.bot.handleGuildMemberRequest(request.requestId, true);
+      }
+      await ctx.database.remove("group_verification_pending", { groupId, userId });
+      await updateStats(ctx, groupId, "manuallyApproved");
       return `已同意用户 ${request.userName}(${userId}) 的加群申请`;
     } catch (error) {
       return `处理申请时出错: ${error.message}`;
@@ -1020,6 +1055,9 @@ ${debugInfo}`];
         let rejectedCount = 0;
         for (const request2 of pendingRequests2) {
           try {
+            if (request2.requestId) {
+              await session.bot.handleGuildMemberRequest(request2.requestId, false);
+            }
             await ctx.database.remove("group_verification_pending", { id: request2.id });
             await updateStats(ctx, groupId, "rejected");
             rejectedCount++;
@@ -1029,13 +1067,17 @@ ${debugInfo}`];
         }
         return `已拒绝 ${rejectedCount} 个加群申请`;
       } else {
-        const recentRequest = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName"]);
-        if (recentRequest.length === 0) {
+        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime"]);
+        if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
-        const request2 = recentRequest[0];
+        pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
+        const request2 = pending[0];
         try {
-          await ctx.database.remove("group_verification_pending", { id: request2.id });
+          if (request2.requestId) {
+            await session.bot.handleGuildMemberRequest(request2.requestId, false);
+          }
+          await ctx.database.remove("group_verification_pending", { groupId, userId: request2.userId });
           await updateStats(ctx, groupId, "rejected");
           return `已拒绝用户 ${request2.userName}(${request2.userId}) 的加群申请`;
         } catch (error) {
@@ -1052,7 +1094,10 @@ ${debugInfo}`];
     }
     const request = pendingRequests[0];
     try {
-      await ctx.database.remove("group_verification_pending", { id: request.id });
+      if (request.requestId) {
+        await session.bot.handleGuildMemberRequest(request.requestId, false);
+      }
+      await ctx.database.remove("group_verification_pending", { groupId, userId });
       await updateStats(ctx, groupId, "rejected");
       return `已拒绝用户 ${request.userName}(${userId}) 的加群申请`;
     } catch (error) {
@@ -1207,6 +1252,7 @@ ${debugInfo}`];
       for (const p of pendings) {
         const updates = {};
         if (p.applyTime instanceof Date) updates.applyTime = p.applyTime.toISOString();
+        if (p.requestId === void 0) updates.requestId = "";
         if (Object.keys(updates).length) {
           await ctx.database.set("group_verification_pending", { id: p.id }, updates);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-verification",
   "description": "[WIP] Koishi 群组加群验证插件，支持多关键词匹配审核、多种审核方式和详细统计功能（开发中）",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/index.ts

@@ -46,6 +46,8 @@ export interface PendingVerification {
   userId: string
   userName: string
   requestMessage: string
+  // raw OneBot requestId (may be empty string)
+  requestId?: string
   applyTime: string | Date
 }
 
@@ -581,14 +583,24 @@ export async function verifyApplication(config: GroupVerificationConfig, message
       requiredThreshold = 'null'
       break
     case 1: // 按数量同意
-      isValid = matchedCount >= (config.reviewParameters || 1)
-      requiredThreshold = `${config.reviewParameters || 1}`
+      {
+        // threshold may legitimately be 0 (表示全部同意)
+        const thresholdNum = config.reviewParameters !== undefined && config.reviewParameters !== null
+          ? config.reviewParameters
+          : 0
+        isValid = matchedCount >= thresholdNum
+        requiredThreshold = `${thresholdNum}`
+      }
       break
     case 2: // 按比例同意
-      const ratio = matchedCount / config.keywords.length
-      const requiredRatio = (config.reviewParameters || 100) / 100
-      isValid = ratio >= requiredRatio
-      requiredThreshold = `${config.reviewParameters || 100}%`
+      {
+        const thresholdPct = config.reviewParameters !== undefined && config.reviewParameters !== null
+          ? config.reviewParameters
+          : 100
+        const ratio = matchedCount / config.keywords.length
+        isValid = ratio >= thresholdPct / 100
+        requiredThreshold = `${thresholdPct}%`
+      }
       break
     case 3: // 全部拒绝
       isValid = false
@@ -637,12 +649,19 @@ export async function handleFailedVerification(
     // 无法获取群名称时使用默认值
   }
 
+  // extract requestId if available (OneBot event attaches it)
+  const requestId = ((session.event as any)?.requestId) || session.messageId || ''
+
+  // 删除同一用户在该群之前的所有待审核记录，保留最新一个
+  await ctx.database.remove('group_verification_pending', { groupId: guildId, userId })
+
   // 将申请加入待审核列表
   await ctx.database.create('group_verification_pending', {
     groupId: guildId,
     userId: userId,
     userName: username,
     requestMessage: message,
+    requestId,
     applyTime: new Date().toISOString()
   })
   // 如果提醒消息被禁用，直接返回
@@ -676,10 +695,18 @@ export async function handleFailedVerification(
     } catch (err) {
       // fallback to ctx.broadcast if bot.broadcast fails for some reason
       logger.warn('bot.broadcast failed, fallback to ctx.broadcast', err)
-      await (ctx.broadcast as any)([target], reminderMsg)
+      if (typeof (ctx.broadcast) === 'function') {
+        await (ctx.broadcast as any)([target], reminderMsg)
+      } else {
+        logger.info('ctx.broadcast 不可用，跳过发送')
+      }
     }
   } else {
-    await (ctx.broadcast as any)([target], reminderMsg)
+    if (typeof (ctx.broadcast) === 'function') {
+      await (ctx.broadcast as any)([target], reminderMsg)
+    } else {
+      logger.info('ctx.broadcast 不可用，跳过发送')
+    }
   }
 }
 
@@ -728,21 +755,30 @@ export function apply(ctx: Context, config: Config) {
     autoInc: true
   })
 
+  // cast schema to any to avoid type conflicts when adding new fields
   ctx.model.extend('group_verification_pending', {
     id: 'unsigned',
     groupId: 'string',
     userId: 'string',
     userName: 'string',
     requestMessage: 'string',
+    // store the raw requestId if provided by OneBot event; used for approving/rejecting
+    requestId: 'string',
     // record full timestamp as string to keep time component
     applyTime: 'string'
-  }, {
+  } as any, {
     primary: 'id',
     autoInc: true
   })
 
 
 
+  // 监听 guild-member-request 事件，以便对新申请执行自动审批或拒绝
+  ctx.on('guild-member-request', async (session) => {
+    logger.info('收到 guild-member-request 事件，转发给处理函数')
+    await handleGuildMemberRequestEvent(ctx, session)
+  })
+
   // 监听群成员增加事件（包括手动邀请入群）
   ctx.on('guild-member-added', async (session) => {
     const groupId = session.guildId
@@ -766,9 +802,11 @@ export function apply(ctx: Context, config: Config) {
     if (pendingRecords.length > 0) {
       // 通过验证的用户入群，更新统计
       await updateStats(ctx, groupId, 'autoApproved')
-      // 清除待审核记录
-      await ctx.database.remove('group_verification_pending', { id: pendingRecords[0].id })
-      logger.info(`用户 ${userId} 通过验证加入群 ${groupId}，统计已更新`)
+      // 清除所有该用户的待审核记录
+      for (const rec of pendingRecords) {
+        await ctx.database.remove('group_verification_pending', { id: rec.id })
+      }
+      logger.info(`用户 ${userId} 通过验证加入群 ${groupId}，已清理 ${pendingRecords.length} 条待审核记录，统计已更新`)
     } else {
       // 手动邀请入群，记录到手动批准统计
       await updateStats(ctx, groupId, 'manuallyApproved')
@@ -1206,7 +1244,8 @@ export function apply(ctx: Context, config: Config) {
       const methodMap = {0: '全部同意', 1: '按数量', 2: '按比例', 3: '全部拒绝'}
       feedbackMessage += `审核方式: ${methodMap[reviewMethod]}\n`
       
-      if (reviewParameters !== 0) {
+      // 显示阈值（即便为 0）
+      if (reviewMethod === 1 || reviewMethod === 2) {
         const thresholdDisplay = reviewMethod === 2 ? `${reviewParameters}%` : reviewParameters.toString()
         feedbackMessage += `阈值: ${thresholdDisplay}\n`
       }
@@ -1269,7 +1308,7 @@ export function apply(ctx: Context, config: Config) {
       if (configs.length > 0 && configs[0].reviewMethod === 3) {
         return '该群已设为全部拒绝，无法手动同意任何申请'
       }
-      // 处理默认情况和all情况
+      // 处理默认情况和 all 情况
       if (!userId || userId.toLowerCase() === 'all') {
         if (userId?.toLowerCase() === 'all') {
           // 处理所有待审核申请
@@ -1281,9 +1320,11 @@ export function apply(ctx: Context, config: Config) {
           let approvedCount = 0
           for (const request of pendingRequests) {
             try {
-              // TODO: 需要获取实际的requestId来进行审批
-              // await session.bot.handleGuildMemberRequest(request.requestId, true)
+              if (request.requestId) {
+                await session.bot.handleGuildMemberRequest(request.requestId, true)
+              }
               await ctx.database.remove('group_verification_pending', { id: request.id })
+              await updateStats(ctx, groupId, 'manuallyApproved')
               approvedCount++
             } catch (error) {
               logger.warn(`处理申请 ${request.id} 时出错:`, error)
@@ -1292,17 +1333,20 @@ export function apply(ctx: Context, config: Config) {
           
           return `已处理 ${approvedCount} 个加群申请`
         } else {
-          // 处理最近的一个申请
-          const recentRequest = await ctx.database.get('group_verification_pending', { groupId }, ['id', 'userId', 'userName'])
-          if (recentRequest.length === 0) {
+          // 处理最近的一个申请（按时间降序）
+          let pending: any[] = await ctx.database.get('group_verification_pending', { groupId }, ['id', 'userId', 'userName', 'applyTime'])
+          if (pending.length === 0) {
             return '当前无待审核的加群申请'
           }
-          
-          const request = recentRequest[0]
+          pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)))
+          const request: any = pending[0]
           try {
-            // 这里需要获取实际的requestId，暂时用userId作为示例
-            await session.bot.handleGuildMemberRequest(request.userId, true)
-            await ctx.database.remove('group_verification_pending', { id: request.id })
+            if (request.requestId) {
+              await session.bot.handleGuildMemberRequest(request.requestId, true)
+            }
+            // 清除该用户的所有待审核记录
+            await ctx.database.remove('group_verification_pending', { groupId, userId: request.userId })
+            await updateStats(ctx, groupId, 'manuallyApproved')
             return `已同意用户 ${request.userName}(${request.userId}) 的加群申请`
           } catch (error) {
             return `处理申请时出错: ${error.message}`
@@ -1311,7 +1355,7 @@ export function apply(ctx: Context, config: Config) {
       }
 
       // 处理指定用户ID的情况
-      const pendingRequests = await ctx.database.get('group_verification_pending', { 
+      let pendingRequests = await ctx.database.get('group_verification_pending', { 
         groupId, 
         userId: userId 
       })
@@ -1322,9 +1366,12 @@ export function apply(ctx: Context, config: Config) {
 
       const request = pendingRequests[0]
       try {
-        // 这里需要获取实际的requestId来进行审批
-        await session.bot.handleGuildMemberRequest(request.userId, true)
-        await ctx.database.remove('group_verification_pending', { id: request.id })
+        if (request.requestId) {
+          await session.bot.handleGuildMemberRequest(request.requestId, true)
+        }
+        // 删除该用户的所有记录
+        await ctx.database.remove('group_verification_pending', { groupId, userId })
+        await updateStats(ctx, groupId, 'manuallyApproved')
         return `已同意用户 ${request.userName}(${userId}) 的加群申请`
       } catch (error) {
         return `处理申请时出错: ${error.message}`
@@ -1351,7 +1398,7 @@ export function apply(ctx: Context, config: Config) {
         return '请在群聊中使用此命令'
       }
 
-      // 处理默认情况和all情况
+      // 处理默认情况和 all 情况
       if (!userId || userId.toLowerCase() === 'all') {
         if (userId?.toLowerCase() === 'all') {
           // 拒绝所有待审核申请
@@ -1363,8 +1410,9 @@ export function apply(ctx: Context, config: Config) {
           let rejectedCount = 0
           for (const request of pendingRequests) {
             try {
-              // TODO: 需要获取实际的requestId来进行拒绝
-              // await session.bot.handleGuildMemberRequest(request.requestId, false)
+              if (request.requestId) {
+                await session.bot.handleGuildMemberRequest(request.requestId, false)
+              }
               await ctx.database.remove('group_verification_pending', { id: request.id })
               await updateStats(ctx, groupId, 'rejected')
               rejectedCount++
@@ -1375,17 +1423,19 @@ export function apply(ctx: Context, config: Config) {
           
           return `已拒绝 ${rejectedCount} 个加群申请`
         } else {
-          // 拒绝最近的一个申请
-          const recentRequest = await ctx.database.get('group_verification_pending', { groupId }, ['id', 'userId', 'userName'])
-          if (recentRequest.length === 0) {
+          // 拒绝最近的一个申请（按 applyTime 降序）
+          let pending: any[] = await ctx.database.get('group_verification_pending', { groupId }, ['id', 'userId', 'userName', 'applyTime'])
+          if (pending.length === 0) {
             return '当前无待审核的加群申请'
           }
-          
-          const request = recentRequest[0]
+          pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)))
+          const request: any = pending[0]
           try {
-            // TODO: 需要获取实际的requestId来进行拒绝
-            // await session.bot.handleGuildMemberRequest(request.requestId, false)
-            await ctx.database.remove('group_verification_pending', { id: request.id })
+            if (request.requestId) {
+              await session.bot.handleGuildMemberRequest(request.requestId, false)
+            }
+            // 删除该用户的所有记录
+            await ctx.database.remove('group_verification_pending', { groupId, userId: request.userId })
             await updateStats(ctx, groupId, 'rejected')
             return `已拒绝用户 ${request.userName}(${request.userId}) 的加群申请`
           } catch (error) {
@@ -1406,9 +1456,11 @@ export function apply(ctx: Context, config: Config) {
 
       const request = pendingRequests[0]
       try {
-        // TODO: 需要获取实际的requestId来进行拒绝
-        // await session.bot.handleGuildMemberRequest(request.requestId, false)
-        await ctx.database.remove('group_verification_pending', { id: request.id })
+        if (request.requestId) {
+          await session.bot.handleGuildMemberRequest(request.requestId, false)
+        }
+        // 删除该用户的所有记录
+        await ctx.database.remove('group_verification_pending', { groupId, userId })
         await updateStats(ctx, groupId, 'rejected')
         return `已拒绝用户 ${request.userName}(${userId}) 的加群申请`
       } catch (error) {
@@ -1593,6 +1645,8 @@ export function apply(ctx: Context, config: Config) {
       for (const p of pendings) {
         const updates: any = {}
         if (p.applyTime instanceof Date) updates.applyTime = p.applyTime.toISOString()
+        // add default empty requestId if record pre-dates the new column
+        if (p.requestId === undefined) updates.requestId = ''
         if (Object.keys(updates).length) {
           await ctx.database.set('group_verification_pending', { id: p.id }, updates)
         }