koishi-plugin-group-verification 1.0.19 → 1.0.20

package/lib/index.d.ts

@@ -17,8 +17,8 @@ export interface GroupVerificationConfig {
     reminderMessage: string;
     createdBy: string;
     updatedBy: string;
-    createdAt: Date;
-    updatedAt: Date;
+    createdAt: string | Date;
+    updatedAt: string | Date;
 }
 export interface GroupVerificationStats {
     id: number;
@@ -26,7 +26,7 @@ export interface GroupVerificationStats {
     autoApproved: number;
     manuallyApproved: number;
     rejected: number;
-    lastUpdated: Date;
+    lastUpdated: string | Date;
 }
 export interface PendingVerification {
     id: number;
@@ -34,7 +34,7 @@ export interface PendingVerification {
     userId: string;
     userName: string;
     requestMessage: string;
-    applyTime: Date;
+    applyTime: string | Date;
 }
 export interface Config {
     defaultReminderMessage?: string;

package/lib/index.js

@@ -299,8 +299,8 @@ function apply(ctx, config) {
     reminderMessage: "string",
     createdBy: "string",
     updatedBy: "string",
-    createdAt: "date",
-    updatedAt: "date"
+    createdAt: "string",
+    updatedAt: "string"
   }, {
     primary: "id",
     autoInc: true
@@ -316,7 +316,9 @@ function apply(ctx, config) {
     autoApproved: "integer",
     manuallyApproved: "integer",
     rejected: "integer",
-    lastUpdated: "date"
+    // store as string (ISO timestamp) to preserve full date+time;
+    // Koishi `date` type truncates to day which leads to 00:00:00.
+    lastUpdated: "string"
   }, {
     primary: "id",
     autoInc: true
@@ -327,7 +329,8 @@ function apply(ctx, config) {
     userId: "string",
     userName: "string",
     requestMessage: "string",
-    applyTime: "date"
+    // record full timestamp as string to keep time component
+    applyTime: "string"
   }, {
     primary: "id",
     autoInc: true
@@ -390,29 +393,30 @@ function apply(ctx, config) {
       logger.info(`用户 ${userId} 被手动邀请加入群 ${groupId}，手动批准统计已更新`);
     }
   });
-  async function handleFailedVerification(ctx2, session, config2) {
-    const guildId = session.guildId;
+  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) {
     }
-    const { matchedCount, requiredThreshold } = await verifyApplication(config2, message, session);
     await ctx2.database.create("group_verification_pending", {
       groupId: guildId,
       userId,
       userName: username,
       requestMessage: message,
-      applyTime: /* @__PURE__ */ new Date()
+      applyTime: (/* @__PURE__ */ new Date()).toISOString()
     });
-    if (!guildId) {
-      logger.warn("handleFailedVerification 收到无效 guildId，已放弃发送");
-      return;
-    }
     if (!config2.reminderEnabled || !config2.reminderMessage || config2.reminderMessage === "") {
       logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
       return;
@@ -428,7 +432,7 @@ function apply(ctx, config) {
       const stats = existingStats[0];
       await ctx.database.set("group_verification_stats", { id: stats.id }, {
         [action]: stats[action] + 1,
-        lastUpdated: /* @__PURE__ */ new Date()
+        lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
       });
     } else {
       await ctx.database.create("group_verification_stats", {
@@ -436,7 +440,7 @@ function apply(ctx, config) {
         autoApproved: action === "autoApproved" ? 1 : 0,
         manuallyApproved: action === "manuallyApproved" ? 1 : 0,
         rejected: action === "rejected" ? 1 : 0,
-        lastUpdated: /* @__PURE__ */ new Date()
+        lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
     await syncTotalStats(ctx);
@@ -533,8 +537,8 @@ ${debugInfo}`];
       remove: flags.remove || options.remove
     };
     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 || cleanedOptions.groupId !== void 0)) {
-      return "参数冲突：-? 或 -r 不能与其他参数或关键词一起使用";
+    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）";
     }
     const hasRealMessageParam = cleanedOptions.message !== void 0;
     const hasRealEnableMessageParam = cleanedOptions.enableMessage === true;
@@ -1103,7 +1107,7 @@ gvc -r                          # 删除配置`;
           autoApproved: totalAutoApproved,
           manuallyApproved: totalManuallyApproved,
           rejected: totalRejected,
-          lastUpdated: /* @__PURE__ */ new Date()
+          lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
         });
         logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}`);
       }

package/package.json

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

package/readme.md

@@ -48,6 +48,9 @@ group-verify.config -r
 
 # 指定群号配置
 group-verify.config -i 123456789 关键词1,关键词2 -m 1 -t 1
+
+> **提示**:  `-?`（查询）和 `-r`（删除）仍然与所有其它参数 / 关键字互斥，
+> 但可以和 `-i` 组合使用，例如 `gvc -i 123 -?` 或 `gvc -i 123 -r`。这样便于在私聊环境下查询或删除指定群的设置。
 ```
 
 ### 审核命令
@@ -106,6 +109,12 @@ group-verify.stats total
 - `-nomsg` - 禁用提醒消息功能
 - 不带参数的 `-msg` 会显示帮助信息
 
+### 提醒消息变量
+
+### 其他注意事项
+
+- 统计数据的 **最后更新时间** 使用完整的日期+时间存储，升级到最新版后若看到 `00:00:00`，请手动重建或清除旧的统计记录以便记录最新时间。
+
 ### 提醒消息变量
 ```
 {user}    - 用户名

package/src/index.ts

@@ -25,8 +25,8 @@ export interface GroupVerificationConfig {
   reminderMessage: string
   createdBy: string
   updatedBy: string
-  createdAt: Date
-  updatedAt: Date
+  createdAt: string | Date
+  updatedAt: string | Date
 }
 
 // 群组统计信息表
@@ -36,7 +36,7 @@ export interface GroupVerificationStats {
   autoApproved: number
   manuallyApproved: number
   rejected: number
-  lastUpdated: Date
+  lastUpdated: string | Date
 }
 
 // 待审核申请表
@@ -46,7 +46,7 @@ export interface PendingVerification {
   userId: string
   userName: string
   requestMessage: string
-  applyTime: Date
+  applyTime: string | Date
 }
 
 export interface Config {
@@ -417,8 +417,8 @@ export function apply(ctx: Context, config: Config) {
     reminderMessage: 'string',
     createdBy: 'string',
     updatedBy: 'string',
-    createdAt: 'date',
-    updatedAt: 'date'
+    createdAt: 'string',
+    updatedAt: 'string'
   }, {
     primary: 'id',
     autoInc: true
@@ -442,7 +442,9 @@ export function apply(ctx: Context, config: Config) {
     autoApproved: 'integer',
     manuallyApproved: 'integer',
     rejected: 'integer',
-    lastUpdated: 'date'
+    // store as string (ISO timestamp) to preserve full date+time;
+    // Koishi `date` type truncates to day which leads to 00:00:00.
+    lastUpdated: 'string'
   }, {
     primary: 'id',
     autoInc: true
@@ -454,7 +456,8 @@ export function apply(ctx: Context, config: Config) {
     userId: 'string',
     userName: 'string',
     requestMessage: 'string',
-    applyTime: 'date'
+    // record full timestamp as string to keep time component
+    applyTime: 'string'
   }, {
     primary: 'id',
     autoInc: true
@@ -546,12 +549,27 @@ export function apply(ctx: Context, config: Config) {
   })
 
   // 处理验证失败的情况
-  async function handleFailedVerification(ctx: Context, session: any, config: GroupVerificationConfig) {
-    const guildId = session.guildId
+  // 处理验证失败的情况并发送提醒消息
+  // 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 {
@@ -560,30 +578,21 @@ export function apply(ctx: Context, config: Config) {
     } catch (error) {
       // 无法获取群名称时使用默认值
     }
-    
-    // 执行验证获取详细信息
-    const { matchedCount, requiredThreshold } = await verifyApplication(config, message, session)
-    
+
     // 将申请加入待审核列表
     await ctx.database.create('group_verification_pending', {
       groupId: guildId,
       userId: userId,
       userName: username,
       requestMessage: message,
-      applyTime: new Date()
+      applyTime: new Date().toISOString()
     })
-    
-    // 如果 guildId 不合法，跳过
-    if (!guildId) {
-      logger.warn('handleFailedVerification 收到无效 guildId，已放弃发送')
-      return
-    }
     // 如果提醒消息被禁用，直接返回
     if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === '') {
       logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`)
       return
     }
-    
+
     // 替换提醒消息中的变量
     let reminderMsg = config.reminderMessage
     reminderMsg = reminderMsg
@@ -592,9 +601,9 @@ export function apply(ctx: Context, config: Config) {
       .replace(/{group}/g, guildId)
       .replace(/{gname}/g, groupName)
       .replace(/{question}/g, message)
-      .replace(/{answer}/g, matchedCount.toString())
-      .replace(/{threshold}/g, requiredThreshold)
-    
+      .replace(/{answer}/g, matchedCount!.toString())
+      .replace(/{threshold}/g, requiredThreshold!)
+
     // 发送提醒消息到群内
     await ctx.broadcast([guildId], reminderMsg)
   }
@@ -609,7 +618,7 @@ export function apply(ctx: Context, config: Config) {
       const stats = existingStats[0]
       await ctx.database.set('group_verification_stats', { id: stats.id }, {
         [action]: stats[action] + 1,
-        lastUpdated: new Date()
+        lastUpdated: new Date().toISOString()
       })
     } else {
       await ctx.database.create('group_verification_stats', {
@@ -617,7 +626,7 @@ export function apply(ctx: Context, config: Config) {
         autoApproved: action === 'autoApproved' ? 1 : 0,
         manuallyApproved: action === 'manuallyApproved' ? 1 : 0,
         rejected: action === 'rejected' ? 1 : 0,
-        lastUpdated: new Date()
+        lastUpdated: new Date().toISOString()
       })
     }
     
@@ -755,11 +764,11 @@ export function apply(ctx: Context, config: Config) {
       }
       logger.info(`合并后options: ${JSON.stringify(cleanedOptions, null, 2)}`)
 
-      // 检查 -? 和 -r 的独占性
+      // 检查 -? 和 -r 的独占性；允许与 -i 并存
       if ((cleanedOptions.query || cleanedOptions.remove) &&
           (parsedKeywords.length > 0 || cleanedOptions.method !== undefined || cleanedOptions.threshold !== undefined ||
-           cleanedOptions.message !== undefined || cleanedOptions.enableMessage || cleanedOptions.disableMessage || cleanedOptions.groupId !== undefined)) {
-        return '参数冲突：-? 或 -r 不能与其他参数或关键词一起使用'
+           cleanedOptions.message !== undefined || cleanedOptions.enableMessage || cleanedOptions.disableMessage)) {
+        return '参数冲突：-? 或 -r 不能与其他参数或关键词一起使用（仅可搭配 -i）'
       }
 
       // 检查消息参数冲突
@@ -1495,7 +1504,7 @@ gvc -r                          # 删除配置`
           autoApproved: totalAutoApproved,
           manuallyApproved: totalManuallyApproved,
           rejected: totalRejected,
-          lastUpdated: new Date()
+          lastUpdated: new Date().toISOString()
         })
         
         logger.info(`总计统计已同步: 自动批准${totalAutoApproved}, 手动批准${totalManuallyApproved}, 拒绝${totalRejected}`)