koishi-plugin-group-verification 1.0.2 → 1.0.4

package/lib/index.d.ts

@@ -16,6 +16,8 @@ export interface GroupVerificationConfig {
         threshold?: number;
     };
     reminderMessage: string;
+    createdBy: string;
+    updatedBy: string;
     createdAt: Date;
     updatedAt: Date;
 }

package/lib/index.js

@@ -36,6 +36,8 @@ function apply(ctx, config) {
     reviewMethod: "integer",
     reviewParameters: "json",
     reminderMessage: "string",
+    createdBy: "string",
+    updatedBy: "string",
     createdAt: "date",
     updatedAt: "date"
   }, {
@@ -75,7 +77,7 @@ function apply(ctx, config) {
       return;
     }
     const config2 = groupConfig[0];
-    const isValid = await verifyApplication(config2, message);
+    const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config2, message, session);
     if (isValid) {
       await updateStats(guildId, "autoApproved");
     } else {
@@ -87,6 +89,13 @@ function apply(ctx, config) {
     const userId = session.userId;
     const username = session.username || "未知用户";
     const message = session.content || "";
+    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,
@@ -94,30 +103,41 @@ function apply(ctx, config) {
       requestMessage: message,
       applyTime: /* @__PURE__ */ new Date()
     });
-    const reminderMsg = config2.reminderMessage || `收到新的加群申请：${username}(${userId})
-申请理由：${message}
-请管理员使用 #同意 或 #拒绝 来处理此申请`;
+    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 verifyApplication(config2, message) {
+  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:
-        return true;
+        isValid = true;
+        requiredThreshold = "null";
+        break;
       case 1:
-        return matchedCount >= (config2.reviewParameters.threshold || 1);
+        isValid = matchedCount >= (config2.reviewParameters.threshold || 1);
+        requiredThreshold = `${config2.reviewParameters.threshold || 1}`;
+        break;
       case 2:
         const ratio = matchedCount / config2.keywords.length;
         const requiredRatio = (config2.reviewParameters.threshold || 100) / 100;
-        return ratio >= requiredRatio;
+        isValid = ratio >= requiredRatio;
+        requiredThreshold = `${config2.reviewParameters.threshold || 100}%`;
+        break;
       case 3:
-        return false;
+        isValid = false;
+        requiredThreshold = "null";
+        break;
       default:
-        return false;
+        isValid = false;
+        requiredThreshold = "null";
     }
+    return { isValid, matchedCount, requiredThreshold };
   }
   __name(verifyApplication, "verifyApplication");
   async function updateStats(groupId, statType) {
@@ -157,29 +177,53 @@ function apply(ctx, config) {
   __name(updateStats, "updateStats");
   async function checkPermission(session, targetGroupId) {
     const groupId = targetGroupId || session.guildId;
-    if (groupId) {
-      try {
-        const member = await session.bot.getGuildMember(groupId, session.userId);
-        if (member && (member.roles?.includes("admin") || member.permissions?.includes("ADMINISTRATOR"))) {
-          return true;
-        }
-      } catch (error) {
-      }
+    if (!groupId) {
+      return [false, "请在群聊中使用此命令或使用 -i 参数指定群号"];
     }
+    console.log(`[权限检查] 用户ID: ${session.userId}, 群号: ${groupId}`);
+    console.log(`[权限检查] Koishi权限等级: ${session.author?.authority || "未获取到"}`);
     if (session.author?.authority && session.author.authority >= 3) {
-      return true;
+      console.log(`[权限检查] 通过koishi权限检查: ${session.author.authority}`);
+      return [true];
+    }
+    try {
+      const member = await session.bot.getGuildMember(groupId, session.userId);
+      console.log(`[权限检查] 获取到成员信息:`, {
+        roles: member?.roles,
+        permissions: member?.permissions
+      });
+      if (member) {
+        if (member.permissions?.includes("OWNER")) {
+          console.log(`[权限检查] 用户是群主`);
+          return [true];
+        }
+        if (member.roles?.includes("admin") || member.permissions?.includes("ADMINISTRATOR")) {
+          console.log(`[权限检查] 用户是管理员`);
+          return [true];
+        }
+      }
+    } catch (error) {
+      console.log(`[权限检查] 获取群成员信息失败:`, error);
+      return [false, `无法获取群 ${groupId} 的成员信息，请确认机器人已在该群中`];
     }
-    return false;
+    console.log(`[权限检查] 权限不足`);
+    return [false, "权限不足：需要群主/管理员权限或koishi三级以上权限"];
   }
   __name(checkPermission, "checkPermission");
-  const groupVerify = ctx.command("group-verify", "群组验证管理命令");
-  groupVerify.subcommand(".config [keywords:text]", "配置群组验证规则").alias("cfg", "配置", "conf", "设置").option("groupId", "-i <groupId> 指定群号").option("method", "-m <method> 审核方式 (0-3)").option("threshold", "-t <threshold> 阈值参数").option("query", "-? 查询当前配置").option("remove", "-r 删除配置").action(async ({ session, options }, keywords) => {
+  const groupVerify = ctx.command("group-verify", "群组验证管理命令").alias("gv", "gverify");
+  groupVerify.subcommand(".config [keywords:text]", "配置群组验证规则").alias("cfg", "配置", "conf", "设置").option("groupId", "-i <groupId> 指定群号").option("method", "-m <method> 审核方式 (0-3)").option("threshold", "-t <threshold> 阈值参数").option("message", "-msg <message> 自定义提醒消息").option("query", "-? 查询当前配置").option("remove", "-r 删除配置").action(async ({ session, options }, keywords) => {
     const targetGroupId = options.groupId || session.guildId;
-    if (!await checkPermission(session, targetGroupId)) {
-      return "权限不足";
+    const [hasPermission, errorMsg] = await checkPermission(session, targetGroupId);
+    if (!hasPermission) {
+      return errorMsg || "权限不足";
     }
-    if (!targetGroupId) {
-      return "请在群聊中使用此命令或使用 -i 参数指定群号";
+    let groupName = "未知群组";
+    if (targetGroupId) {
+      try {
+        const guild = await session.bot.getGuild(targetGroupId);
+        groupName = guild.name || groupName;
+      } catch (error) {
+      }
     }
     if (options.remove) {
       const existingConfig2 = await ctx.database.get("group_verification_config", { groupId: targetGroupId });
@@ -195,34 +239,41 @@ function apply(ctx, config) {
       if (existingConfig2.length > 0) {
         const config2 = existingConfig2[0];
         let methodDesc = "";
+        let thresholdInfo = "";
         switch (config2.reviewMethod) {
           case 0:
             methodDesc = "全部同意";
+            thresholdInfo = "null";
             break;
           case 1:
-            methodDesc = `按数量同意 (${config2.reviewParameters.threshold || 1})`;
+            methodDesc = `按数量同意`;
+            thresholdInfo = `${config2.reviewParameters.threshold || 1}`;
             break;
           case 2:
-            methodDesc = `按比例同意 (${config2.reviewParameters.threshold || 100}%)`;
+            methodDesc = `按比例同意`;
+            thresholdInfo = `${config2.reviewParameters.threshold || 100}%`;
             break;
           case 3:
             methodDesc = "全部拒绝";
+            thresholdInfo = "null";
             break;
         }
+        const createTime = new Date(config2.createdAt).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
+        const updateTime = new Date(config2.updatedAt).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
         return `群 ${targetGroupId} 配置：
 关键词: ${config2.keywords.join(", ")}
-审核方式: ${methodDesc}`;
+审核方式: ${methodDesc}
+阈值: ${thresholdInfo}
+提醒消息: ${config2.reminderMessage}
+创建时间: ${createTime}
+更新时间: ${updateTime}
+创建者: ${config2.createdBy}
+更新者: ${config2.updatedBy}`;
       } else {
         return `群 ${targetGroupId} 无验证配置`;
       }
     }
-    if (!keywords) {
-      return "请提供关键词参数，或使用 -? 查询配置，-r 删除配置";
-    }
-    const keywordList = keywords.split(",").map((k) => k.trim()).filter((k) => k);
-    if (keywordList.length === 0) {
-      return "请提供有效的关键词";
-    }
+    const keywordList = keywords ? keywords.split(",").map((k) => k.trim()).filter((k) => k) : [];
     let reviewMethod = 0;
     let reviewParameters = {};
     if (options.method !== void 0) {
@@ -249,25 +300,30 @@ function apply(ctx, config) {
         }
       }
     }
+    let reminderMessage = options.message || `用户 {user}({id}) 申请加入群 {gname}({group})
+申请理由：{question}
+答对情况：{answer}
+阈值要求：{threshold}
+请管理员使用 #同意 或 #拒绝 来处理此申请`;
+    reminderMessage = reminderMessage.replace(/\\n/g, "\n");
     const existingConfig = await ctx.database.get("group_verification_config", { groupId: targetGroupId });
+    const configData = {
+      keywords: keywordList,
+      reviewMethod,
+      reviewParameters,
+      reminderMessage,
+      updatedBy: session.username || session.userId,
+      updatedAt: /* @__PURE__ */ new Date()
+    };
     if (existingConfig.length > 0) {
-      await ctx.database.set("group_verification_config", { id: existingConfig[0].id }, {
-        keywords: keywordList,
-        reviewMethod,
-        reviewParameters,
-        reminderMessage: `New join request received. Please use #approve or #reject to handle this request`,
-        updatedAt: /* @__PURE__ */ new Date()
-      });
+      await ctx.database.set("group_verification_config", { id: existingConfig[0].id }, configData);
       return `已更新群 ${targetGroupId} 的验证配置`;
     } else {
       await ctx.database.create("group_verification_config", {
+        ...configData,
         groupId: targetGroupId,
-        keywords: keywordList,
-        reviewMethod,
-        reviewParameters,
-        reminderMessage: `New join request received. Please use #approve or #reject to handle this request`,
-        createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date()
+        createdBy: session.username || session.userId,
+        createdAt: /* @__PURE__ */ new Date()
       });
       return `已为群 ${targetGroupId} 创建验证配置`;
     }
@@ -357,19 +413,42 @@ function apply(ctx, config) {
   });
   groupVerify.subcommand(".help", "显示帮助信息").alias("帮助", "hlp", "帮助信息").action(() => {
     return `群组验证命令帮助：
-.config [关键词] [选项] - 配置验证规则
-  选项：-i 群号  -m 方式(0-3)  -t 阈值  -? 查询  -r 删除
-  审核方式：0=全部同意, 1=按数量, 2=按比例, 3=全部拒绝
-  示例：group-verify.config 学生,校友,老师 -m 1 -t 2
+主指令别名：gv, gverify
+
+配置命令 (.config):
+  选项：
+    -i <群号>     指定群号（私聊时必需）
+    -m <方式>     审核方式 (0=全部同意, 1=按数量, 2=按比例, 3=全部拒绝)
+    -t <阈值>     阈值参数（方式1或2时必需）
+    -msg <消息>   自定义提醒消息
+    -?           查询当前配置
+    -r           删除配置
+  
+  示例：
+    gv.config 关键词1,关键词2 -m 1 -t 2
+    gv.config -i 123456789 -?
+    gv.config -r -i 123456789
+
+提醒消息变量：
+  {user} - 用户名
+  {id} - 用户ID  
+  {group} - 群号
+  {gname} - 群名称
+  {question} - 申请理由
+  {answer} - 答对数量/比例
+  {threshold} - 阈值要求
+  \\n - 换行符
 
-.approve <用户ID> - 同意加群申请 (需管理员权限)
-.reject <用户ID> - 拒绝加群申请 (需管理员权限)
-.pending - 查看待审核列表
-.stats [群号] - 查看统计信息
-.help - 显示此帮助信息
+权限说明：
+  - 群主/管理员权限
+  - koishi三级以上权限
+  - 私聊时必须指定群号(-i参数)
 
-权限说明：管理命令需群管理员或koishi三级以上权限
-别名：.cfg(配置) .accept(同意) .rej(拒绝) .stat(统计) .list(列表)`;
+其他命令：
+  .approve <用户ID> - 同意加群申请
+  .reject <用户ID> - 拒绝加群申请  
+  .pending - 查看待审核列表
+  .stats [群号] - 查看统计信息`;
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-verification",
   "description": "Koishi 群组加群验证插件，支持多关键词匹配审核、多种审核方式和详细统计功能",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -34,10 +34,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.18.7"
+    "koishi": "^4.15.0"
   },
   "devDependencies": {
-    "typescript": "^5.0.0",
-    "@types/node": "^18.0.0"
+    "typescript": "^4.9.0",
+    "@types/node": "^16.0.0"
   }
 }

package/src/index.ts

@@ -21,6 +21,8 @@ export interface GroupVerificationConfig {
     threshold?: number  // 数量阈值或比例阈值
   }
   reminderMessage: string
+  createdBy: string
+  updatedBy: string
   createdAt: Date
   updatedAt: Date
 }
@@ -58,6 +60,8 @@ export function apply(ctx: Context, config: Config) {
     reviewMethod: 'integer',
     reviewParameters: 'json',
     reminderMessage: 'string',
+    createdBy: 'string',
+    updatedBy: 'string',
     createdAt: 'date',
     updatedAt: 'date'
   }, {
@@ -110,7 +114,7 @@ export function apply(ctx: Context, config: Config) {
     const config = groupConfig[0]
     
     // 执行验证
-    const isValid = await verifyApplication(config, message)
+    const { isValid, matchedCount, requiredThreshold } = await verifyApplication(config, message, session)
     
     if (isValid) {
       // 验证成功，自动同意入群
@@ -131,6 +135,18 @@ export function apply(ctx: Context, config: Config) {
     const username = session.username || '未知用户'
     const message = session.content || ''
     
+    // 获取群信息
+    let groupName = '未知群组'
+    try {
+      const guild = await session.bot.getGuild(guildId)
+      groupName = guild.name || groupName
+    } catch (error) {
+      // 无法获取群名称时使用默认值
+    }
+    
+    // 执行验证获取详细信息
+    const { matchedCount, requiredThreshold } = await verifyApplication(config, message, session)
+    
     // 将申请加入待审核列表
     await ctx.database.create('group_verification_pending', {
       groupId: guildId,
@@ -140,32 +156,56 @@ export function apply(ctx: Context, config: Config) {
       applyTime: new Date()
     })
     
+    // 替换提醒消息中的变量
+    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)
+    
     // 发送提醒消息到群内
-    const reminderMsg = config.reminderMessage || `收到新的加群申请：${username}(${userId})\n申请理由：${message}\n请管理员使用 #同意 或 #拒绝 来处理此申请`
     await ctx.broadcast([guildId], reminderMsg)
   }
 
   // 验证申请
-  async function verifyApplication(config: GroupVerificationConfig, message: string): Promise<boolean> {
+  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: // 全部同意
-        return true
+        isValid = true
+        requiredThreshold = 'null'
+        break
       case 1: // 按数量同意
-        return matchedCount >= (config.reviewParameters.threshold || 1)
+        isValid = matchedCount >= (config.reviewParameters.threshold || 1)
+        requiredThreshold = `${config.reviewParameters.threshold || 1}`
+        break
       case 2: // 按比例同意
         const ratio = matchedCount / config.keywords.length
         const requiredRatio = (config.reviewParameters.threshold || 100) / 100
-        return ratio >= requiredRatio
+        isValid = ratio >= requiredRatio
+        requiredThreshold = `${config.reviewParameters.threshold || 100}%`
+        break
       case 3: // 全部拒绝
-        return false
+        isValid = false
+        requiredThreshold = 'null'
+        break
       default:
-        return false
+        isValid = false
+        requiredThreshold = 'null'
     }
+    
+    return { isValid, matchedCount, requiredThreshold }
   }
 
   // 更新统计信息
@@ -210,31 +250,56 @@ export function apply(ctx: Context, config: Config) {
   }
 
   // 权限检查函数
-  async function checkPermission(session: any, targetGroupId?: string): Promise<boolean> {
+  async function checkPermission(session: any, targetGroupId?: string): Promise<[boolean, string?]> {
     const groupId = targetGroupId || session.guildId
     
-    // 检查是否为群管理员
-    if (groupId) {
-      try {
-        const member = await session.bot.getGuildMember(groupId, session.userId)
-        if (member && (member.roles?.includes('admin') || member.permissions?.includes('ADMINISTRATOR'))) {
-          return true
-        }
-      } catch (error) {
-        // 如果无法获取群成员信息，继续检查其他权限
-      }
+    // 私聊情况下必须指定群号
+    if (!groupId) {
+      return [false, '请在群聊中使用此命令或使用 -i 参数指定群号']
     }
     
+    // 调试日志：输出权限检查信息
+    console.log(`[权限检查] 用户ID: ${session.userId}, 群号: ${groupId}`)
+    console.log(`[权限检查] Koishi权限等级: ${session.author?.authority || '未获取到'}`)
+    
     // 检查koishi权限等级（三级及以上）
     if (session.author?.authority && session.author.authority >= 3) {
-      return true
+      console.log(`[权限检查] 通过koishi权限检查: ${session.author.authority}`)
+      return [true]
     }
     
-    return false
+    // 检查是否为群主或管理员
+    try {
+      const member = await session.bot.getGuildMember(groupId, session.userId)
+      console.log(`[权限检查] 获取到成员信息:`, {
+        roles: member?.roles,
+        permissions: member?.permissions
+      })
+      
+      if (member) {
+        // 检查群主权限
+        if (member.permissions?.includes('OWNER')) {
+          console.log(`[权限检查] 用户是群主`)
+          return [true]
+        }
+        // 检查管理员权限
+        if (member.roles?.includes('admin') || member.permissions?.includes('ADMINISTRATOR')) {
+          console.log(`[权限检查] 用户是管理员`)
+          return [true]
+        }
+      }
+    } catch (error) {
+      console.log(`[权限检查] 获取群成员信息失败:`, error)
+      return [false, `无法获取群 ${groupId} 的成员信息，请确认机器人已在该群中`]
+    }
+    
+    console.log(`[权限检查] 权限不足`)
+    return [false, '权限不足：需要群主/管理员权限或koishi三级以上权限']
   }
 
-  // Create main command
+  // Create main command with aliases
   const groupVerify = ctx.command('group-verify', '群组验证管理命令')
+    .alias('gv', 'gverify')
 
   // Subcommand: configure group verification
   groupVerify
@@ -243,18 +308,27 @@ export function apply(ctx: Context, config: Config) {
     .option('groupId', '-i <groupId> 指定群号')
     .option('method', '-m <method> 审核方式 (0-3)')
     .option('threshold', '-t <threshold> 阈值参数')
+    .option('message', '-msg <message> 自定义提醒消息')
     .option('query', '-? 查询当前配置')
     .option('remove', '-r 删除配置')
     .action(async ({ session, options }, keywords) => {
       const targetGroupId = options.groupId || session.guildId
       
       // 权限检查
-      if (!(await checkPermission(session, targetGroupId))) {
-        return '权限不足'
+      const [hasPermission, errorMsg] = await checkPermission(session, targetGroupId)
+      if (!hasPermission) {
+        return errorMsg || '权限不足'
       }
 
-      if (!targetGroupId) {
-        return '请在群聊中使用此命令或使用 -i 参数指定群号'
+      // 获取群信息
+      let groupName = '未知群组'
+      if (targetGroupId) {
+        try {
+          const guild = await session.bot.getGuild(targetGroupId)
+          groupName = guild.name || groupName
+        } catch (error) {
+          // 无法获取群名称时使用默认值
+        }
       }
       
       // 处理删除配置
@@ -274,30 +348,47 @@ export function apply(ctx: Context, config: Config) {
         if (existingConfig.length > 0) {
           const config = existingConfig[0]
           let methodDesc = ''
+          let thresholdInfo = ''
           switch (config.reviewMethod) {
-            case 0: methodDesc = '全部同意'; break
-            case 1: methodDesc = `按数量同意 (${config.reviewParameters.threshold || 1})`; break
-            case 2: methodDesc = `按比例同意 (${config.reviewParameters.threshold || 100}%)`; break
-            case 3: methodDesc = '全部拒绝'; break
+            case 0: 
+              methodDesc = '全部同意'
+              thresholdInfo = 'null'
+              break
+            case 1: 
+              methodDesc = `按数量同意`
+              thresholdInfo = `${config.reviewParameters.threshold || 1}`
+              break
+            case 2: 
+              methodDesc = `按比例同意`
+              thresholdInfo = `${config.reviewParameters.threshold || 100}%`
+              break
+            case 3: 
+              methodDesc = '全部拒绝'
+              thresholdInfo = 'null'
+              break
           }
-          return `群 ${targetGroupId} 配置：\n关键词: ${config.keywords.join(', ')}\n审核方式: ${methodDesc}`
+          
+          const createTime = new Date(config.createdAt).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' })
+          const updateTime = new Date(config.updatedAt).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' })
+          
+          return `群 ${targetGroupId} 配置：
+关键词: ${config.keywords.join(', ')}
+审核方式: ${methodDesc}
+阈值: ${thresholdInfo}
+提醒消息: ${config.reminderMessage}
+创建时间: ${createTime}
+更新时间: ${updateTime}
+创建者: ${config.createdBy}
+更新者: ${config.updatedBy}`
         } else {
           return `群 ${targetGroupId} 无验证配置`
         }
       }
       
       // 处理配置创建/更新
-      if (!keywords) {
-        return '请提供关键词参数，或使用 -? 查询配置，-r 删除配置'
-      }
+      const keywordList = keywords ? keywords.split(',').map(k => k.trim()).filter(k => k) : []
       
-      const keywordList = keywords.split(',').map(k => k.trim()).filter(k => k)
-      
-      if (keywordList.length === 0) {
-        return '请提供有效的关键词'
-      }
-      
-      // 解析审核方式
+      // 解析审核方式和阈值
       let reviewMethod: 0 | 1 | 2 | 3 = 0 // 默认全部同意
       let reviewParameters: { threshold?: number } = {}
       
@@ -329,29 +420,40 @@ export function apply(ctx: Context, config: Config) {
         }
       }
       
+      // 处理提醒消息
+      let reminderMessage = options.message || 
+        `用户 {user}({id}) 申请加入群 {gname}({group})
+申请理由：{question}
+答对情况：{answer}
+阈值要求：{threshold}
+请管理员使用 #同意 或 #拒绝 来处理此申请`
+      
+      // 替换换行符
+      reminderMessage = reminderMessage.replace(/\\n/g, '\n')
+      
       // Check if configuration already exists
       const existingConfig = await ctx.database.get('group_verification_config', { groupId: targetGroupId })
       
+      const configData = {
+        keywords: keywordList,
+        reviewMethod: reviewMethod,
+        reviewParameters: reviewParameters,
+        reminderMessage: reminderMessage,
+        updatedBy: session.username || session.userId,
+        updatedAt: new Date()
+      }
+      
       if (existingConfig.length > 0) {
         // Update existing configuration
-        await ctx.database.set('group_verification_config', { id: existingConfig[0].id }, {
-          keywords: keywordList,
-          reviewMethod: reviewMethod,
-          reviewParameters: reviewParameters,
-          reminderMessage: `New join request received. Please use #approve or #reject to handle this request`,
-          updatedAt: new Date()
-        })
+        await ctx.database.set('group_verification_config', { id: existingConfig[0].id }, configData)
         return `已更新群 ${targetGroupId} 的验证配置`
       } else {
         // Create new configuration
         await ctx.database.create('group_verification_config', {
+          ...configData,
           groupId: targetGroupId,
-          keywords: keywordList,
-          reviewMethod: reviewMethod,
-          reviewParameters: reviewParameters,
-          reminderMessage: `New join request received. Please use #approve or #reject to handle this request`,
-          createdAt: new Date(),
-          updatedAt: new Date()
+          createdBy: session.username || session.userId,
+          createdAt: new Date()
         })
         return `已为群 ${targetGroupId} 创建验证配置`
       }
@@ -486,17 +588,42 @@ export function apply(ctx: Context, config: Config) {
     .subcommand('.help', '显示帮助信息')
     .alias('帮助', 'hlp', '帮助信息')
     .action(() => {
-      return `群组验证命令帮助：\n` +
-        `.config [关键词] [选项] - 配置验证规则\n` +
-        `  选项：-i 群号  -m 方式(0-3)  -t 阈值  -? 查询  -r 删除\n` +
-        `  审核方式：0=全部同意, 1=按数量, 2=按比例, 3=全部拒绝\n` +
-        `  示例：group-verify.config 学生,校友,老师 -m 1 -t 2\n\n` +
-        `.approve <用户ID> - 同意加群申请 (需管理员权限)\n` +
-        `.reject <用户ID> - 拒绝加群申请 (需管理员权限)\n` +
-        `.pending - 查看待审核列表\n` +
-        `.stats [群号] - 查看统计信息\n` +
-        `.help - 显示此帮助信息\n\n` +
-        `权限说明：管理命令需群管理员或koishi三级以上权限\n` +
-        `别名：.cfg(配置) .accept(同意) .rej(拒绝) .stat(统计) .list(列表)`
+      return `群组验证命令帮助：
+主指令别名：gv, gverify
+
+配置命令 (.config):
+  选项：
+    -i <群号>     指定群号（私聊时必需）
+    -m <方式>     审核方式 (0=全部同意, 1=按数量, 2=按比例, 3=全部拒绝)
+    -t <阈值>     阈值参数（方式1或2时必需）
+    -msg <消息>   自定义提醒消息
+    -?           查询当前配置
+    -r           删除配置
+  
+  示例：
+    gv.config 关键词1,关键词2 -m 1 -t 2
+    gv.config -i 123456789 -?
+    gv.config -r -i 123456789
+
+提醒消息变量：
+  {user} - 用户名
+  {id} - 用户ID  
+  {group} - 群号
+  {gname} - 群名称
+  {question} - 申请理由
+  {answer} - 答对数量/比例
+  {threshold} - 阈值要求
+  \\n - 换行符
+
+权限说明：
+  - 群主/管理员权限
+  - koishi三级以上权限
+  - 私聊时必须指定群号(-i参数)
+
+其他命令：
+  .approve <用户ID> - 同意加群申请
+  .reject <用户ID> - 拒绝加群申请  
+  .pending - 查看待审核列表
+  .stats [群号] - 查看统计信息`
     })
 }