koishi-plugin-group-verification 1.0.31 → 1.0.33

package/lib/index.js

@@ -348,7 +348,7 @@ async function checkPermission(session, targetGroupId) {
     });
   }
   if (koishiAuthority && koishiAuthority >= 3) {
-    logger.info(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`);
+    logger.debug(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`);
     return [true];
   }
   try {
@@ -661,7 +661,9 @@ async function processBlacklistCommand(ctx, session, rawArgs, config) {
     targetUser = parts[1];
     if (!targetUser) return "请提供用户ID";
     const rest = parts.slice(2);
-    if (rest.length > 0) {
+    if (rest.length === 1) {
+      reason = rest[0];
+    } else if (rest.length > 1) {
       const last = rest[rest.length - 1];
       if (/^\d+$/.test(last) || last.toLowerCase() === "all") {
         group = last;
@@ -700,6 +702,14 @@ async function processBlacklistCommand(ctx, session, rawArgs, config) {
       entries[targetUser] = storedReason;
       await ctx.database.create("group_verification_blacklist", { groupId: group, entries });
     }
+    if (session.bot && typeof session.bot.kickGuildMember === "function") {
+      try {
+        await session.bot.kickGuildMember(group, targetUser);
+        logger.info(`已将黑名单用户 ${targetUser} 从群 ${group} 踢出`);
+      } catch (e) {
+        logger.warn(`踢出用户 ${targetUser} 失败`, e);
+      }
+    }
     const tmpl = config && config.blacklistAddSuccess || "已将用户 {user} 加入群 {group} 黑名单{reason}";
     return tmpl.replace("{user}", targetUser).replace("{group}", group).replace("{reason}", reason ? `，原因：${reason}` : "");
   }
@@ -872,7 +882,7 @@ function apply(ctx, config) {
     userId: "string",
     userName: "string",
     requestMessage: "string",
-    // store the raw requestId if provided by OneBot event; used for approving/rejecting
+    // 保存 OneBot 事件提供的原始 requestId；用于同意/拒绝操作
     requestId: "string",
     // record full timestamp as string to keep time component
     applyTime: "string"

package/package.json

@@ -1,51 +1,50 @@
-{
-  "name": "koishi-plugin-group-verification",
-  "description": "Koishi 群组加群验证插件，支持多关键词匹配审核、多种审核方式和详细统计功能",
-
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/LHDyx/koishi-plugin-group-verification.git"
-  },
-  "bugs": {
-    "url": "https://github.com/LHDyx/koishi-plugin-group-verification/issues"
-  },
-  "version": "1.0.31",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "dist",
-    "src",
-    "README.md",
-    "USAGE_EXAMPLE.md"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc -w",
-    "test": "ts-node test/basic-test.ts"
-  },
-  "license": "MIT",
-  "keywords": [
-    "chatbot",
-    "koishi",
-    "plugin",
-    "group-verification",
-    "guild-management",
-    "join-request",
-    "moderation"
-  ],
-  "koishi": {
-    "service": {
-      "required": [
-        "database"
-      ]
-    }
-  },
-  "peerDependencies": {
-    "koishi": "^4.15.0"
-  },
-  "devDependencies": {
-    "typescript": "^4.9.0",
-    "@types/node": "^16.0.0"
-  }
-}
+{
+  "name": "koishi-plugin-group-verification",
+  "description": "Koishi 群组加群验证插件，支持多关键词匹配审核、多种审核方式和详细统计功能",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/LHDyx/koishi-plugin-group-verification.git"
+  },
+  "bugs": {
+    "url": "https://github.com/LHDyx/koishi-plugin-group-verification/issues"
+  },
+  "version": "1.0.33",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "dist",
+    "src",
+    "README.md",
+    "USAGE_EXAMPLE.md"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc -w",
+    "test": "ts-node test/basic-test.ts"
+  },
+  "license": "MIT",
+  "keywords": [
+    "chatbot",
+    "koishi",
+    "plugin",
+    "group-verification",
+    "guild-management",
+    "join-request",
+    "moderation"
+  ],
+  "koishi": {
+    "service": {
+      "required": [
+        "database"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "koishi": "^4.15.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.9.0",
+    "@types/node": "^16.0.0"
+  }
+}

package/readme.md

@@ -134,6 +134,22 @@ group-verify.blacklist i <用户ID> [群号|all]
 
 ## ⚙️ 参数说明
 
+### 日志级别配置
+
+插件启动时会输出运行状态，并根据 `logLevel` 调整输出量。
+- `debug`：打印所有调试细节，包括权限检查、命令解析等。
+- `info`：默认值，记录关键事件（插件启动、配置修改、自动拒绝、黑名单踢人等）。
+- `warn`：记录可恢复的异常，例如尝试踢出用户失败、数据库操作问题。
+- `error`：仅在遇到严重错误时输出。
+
+添加黑名单时会尝试在对应群踢出该用户，成功记为 `info`，失败记为 `warn`。
+
+### 严格群号检查
+
+`enableStrictGroupCheck` 可开启简单群号格式验证（长度 5‑15 位），
+影响所有需要群号的命令。
+
+
 ### 审核方式 (-m)
 
 *如果改变审核方式而未提供 `-t`，阈值会自动设置为最大值（方式1为关键词数量，方式2为100）。*

package/src/index.ts

@@ -57,7 +57,7 @@ export interface PendingVerification {
   userId: string
   userName: string
   requestMessage: string
-  // raw OneBot requestId (may be empty string)
+  // 原始 OneBot requestId（字符串可能为空）
   requestId?: string
   applyTime: string | Date
 }
@@ -104,11 +104,11 @@ export const inject = ['database']
  */
 export interface TokenizeResult {
   tokens: string[];
-  seps: string[]; // separator that preceded each token: ' ' or ',' or '' (start)
+  seps: string[]; // 每个令牌前面的分隔符：' ' 或 ',' 或 ''（表示开始）
   error?: string;
 }
 
-// Sentinel characters used internally to distinguish escaped quotes/backslashes
+// 内部哨兵字符，用于区分转义的引号或反斜杠
 const ESC_QUOTE = '\u0000';
 const ESC_BACKSLASH = '\u0001';
 
@@ -116,7 +116,7 @@ export function tokenize(input: string): TokenizeResult {
   const tokens: string[] = [];
   const seps: string[] = [];
   let cur = '';
-  let lastSep = ''; // separator before current token
+  let lastSep = ''; // 当前令牌之前的分隔符
   let i = 0;
 
   const flush = () => {
@@ -131,7 +131,7 @@ export function tokenize(input: string): TokenizeResult {
   while (i < input.length) {
     const ch = input[i];
     if (ch === ' ' || ch === ',') {
-      // record separator for next token
+      // 记录下一个令牌的分隔符
       lastSep = ch;
       flush();
       i++;
@@ -226,7 +226,7 @@ export interface ParsedArgs {
 /**
  * 验证关键词格式：仅允许用逗号和引号分隔，禁止纯空格分隔
  */
-// helper used during parsing
+// 解析过程中使用的辅助函数
 function validateKeywordFormat(raw: string): boolean {
   if (raw.includes(',') || raw.includes('"')) {
     return true;
@@ -403,7 +403,8 @@ export async function incrementTotal(ctx: Context, groupId: string) {
   await syncTotalStats(ctx)
 }
 
-// helper to decide reviewParameters based on existing configuration, keyword list, user inputs,
+// 根据已有配置、关键词列表及用户输入确定阈值参数的辅助函数，
+// 并处理审核方式更改所致的自动调整
 // and whether the audit method has been changed by the command.
 export interface ThresholdResult {
   reviewParameters: number
@@ -498,7 +499,7 @@ export async function checkPermission(session: any, targetGroupId?: string): Pro
   }
   
   if (koishiAuthority && koishiAuthority >= 3) {
-    logger.info(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`)
+    logger.debug(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`)
     return [true]
   }
   
@@ -603,7 +604,7 @@ export function parseConfigArgs(raw: string): ParsedArgs {
 
   const isFlag = (tok: string) => /^-(?:i|m|t|msg|nomsg|\?|r)$/.test(tok);
 
-  // catch unescaped stray quotes before we unescape the sentinel symbols
+  // 在还原哨兵字符之前处理未转义的杂散引号
   for (const tok of tokens) {
     if (tok.includes('"')) {
       error = '存在未转义的引号';
@@ -611,7 +612,7 @@ export function parseConfigArgs(raw: string): ParsedArgs {
     }
   }
 
-  // unescape sentinel placeholders back to real characters
+  // 将哨兵占位符还原为真实字符
   tokens = tokens.map(t =>
     t.replace(new RegExp(ESC_QUOTE, 'g'), '"').replace(new RegExp(ESC_BACKSLASH, 'g'), '\\')
   );
@@ -781,7 +782,7 @@ export async function handleFailedVerification(
     // 无法获取群名称时使用默认值
   }
 
-  // extract requestId if available (OneBot event attaches it)
+  // 如果可用则提取 requestId（OneBot 事件会附带）
   const requestId = ((session.event as any)?.requestId) || session.messageId || ''
 
   // 删除同一用户在该群之前的所有待审核记录，保留最新一个
@@ -886,13 +887,17 @@ export async function processBlacklistCommand(ctx: Context, session: any, rawArg
     targetUser = parts[1]
     if (!targetUser) return '请提供用户ID'
     // handle optional reason and group at end
+    // 规则：如果只有一个附加参数，则作为 reason；两个及以上时最后一个为群号，其余拼成 reason
     const rest = parts.slice(2)
-    if (rest.length > 0) {
+    if (rest.length === 1) {
+      reason = rest[0]
+    } else if (rest.length > 1) {
       const last = rest[rest.length - 1]
       if (/^\d+$/.test(last) || last.toLowerCase() === 'all') {
         group = last
         reason = rest.slice(0, -1).join(' ')
       } else {
+        // 虽然数量>=2，但最后一个不是数字，全部作为reason
         reason = rest.join(' ')
       }
     }
@@ -930,6 +935,15 @@ export async function processBlacklistCommand(ctx: Context, session: any, rawArg
       entries[targetUser] = storedReason
       await ctx.database.create('group_verification_blacklist', { groupId: group, entries })
     }
+    // 添加成功后尝试踢人
+    if (session.bot && typeof session.bot.kickGuildMember === 'function') {
+      try {
+        await session.bot.kickGuildMember(group, targetUser)
+        logger.info(`已将黑名单用户 ${targetUser} 从群 ${group} 踢出`)        
+      } catch (e) {
+        logger.warn(`踢出用户 ${targetUser} 失败`, e)
+      }
+    }
     const tmpl = (config && config.blacklistAddSuccess) || '已将用户 {user} 加入群 {group} 黑名单{reason}'
     return tmpl.replace('{user}', targetUser).replace('{group}', group).replace('{reason}', reason ? `，原因：${reason}` : '')
   }
@@ -1001,7 +1015,7 @@ export async function processBlacklistCommand(ctx: Context, session: any, rawArg
     const globalRows = await ctx.database.get('group_verification_blacklist', { groupId: 'all' })
     const globalHit = globalRows.length > 0 && (globalRows[0].entries || {})[targetUser] !== undefined
 
-    // helper to format reply using template
+    // 使用模板格式化回复的辅助函数
     const tmpl = (config && config.blacklistInfoTemplate) || '全局黑名单: {global}\n本群黑名单: {group}'
     const formatReply = (localHit: boolean, groupsList?: string[]) => {
       if (groupsList) {
@@ -1119,7 +1133,7 @@ export function apply(ctx: Context, config: Config) {
     userId: 'string',
     userName: 'string',
     requestMessage: 'string',
-    // store the raw requestId if provided by OneBot event; used for approving/rejecting
+    // 保存 OneBot 事件提供的原始 requestId；用于同意/拒绝操作
     requestId: 'string',
     // record full timestamp as string to keep time component
     applyTime: 'string'