koishi-plugin-group-verification 1.0.27 → 1.0.29

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 {
@@ -41,6 +42,10 @@ export interface Config {
     defaultReminderMessage?: string;
     enableStrictGroupCheck?: boolean;
     logLevel?: 'debug' | 'info' | 'warn' | 'error';
+    permissionDeniedMessage?: string;
+    invalidGroupMessage?: string;
+    parameterConflictMessage?: string;
+    noKeywordsMessage?: string;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: string[];
@@ -86,12 +91,19 @@ export declare function mergeReminder(existingConfig: any | null, cleanedOptions
     message?: string;
     enableMessage?: boolean;
     disableMessage?: boolean;
-}, hasRealMessageParam: boolean, hasRealEnableMessageParam: boolean, hasRealDisableMessageParam: boolean, logger: any): {
+}, hasRealMessageParam: boolean, hasRealEnableMessageParam: boolean, hasRealDisableMessageParam: boolean, logger: any, defaultMessage?: string): {
     reminderEnabled: boolean;
     reminderMessage: string;
 };
 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 interface ThresholdResult {
+    reviewParameters: number;
+    error?: string;
+    autoInfo?: 'methodChange' | 'kwChange';
+}
+export declare function resolveThreshold(existingConfig: any | null, keywordList: string[], reviewMethod: 0 | 1 | 2 | 3, thresholdStr?: string, methodChanged?: boolean): ThresholdResult;
 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,10 +26,12 @@ __export(src_exports, {
   checkPermission: () => checkPermission,
   handleFailedVerification: () => handleFailedVerification,
   handleGuildMemberRequestEvent: () => handleGuildMemberRequestEvent,
+  incrementTotal: () => incrementTotal,
   inject: () => inject,
   mergeReminder: () => mergeReminder,
   name: () => name,
   parseConfigArgs: () => parseConfigArgs,
+  resolveThreshold: () => resolveThreshold,
   syncTotalStats: () => syncTotalStats,
   tokenize: () => tokenize,
   updateStats: () => updateStats,
@@ -41,9 +43,13 @@ var import_koishi = require("koishi");
 var name = "group-verification";
 var logger = console;
 var Config = import_koishi.Schema.object({
-  defaultReminderMessage: import_koishi.Schema.string().description("默认提醒消息模板（使用 \n 表示换行，可包含下方变量）").default("{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}\n使用 gva 同意或 gvr 拒绝申请"),
+  defaultReminderMessage: import_koishi.Schema.string().description("默认提醒消息模板（使用 \\n 表示换行，可包含下方变量）").default("{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}\n使用 gva 同意或 gvr 拒绝申请"),
   enableStrictGroupCheck: import_koishi.Schema.boolean().description("是否启用严格的群号检查（检查群号长度）").default(false),
-  logLevel: import_koishi.Schema.union(["debug", "info", "warn", "error"]).description("日志级别").default("info")
+  logLevel: import_koishi.Schema.union(["debug", "info", "warn", "error"]).description("日志级别").default("info"),
+  permissionDeniedMessage: import_koishi.Schema.string().description("权限不足时返回给调用者的提示").default("权限不足：需要群主/管理员权限或koishi三级以上权限"),
+  invalidGroupMessage: import_koishi.Schema.string().description("无效群号或机器人未在该群时的提示").default("群号 {group} 格式不合法或机器人不在该群中"),
+  parameterConflictMessage: import_koishi.Schema.string().description("参数冲突时提示").default("参数冲突：-? 或 -r 不能与其他参数或关键词一起使用（仅可搭配 -i）"),
+  noKeywordsMessage: import_koishi.Schema.string().description("未提供关键词且无法从现有配置继承时的提示").default("请先提供关键词创建配置，或使用 -? 查询配置，-r 删除配置")
 }).description("群组验证插件配置");
 var inject = ["database"];
 var ESC_QUOTE = "\0";
@@ -174,24 +180,24 @@ function usageString() {
     使用 \\n   换行`;
 }
 __name(usageString, "usageString");
-function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasRealEnableMessageParam, hasRealDisableMessageParam, logger2) {
+function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasRealEnableMessageParam, hasRealDisableMessageParam, logger2, defaultMessage) {
   let reminderEnabled = true;
-  let reminderMessage = "{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}";
+  let reminderMessage = defaultMessage || "{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}";
   if (existingConfig) {
     reminderEnabled = existingConfig.reminderEnabled;
     reminderMessage = existingConfig.reminderMessage || reminderMessage;
   }
   if (hasRealDisableMessageParam) {
     reminderEnabled = false;
-    logger2.info("禁用提醒消息功能 (保留现有内容)");
+    logger2.debug("禁用提醒消息功能 (保留现有内容)");
   } else if (hasRealEnableMessageParam) {
     reminderEnabled = true;
-    logger2.info(`启用提醒消息（保留原消息）: ${reminderMessage.substring(0, 50)}...`);
+    logger2.debug(`启用提醒消息（保留原消息）: ${reminderMessage.substring(0, 50)}...`);
   } else if (hasRealMessageParam) {
     reminderEnabled = true;
     if (cleanedOptions.message !== void 0) {
       reminderMessage = cleanedOptions.message.replace(/\\n/g, "\n");
-      logger2.info(`设置自定义提醒消息: ${reminderMessage.substring(0, 50)}...`);
+      logger2.debug(`设置自定义提醒消息: ${reminderMessage.substring(0, 50)}...`);
     }
   }
   return { reminderEnabled, reminderMessage };
@@ -207,13 +213,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.debug(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}, 入群${totalJoined}`);
     }
   } catch (error) {
     logger.error("同步总计统计时出错:", error);
@@ -234,36 +242,100 @@ 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");
+function resolveThreshold(existingConfig, keywordList, reviewMethod, thresholdStr, methodChanged = false) {
+  let reviewParameters = 0;
+  if (existingConfig) {
+    reviewParameters = existingConfig.reviewParameters || 0;
+    if (isNaN(reviewParameters)) reviewParameters = 0;
+  }
+  if (thresholdStr !== void 0) {
+    const thresholdNum = parseInt(thresholdStr);
+    if (isNaN(thresholdNum)) {
+      return { reviewParameters, error: "阈值参数必须为数字" };
+    }
+    if (reviewMethod === 1) {
+      if (thresholdNum < 0 || thresholdNum > keywordList.length) {
+        return { reviewParameters, error: `数量阈值必须在0-${keywordList.length}之间（0表示全部同意）` };
+      }
+    } else if (reviewMethod === 2) {
+      if (thresholdNum < 0 || thresholdNum > 100) {
+        return { reviewParameters, error: "比例阈值必须在0-100之间（0表示全部同意）" };
+      }
+    }
+    return { reviewParameters: thresholdNum };
+  }
+  if (methodChanged) {
+    if (reviewMethod === 1) {
+      reviewParameters = keywordList.length;
+      return { reviewParameters, autoInfo: "methodChange" };
+    }
+    if (reviewMethod === 2) {
+      reviewParameters = 100;
+      return { reviewParameters, autoInfo: "methodChange" };
+    }
+  }
+  if (existingConfig && reviewMethod === 1 && reviewParameters !== 0) {
+    const oldKeywordCount = existingConfig.keywords.length;
+    const newKeywordCount = keywordList.length;
+    if (oldKeywordCount !== newKeywordCount) {
+      reviewParameters = newKeywordCount;
+      return { reviewParameters, autoInfo: "kwChange" };
+    }
+  }
+  return { reviewParameters };
+}
+__name(resolveThreshold, "resolveThreshold");
 async function checkPermission(session, targetGroupId) {
   const groupId = targetGroupId || session.guildId;
   if (!groupId) {
     return [false, "请在群聊中使用此命令或使用 -i 参数指定群号"];
   }
-  logger.info(`权限检查 - 用户ID: ${session.userId}, 群号: ${groupId}`);
+  logger.debug(`权限检查 - 用户ID: ${session.userId}, 群号: ${groupId}`);
   const koishiAuthority = session.author?.authority || session.user?.authority;
-  logger.info(`权限检查 - Koishi权限等级: ${koishiAuthority || "未获取到"}`);
+  logger.debug(`权限检查 - Koishi权限等级: ${koishiAuthority || "未获取到"}`);
   if (!session.author) {
-    logger.info(`权限检查 - session中可能的权限字段:`, {
+    logger.debug(`权限检查 - session中可能的权限字段:`, {
       authority: session.authority,
       permission: session.permission,
       role: session.role
     });
   } else {
-    logger.info(`权限检查 - author对象中的字段:`, {
-      authority: session.author.authority,
+    logger.debug(`权限检查 - author对象中的字段:`, {
       permission: session.author.permission,
       role: session.author.role,
       permissions: session.author.permissions
     });
   }
   if (session.user) {
-    logger.info(`权限检查 - user对象中的权限信息:`, {
+    logger.debug(`权限检查 - user对象中的权限信息:`, {
       authority: session.user.authority,
       permission: session.user.permission,
       role: session.user.role
@@ -321,12 +393,12 @@ async function handleGuildMemberRequestEvent(ctx, session) {
     return;
   }
   const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session);
-  logger.info(`验证结果 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
+  logger.debug(`验证结果 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
   if (isValid) {
     if (requestId) {
       try {
         await session.bot.handleGuildMemberRequest(requestId, true);
-        logger.info(`自动同意 requestId=${requestId}`);
+        logger.debug(`自动同意 requestId=${requestId}`);
         if (!autoQueue.has(guildId)) autoQueue.set(guildId, /* @__PURE__ */ new Set());
         autoQueue.get(guildId).add(userId);
       } catch (e) {
@@ -454,7 +526,8 @@ async function verifyApplication(config, message, session) {
         const thresholdPct = config.reviewParameters !== void 0 && config.reviewParameters !== null ? config.reviewParameters : 100;
         const ratio = matchedCount / config.keywords.length;
         isValid = ratio >= thresholdPct / 100;
-        requiredThreshold = `${thresholdPct}%`;
+        const needed = Math.ceil(config.keywords.length * thresholdPct / 100);
+        requiredThreshold = `${needed}`;
       }
       break;
     case 3:
@@ -465,7 +538,7 @@ async function verifyApplication(config, message, session) {
       isValid = false;
       requiredThreshold = "null";
   }
-  logger.info(`verifyApplication msg="${message}" keywords=${JSON.stringify(config.keywords)} matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
+  logger.debug(`verifyApplication msg="${message}" keywords=${JSON.stringify(config.keywords)} matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
   return { isValid, matchedCount, requiredThreshold };
 }
 __name(verifyApplication, "verifyApplication");
@@ -478,7 +551,7 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
   }
   const username = session.username || "未知用户";
   const message = session.content || "";
-  logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`);
+  logger.debug(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`);
   if (matchedCount === void 0 || requiredThreshold === void 0) {
     const result = await verifyApplication(config, message, session);
     matchedCount = result.matchedCount;
@@ -501,7 +574,7 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
     applyTime: (/* @__PURE__ */ new Date()).toISOString()
   });
   if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === "") {
-    logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
+    logger.debug(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
     return;
   }
   let reminderMsg = config.reminderMessage;
@@ -549,6 +622,7 @@ function apply(ctx, config) {
     autoInc: true
   });
   logger = ctx.logger("group-verification");
+  if (config.logLevel) logger.level = config.logLevel;
   logger.info("群组验证插件已启动");
   logger.info(`默认提醒消息: ${config.defaultReminderMessage}`);
   logger.info(`严格群号检查: ${config.enableStrictGroupCheck ? "启用" : "禁用"}`);
@@ -559,6 +633,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"
@@ -587,6 +662,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");
@@ -612,19 +688,19 @@ function apply(ctx, config) {
   async function checkPermission2(session, targetGroupId) {
     const groupId = targetGroupId || session.guildId;
     if (!groupId) {
-      return [false, "请在群聊中使用此命令或使用 -i 参数指定群号"];
+      return [false, config.invalidGroupMessage || "请在群聊中使用此命令或使用 -i 参数指定群号"];
     }
-    logger.info(`权限检查 - 用户ID: ${session.userId}, 群号: ${groupId}`);
+    logger.debug(`权限检查 - 用户ID: ${session.userId}, 群号: ${groupId}`);
     const koishiAuthority = session.author?.authority || session.user?.authority;
-    logger.info(`权限检查 - Koishi权限等级: ${koishiAuthority || "未获取到"}`);
+    logger.debug(`权限检查 - Koishi权限等级: ${koishiAuthority || "未获取到"}`);
     if (!session.author) {
-      logger.info(`权限检查 - session中可能的权限字段:`, {
+      logger.debug(`权限检查 - session中可能的权限字段:`, {
         authority: session.authority,
         permission: session.permission,
         role: session.role
       });
     } else {
-      logger.info(`权限检查 - author对象中的字段:`, {
+      logger.debug(`权限检查 - author对象中的字段:`, {
         authority: session.author.authority,
         permission: session.author.permission,
         role: session.author.role,
@@ -632,19 +708,19 @@ function apply(ctx, config) {
       });
     }
     if (session.user) {
-      logger.info(`权限检查 - user对象中的权限信息:`, {
+      logger.debug(`权限检查 - user对象中的权限信息:`, {
         authority: session.user.authority,
         permission: session.user.permission,
         role: session.user.role
       });
     }
     if (koishiAuthority && koishiAuthority >= 3) {
-      logger.info(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`);
+      logger.debug(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`);
       return [true];
     }
     try {
       const member = await session.bot.getGuildMember(groupId, session.userId);
-      logger.info(`权限检查 - 获取到成员信息:`, {
+      logger.debug(`权限检查 - 获取到成员信息:`, {
         roles: member?.roles,
         permissions: member?.permissions
       });
@@ -654,7 +730,7 @@ function apply(ctx, config) {
           return [true];
         }
         if (member.roles?.includes("admin") || member.permissions?.includes("ADMINISTRATOR")) {
-          logger.info(`权限检查 - 用户是管理员`);
+          logger.debug(`权限检查 - 用户是管理员`);
           return [true];
         }
       }
@@ -662,9 +738,9 @@ function apply(ctx, config) {
       logger.warn(`权限检查 - 获取群成员信息失败:`, error);
       return [false, `无法获取群 ${groupId} 的成员信息，请确认机器人已在该群中`];
     }
-    logger.info(`权限检查 - 权限不足`);
+    logger.debug(`权限检查 - 权限不足`);
     const debugInfo = `调试信息 - 用户ID:${session.userId}, 群号:${groupId}, 权限等级:${koishiAuthority || "未知"}`;
-    return [false, `权限不足：需要群主/管理员权限或koishi三级以上权限
+    return [false, (config.permissionDeniedMessage || "权限不足：需要群主/管理员权限或koishi三级以上权限") + `
 ${debugInfo}`];
   }
   __name(checkPermission2, "checkPermission");
@@ -701,7 +777,7 @@ ${debugInfo}`];
     };
     logger.info(`合并后options: ${JSON.stringify(cleanedOptions, null, 2)}`);
     if ((cleanedOptions.query || cleanedOptions.remove) && (parsedKeywords.length > 0 || cleanedOptions.method !== void 0 || cleanedOptions.threshold !== void 0 || cleanedOptions.message !== void 0 || cleanedOptions.enableMessage || cleanedOptions.disableMessage)) {
-      return "参数冲突：-? 或 -r 不能与其他参数或关键词一起使用（仅可搭配 -i）";
+      return config.parameterConflictMessage || "参数冲突：-? 或 -r 不能与其他参数或关键词一起使用（仅可搭配 -i）";
     }
     const hasRealMessageParam = cleanedOptions.message !== void 0;
     const hasRealEnableMessageParam = cleanedOptions.enableMessage === true;
@@ -813,7 +889,7 @@ ${debugInfo}`];
     }
     if (keywordList.length === 0 && !cleanedOptions.query && !cleanedOptions.remove) {
       if (!existingConfig) {
-        return "请先提供关键词创建配置，或使用 -? 查询配置，-r 删除配置";
+        return config.noKeywordsMessage || "请先提供关键词创建配置，或使用 -? 查询配置，-r 删除配置";
       }
       keywordList = existingConfig.keywords;
     }
@@ -823,7 +899,8 @@ ${debugInfo}`];
       hasRealMessageParam,
       hasRealEnableMessageParam,
       hasRealDisableMessageParam,
-      logger
+      logger,
+      config.defaultReminderMessage
     );
     let reviewMethod = 0;
     let reviewParameters = 0;
@@ -841,44 +918,45 @@ ${debugInfo}`];
       if (isNaN(methodNum) || methodNum < 0 || methodNum > 3) {
         return "审核方式参数错误：0-全部同意, 1-按数量同意, 2-按比例同意, 3-全部拒绝";
       }
+      const oldMethod = reviewMethod;
       reviewMethod = methodNum;
-      logger.info(`审核方式明确指定为: ${reviewMethod}`);
+      logger.debug(`审核方式明确指定为: ${reviewMethod}`);
+      var methodChanged = oldMethod !== reviewMethod;
     } else {
-      logger.info(`未指定审核方式，保持原有值: ${reviewMethod}`);
+      logger.debug(`未指定审核方式，保持原有值: ${reviewMethod}`);
+      var methodChanged = false;
     }
-    if (cleanedOptions.threshold !== void 0) {
-      const thresholdNum = parseInt(cleanedOptions.threshold);
-      if (isNaN(thresholdNum)) {
-        return "阈值参数必须为数字";
-      }
+    const thresholdResult = resolveThreshold(
+      existingConfig,
+      keywordList,
+      reviewMethod,
+      cleanedOptions.threshold,
+      methodChanged
+    );
+    if (thresholdResult.error) {
+      return thresholdResult.error;
+    }
+    reviewParameters = thresholdResult.reviewParameters;
+    if (existingConfig && reviewParameters !== existingConfig.reviewParameters) {
+      await ctx.database.set("group_verification_config", { id: existingConfig.id }, {
+        reviewParameters,
+        updatedBy: session.username || session.userId,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      logger.debug(`自动调整并更新数据库阈值为: ${reviewParameters}`);
+    }
+    let autoAdjustNote = "";
+    if (thresholdResult.autoInfo === "methodChange") {
       if (reviewMethod === 1) {
-        if (thresholdNum < 0 || thresholdNum > keywordList.length) {
-          return `数量阈值必须在0-${keywordList.length}之间（0表示全部同意）`;
-        }
-        reviewParameters = thresholdNum;
-        logger.info(`明确指定阈值: ${thresholdNum}`);
+        autoAdjustNote = `⚠️ 审核方式由 ${existingConfig?.reviewMethod} 改为 ${reviewMethod}，阈值自动设为 ${reviewParameters}
+`;
       } else if (reviewMethod === 2) {
-        if (thresholdNum < 0 || thresholdNum > 100) {
-          return "比例阈值必须在0-100之间（0表示全部同意）";
-        }
-        reviewParameters = thresholdNum;
-        logger.info(`明确指定阈值: ${thresholdNum}%`);
-      }
-    } else if (existingConfig && reviewMethod === 1 && reviewParameters !== 0) {
-      const oldKeywordCount = existingConfig.keywords.length;
-      const newKeywordCount = keywordList.length;
-      if (oldKeywordCount !== newKeywordCount) {
-        reviewParameters = newKeywordCount;
-        logger.info(`关键词数量从${oldKeywordCount}变为${newKeywordCount}，自动调整阈值`);
-        await ctx.database.set("group_verification_config", { id: existingConfig.id }, {
-          reviewParameters,
-          updatedBy: session.username || session.userId,
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-        });
-        logger.info(`已更新数据库阈值为: ${reviewParameters}`);
-      } else {
-        logger.info(`关键词数量未变化(${newKeywordCount})，保持原阈值: ${reviewParameters}`);
+        autoAdjustNote = `⚠️ 审核方式由 ${existingConfig?.reviewMethod} 改为 ${reviewMethod}，阈值自动设为 ${reviewParameters}%
+`;
       }
+    } else if (thresholdResult.autoInfo === "kwChange") {
+      autoAdjustNote = `⚠️ 关键词数量从${existingConfig?.keywords.length}变为${keywordList.length}，阈值已自动调整为${reviewParameters}
+`;
     }
     const encodedKeywords = keywordList.map((keyword) => {
       return keyword.replace(/,/g, "[[COMMA]]");
@@ -912,6 +990,7 @@ ${debugInfo}`];
     const decodedKeywords = keywordList;
     let feedbackMessage = `群 ${targetGroupId} 配置已更新:
 `;
+    if (autoAdjustNote) feedbackMessage += autoAdjustNote;
     const displayKeywords = keywordList.map((k) => k.replace(/\[\[COMMA\]\]/g, ","));
     feedbackMessage += `关键词: ${displayKeywords.map((k) => `"${k}"`).join(", ")}
 `;
@@ -927,10 +1006,6 @@ ${debugInfo}`];
 `;
     if (reminderMessage && reminderEnabled) {
       feedbackMessage += `提醒消息: ${reminderMessage.substring(0, 30)}${reminderMessage.length > 30 ? "..." : ""}
-`;
-    }
-    if (existingConfig && reviewMethod === 1 && keywordList.length !== existingConfig.keywords.length) {
-      feedbackMessage += `⚠️ 关键词数量从${existingConfig.keywords.length}变为${keywordList.length}，阈值已自动调整为${keywordList.length}
 `;
     }
     logger.info(`准备存储到数据库的关键词: ${JSON.stringify(encodedKeywords)}`);
@@ -978,33 +1053,38 @@ ${debugInfo}`];
           return "当前无待审核的加群申请";
         }
         let approvedCount = 0;
+        let skippedCount = 0;
         for (const request2 of pendingRequests2) {
-          try {
-            if (request2.requestId) {
+          if (request2.requestId) {
+            try {
               await session.bot.handleGuildMemberRequest(request2.requestId, true);
+              approvedCount++;
+            } catch (error) {
+              logger.warn(`处理申请 ${request2.id} 时出错:`, error);
             }
-            await ctx.database.remove("group_verification_pending", { id: request2.id });
-            await updateStats(ctx, groupId, "manuallyApproved");
-            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 {
-        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime"]);
+        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime", "requestId"]);
         if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
         pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
         const request2 = pending[0];
+        if (!request2.requestId) {
+          return `用户 ${request2.userId} 的申请缺少 requestId，无法自动同意`;
+        }
         try {
-          if (request2.requestId) {
-            await session.bot.handleGuildMemberRequest(request2.requestId, true);
-          }
+          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}) 的加群申请`;
+          const displayName = request2.userName && request2.userName !== request2.userId ? `${request2.userName}(${request2.userId})` : request2.userId;
+          return `已同意用户 ${displayName} 的加群申请`;
         } catch (error) {
           return `处理申请时出错: ${error.message}`;
         }
@@ -1018,13 +1098,14 @@ ${debugInfo}`];
       return `未找到用户 ${userId} 的待审核申请`;
     }
     const request = pendingRequests[0];
+    if (!request.requestId) {
+      return `用户 ${userId} 的申请缺少 requestId，无法自动同意`;
+    }
     try {
-      if (request.requestId) {
-        await session.bot.handleGuildMemberRequest(request.requestId, true);
-      }
+      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}) 的加群申请`;
+      const displayName = request.userName && request.userName !== request.userId ? `${request.userName}(${request.userId})` : request.userId;
+      return `已同意用户 ${displayName} 的加群申请`;
     } catch (error) {
       return `处理申请时出错: ${error.message}`;
     }
@@ -1053,33 +1134,40 @@ ${debugInfo}`];
           return "当前无待审核的加群申请";
         }
         let rejectedCount = 0;
+        let skippedCount = 0;
         for (const request2 of pendingRequests2) {
-          try {
-            if (request2.requestId) {
+          if (request2.requestId) {
+            try {
               await session.bot.handleGuildMemberRequest(request2.requestId, false);
+              rejectedCount++;
+            } catch (error) {
+              logger.warn(`处理申请 ${request2.id} 时出错:`, error);
             }
-            await ctx.database.remove("group_verification_pending", { id: request2.id });
-            await updateStats(ctx, groupId, "rejected");
-            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 {
-        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime"]);
+        let pending = await ctx.database.get("group_verification_pending", { groupId }, ["id", "userId", "userName", "applyTime", "requestId"]);
         if (pending.length === 0) {
           return "当前无待审核的加群申请";
         }
         pending.sort((a, b) => String(b.applyTime).localeCompare(String(a.applyTime)));
         const request2 = pending[0];
+        if (!request2.requestId) {
+          return `用户 ${request2.userId} 的申请缺少 requestId，无法自动拒绝`;
+        }
         try {
-          if (request2.requestId) {
-            await session.bot.handleGuildMemberRequest(request2.requestId, false);
-          }
+          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}`;
         }
@@ -1093,13 +1181,15 @@ ${debugInfo}`];
       return `未找到用户 ${userId} 的待审核申请`;
     }
     const request = pendingRequests[0];
+    if (!request.requestId) {
+      return `用户 ${userId} 的申请缺少 requestId，无法自动拒绝`;
+    }
     try {
-      if (request.requestId) {
-        await session.bot.handleGuildMemberRequest(request.requestId, false);
-      }
+      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}`;
     }
@@ -1244,6 +1334,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);
         }
@@ -1314,10 +1405,12 @@ __name(apply, "apply");
   checkPermission,
   handleFailedVerification,
   handleGuildMemberRequestEvent,
+  incrementTotal,
   inject,
   mergeReminder,
   name,
   parseConfigArgs,
+  resolveThreshold,
   syncTotalStats,
   tokenize,
   updateStats,