koishi-plugin-group-verification 1.0.18 → 1.0.19

package/lib/index.d.ts

@@ -95,4 +95,9 @@ export declare function mergeReminder(existingConfig: any | null, cleanedOptions
  * 若检测到格式错误（如纯空格分隔关键词），返回 error 字段。
  */
 export declare function parseConfigArgs(raw: string): ParsedArgs;
+export declare function verifyApplication(config: GroupVerificationConfig, message: string, session: any): Promise<{
+    isValid: boolean;
+    matchedCount: number;
+    requiredThreshold: string;
+}>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -26,11 +26,13 @@ __export(src_exports, {
   mergeReminder: () => mergeReminder,
   name: () => name,
   parseConfigArgs: () => parseConfigArgs,
-  tokenize: () => tokenize
+  tokenize: () => tokenize,
+  verifyApplication: () => verifyApplication
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var name = "group-verification";
+var logger = console;
 var Config = import_koishi.Schema.object({
   defaultReminderMessage: import_koishi.Schema.string().description("默认提醒消息模板").default("{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}"),
   enableStrictGroupCheck: import_koishi.Schema.boolean().description("是否启用严格的群号检查（检查群号长度）").default(false),
@@ -140,7 +142,7 @@ function validateKeywordFormat(raw) {
   return true;
 }
 __name(validateKeywordFormat, "validateKeywordFormat");
-function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasRealEnableMessageParam, hasRealDisableMessageParam, logger) {
+function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasRealEnableMessageParam, hasRealDisableMessageParam, logger2) {
   let reminderEnabled = true;
   let reminderMessage = "{user}({id}) 申请加入群 {gname}({group})\n申请理由：{question}\n匹配情况：{answer}/{threshold}";
   if (existingConfig) {
@@ -149,15 +151,15 @@ function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasR
   }
   if (hasRealDisableMessageParam) {
     reminderEnabled = false;
-    logger.info("禁用提醒消息功能 (保留现有内容)");
+    logger2.info("禁用提醒消息功能 (保留现有内容)");
   } else if (hasRealEnableMessageParam) {
     reminderEnabled = true;
-    logger.info(`启用提醒消息（保留原消息）: ${reminderMessage.substring(0, 50)}...`);
+    logger2.info(`启用提醒消息（保留原消息）: ${reminderMessage.substring(0, 50)}...`);
   } else if (hasRealMessageParam) {
     reminderEnabled = true;
     if (cleanedOptions.message !== void 0) {
       reminderMessage = cleanedOptions.message.replace(/\\n/g, "\n");
-      logger.info(`设置自定义提醒消息: ${reminderMessage.substring(0, 50)}...`);
+      logger2.info(`设置自定义提醒消息: ${reminderMessage.substring(0, 50)}...`);
     }
   }
   return { reminderEnabled, reminderMessage };
@@ -247,6 +249,44 @@ function parseConfigArgs(raw) {
   return { keywords, flags, error };
 }
 __name(parseConfigArgs, "parseConfigArgs");
+async function verifyApplication(config, message, session) {
+  const lowered = message.toLowerCase();
+  const matched = /* @__PURE__ */ new Set();
+  for (const keyword of config.keywords) {
+    if (lowered.includes(keyword.toLowerCase())) {
+      matched.add(keyword);
+    }
+  }
+  const matchedCount = matched.size;
+  let isValid = false;
+  let requiredThreshold = "";
+  switch (config.reviewMethod) {
+    case 0:
+      isValid = true;
+      requiredThreshold = "null";
+      break;
+    case 1:
+      isValid = matchedCount >= (config.reviewParameters || 1);
+      requiredThreshold = `${config.reviewParameters || 1}`;
+      break;
+    case 2:
+      const ratio = matchedCount / config.keywords.length;
+      const requiredRatio = (config.reviewParameters || 100) / 100;
+      isValid = ratio >= requiredRatio;
+      requiredThreshold = `${config.reviewParameters || 100}%`;
+      break;
+    case 3:
+      isValid = false;
+      requiredThreshold = "null";
+      break;
+    default:
+      isValid = false;
+      requiredThreshold = "null";
+  }
+  logger.info(`verifyApplication msg="${message}" keywords=${JSON.stringify(config.keywords)} matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
+  return { isValid, matchedCount, requiredThreshold };
+}
+__name(verifyApplication, "verifyApplication");
 function apply(ctx, config) {
   ctx.model.extend("group_verification_config", {
     id: "unsigned",
@@ -265,7 +305,7 @@ function apply(ctx, config) {
     primary: "id",
     autoInc: true
   });
-  const logger = ctx.logger("group-verification");
+  logger = ctx.logger("group-verification");
   logger.info("群组验证插件已启动");
   logger.info(`默认提醒消息: ${config.defaultReminderMessage}`);
   logger.info(`严格群号检查: ${config.enableStrictGroupCheck ? "启用" : "禁用"}`);
@@ -292,6 +332,7 @@ function apply(ctx, config) {
     primary: "id",
     autoInc: true
   });
+  const autoQueue = /* @__PURE__ */ new Map();
   ctx.on("guild-member-request", async (session) => {
     logger.debug("guild-member-request event", session);
     let guildId = (session.guildId || session.channelId || "").toString().trim();
@@ -302,16 +343,6 @@ function apply(ctx, config) {
       return;
     }
     const requestId = session.event?.requestId || session.messageId || "";
-    if (requestId) {
-      try {
-        await session.bot.handleGuildMemberRequest(requestId, true);
-        logger.info(`自动同意申请 requestId=${requestId}`);
-        await updateStats(guildId, "autoApproved");
-        return;
-      } catch (e) {
-        logger.warn("自动同意失败", e);
-      }
-    }
     const groupConfig = await ctx.database.get("group_verification_config", {
       groupId: guildId
     });
@@ -320,16 +351,18 @@ function apply(ctx, config) {
     }
     const config2 = groupConfig[0];
     const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config2, message, session);
+    logger.info(`验证结果 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.info(`自动同意 requestId=${requestId}`);
+          if (!autoQueue.has(guildId)) autoQueue.set(guildId, /* @__PURE__ */ new Set());
+          autoQueue.get(guildId).add(userId);
         } catch (e) {
           logger.warn("自动同意失败", e);
         }
       }
-      await updateStats(guildId, "autoApproved");
     } else {
       await handleFailedVerification(ctx, session, config2);
     }
@@ -337,6 +370,13 @@ function apply(ctx, config) {
   ctx.on("guild-member-added", async (session) => {
     const groupId = session.guildId;
     const userId = session.userId;
+    const set = autoQueue.get(groupId);
+    if (set && set.has(userId)) {
+      await updateStats(groupId, "autoApproved");
+      set.delete(userId);
+      logger.info(`用户 ${userId} 通过机器人审批加入群 ${groupId}（autoQueue），统计已更新`);
+      return;
+    }
     const pendingRecords = await ctx.database.get("group_verification_pending", {
       groupId,
       userId
@@ -382,38 +422,6 @@ function apply(ctx, config) {
     await ctx2.broadcast([guildId], reminderMsg);
   }
   __name(handleFailedVerification, "handleFailedVerification");
-  async function verifyApplication(config2, message, session) {
-    const matchedCount = config2.keywords.filter(
-      (keyword) => message.toLowerCase().includes(keyword.toLowerCase())
-    ).length;
-    let isValid = false;
-    let requiredThreshold = "";
-    switch (config2.reviewMethod) {
-      case 0:
-        isValid = true;
-        requiredThreshold = "null";
-        break;
-      case 1:
-        isValid = matchedCount >= (config2.reviewParameters || 1);
-        requiredThreshold = `${config2.reviewParameters || 1}`;
-        break;
-      case 2:
-        const ratio = matchedCount / config2.keywords.length;
-        const requiredRatio = (config2.reviewParameters || 100) / 100;
-        isValid = ratio >= requiredRatio;
-        requiredThreshold = `${config2.reviewParameters || 100}%`;
-        break;
-      case 3:
-        isValid = false;
-        requiredThreshold = "null";
-        break;
-      default:
-        isValid = false;
-        requiredThreshold = "null";
-    }
-    return { isValid, matchedCount, requiredThreshold };
-  }
-  __name(verifyApplication, "verifyApplication");
   async function updateStats(groupId, action) {
     const existingStats = await ctx.database.get("group_verification_stats", { groupId });
     if (existingStats.length > 0) {
@@ -805,7 +813,8 @@ gvc -r                          # 删除配置`;
         for (const request2 of pendingRequests2) {
           try {
             await ctx.database.remove("group_verification_pending", { id: request2.id });
-            await updateStats(groupId, "manuallyApproved");
+            if (!autoQueue.has(groupId)) autoQueue.set(groupId, /* @__PURE__ */ new Set());
+            autoQueue.get(groupId).add(request2.userId);
             approvedCount++;
           } catch (error) {
             logger.warn(`处理申请 ${request2.id} 时出错:`, error);
@@ -821,7 +830,8 @@ gvc -r                          # 删除配置`;
         try {
           await session.bot.handleGuildMemberRequest(request2.userId, true);
           await ctx.database.remove("group_verification_pending", { id: request2.id });
-          await updateStats(groupId, "manuallyApproved");
+          if (!autoQueue.has(groupId)) autoQueue.set(groupId, /* @__PURE__ */ new Set());
+          autoQueue.get(groupId).add(request2.userId);
           return `已同意用户 ${request2.userName}(${request2.userId}) 的加群申请`;
         } catch (error) {
           return `处理申请时出错: ${error.message}`;
@@ -839,7 +849,8 @@ gvc -r                          # 删除配置`;
     try {
       await session.bot.handleGuildMemberRequest(request.userId, true);
       await ctx.database.remove("group_verification_pending", { id: request.id });
-      await updateStats(groupId, "manuallyApproved");
+      if (!autoQueue.has(groupId)) autoQueue.set(groupId, /* @__PURE__ */ new Set());
+      autoQueue.get(groupId).add(userId);
       return `已同意用户 ${request.userName}(${userId}) 的加群申请`;
     } catch (error) {
       return `处理申请时出错: ${error.message}`;
@@ -1111,5 +1122,6 @@ __name(apply, "apply");
   mergeReminder,
   name,
   parseConfigArgs,
-  tokenize
+  tokenize,
+  verifyApplication
 });

package/package.json

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

package/src/index.ts

@@ -2,6 +2,9 @@ import { Context, Schema, Session } from 'koishi'
 
 export const name = 'group-verification'
 
+// 模块级日志器，测试时使用 console
+let logger: any = console
+
 // 数据库模型定义
 declare module 'koishi' {
   interface Tables {
@@ -358,6 +361,50 @@ export function parseConfigArgs(raw: string): ParsedArgs {
 
   return { keywords, flags, error };
 }
+
+// 验证申请（提取到外层，供测试调用）
+export async function verifyApplication(config: GroupVerificationConfig, message: string, session: any): Promise<{isValid: boolean, matchedCount: number, requiredThreshold: string}> {
+  // 统计匹配的关键词数量（允许相互重叠）
+  const lowered = message.toLowerCase()
+  const matched = new Set<string>()
+  for (const keyword of config.keywords) {
+    if (lowered.includes(keyword.toLowerCase())) {
+      matched.add(keyword)
+    }
+  }
+  const matchedCount = matched.size
+
+  let isValid = false
+  let requiredThreshold = ''
+
+  switch (config.reviewMethod) {
+    case 0: // 全部同意
+      isValid = true
+      requiredThreshold = 'null'
+      break
+    case 1: // 按数量同意
+      isValid = matchedCount >= (config.reviewParameters || 1)
+      requiredThreshold = `${config.reviewParameters || 1}`
+      break
+    case 2: // 按比例同意
+      const ratio = matchedCount / config.keywords.length
+      const requiredRatio = (config.reviewParameters || 100) / 100
+      isValid = ratio >= requiredRatio
+      requiredThreshold = `${config.reviewParameters || 100}%`
+      break
+    case 3: // 全部拒绝
+      isValid = false
+      requiredThreshold = 'null'
+      break
+    default:
+      isValid = false
+      requiredThreshold = 'null'
+  }
+
+  logger.info(`verifyApplication msg="${message}" keywords=${JSON.stringify(config.keywords)} matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`)
+  return { isValid, matchedCount, requiredThreshold }
+}
+
 export function apply(ctx: Context, config: Config) {
   // 创建数据库表
   ctx.model.extend('group_verification_config', {
@@ -377,8 +424,8 @@ export function apply(ctx: Context, config: Config) {
     autoInc: true
   })
 
-  // 获取logger实例
-  const logger = ctx.logger('group-verification')
+  // 获取logger实例并保存到模块级变量
+  logger = ctx.logger('group-verification')
   
   // 设置日志级别
   // 注意：Koishi logger的level设置可能需要不同的方式
@@ -413,80 +460,78 @@ export function apply(ctx: Context, config: Config) {
     autoInc: true
   })
 
+  // 缓存正在审批的用户，用于避免 guild-member-added 重复计数
+  const autoQueue = new Map<string, Set<string>>();
+
   // 监听加群申请事件
   ctx.on('guild-member-request', async (session) => {
     // debug: 输出整个 session 以便定位字段名
     logger.debug('guild-member-request event', session)
 
-    // session.guildId 有时可能带空格或为空，先做 trim 并备选 channelId
-    let guildId = (session.guildId || session.channelId || '').toString().trim()
-    const userId = session.userId
-    const message = session.content || ''
+    let guildId = (session.guildId || session.channelId || '').toString().trim();
+    const userId = session.userId;
+    const message = session.content || '';
 
     if (!guildId) {
-      logger.warn('guild-member-request 没有 guildId，跳过处理')
-      return
+      logger.warn('guild-member-request 没有 guildId，跳过处理');
+      return;
     }
 
-    // 尝试自动同意，如 event 中包含 requestId
-    const requestId = ((session.event as any)?.requestId) || session.messageId || ''
-    if (requestId) {
-      try {
-        await session.bot.handleGuildMemberRequest(requestId, true)
-        logger.info(`自动同意申请 requestId=${requestId}`)
-        await updateStats(guildId, 'autoApproved')
-        // 不再执行后续验证或提醒
-        return
-      } catch (e) {
-        logger.warn('自动同意失败', e)
-        // 继续下面的验证逻辑
-      }
-    }
+    // 获取 requestId（不同平台字段不同）
+    const requestId = ((session.event as any)?.requestId) || session.messageId || '';
 
     // 获取群组配置
     const groupConfig = await ctx.database.get('group_verification_config', {
       groupId: guildId
-    })
+    });
 
     if (!groupConfig || groupConfig.length === 0) {
-      // 如果没有配置，默认同意（以上 auto-approve 未触发时仍然需要一个 requestId）
-      return
+      // 无配置直接放行（需要有 requestId）
+      return;
     }
+    const config = groupConfig[0];
 
-    const config = groupConfig[0]
-
-    // 执行验证
-    const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session)
+    // 执行验证，记录详细情况
+    const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session);
+    logger.info(`验证结果 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold} valid=${isValid}`);
 
     if (isValid) {
-      // 验证成功，自动同意入群（同样需要 requestId）
       if (requestId) {
         try {
-          await session.bot.handleGuildMemberRequest(requestId, true)
-          logger.info(`自动同意申请 requestId=${requestId}`)
+          await session.bot.handleGuildMemberRequest(requestId, true);
+          logger.info(`自动同意 requestId=${requestId}`);
+          // 将此用户标记为自动批准，等待 guild-member-added 更新统计
+          if (!autoQueue.has(guildId)) autoQueue.set(guildId, new Set());
+          autoQueue.get(guildId)!.add(userId);
         } catch (e) {
-          logger.warn('自动同意失败', e)
+          logger.warn('自动同意失败', e);
         }
       }
-      // 更新统计信息
-      await updateStats(guildId, 'autoApproved')
     } else {
-      // 验证失败，发送提醒到群内
-      await handleFailedVerification(ctx, session, config)
+      await handleFailedVerification(ctx, session, config);
     }
-  })
+  });
 
   // 监听群成员增加事件（包括手动邀请入群）
   ctx.on('guild-member-added', async (session) => {
     const groupId = session.guildId
     const userId = session.userId
-    
+
+    // 先检查 autoQueue
+    const set = autoQueue.get(groupId)
+    if (set && set.has(userId)) {
+      await updateStats(groupId, 'autoApproved')
+      set.delete(userId)
+      logger.info(`用户 ${userId} 通过机器人审批加入群 ${groupId}（autoQueue），统计已更新`)
+      return
+    }
+
     // 检查是否有待审核记录
     const pendingRecords = await ctx.database.get('group_verification_pending', {
       groupId: groupId,
       userId: userId
     })
-    
+
     if (pendingRecords.length > 0) {
       // 通过验证的用户入群，更新统计
       await updateStats(groupId, 'autoApproved')
@@ -554,42 +599,6 @@ export function apply(ctx: Context, config: Config) {
     await ctx.broadcast([guildId], reminderMsg)
   }
 
-  // 验证申请
-  async function verifyApplication(config: GroupVerificationConfig, message: string, session: any): Promise<{isValid: boolean, matchedCount: number, requiredThreshold: string}> {
-    // 统计匹配的关键词数量
-    const matchedCount = config.keywords.filter(keyword => 
-      message.toLowerCase().includes(keyword.toLowerCase())
-    ).length
-    
-    let isValid = false
-    let requiredThreshold = ''
-    
-    switch (config.reviewMethod) {
-      case 0: // 全部同意
-        isValid = true
-        requiredThreshold = 'null'
-        break
-      case 1: // 按数量同意
-        isValid = matchedCount >= (config.reviewParameters || 1)
-        requiredThreshold = `${config.reviewParameters || 1}`
-        break
-      case 2: // 按比例同意
-        const ratio = matchedCount / config.keywords.length
-        const requiredRatio = (config.reviewParameters || 100) / 100
-        isValid = ratio >= requiredRatio
-        requiredThreshold = `${config.reviewParameters || 100}%`
-        break
-      case 3: // 全部拒绝
-        isValid = false
-        requiredThreshold = 'null'
-        break
-      default:
-        isValid = false
-        requiredThreshold = 'null'
-    }
-    
-    return { isValid, matchedCount, requiredThreshold }
-  }
 
   // 更新统计信息
   async function updateStats(groupId: string, action: 'autoApproved' | 'manuallyApproved' | 'rejected') {
@@ -1117,7 +1126,9 @@ gvc -r                          # 删除配置`
               // TODO: 需要获取实际的requestId来进行审批
               // await session.bot.handleGuildMemberRequest(request.requestId, true)
               await ctx.database.remove('group_verification_pending', { id: request.id })
-              await updateStats(groupId, 'manuallyApproved')
+              // 标记为自动批准，实际统计在 guild-member-added 处理
+              if (!autoQueue.has(groupId)) autoQueue.set(groupId, new Set())
+              autoQueue.get(groupId)!.add(request.userId)
               approvedCount++
             } catch (error) {
               logger.warn(`处理申请 ${request.id} 时出错:`, error)
@@ -1137,7 +1148,8 @@ gvc -r                          # 删除配置`
             // 这里需要获取实际的requestId，暂时用userId作为示例
             await session.bot.handleGuildMemberRequest(request.userId, true)
             await ctx.database.remove('group_verification_pending', { id: request.id })
-            await updateStats(groupId, 'manuallyApproved')
+            if (!autoQueue.has(groupId)) autoQueue.set(groupId, new Set())
+            autoQueue.get(groupId)!.add(request.userId)
             return `已同意用户 ${request.userName}(${request.userId}) 的加群申请`
           } catch (error) {
             return `处理申请时出错: ${error.message}`
@@ -1160,7 +1172,8 @@ gvc -r                          # 删除配置`
         // 这里需要获取实际的requestId来进行审批
         await session.bot.handleGuildMemberRequest(request.userId, true)
         await ctx.database.remove('group_verification_pending', { id: request.id })
-        await updateStats(groupId, 'manuallyApproved')
+        if (!autoQueue.has(groupId)) autoQueue.set(groupId, new Set())
+        autoQueue.get(groupId)!.add(userId)
         return `已同意用户 ${request.userName}(${userId}) 的加群申请`
       } catch (error) {
         return `处理申请时出错: ${error.message}`