koishi-plugin-group-verification 1.0.20 → 1.0.22

package/lib/index.d.ts

@@ -100,4 +100,5 @@ export declare function verifyApplication(config: GroupVerificationConfig, messa
     matchedCount: number;
     requiredThreshold: string;
 }>;
+export declare function handleFailedVerification(ctx: Context, session: any, config: GroupVerificationConfig, matchedCount?: number, requiredThreshold?: string): Promise<void>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -22,6 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  handleFailedVerification: () => handleFailedVerification,
   inject: () => inject,
   mergeReminder: () => mergeReminder,
   name: () => name,
@@ -287,6 +288,39 @@ async function verifyApplication(config, message, session) {
   return { isValid, matchedCount, requiredThreshold };
 }
 __name(verifyApplication, "verifyApplication");
+async function handleFailedVerification(ctx, session, config, matchedCount, requiredThreshold) {
+  const guildId = (session.guildId || session.channelId || "").toString().trim();
+  const userId = session.userId;
+  const username = session.username || "未知用户";
+  const message = session.content || "";
+  logger.info(`处理失败验证 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;
+    requiredThreshold = result.requiredThreshold;
+  }
+  let groupName = "未知群组";
+  try {
+    const guild = await session.bot.getGuild(guildId);
+    groupName = guild.name || groupName;
+  } catch (error) {
+  }
+  await ctx.database.create("group_verification_pending", {
+    groupId: guildId,
+    userId,
+    userName: username,
+    requestMessage: message,
+    applyTime: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === "") {
+    logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
+    return;
+  }
+  let reminderMsg = config.reminderMessage;
+  reminderMsg = reminderMsg.replace(/{user}/g, username).replace(/{id}/g, userId).replace(/{group}/g, guildId).replace(/{gname}/g, groupName).replace(/{question}/g, message).replace(/{answer}/g, matchedCount.toString()).replace(/{threshold}/g, requiredThreshold);
+  await ctx.broadcast([guildId], reminderMsg);
+}
+__name(handleFailedVerification, "handleFailedVerification");
 function apply(ctx, config) {
   ctx.model.extend("group_verification_config", {
     id: "unsigned",
@@ -367,7 +401,7 @@ function apply(ctx, config) {
         }
       }
     } else {
-      await handleFailedVerification(ctx, session, config2);
+      await handleFailedVerification(ctx, session, config2, matchedCount, requiredThreshold);
     }
   });
   ctx.on("guild-member-added", async (session) => {
@@ -393,39 +427,6 @@ function apply(ctx, config) {
       logger.info(`用户 ${userId} 被手动邀请加入群 ${groupId}，手动批准统计已更新`);
     }
   });
-  async function handleFailedVerification(ctx2, session, config2, matchedCount, requiredThreshold) {
-    const guildId = (session.guildId || session.channelId || "").toString().trim();
-    const userId = session.userId;
-    const username = session.username || "未知用户";
-    const message = session.content || "";
-    logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`);
-    if (matchedCount === void 0 || requiredThreshold === void 0) {
-      const result = await verifyApplication(config2, message, session);
-      matchedCount = result.matchedCount;
-      requiredThreshold = result.requiredThreshold;
-    }
-    let groupName = "未知群组";
-    try {
-      const guild = await session.bot.getGuild(guildId);
-      groupName = guild.name || groupName;
-    } catch (error) {
-    }
-    await ctx2.database.create("group_verification_pending", {
-      groupId: guildId,
-      userId,
-      userName: username,
-      requestMessage: message,
-      applyTime: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    if (!config2.reminderEnabled || !config2.reminderMessage || config2.reminderMessage === "") {
-      logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
-      return;
-    }
-    let reminderMsg = config2.reminderMessage;
-    reminderMsg = reminderMsg.replace(/{user}/g, username).replace(/{id}/g, userId).replace(/{group}/g, guildId).replace(/{gname}/g, groupName).replace(/{question}/g, message).replace(/{answer}/g, matchedCount.toString()).replace(/{threshold}/g, requiredThreshold);
-    await ctx2.broadcast([guildId], reminderMsg);
-  }
-  __name(handleFailedVerification, "handleFailedVerification");
   async function updateStats(groupId, action) {
     const existingStats = await ctx.database.get("group_verification_stats", { groupId });
     if (existingStats.length > 0) {
@@ -716,7 +717,7 @@ gvc -r                          # 删除配置`;
         await ctx.database.set("group_verification_config", { id: existingConfig.id }, {
           reviewParameters,
           updatedBy: session.username || session.userId,
-          updatedAt: /* @__PURE__ */ new Date()
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         logger.info(`已更新数据库阈值为: ${reviewParameters}`);
       } else {
@@ -735,17 +736,20 @@ gvc -r                          # 删除配置`;
       reminderEnabled,
       reminderMessage,
       updatedBy: session.username || session.userId,
-      updatedAt: /* @__PURE__ */ new Date()
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     if (existingConfig) {
-      await ctx.database.set("group_verification_config", { id: existingConfig.id }, dbData);
+      await ctx.database.set("group_verification_config", { id: existingConfig.id }, {
+        ...dbData,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
       logger.info(`更新配置成功 - 审核方式: ${reviewMethod}, 阈值: ${reviewParameters}`);
     } else {
       await ctx.database.create("group_verification_config", {
         groupId: targetGroupId,
         ...dbData,
         createdBy: session.username || session.userId,
-        createdAt: /* @__PURE__ */ new Date()
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
       });
       logger.info(`创建配置成功 - 审核方式: ${reviewMethod}, 阈值: ${reviewParameters}`);
     }
@@ -1051,6 +1055,36 @@ gvc -r                          # 删除配置`;
   - 私聊时必须指定群号(-i参数)`;
   });
   ctx.on("ready", async () => {
+    try {
+      const configs = await ctx.database.get("group_verification_config", {});
+      for (const cfg of configs) {
+        const updates = {};
+        if (cfg.createdAt instanceof Date) updates.createdAt = cfg.createdAt.toISOString();
+        if (cfg.updatedAt instanceof Date) updates.updatedAt = cfg.updatedAt.toISOString();
+        if (Object.keys(updates).length) {
+          await ctx.database.set("group_verification_config", { id: cfg.id }, updates);
+        }
+      }
+      const stats = await ctx.database.get("group_verification_stats", {});
+      for (const st of stats) {
+        const updates = {};
+        if (st.lastUpdated instanceof Date) updates.lastUpdated = st.lastUpdated.toISOString();
+        if (Object.keys(updates).length) {
+          await ctx.database.set("group_verification_stats", { id: st.id }, updates);
+        }
+      }
+      const pendings = await ctx.database.get("group_verification_pending", {});
+      for (const p of pendings) {
+        const updates = {};
+        if (p.applyTime instanceof Date) updates.applyTime = p.applyTime.toISOString();
+        if (Object.keys(updates).length) {
+          await ctx.database.set("group_verification_pending", { id: p.id }, updates);
+        }
+      }
+      logger.info("旧版日期字段迁移完成");
+    } catch (e) {
+      logger.warn("迁移旧日期字段时出错", e);
+    }
     const totalStats = await ctx.database.get("group_verification_stats", { groupId: "TOTAL" });
     if (totalStats.length === 0) {
       await ctx.database.create("group_verification_stats", {
@@ -1058,7 +1092,7 @@ gvc -r                          # 删除配置`;
         autoApproved: 0,
         manuallyApproved: 0,
         rejected: 0,
-        lastUpdated: /* @__PURE__ */ new Date()
+        lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
       });
       logger.info("已创建总计统计行");
     } else {
@@ -1122,6 +1156,7 @@ __name(apply, "apply");
 0 && (module.exports = {
   Config,
   apply,
+  handleFailedVerification,
   inject,
   mergeReminder,
   name,

package/package.json

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

package/src/index.ts

@@ -405,6 +405,64 @@ export async function verifyApplication(config: GroupVerificationConfig, message
   return { isValid, matchedCount, requiredThreshold }
 }
 
+// 处理验证失败的情况并发送提醒消息（可由 tests 调用）
+export async function handleFailedVerification(
+  ctx: Context,
+  session: any,
+  config: GroupVerificationConfig,
+  matchedCount?: number,
+  requiredThreshold?: string
+) {
+  const guildId = (session.guildId || session.channelId || '').toString().trim();
+  const userId = session.userId
+  const username = session.username || '未知用户'
+  const message = session.content || ''
+  logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`)
+  // 如果未传入匹配信息，则重新计算一次（老调用）
+  if (matchedCount === undefined || requiredThreshold === undefined) {
+    const result = await verifyApplication(config, message, session)
+    matchedCount = result.matchedCount
+    requiredThreshold = result.requiredThreshold
+  }
+
+  // 获取群信息
+  let groupName = '未知群组'
+  try {
+    const guild = await session.bot.getGuild(guildId)
+    groupName = guild.name || groupName
+  } catch (error) {
+    // 无法获取群名称时使用默认值
+  }
+
+  // 将申请加入待审核列表
+  await ctx.database.create('group_verification_pending', {
+    groupId: guildId,
+    userId: userId,
+    userName: username,
+    requestMessage: message,
+    applyTime: new Date().toISOString()
+  })
+  // 如果提醒消息被禁用，直接返回
+  if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === '') {
+    logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`)
+    return
+  }
+
+  // 替换提醒消息中的变量
+  let reminderMsg = config.reminderMessage
+  reminderMsg = reminderMsg
+    .replace(/{user}/g, username)
+    .replace(/{id}/g, userId)
+    .replace(/{group}/g, guildId)
+    .replace(/{gname}/g, groupName)
+    .replace(/{question}/g, message)
+    .replace(/{answer}/g, matchedCount!.toString())
+    .replace(/{threshold}/g, requiredThreshold!)
+
+  // 发送提醒消息到群内
+  await ctx.broadcast([guildId], reminderMsg)
+}
+
 export function apply(ctx: Context, config: Config) {
   // 创建数据库表
   ctx.model.extend('group_verification_config', {
@@ -511,7 +569,7 @@ export function apply(ctx: Context, config: Config) {
         }
       }
     } else {
-      await handleFailedVerification(ctx, session, config);
+      await handleFailedVerification(ctx, session, config, matchedCount, requiredThreshold);
     }
   });
 
@@ -548,65 +606,6 @@ export function apply(ctx: Context, config: Config) {
     }
   })
 
-  // 处理验证失败的情况
-  // 处理验证失败的情况并发送提醒消息
-  // matchedCount/requiredThreshold 可选，为空时内部重新计算（兼容旧调用）
-  async function handleFailedVerification(
-    ctx: Context,
-    session: any,
-    config: GroupVerificationConfig,
-    matchedCount?: number,
-    requiredThreshold?: string
-  ) {
-    const guildId = (session.guildId || session.channelId || '').toString().trim();
-    const userId = session.userId
-    const username = session.username || '未知用户'
-    const message = session.content || ''
-    logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`)
-    // 如果未传入匹配信息，则重新计算一次（老调用）
-    if (matchedCount === undefined || requiredThreshold === undefined) {
-      const result = await verifyApplication(config, message, session)
-      matchedCount = result.matchedCount
-      requiredThreshold = result.requiredThreshold
-    }
-
-    // 获取群信息
-    let groupName = '未知群组'
-    try {
-      const guild = await session.bot.getGuild(guildId)
-      groupName = guild.name || groupName
-    } catch (error) {
-      // 无法获取群名称时使用默认值
-    }
-
-    // 将申请加入待审核列表
-    await ctx.database.create('group_verification_pending', {
-      groupId: guildId,
-      userId: userId,
-      userName: username,
-      requestMessage: message,
-      applyTime: new Date().toISOString()
-    })
-    // 如果提醒消息被禁用，直接返回
-    if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === '') {
-      logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`)
-      return
-    }
-
-    // 替换提醒消息中的变量
-    let reminderMsg = config.reminderMessage
-    reminderMsg = reminderMsg
-      .replace(/{user}/g, username)
-      .replace(/{id}/g, userId)
-      .replace(/{group}/g, guildId)
-      .replace(/{gname}/g, groupName)
-      .replace(/{question}/g, message)
-      .replace(/{answer}/g, matchedCount!.toString())
-      .replace(/{threshold}/g, requiredThreshold!)
-
-    // 发送提醒消息到群内
-    await ctx.broadcast([guildId], reminderMsg)
-  }
 
 
   // 更新统计信息
@@ -1008,7 +1007,7 @@ gvc -r                          # 删除配置`
           await ctx.database.set('group_verification_config', { id: existingConfig.id }, {
             reviewParameters: reviewParameters,
             updatedBy: session.username || session.userId,
-            updatedAt: new Date()
+            updatedAt: new Date().toISOString()
           })
           logger.info(`已更新数据库阈值为: ${reviewParameters}`)
         } else {
@@ -1034,18 +1033,22 @@ gvc -r                          # 删除配置`
         reminderEnabled: reminderEnabled,
         reminderMessage: reminderMessage,
         updatedBy: session.username || session.userId,
-        updatedAt: new Date()
+        updatedAt: new Date().toISOString()
       }
       
       if (existingConfig) {
-        await ctx.database.set('group_verification_config', { id: existingConfig.id }, dbData)
+        // ensure timestamp strings for compatibility
+        await ctx.database.set('group_verification_config', { id: existingConfig.id }, {
+          ...dbData,
+          updatedAt: new Date().toISOString(),
+        })
         logger.info(`更新配置成功 - 审核方式: ${reviewMethod}, 阈值: ${reviewParameters}`)
       } else {
         await ctx.database.create('group_verification_config', {
           groupId: targetGroupId,
           ...dbData,
           createdBy: session.username || session.userId,
-          createdAt: new Date()
+          createdAt: new Date().toISOString()
         })
         logger.info(`创建配置成功 - 审核方式: ${reviewMethod}, 阈值: ${reviewParameters}`)
       }
@@ -1428,6 +1431,38 @@ gvc -r                          # 删除配置`
 
   // 插件初始化时确保总计统计行存在
   ctx.on('ready', async () => {
+    // 迁移：将旧版保留的 Date 对象字段转换为 ISO 字符串，以避免绑定错误
+    try {
+      const configs = await ctx.database.get('group_verification_config', {})
+      for (const cfg of configs) {
+        const updates: any = {}
+        if (cfg.createdAt instanceof Date) updates.createdAt = cfg.createdAt.toISOString()
+        if (cfg.updatedAt instanceof Date) updates.updatedAt = cfg.updatedAt.toISOString()
+        if (Object.keys(updates).length) {
+          await ctx.database.set('group_verification_config', { id: cfg.id }, updates)
+        }
+      }
+      const stats = await ctx.database.get('group_verification_stats', {})
+      for (const st of stats) {
+        const updates: any = {}
+        if (st.lastUpdated instanceof Date) updates.lastUpdated = st.lastUpdated.toISOString()
+        if (Object.keys(updates).length) {
+          await ctx.database.set('group_verification_stats', { id: st.id }, updates)
+        }
+      }
+      const pendings = await ctx.database.get('group_verification_pending', {})
+      for (const p of pendings) {
+        const updates: any = {}
+        if (p.applyTime instanceof Date) updates.applyTime = p.applyTime.toISOString()
+        if (Object.keys(updates).length) {
+          await ctx.database.set('group_verification_pending', { id: p.id }, updates)
+        }
+      }
+      logger.info('旧版日期字段迁移完成')
+    } catch (e) {
+      logger.warn('迁移旧日期字段时出错', e)
+    }
+
     // 检查是否已存在总计行（groupId为'TOTAL'）
     const totalStats = await ctx.database.get('group_verification_stats', { groupId: 'TOTAL' })
     
@@ -1438,7 +1473,7 @@ gvc -r                          # 删除配置`
         autoApproved: 0,
         manuallyApproved: 0,
         rejected: 0,
-        lastUpdated: new Date()
+        lastUpdated: new Date().toISOString()
       })
       logger.info('已创建总计统计行')
     } else {