koishi-plugin-onebot-verifier 1.0.3 → 1.0.5

package/lib/index.d.ts

@@ -6,7 +6,6 @@ export declare const inject: {
 export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n  <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n  <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n  <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n  <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
 export interface Config {
     notifyTarget?: string;
-    notifyAuto?: boolean;
     debugMode?: boolean;
     timeout?: number;
     timeoutAction?: 'accept' | 'reject';
@@ -14,12 +13,12 @@ export interface Config {
     friendRegex?: string;
     minMembers?: number;
     maxCapacity?: number;
-    verifyMode?: 'strict' | 'assist' | 'manual';
+    verifyMode?: 'accept' | 'reject' | 'manual';
     verifyRules?: {
         guildId: string;
         keyword?: string;
         minLevel?: number;
-        groupAction?: 'accept' | 'reject';
+        action?: 'accept' | 'reject';
     }[];
 }
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -45,7 +45,6 @@ var usage = `
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     notifyTarget: import_koishi.Schema.string().description("通知目标(guild/private:number)").required(),
-    notifyAuto: import_koishi.Schema.boolean().description("发送全部通知").default(true),
     debugMode: import_koishi.Schema.boolean().description("输出调试日志").default(false)
   }).description("基础配置"),
   import_koishi.Schema.object({
@@ -61,15 +60,15 @@ var Config = import_koishi.Schema.intersect([
   }).description("好友邀群配置"),
   import_koishi.Schema.object({
     verifyMode: import_koishi.Schema.union([
-      import_koishi.Schema.const("strict").description("规则"),
-      import_koishi.Schema.const("assist").description("超时"),
+      import_koishi.Schema.const("accept").description("同意"),
+      import_koishi.Schema.const("reject").description("拒绝"),
       import_koishi.Schema.const("manual").description("手动")
-    ]).description("处理模式").default("assist"),
+    ]).description("处理模式").default("manual"),
     verifyRules: import_koishi.Schema.array(import_koishi.Schema.object({
       guildId: import_koishi.Schema.string().description("群号").required(),
       keyword: import_koishi.Schema.string().description("正则"),
       minLevel: import_koishi.Schema.number().description("等级").default(-1),
-      groupAction: import_koishi.Schema.union([
+      action: import_koishi.Schema.union([
         import_koishi.Schema.const("accept").description("同意"),
         import_koishi.Schema.const("reject").description("拒绝")
       ]).description("操作")
@@ -82,6 +81,7 @@ function apply(ctx, config = {}) {
   const executeAction = /* @__PURE__ */ __name(async (session, kind, pass, reason = "", remark = "") => {
     try {
       const eventData = session.event?._data || {};
+      if (config.debugMode) logger.info(`[执行操作] 类型:${kind} 结果:${pass ? "同意" : "拒绝"} 原因:${reason || "无"}`);
       if (!pass && kind === "guild" && session.guildId && (session.event?.type === "guild-added" || eventData.notice_type === "group_increase")) {
         if (reason) {
           try {
@@ -107,7 +107,6 @@ function apply(ctx, config = {}) {
     if (!notifyConfig) return [];
     const [targetType, targetId] = notifyConfig.split(":");
     if (!targetId || targetType !== "guild" && targetType !== "private") return [];
-    if (status !== "waiting" && !config.notifyAuto) return [];
     try {
       const eventData = session.event?._data || {};
       const userInfo = session.userId ? await session.bot.getUser?.(session.userId)?.catch(() => null) : null;
@@ -133,28 +132,18 @@ function apply(ctx, config = {}) {
     const rawText = session.event?._data?.comment || "";
     const cleanLines = rawText.split(/[\r\n]+/).map((s) => s.trim()).filter((s) => /^(回答)[:：]/i.test(s)).map((s) => s.replace(/^(回答)[:：]\s*/i, ""));
     const verifyText = cleanLines.length > 0 ? cleanLines.join("\n") : rawText;
-    if (kind === "member") {
-      const groupRule = config.verifyRules?.find((r) => r.guildId === session.guildId);
-      if (!groupRule) return false;
-      try {
-        if (groupRule.keyword && !new RegExp(groupRule.keyword, "i").test(verifyText)) return false;
-        const limitLevel = groupRule.minLevel ?? -1;
-        if (limitLevel >= 0 && session.onebot && session.userId) {
-          const stats = await session.onebot.getStrangerInfo(session.userId, true);
-          if ((stats.qqLevel ?? 0) < limitLevel) return `QQ 等级低于 ${limitLevel} 级`;
-        }
-      } catch {
-        return false;
-      }
-      return true;
-    }
     if (kind === "friend") {
       try {
-        if (config.friendRegex && new RegExp(config.friendRegex, "i").test(verifyText)) return true;
+        if (config.friendRegex && new RegExp(config.friendRegex, "i").test(verifyText)) {
+          if (config.debugMode) logger.info(`[规则匹配] 好友检查: ${config.friendRegex}`);
+          return true;
+        }
         const limitLevel = config.friendLevel ?? -1;
         if (limitLevel >= 0 && session.onebot && session.userId) {
           const stats = await session.onebot.getStrangerInfo(session.userId, true);
-          if ((stats.qqLevel ?? 0) < limitLevel) return `QQ 等级低于 ${limitLevel} 级`;
+          const isPassed = (stats.qqLevel ?? 0) >= limitLevel;
+          if (config.debugMode) logger.info(`[规则判定] 等级检查: ${stats.qqLevel} > ${limitLevel} = ${isPassed}`);
+          if (!isPassed) return `QQ 等级低于 ${limitLevel} 级`;
           return true;
         }
       } catch {
@@ -165,14 +154,23 @@ function apply(ctx, config = {}) {
     if (kind === "guild") {
       try {
         const userData = session.userId ? await ctx.database.getUser(session.platform, session.userId) : null;
-        if (userData && userData.authority > 1) return true;
+        if (userData && userData.authority > 1) {
+          if (config.debugMode) logger.info(`[规则匹配] : ${userData.authority}`);
+          return true;
+        }
       } catch {
       }
       if (session.onebot && session.guildId && ((config.minMembers ?? -1) >= 0 || (config.maxCapacity ?? -1) >= 0)) {
         try {
           const stats = await session.onebot.getGroupInfo(session.guildId, true);
-          if ((config.minMembers ?? -1) >= 0 && stats.member_count < (config.minMembers ?? 0)) return `群成员不足 ${config.minMembers} 人`;
-          if ((config.maxCapacity ?? -1) >= 0 && stats.max_member_count < (config.maxCapacity ?? 0)) return `群容量不足 ${config.maxCapacity} 人`;
+          if ((config.minMembers ?? -1) >= 0 && stats.member_count < (config.minMembers ?? 0)) {
+            if (config.debugMode) logger.info(`[规则判定] 成员检查: ${stats.member_count} < ${config.minMembers}`);
+            return `群成员不足 ${config.minMembers} 人`;
+          }
+          if ((config.maxCapacity ?? -1) >= 0 && stats.max_member_count < (config.maxCapacity ?? 0)) {
+            if (config.debugMode) logger.info(`[规则判定] 容量检查: ${stats.max_member_count} < ${config.maxCapacity}`);
+            return `群容量不足 ${config.maxCapacity} 人`;
+          }
           return true;
         } catch {
           return false;
@@ -192,12 +190,9 @@ function apply(ctx, config = {}) {
       task.timer = setTimeout(async () => {
         if (!activeTasks.has(msgIds[0])) return;
         msgIds.forEach((id) => activeTasks.delete(id));
-        let finalAction = config.timeoutAction;
-        if (kind === "member") {
-          const groupRule = config.verifyRules?.find((r) => r.guildId === session.guildId);
-          if (groupRule?.groupAction) finalAction = groupRule.groupAction;
-        }
-        const isPass = finalAction === "accept";
+        const action = kind === "member" ? config.verifyMode : config.timeoutAction;
+        if (action === "manual" || !action) return;
+        const isPass = action === "accept";
         await executeAction(session, kind, isPass, isPass ? "" : "等待人工超时，自动拒绝");
         const notifyConfig = config.notifyTarget || "";
         const [targetType, targetId] = notifyConfig.split(":");
@@ -210,15 +205,24 @@ function apply(ctx, config = {}) {
   }, "setupManual");
   const handleEvent = /* @__PURE__ */ __name(async (session, kind) => {
     try {
+      if (config.debugMode) logger.info(`[收到请求] 类型:${kind} 数据:${JSON.stringify(session.event?._data || {})}`);
       if (kind === "member") {
-        if (config.verifyMode === "manual") {
-          await setupManual(session, kind);
-          return;
-        }
-        if (config.verifyMode === "strict") {
-          const matched = config.verifyRules?.some((r) => r.guildId === session.guildId);
-          if (!matched) return;
+        const rule = config.verifyRules?.find((r) => r.guildId === session.guildId);
+        if (rule) {
+          const rawText = session.event?._data?.comment || "";
+          const stats = (rule.minLevel ?? -1) >= 0 && session.onebot && session.userId ? await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({})) : null;
+          const keywordMatch = !rule.keyword || new RegExp(rule.keyword, "i").test(rawText);
+          const levelMatch = !stats || (stats.qqLevel ?? 0) >= rule.minLevel;
+          const isMatch = keywordMatch && levelMatch;
+          if (config.debugMode) logger.info(`[规则判定] ${rule.guildId}: 关键词=${keywordMatch}, 等级=${levelMatch}, 结果=${isMatch}`);
+          if (isMatch && rule.action) {
+            const isApprove = rule.action === "accept";
+            await executeAction(session, kind, isApprove, isApprove ? "" : "命中拒绝规则，自动拒绝");
+            await sendNotice(session, kind, isApprove ? "auto_pass" : "auto_reject");
+            return;
+          }
         }
+        return await setupManual(session, kind);
       }
       const verdict = await checkCriteria(session, kind);
       if (verdict === true) {
@@ -228,7 +232,6 @@ function apply(ctx, config = {}) {
         await executeAction(session, kind, false, verdict);
         await sendNotice(session, kind, "auto_reject");
       } else {
-        if (kind === "member" && config.verifyMode === "strict") return;
         await setupManual(session, kind);
       }
     } catch (error) {
@@ -259,6 +262,7 @@ function apply(ctx, config = {}) {
     activeTask.messages.forEach((msg) => activeTasks.delete(msg));
     const isApprove = cmdMatch[1] === "y" || cmdMatch[1] === "通过";
     const extraInfo = cmdMatch[2]?.trim() || "";
+    if (config.debugMode) logger.info(`[人工回复] 用户 ${session.userId} 回复: ${cmdMatch[1]} 备注: ${extraInfo}`);
     const isSuccess = await executeAction(activeTask.session, activeTask.kind, isApprove, isApprove ? "" : extraInfo, isApprove && activeTask.kind === "friend" ? extraInfo : "");
     const replyText = isSuccess ? `已${isApprove ? "通过" : "拒绝"}该请求` : `处理请求失败`;
     await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, replyText) : session.bot.sendMessage(targetId, replyText));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-onebot-verifier",
   "description": "适用于 Onebot 的审核插件，支持自动审核好友/加群/邀请请求",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],