koishi-plugin-group-verification 1.0.31 → 1.0.32

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}` : "");
   }

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.32",
+  "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/src/index.ts

@@ -498,7 +498,7 @@ export async function checkPermission(session: any, targetGroupId?: string): Pro
   }
   
   if (koishiAuthority && koishiAuthority >= 3) {
-    logger.info(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`)
+    logger.debug(`权限检查 - 通过koishi权限检查: ${koishiAuthority}`)
     return [true]
   }
   
@@ -886,13 +886,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 +934,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}` : '')
   }