koishi-plugin-group-verification 1.0.26 → 1.0.28

package/lib/index.d.ts

@@ -26,6 +26,7 @@ export interface GroupVerificationStats {
     autoApproved: number;
     manuallyApproved: number;
     rejected: number;
+    totalJoined: number;
     lastUpdated: string | Date;
 }
 export interface PendingVerification {
@@ -34,6 +35,7 @@ export interface PendingVerification {
     userId: string;
     userName: string;
     requestMessage: string;
+    requestId?: string;
     applyTime: string | Date;
 }
 export interface Config {
@@ -91,6 +93,7 @@ export declare function mergeReminder(existingConfig: any | null, cleanedOptions
 };
 export declare function syncTotalStats(ctx: Context): Promise<void>;
 export declare function updateStats(ctx: Context, groupId: string, action: 'autoApproved' | 'manuallyApproved' | 'rejected'): Promise<void>;
+export declare function incrementTotal(ctx: Context, groupId: string): Promise<void>;
 export declare function checkPermission(session: any, targetGroupId?: string): Promise<[boolean, string?]>;
 export declare function handleGuildMemberRequestEvent(ctx: Context, session: any): Promise<void>;
 export declare function __getAutoQueue(): Map<string, Set<string>>;

package/lib/index.js

@@ -26,6 +26,7 @@ __export(src_exports, {
   checkPermission: () => checkPermission,
   handleFailedVerification: () => handleFailedVerification,
   handleGuildMemberRequestEvent: () => handleGuildMemberRequestEvent,
+  incrementTotal: () => incrementTotal,
   inject: () => inject,
   mergeReminder: () => mergeReminder,
   name: () => name,
@@ -207,13 +208,15 @@ async function syncTotalStats(ctx) {
       const totalAutoApproved = allStats.reduce((sum, stat) => sum + (stat.autoApproved || 0), 0);
       const totalManuallyApproved = allStats.reduce((sum, stat) => sum + (stat.manuallyApproved || 0), 0);
       const totalRejected = allStats.reduce((sum, stat) => sum + (stat.rejected || 0), 0);
+      const totalJoined = allStats.reduce((sum, stat) => sum + (stat.totalJoined || 0), 0);
       await ctx.database.set("group_verification_stats", { groupId: "TOTAL" }, {
         autoApproved: totalAutoApproved,
         manuallyApproved: totalManuallyApproved,
         rejected: totalRejected,
+        totalJoined,
         lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
       });
-      logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}`);
+      logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}, 入群${totalJoined}`);
     }
   } catch (error) {
     logger.error("同步总计统计时出错:", error);
@@ -234,12 +237,34 @@ async function updateStats(ctx, groupId, action) {
       autoApproved: action === "autoApproved" ? 1 : 0,
       manuallyApproved: action === "manuallyApproved" ? 1 : 0,
       rejected: action === "rejected" ? 1 : 0,
+      totalJoined: 0,
       lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
     });
   }
   await syncTotalStats(ctx);
 }
 __name(updateStats, "updateStats");
+async function incrementTotal(ctx, groupId) {
+  const existingStats = await ctx.database.get("group_verification_stats", { groupId });
+  if (existingStats.length > 0) {
+    const stats = existingStats[0];
+    await ctx.database.set("group_verification_stats", { id: stats.id }, {
+      totalJoined: (stats.totalJoined || 0) + 1,
+      lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  } else {
+    await ctx.database.create("group_verification_stats", {
+      groupId,
+      autoApproved: 0,
+      manuallyApproved: 0,
+      rejected: 0,
+      totalJoined: 1,
+      lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  }
+  await syncTotalStats(ctx);
+}
+__name(incrementTotal, "incrementTotal");
 async function checkPermission(session, targetGroupId) {
   const groupId = targetGroupId || session.guildId;
   if (!groupId) {
@@ -443,14 +468,20 @@ 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;
+        const needed = Math.ceil(config.keywords.length * thresholdPct / 100);
+        requiredThreshold = `${needed}`;
+      }
       break;
     case 3:
       isValid = false;
@@ -485,11 +516,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 +541,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");
@@ -543,6 +585,7 @@ function apply(ctx, config) {
     autoApproved: "integer",
     manuallyApproved: "integer",
     rejected: "integer",
+    totalJoined: "integer",
     // store as string (ISO timestamp) to preserve full date+time;
     // Koishi `date` type truncates to day which leads to 00:00:00.
     lastUpdated: "string"
@@ -556,6 +599,8 @@ 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"
   }, {
@@ -569,6 +614,7 @@ function apply(ctx, config) {
   ctx.on("guild-member-added", async (session) => {
     const groupId = session.guildId;
     const userId = session.userId;
+    await incrementTotal(ctx, groupId);
     const set = autoQueue.get(groupId);
     if (set && set.has(userId)) {
       await updateStats(ctx, groupId, "autoApproved");
@@ -582,8 +628,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}，手动批准统计已更新`);
@@ -898,7 +946,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}
 `;
@@ -958,31 +1006,44 @@ ${debugInfo}`];
           return "当前无待审核的加群申请";
         }
         let approvedCount = 0;
+        let skippedCount = 0;
         for (const request2 of pendingRequests2) {
-          try {
-            await ctx.database.remove("group_verification_pending", { id: request2.id });
-            approvedCount++;
-          } catch (error) {
-            logger.warn(`处理申请 ${request2.id} 时出错:`, error);
+          if (request2.requestId) {
+            try {
+              await session.bot.handleGuildMemberRequest(request2.requestId, true);
+              approvedCount++;
+            } catch (error) {
+              logger.warn(`处理申请 ${request2.id} 时出错:`, error);
+            }
+          } else {
+            skippedCount++;
           }
+          await ctx.database.remove("group_verification_pending", { id: request2.id });
         }
-        return `已处理 ${approvedCount} 个加群申请`;
+        let msg = `已处理 ${approvedCount} 个加群申请`;
+        if (skippedCount) msg += `，${skippedCount} 个因缺少 requestId 未处理`;
+        return msg;
       } 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", "requestId"]);
+        if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
-        const request2 = recentRequest[0];
+        pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
+        const request2 = pending[0];
+        if (!request2.requestId) {
+          return `用户 ${request2.userId} 的申请缺少 requestId，无法自动同意`;
+        }
         try {
-          await session.bot.handleGuildMemberRequest(request2.userId, true);
-          await ctx.database.remove("group_verification_pending", { id: request2.id });
-          return `已同意用户 ${request2.userName}(${request2.userId}) 的加群申请`;
+          await session.bot.handleGuildMemberRequest(request2.requestId, true);
+          await ctx.database.remove("group_verification_pending", { groupId, userId: request2.userId });
+          const displayName = request2.userName && request2.userName !== request2.userId ? `${request2.userName}(${request2.userId})` : request2.userId;
+          return `已同意用户 ${displayName} 的加群申请`;
         } 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
     });
@@ -990,10 +1051,14 @@ ${debugInfo}`];
       return `未找到用户 ${userId} 的待审核申请`;
     }
     const request = pendingRequests[0];
+    if (!request.requestId) {
+      return `用户 ${userId} 的申请缺少 requestId，无法自动同意`;
+    }
     try {
-      await session.bot.handleGuildMemberRequest(request.userId, true);
-      await ctx.database.remove("group_verification_pending", { id: request.id });
-      return `已同意用户 ${request.userName}(${userId}) 的加群申请`;
+      await session.bot.handleGuildMemberRequest(request.requestId, true);
+      await ctx.database.remove("group_verification_pending", { groupId, userId });
+      const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId;
+      return `已同意用户 ${displayName} 的加群申请`;
     } catch (error) {
       return `处理申请时出错: ${error.message}`;
     }
@@ -1022,26 +1087,40 @@ ${debugInfo}`];
           return "当前无待审核的加群申请";
         }
         let rejectedCount = 0;
+        let skippedCount = 0;
         for (const request2 of pendingRequests2) {
-          try {
-            await ctx.database.remove("group_verification_pending", { id: request2.id });
-            await updateStats(ctx, groupId, "rejected");
-            rejectedCount++;
-          } catch (error) {
-            logger.warn(`处理申请 ${request2.id} 时出错:`, error);
+          if (request2.requestId) {
+            try {
+              await session.bot.handleGuildMemberRequest(request2.requestId, false);
+              rejectedCount++;
+            } catch (error) {
+              logger.warn(`处理申请 ${request2.id} 时出错:`, error);
+            }
+          } else {
+            skippedCount++;
           }
+          await ctx.database.remove("group_verification_pending", { id: request2.id });
+          await updateStats(ctx, groupId, "rejected");
         }
-        return `已拒绝 ${rejectedCount} 个加群申请`;
+        let msg = `已拒绝 ${rejectedCount} 个加群申请`;
+        if (skippedCount) msg += `，${skippedCount} 个因缺少 requestId 未处理`;
+        return msg;
       } 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", "requestId"]);
+        if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
-        const request2 = recentRequest[0];
+        pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
+        const request2 = pending[0];
+        if (!request2.requestId) {
+          return `用户 ${request2.userId} 的申请缺少 requestId，无法自动拒绝`;
+        }
         try {
-          await ctx.database.remove("group_verification_pending", { id: request2.id });
+          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}) 的加群申请`;
+          const displayName = request2.userName && request2.userName !== request2.userId ? `${request2.userName}(${request2.userId})` : request2.userId;
+          return `已拒绝用户 ${displayName} 的加群申请`;
         } catch (error) {
           return `处理申请时出错: ${error.message}`;
         }
@@ -1055,10 +1134,15 @@ ${debugInfo}`];
       return `未找到用户 ${userId} 的待审核申请`;
     }
     const request = pendingRequests[0];
+    if (!request.requestId) {
+      return `用户 ${userId} 的申请缺少 requestId，无法自动拒绝`;
+    }
     try {
-      await ctx.database.remove("group_verification_pending", { id: request.id });
+      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}) 的加群申请`;
+      const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId;
+      return `已拒绝用户 ${displayName} 的加群申请`;
     } catch (error) {
       return `处理申请时出错: ${error.message}`;
     }
@@ -1203,6 +1287,7 @@ ${debugInfo}`];
       for (const st of stats) {
         const updates = {};
         if (st.lastUpdated instanceof Date) updates.lastUpdated = st.lastUpdated.toISOString();
+        if (st.totalJoined === void 0) updates.totalJoined = 0;
         if (Object.keys(updates).length) {
           await ctx.database.set("group_verification_stats", { id: st.id }, updates);
         }
@@ -1211,6 +1296,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);
         }
@@ -1272,6 +1358,7 @@ __name(apply, "apply");
   checkPermission,
   handleFailedVerification,
   handleGuildMemberRequestEvent,
+  incrementTotal,
   inject,
   mergeReminder,
   name,

package/package.json

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

package/readme.md

@@ -7,7 +7,7 @@
 - **多关键词匹配**：支持多个关键词的灵活配置
 - **四种审核方式**：全部同意、按数量同意、按比例同意、全部拒绝
 - **完善的权限控制**：群主/管理员权限或 Koishi 三级以上权限
-- **详细的统计功能**：自动记录审核统计和手动入群统计
+- **详细的统计功能**：自动记录审核统计和手动入群统计（含自动通过、手动通过、拒绝以及总入群人数）
 - **灵活的消息配置**：支持自定义提醒消息和禁用功能
 - **友好的命令系统**：丰富的别名和快捷命令
 
@@ -54,6 +54,12 @@ group-verify.config -i 123456789 关键词1,关键词2 -m 1 -t 1
 ```
 
 ### 审核命令
+
+> **命令增强**
+> - 未提供参数时 `gva`/`gvr` 会处理最近一条申请，`all` 可以批量处理。
+> - 如果申请记录缺少 requestId，则无法通过机器人接口处理，会提示管理员请在客户端手动操作。
+> - 输出结果会智能展示用户名和ID，避免出现 "12345(12345)" 这样的重复显示。
+
 ```
 # 同意申请（处理最近一个）
 group-verify.approve
@@ -103,6 +109,10 @@ group-verify.stats total
 - 方式2（按比例）：需要达到的百分比（1-100）
 
 ### 提醒消息配置
+
+提醒消息里的 `{threshold}` 在“按比例审核”模式下会显示为需要匹配的关键词数量
+（而非百分比），例如三条关键词、阈值60%时显示为“1/2”。
+
 - `-msg "消息内容"` - 设置自定义提醒消息
   - 消息内部可包含逗号：只要所有逗号前后都没有空格，它们将被视为同一消息内容。
   - 若逗号之后仍需写关键词，请使用引号包裹整个消息或在逗号后加空格以分隔。
@@ -144,10 +154,12 @@ group-verify.stats total
 ## 📊 统计功能
 
 插件会自动记录以下统计信息：
-- **自动批准**：通过关键词验证自动入群的用户数
-- **手动批准**：管理员手动同意的用户数
-- **拒绝**：被拒绝的申请数
-- **手动入群**：管理员直接邀请入群的用户数
+- **自动批准**：通过关键词验证自动入群的用户数（包括自动审批与手动 gva 同意）
+- **手动批准**：通过 gva 指令手动同意的用户数
+- **拒绝**：被拒绝的申请数（包括自动拒绝与 gvr 指令）
+- **总入群人数**：无论通过哪种方式，只要检测到成员加入即增加
+
+> ⚠️ 注意：绕过机器人手动在客户端同意/拒绝的操作不会计入自动批准/拒绝统计，但仍会反映在总入群人数中。
 ### ⚠️ OneBot/QQ 适配器注意
 默认情况下插件会使用 `ctx.broadcast` 发送提醒消息，
 为了兼容 OneBot、QQ 等需要同时指定频道和群号的协议，

package/src/index.ts

@@ -36,6 +36,8 @@ export interface GroupVerificationStats {
   autoApproved: number
   manuallyApproved: number
   rejected: number
+  // 新增：总入群人数（不论方式，只要检测到成员加入则增加）
+  totalJoined: number
   lastUpdated: string | Date
 }
 
@@ -46,6 +48,8 @@ export interface PendingVerification {
   userId: string
   userName: string
   requestMessage: string
+  // raw OneBot requestId (may be empty string)
+  requestId?: string
   applyTime: string | Date
 }
 
@@ -304,16 +308,18 @@ export async function syncTotalStats(ctx: Context) {
       const totalAutoApproved = allStats.reduce((sum, stat) => sum + (stat.autoApproved || 0), 0)
       const totalManuallyApproved = allStats.reduce((sum, stat) => sum + (stat.manuallyApproved || 0), 0)
       const totalRejected = allStats.reduce((sum, stat) => sum + (stat.rejected || 0), 0)
+      const totalJoined = allStats.reduce((sum, stat) => sum + (stat.totalJoined || 0), 0)
       
       // 更新总计行
       await ctx.database.set('group_verification_stats', { groupId: 'TOTAL' }, {
         autoApproved: totalAutoApproved,
         manuallyApproved: totalManuallyApproved,
         rejected: totalRejected,
+        totalJoined,
         lastUpdated: new Date().toISOString()
       })
       
-      logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}`)
+      logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}, 入群${totalJoined}`)
     }
   } catch (error) {
     logger.error('同步总计统计时出错:', error)
@@ -336,6 +342,7 @@ export async function updateStats(ctx: Context, groupId: string, action: 'autoAp
       autoApproved: action === 'autoApproved' ? 1 : 0,
       manuallyApproved: action === 'manuallyApproved' ? 1 : 0,
       rejected: action === 'rejected' ? 1 : 0,
+      totalJoined: 0,
       lastUpdated: new Date().toISOString()
     })
   }
@@ -344,6 +351,28 @@ export async function updateStats(ctx: Context, groupId: string, action: 'autoAp
   await syncTotalStats(ctx)
 }
 
+// 提取成独立函数：增加总入群计数，供事件统一调用
+export async function incrementTotal(ctx: Context, groupId: string) {
+  const existingStats = await ctx.database.get('group_verification_stats', { groupId })
+  if (existingStats.length > 0) {
+    const stats = existingStats[0]
+    await ctx.database.set('group_verification_stats', { id: stats.id }, {
+      totalJoined: (stats.totalJoined || 0) + 1,
+      lastUpdated: new Date().toISOString()
+    })
+  } else {
+    await ctx.database.create('group_verification_stats', {
+      groupId,
+      autoApproved: 0,
+      manuallyApproved: 0,
+      rejected: 0,
+      totalJoined: 1,
+      lastUpdated: new Date().toISOString()
+    })
+  }
+  await syncTotalStats(ctx)
+}
+
 // 权限检查函数（也可用于命令）
 export async function checkPermission(session: any, targetGroupId?: string): Promise<[boolean, string?]> {
   const groupId = targetGroupId || session.guildId
@@ -581,14 +610,26 @@ 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
+        // 显示阈值为需要匹配的关键词数量，避免 "1/60%" 之类混淆
+        const needed = Math.ceil(config.keywords.length * thresholdPct / 100)
+        requiredThreshold = `${needed}`
+      }
       break
     case 3: // 全部拒绝
       isValid = false
@@ -637,12 +678,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 +724,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 不可用，跳过发送')
+    }
   }
 }
 
@@ -720,6 +776,7 @@ export function apply(ctx: Context, config: Config) {
     autoApproved: 'integer',
     manuallyApproved: 'integer',
     rejected: 'integer',
+    totalJoined: 'integer',
     // store as string (ISO timestamp) to preserve full date+time;
     // Koishi `date` type truncates to day which leads to 00:00:00.
     lastUpdated: 'string'
@@ -728,15 +785,18 @@ 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
   })
@@ -754,6 +814,9 @@ export function apply(ctx: Context, config: Config) {
     const groupId = session.guildId
     const userId = session.userId
 
+    // 无论什么情况只要检测到加入就累加总入群
+    await incrementTotal(ctx, groupId)
+
     // 先检查 autoQueue
     const set = autoQueue.get(groupId)
     if (set && set.has(userId)) {
@@ -772,9 +835,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')
@@ -1212,7 +1277,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`
       }
@@ -1275,7 +1341,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') {
           // 处理所有待审核申请
@@ -1285,31 +1351,41 @@ export function apply(ctx: Context, config: Config) {
           }
           
           let approvedCount = 0
+          let skippedCount = 0
           for (const request of pendingRequests) {
-            try {
-              // TODO: 需要获取实际的requestId来进行审批
-              // await session.bot.handleGuildMemberRequest(request.requestId, true)
-              await ctx.database.remove('group_verification_pending', { id: request.id })
-              approvedCount++
-            } catch (error) {
-              logger.warn(`处理申请 ${request.id} 时出错:`, error)
+            if (request.requestId) {
+              try {
+                await session.bot.handleGuildMemberRequest(request.requestId, true)
+                approvedCount++
+              } catch (error) {
+                logger.warn(`处理申请 ${request.id} 时出错:`, error)
+              }
+            } else {
+              skippedCount++
             }
+            // 不论是否有 requestId，都清除记录，避免无限积累
+            await ctx.database.remove('group_verification_pending', { id: request.id })
           }
-          
-          return `已处理 ${approvedCount} 个加群申请`
+          let msg = `已处理 ${approvedCount} 个加群申请`
+          if (skippedCount) msg += `，${skippedCount} 个因缺少 requestId 未处理`;
+          return msg
         } 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', 'requestId'])
+          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]
+          if (!request.requestId) {
+            return `用户 ${request.userId} 的申请缺少 requestId，无法自动同意`;
+          }
           try {
-            // 这里需要获取实际的requestId，暂时用userId作为示例
-            await session.bot.handleGuildMemberRequest(request.userId, true)
-            await ctx.database.remove('group_verification_pending', { id: request.id })
-            return `已同意用户 ${request.userName}(${request.userId}) 的加群申请`
+            await session.bot.handleGuildMemberRequest(request.requestId, true)
+            // 清除该用户的所有待审核记录
+            await ctx.database.remove('group_verification_pending', { groupId, userId: request.userId })
+            const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId
+            return `已同意用户 ${displayName} 的加群申请`
           } catch (error) {
             return `处理申请时出错: ${error.message}`
           }
@@ -1317,7 +1393,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 
       })
@@ -1327,11 +1403,15 @@ export function apply(ctx: Context, config: Config) {
       }
 
       const request = pendingRequests[0]
+      if (!request.requestId) {
+        return `用户 ${userId} 的申请缺少 requestId，无法自动同意`
+      }
       try {
-        // 这里需要获取实际的requestId来进行审批
-        await session.bot.handleGuildMemberRequest(request.userId, true)
-        await ctx.database.remove('group_verification_pending', { id: request.id })
-        return `已同意用户 ${request.userName}(${userId}) 的加群申请`
+        await session.bot.handleGuildMemberRequest(request.requestId, true)
+        // 删除该用户的所有记录
+        await ctx.database.remove('group_verification_pending', { groupId, userId })
+        const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId
+        return `已同意用户 ${displayName} 的加群申请`
       } catch (error) {
         return `处理申请时出错: ${error.message}`
       }
@@ -1357,7 +1437,7 @@ export function apply(ctx: Context, config: Config) {
         return '请在群聊中使用此命令'
       }
 
-      // 处理默认情况和all情况
+      // 处理默认情况和 all 情况
       if (!userId || userId.toLowerCase() === 'all') {
         if (userId?.toLowerCase() === 'all') {
           // 拒绝所有待审核申请
@@ -1367,33 +1447,42 @@ export function apply(ctx: Context, config: Config) {
           }
           
           let rejectedCount = 0
+          let skippedCount = 0
           for (const request of pendingRequests) {
-            try {
-              // TODO: 需要获取实际的requestId来进行拒绝
-              // await session.bot.handleGuildMemberRequest(request.requestId, false)
-              await ctx.database.remove('group_verification_pending', { id: request.id })
-              await updateStats(ctx, groupId, 'rejected')
-              rejectedCount++
-            } catch (error) {
-              logger.warn(`处理申请 ${request.id} 时出错:`, error)
+            if (request.requestId) {
+              try {
+                await session.bot.handleGuildMemberRequest(request.requestId, false)
+                rejectedCount++
+              } catch (error) {
+                logger.warn(`处理申请 ${request.id} 时出错:`, error)
+              }
+            } else {
+              skippedCount++
             }
+            await ctx.database.remove('group_verification_pending', { id: request.id })
+            await updateStats(ctx, groupId, 'rejected')
           }
-          
-          return `已拒绝 ${rejectedCount} 个加群申请`
+          let msg = `已拒绝 ${rejectedCount} 个加群申请`
+          if (skippedCount) msg += `，${skippedCount} 个因缺少 requestId 未处理`;
+          return msg
         } 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', 'requestId'])
+          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]
+          if (!request.requestId) {
+            return `用户 ${request.userId} 的申请缺少 requestId，无法自动拒绝`;
+          }
           try {
-            // TODO: 需要获取实际的requestId来进行拒绝
-            // await session.bot.handleGuildMemberRequest(request.requestId, false)
-            await ctx.database.remove('group_verification_pending', { id: request.id })
+            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}) 的加群申请`
+            const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId
+            return `已拒绝用户 ${displayName} 的加群申请`
           } catch (error) {
             return `处理申请时出错: ${error.message}`
           }
@@ -1411,12 +1500,16 @@ export function apply(ctx: Context, config: Config) {
       }
 
       const request = pendingRequests[0]
+      if (!request.requestId) {
+        return `用户 ${userId} 的申请缺少 requestId，无法自动拒绝`
+      }
       try {
-        // TODO: 需要获取实际的requestId来进行拒绝
-        // await session.bot.handleGuildMemberRequest(request.requestId, false)
-        await ctx.database.remove('group_verification_pending', { id: request.id })
+        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}) 的加群申请`
+        const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId
+        return `已拒绝用户 ${displayName} 的加群申请`
       } catch (error) {
         return `处理申请时出错: ${error.message}`
       }
@@ -1591,6 +1684,8 @@ export function apply(ctx: Context, config: Config) {
       for (const st of stats) {
         const updates: any = {}
         if (st.lastUpdated instanceof Date) updates.lastUpdated = st.lastUpdated.toISOString()
+        // add missing totalJoined column default 0
+        if (st.totalJoined === undefined) updates.totalJoined = 0
         if (Object.keys(updates).length) {
           await ctx.database.set('group_verification_stats', { id: st.id }, updates)
         }
@@ -1599,6 +1694,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)
         }