koishi-plugin-onebot-verifier 0.0.1 → 1.0.1

package/lib/index.d.ts

@@ -2,21 +2,22 @@ import { Context, Schema } from 'koishi';
 export declare const name = "onebot-verifier";
 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 {
-    enable?: boolean;
     notifyTarget?: string;
-    enableDebug?: boolean;
-    FriendLevel?: number;
-    FriendRequestAutoRegex?: string;
-    MemberRequestAutoRules?: {
+    notifyAuto?: boolean;
+    debugMode?: boolean;
+    timeout?: number;
+    timeoutAction?: 'accept' | 'reject';
+    friendLevel?: number;
+    friendRegex?: string;
+    minMembers?: number;
+    maxCapacity?: number;
+    verifyMode?: 'strict' | 'assist' | 'manual';
+    verifyRules?: {
         guildId: string;
-        keyword: string;
-        minLevel: number;
+        keyword?: string;
+        minLevel?: number;
+        groupAction?: 'accept' | 'reject';
     }[];
-    GuildAllowUsers?: string[];
-    GuildMinMemberCount?: number;
-    GuildMaxCapacity?: number;
-    manualTimeout?: number;
-    manualTimeoutAction?: 'accept' | 'reject';
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config?: Config): void;

package/lib/index.js

@@ -40,267 +40,231 @@ var usage = `
   <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
 </div>
 `;
-var Config = import_koishi.Schema.object({
-  enable: import_koishi.Schema.boolean().description("开启请求监听").default(true),
-  notifyTarget: import_koishi.Schema.string().description("通知目标(guild/private:number)").required(),
-  enableDebug: import_koishi.Schema.boolean().description("开启调试日志").default(false),
-  manualTimeout: import_koishi.Schema.number().description("请求超时时长").default(360).min(0),
-  manualTimeoutAction: import_koishi.Schema.union([
-    import_koishi.Schema.const("accept").description("同意"),
-    import_koishi.Schema.const("reject").description("拒绝")
-  ]).description("默认超时操作").default("accept"),
-  FriendLevel: import_koishi.Schema.number().description("最低好友等级").default(-1).min(-1).max(256),
-  GuildMinMemberCount: import_koishi.Schema.number().description("最低群成员数").default(-1).min(-1).max(3e3),
-  GuildMaxCapacity: import_koishi.Schema.number().description("最低受邀容量").default(-1).min(-1).max(3e3),
-  FriendRequestAutoRegex: import_koishi.Schema.string().description("好友验证正则"),
-  MemberRequestAutoRules: import_koishi.Schema.array(import_koishi.Schema.object({
-    guildId: import_koishi.Schema.string().description("群号"),
-    keyword: import_koishi.Schema.string().description("正则"),
-    minLevel: import_koishi.Schema.number().description("等级").default(-1)
-  })).description("加群验证规则").role("table"),
-  GuildAllowUsers: import_koishi.Schema.array(String).description("邀请加群白名单").role("table")
-}).description("请求处理配置");
-function extractAnswers(message) {
-  if (!message) return "";
-  const lines = message.split(/[\r\n]+/);
-  const answers = lines.map((line) => line.trim()).filter((line) => /^(回答)[:：]/i.test(line)).map((line) => line.replace(/^(回答)[:：]\s*/i, ""));
-  if (answers.length > 0) return answers.join("\n");
-  return message;
-}
-__name(extractAnswers, "extractAnswers");
+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({
+    timeout: import_koishi.Schema.number().description("请求超时时长").default(360).min(0),
+    timeoutAction: import_koishi.Schema.union([
+      import_koishi.Schema.const("accept").description("同意"),
+      import_koishi.Schema.const("reject").description("拒绝")
+    ]).description("默认超时操作").default("accept"),
+    friendLevel: import_koishi.Schema.number().description("最低好友等级").default(-1).min(-1).max(256),
+    friendRegex: import_koishi.Schema.string().description("好友验证正则"),
+    minMembers: import_koishi.Schema.number().description("最低群成员数").default(-1).min(-1).max(3e3),
+    maxCapacity: import_koishi.Schema.number().description("最低受邀容量").default(-1).min(-1).max(3e3)
+  }).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("manual").description("手动")
+    ]).description("处理模式").default("assist"),
+    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([
+        import_koishi.Schema.const("accept").description("同意"),
+        import_koishi.Schema.const("reject").description("拒绝")
+      ]).description("操作")
+    })).description("加群验证配置").role("table")
+  }).description("加群请求配置")
+]);
 function apply(ctx, config = {}) {
   const logger = new import_koishi.Logger("onebot-verifier");
-  const requestNumberMap = /* @__PURE__ */ new Map();
-  let nextRequestNumber = 1;
-  const activeRequests = /* @__PURE__ */ new Map();
-  const processedFlags = /* @__PURE__ */ new Set();
-  const cleanupActiveRequest = /* @__PURE__ */ __name((requestKey) => {
-    const activeRequest = activeRequests.get(requestKey);
-    if (!activeRequest) return;
-    activeRequest.disposer?.();
-    if (activeRequest.timeoutTimer) clearTimeout(activeRequest.timeoutTimer);
-    requestNumberMap.delete(activeRequest.requestNumber);
-    activeRequests.delete(requestKey);
-  }, "cleanupActiveRequest");
-  const processRequestAction = /* @__PURE__ */ __name(async (session, type, approve, reason = "", remark = "") => {
+  const activeTasks = /* @__PURE__ */ new Map();
+  const executeAction = /* @__PURE__ */ __name(async (session, kind, pass, reason = "", remark = "") => {
     try {
       const eventData = session.event?._data || {};
-      if (!approve && type === "guild" && session.guildId && (session.event?.type === "guild-added" || eventData.notice_type === "group_increase")) {
+      if (!pass && kind === "guild" && session.guildId && (session.event?.type === "guild-added" || eventData.notice_type === "group_increase")) {
         if (reason) {
           try {
-            await session.bot.sendMessage(session.guildId, `将退出该群 ${reason}`);
-          } catch (e) {
-            logger.warn(`发送退群通知失败: ${e}`);
+            await session.bot.sendMessage(session.guildId, `${reason}，将退出该群`);
+          } catch (error) {
+            logger.warn(`发送退群通知失败: ${error}`);
           }
         }
-        try {
-          if (session.onebot) await session.onebot.setGroupLeave(session.guildId, false);
-          return true;
-        } catch (e) {
-          logger.error(`退出群组 ${session.guildId} 失败: ${e}`);
-          return false;
-        }
+        await session.onebot?.setGroupLeave(session.guildId, false);
+        return true;
       }
-      const flag = eventData.flag;
-      if (!flag || !session.onebot) return false;
-      if (type === "friend") await session.onebot.setFriendAddRequest(flag, approve, remark);
-      else await session.onebot.setGroupAddRequest(flag, eventData.sub_type ?? "add", approve, approve ? "" : reason);
+      if (!eventData.flag || !session.onebot) return false;
+      if (kind === "friend") await session.onebot.setFriendAddRequest(eventData.flag, pass, remark);
+      else await session.onebot.setGroupAddRequest(eventData.flag, eventData.sub_type ?? "add", pass, pass ? "" : reason);
       return true;
-    } catch (e) {
-      logger.error(`请求处理失败: ${e}`);
+    } catch (error) {
+      logger.error(`操作失败: ${error}`);
       return false;
     }
-  }, "processRequestAction");
-  const sendRequestNotification = /* @__PURE__ */ __name(async (session, type, status, details = {}) => {
-    const { notifyTarget = "" } = config;
-    if (!notifyTarget) return;
-    const [targetType, targetId] = notifyTarget.split(":");
-    if (!targetId || targetType !== "guild" && targetType !== "private") return;
+  }, "executeAction");
+  const sendNotice = /* @__PURE__ */ __name(async (session, kind, status = "waiting") => {
+    const notifyConfig = config.notifyTarget || "";
+    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 user = session.userId ? await session.bot.getUser?.(session.userId)?.catch(() => null) : null;
-      const userName = user?.name || session.userId || "未知用户";
-      const guild = type !== "friend" && session.guildId ? await session.bot.getGuild?.(session.guildId)?.catch(() => null) : null;
-      const operator = eventData.operator_id && session.userId && eventData.operator_id.toString() !== session.userId ? await session.bot.getUser?.(eventData.operator_id.toString())?.catch(() => null) : null;
-      const msgLines = [];
-      if (user?.avatar) msgLines.push(`<image url="${user.avatar}"/>`);
-      let requestTypeText = type === "friend" ? "好友申请" : type === "member" ? "加群请求" : "群组邀请";
-      msgLines.push(`类型：${requestTypeText}`);
-      if (type !== "guild" || session.userId !== session.selfId) {
-        msgLines.push(`用户：${userName}${session.userId ? `(${session.userId})` : ""}`);
-      }
-      if (operator) msgLines.push(`管理：${operator.name ? `${operator.name}(${eventData.operator_id})` : eventData.operator_id}`);
-      if (guild) msgLines.push(`群组：${guild.name ? `${guild.name}(${session.guildId})` : session.guildId}`);
-      if (eventData.comment) msgLines.push(`验证信息：${eventData.comment}`);
-      const sendFunc = targetType === "private" ? (m) => session.bot.sendPrivateMessage(targetId, m) : (m) => session.bot.sendMessage(targetId, m);
-      await sendFunc(msgLines.join("\n"));
-      if (status === "pending" && details.requestNumber) {
-        await sendFunc(`请回复以下命令处理请求 #${details.requestNumber}：
-通过[y/ya]${details.requestNumber} [备注] | 拒绝[n/na]${details.requestNumber} [理由]`);
-      }
-    } catch (e) {
-      logger.error(`发送通知失败: ${e}`);
+      const userInfo = session.userId ? await session.bot.getUser?.(session.userId)?.catch(() => null) : null;
+      const groupInfo = kind !== "friend" && session.guildId ? await session.bot.getGuild?.(session.guildId)?.catch(() => null) : null;
+      const adminInfo = eventData.operator_id && session.userId && eventData.operator_id !== session.userId ? await session.bot.getUser?.(eventData.operator_id)?.catch(() => null) : null;
+      const infoLines = [];
+      if (userInfo?.avatar) infoLines.push(`<image url="${userInfo.avatar}"/>`);
+      const typeName = kind === "friend" ? "好友申请" : kind === "member" ? "加群请求" : "群组邀请";
+      const statusText = status === "auto_pass" ? "[自动通过]" : status === "auto_reject" ? "[自动拒绝]" : "[等待处理]";
+      infoLines.push(`类型：${typeName} ${statusText}`);
+      if (kind !== "guild" || session.userId !== session.selfId) infoLines.push(`用户：${userInfo?.name || session.userId}${session.userId ? `(${session.userId})` : ""}`);
+      if (adminInfo) infoLines.push(`管理：${adminInfo.name ? `${adminInfo.name}(${eventData.operator_id})` : eventData.operator_id}`);
+      if (groupInfo) infoLines.push(`群组：${groupInfo.name ? `${groupInfo.name}(${session.guildId})` : session.guildId}`);
+      if (eventData.comment) infoLines.push(`验证信息：${eventData.comment}`);
+      const content = infoLines.join("\n");
+      return await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, content) : session.bot.sendMessage(targetId, content)) || [];
+    } catch (error) {
+      logger.error(`通知失败: ${error}`);
+      return [];
     }
-  }, "sendRequestNotification");
-  const shouldAutoAccept = /* @__PURE__ */ __name(async (session, type) => {
-    const validationMessage = extractAnswers(session.event?._data?.comment);
-    const parseRegex = /* @__PURE__ */ __name((input) => {
-      const slashMatch = input.match(/^\/(.+)\/([a-z]*)$/);
-      if (slashMatch) return new RegExp(slashMatch[1], slashMatch[2]);
-      return new RegExp(input, "i");
-    }, "parseRegex");
-    switch (type) {
-      case "member": {
-        const rule = (config.MemberRequestAutoRules || []).find((r) => r.guildId === session.guildId);
-        if (!rule) return false;
-        if (rule.keyword) {
-          try {
-            if (!parseRegex(rule.keyword).test(validationMessage)) return false;
-          } catch (e) {
-            return false;
-          }
+  }, "sendNotice");
+  const checkCriteria = /* @__PURE__ */ __name(async (session, kind) => {
+    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;
+    const toRegex = /* @__PURE__ */ __name((text) => {
+      const match = text.match(/^\/(.+)\/([a-z]*)$/);
+      return match ? new RegExp(match[1], match[2]) : new RegExp(text, "i");
+    }, "toRegex");
+    if (kind === "member") {
+      const groupRule = config.verifyRules?.find((r) => r.guildId === session.guildId);
+      if (!groupRule) return false;
+      try {
+        if (groupRule.keyword && !toRegex(groupRule.keyword).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} 级`;
         }
-        if ((rule.minLevel ?? -1) >= 0 && session.onebot && session.userId) {
-          try {
-            const userInfo = await session.onebot.getStrangerInfo(session.userId, true);
-            if ((userInfo.qqLevel ?? 0) < rule.minLevel) return `QQ 等级低于${rule.minLevel}级`;
-          } catch (e) {
-            return false;
-          }
-        }
-        return true;
+      } catch {
+        return false;
       }
-      case "friend": {
-        if (config.FriendRequestAutoRegex) {
-          try {
-            if (parseRegex(config.FriendRequestAutoRegex).test(validationMessage)) return true;
-          } catch (e) {
-          }
-        }
-        if ((config.FriendLevel ?? -1) >= 0 && session.onebot && session.userId) {
-          try {
-            const userInfo = await session.onebot.getStrangerInfo(session.userId, true);
-            if ((userInfo.qqLevel ?? 0) < config.FriendLevel) return `QQ 等级低于${config.FriendLevel}级`;
-            return true;
-          } catch (e) {
-            return false;
-          }
+      return true;
+    }
+    if (kind === "friend") {
+      try {
+        if (config.friendRegex && toRegex(config.friendRegex).test(verifyText)) 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} 级`;
+          return true;
         }
+      } catch {
         return false;
       }
-      case "guild": {
-        if (session.userId && (config.GuildAllowUsers || []).includes(session.userId)) return true;
+      return false;
+    }
+    if (kind === "guild") {
+      try {
+        const userData = session.userId ? await ctx.database.getUser(session.platform, session.userId) : null;
+        if (userData && userData.authority > 1) return true;
+      } catch {
+      }
+      if (session.onebot && session.guildId && ((config.minMembers ?? -1) >= 0 || (config.maxCapacity ?? -1) >= 0)) {
         try {
-          if (session.userId) {
-            const user = await ctx.database.getUser(session.platform, session.userId);
-            if (user && user.authority > 1) return true;
-          }
+          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} 人`;
+          return true;
         } catch {
+          return false;
         }
-        if ((config.GuildMinMemberCount ?? -1) >= 0 || (config.GuildMaxCapacity ?? -1) >= 0) {
-          if (session.onebot && session.guildId) {
-            try {
-              const info = await session.onebot.getGroupInfo(session.guildId, true);
-              if (config.GuildMinMemberCount >= 0 && info.member_count < config.GuildMinMemberCount) return `群成员不足${config.GuildMinMemberCount}人`;
-              if (config.GuildMaxCapacity >= 0 && info.max_member_count < config.GuildMaxCapacity) return `群容量不足${config.GuildMaxCapacity}`;
-              return true;
-            } catch (e) {
-              return false;
-            }
-          }
-        }
-        return false;
       }
+      return false;
     }
-  }, "shouldAutoAccept");
-  const setupManualHandling = /* @__PURE__ */ __name(async (session, type, requestId) => {
-    const requestNumber = nextRequestNumber++;
-    requestNumberMap.set(requestNumber, requestId);
-    const activeRequest = { session, type, requestNumber };
-    activeRequests.set(requestId, activeRequest);
-    await sendRequestNotification(session, type, "pending", { requestNumber });
-    const timeoutMin = config.manualTimeout ?? 60;
-    if (timeoutMin > 0) {
-      activeRequest.timeoutTimer = setTimeout(async () => {
-        if (!activeRequests.has(requestId)) return;
-        cleanupActiveRequest(requestId);
-        const action = config.manualTimeoutAction || "accept";
-        await processRequestAction(session, type, action === "accept", action === "reject" ? "处理超时自动拒绝" : "");
-        const [tType, tId] = (config.notifyTarget || "").split(":");
-        if (tId) {
-          const send = tType === "private" ? (m) => session.bot.sendPrivateMessage(tId, m) : (m) => session.bot.sendMessage(tId, m);
-          await send(`请求 #${requestNumber} 超时，已自动${action === "accept" ? "通过" : "拒绝"}`);
+    return false;
+  }, "checkCriteria");
+  const setupManual = /* @__PURE__ */ __name(async (session, kind) => {
+    const msgIds = await sendNotice(session, kind, "waiting");
+    if (!msgIds?.length) return;
+    const task = { session, kind, messages: msgIds };
+    msgIds.forEach((id) => activeTasks.set(id, task));
+    const waitMinutes = config.timeout ?? 0;
+    if (waitMinutes > 0) {
+      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;
         }
-      }, timeoutMin * 60 * 1e3);
-    }
-    const [targetType, targetId] = (config.notifyTarget || "").split(":");
-    if (!targetId) return;
-    activeRequest.disposer = ctx.middleware(async (s, next) => {
-      if (typeof s.content !== "string") return next();
-      if (targetType === "private" ? s.userId !== targetId : s.guildId !== targetId) return next();
-      const bulkMatch = s.content.trim().match(/^(ya|na|全部同意|全部拒绝)\s*(.*)$/);
-      if (bulkMatch && activeRequests.size > 0) {
-        const reqs = [...activeRequests.values()];
-        activeRequests.clear();
-        requestNumberMap.clear();
-        const isApprove2 = bulkMatch[1] === "ya" || bulkMatch[1] === "全部同意";
-        const extra2 = bulkMatch[2]?.trim() || "";
-        for (const r of reqs) {
-          r.disposer?.();
-          if (r.timeoutTimer) clearTimeout(r.timeoutTimer);
-          await processRequestAction(r.session, r.type, isApprove2, !isApprove2 ? extra2 : "", isApprove2 && r.type === "friend" ? extra2 : "");
+        const isPass = finalAction === "accept";
+        await executeAction(session, kind, isPass, isPass ? "" : "等待人工超时，自动拒绝");
+        const notifyConfig = config.notifyTarget || "";
+        const [targetType, targetId] = notifyConfig.split(":");
+        if (targetId) {
+          const statusText = `已自动${isPass ? "通过" : "拒绝"}该请求`;
+          await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, statusText) : session.bot.sendMessage(targetId, statusText));
         }
-        const send2 = targetType === "private" ? (m) => s.bot.sendPrivateMessage(targetId, m) : (m) => s.bot.sendMessage(targetId, m);
-        await send2(`已${isApprove2 ? "通过" : "拒绝"} ${reqs.length} 个请求`);
-        return;
-      }
-      const match = s.content.trim().match(new RegExp(`^(y|n|通过|拒绝)(${requestNumber})\\s*(.*)$`));
-      if (!match) return next();
-      cleanupActiveRequest(requestId);
-      const isApprove = match[1] === "y" || match[1] === "通过";
-      const extra = match[3]?.trim() || "";
-      const success = await processRequestAction(session, type, isApprove, !isApprove ? extra : "", isApprove && type === "friend" ? extra : "");
-      const send = targetType === "private" ? (m) => s.bot.sendPrivateMessage(targetId, m) : (m) => s.bot.sendMessage(targetId, m);
-      if (success) await send(`请求 #${requestNumber} 已${isApprove ? "通过" : "拒绝"}`);
-      else await send(`处理请求 #${requestNumber} 失败`);
-    });
-  }, "setupManualHandling");
-  const processRequest = /* @__PURE__ */ __name(async (session, type) => {
-    const flag = session.event?._data?.flag;
-    if (flag) {
-      if (processedFlags.has(flag)) return;
-      processedFlags.add(flag);
-      setTimeout(() => processedFlags.delete(flag), 6e4);
+      }, waitMinutes * 6e4);
     }
-    const requestKey = type === "friend" ? `friend:${session.userId}` : type === "guild" ? `guild:${session.guildId}` : `member:${session.userId}:${session.guildId}`;
-    cleanupActiveRequest(requestKey);
+  }, "setupManual");
+  const handleEvent = /* @__PURE__ */ __name(async (session, kind) => {
     try {
-      const autoResult = await shouldAutoAccept(session, type);
-      if (autoResult === true) {
-        await processRequestAction(session, type, true);
-        await sendRequestNotification(session, type, "approved");
-      } else if (typeof autoResult === "string") {
-        await processRequestAction(session, type, false, autoResult);
-        await sendRequestNotification(session, type, "rejected", { reason: autoResult });
+      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 verdict = await checkCriteria(session, kind);
+      if (verdict === true) {
+        await executeAction(session, kind, true);
+        await sendNotice(session, kind, "auto_pass");
+      } else if (typeof verdict === "string") {
+        await executeAction(session, kind, false, verdict);
+        await sendNotice(session, kind, "auto_reject");
       } else {
-        await setupManualHandling(session, type, requestKey);
+        if (kind === "member" && config.verifyMode === "strict") return;
+        await setupManual(session, kind);
       }
-    } catch (e) {
-      logger.error(`处理流程出错: ${e}`);
+    } catch (error) {
+      logger.error(`处理失败: ${error}`);
     }
-  }, "processRequest");
-  if (config.enable !== false) {
-    const handle = /* @__PURE__ */ __name((type) => async (session) => {
-      const data = session.event?._data || {};
-      session.userId = data.user_id?.toString();
-      if (type !== "friend") session.guildId = data.group_id?.toString();
-      await processRequest(session, type);
-    }, "handle");
-    ctx.on("friend-request", handle("friend"));
-    ctx.on("guild-request", handle("guild"));
-    ctx.on("guild-member-request", handle("member"));
-    ctx.on("guild-added", handle("guild"));
-  }
+  }, "handleEvent");
+  const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {
+    const eventData = session.event?._data || {};
+    session.userId = eventData.user_id;
+    if (kind !== "friend") session.guildId = eventData.group_id;
+    await handleEvent(session, kind);
+  }, "hookEvent");
+  ctx.on("friend-request", hookEvent("friend"));
+  ctx.on("guild-request", hookEvent("guild"));
+  ctx.on("guild-member-request", hookEvent("member"));
+  ctx.on("guild-added", hookEvent("guild"));
+  ctx.middleware(async (session, next) => {
+    if (typeof session.content !== "string" || !session.quote?.id) return next();
+    const activeTask = activeTasks.get(session.quote.id);
+    if (!activeTask) return next();
+    const notifyConfig = config.notifyTarget || "";
+    const [targetType, targetId] = notifyConfig.split(":");
+    if (targetType === "private" ? session.userId !== targetId : session.guildId !== targetId) return next();
+    const input = session.content.replace(/<(quote|at)\s+[^>]*\/>/gi, "").trim();
+    const cmdMatch = input.match(/^(y|n|通过|拒绝)(?:\s+(.*))?$/);
+    if (!cmdMatch) return next();
+    if (activeTask.timer) clearTimeout(activeTask.timer);
+    activeTask.messages.forEach((msg) => activeTasks.delete(msg));
+    const isApprove = cmdMatch[1] === "y" || cmdMatch[1] === "通过";
+    const extraInfo = cmdMatch[2]?.trim() || "";
+    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));
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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

package/readme.md

@@ -2,4 +2,66 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-onebot-verifier?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-onebot-verifier)
 
-适用于 Onebot 的审核插件，支持自动审核好友/加群/邀请请求
+**适用于 OneBot 协议的综合审核管理插件**。本插件支持自动处理好友申请、加群申请以及进群邀请，并提供灵活的人工审核通知与指令操作功能。
+
+## ✨ 功能特性
+
+- **多场景覆盖**：支持好友申请、他人加群、邀请机器人进群三种场景。
+- **自动审核机制**：
+  - **等级校验**：根据 QQ 等级进行初步筛选。
+  - **正则匹配**：对验证信息进行关键词正则匹配。
+  - **群规模校验**：针对机器人被邀请进群，可设置最小成员数或最小群容量要求。
+- **三种工作模式**：
+  - `strict`（规则模式）：仅处理配置了规则的请求。
+  - `assist`（辅助模式）：规则不匹配时转为人工审核。
+  - `manual`（手动模式）：全人工介入。
+- **交互式人工审核**：通过引用通知消息并回复 `y/n` 即可快速通过或拒绝申请。
+- **超时自动处理**：防止人工审核积压，支持超时后自动通过或拒绝。
+
+## ⚙️ 配置项说明
+
+### 1. 基础配置
+
+- **通知目标 (`notifyTarget`)**: 审核信息的推送位置。格式为 `private:QQ号` 或 `guild:群号`。
+- **发送全部通知 (`notifyAuto`)**: 开启后，即便被插件自动通过/拒绝的请求也会发送通知。
+- **调试模式 (`debugMode`)**: 开启后将输出更详细的日志。
+
+### 2. 好友与邀群配置
+
+- **请求超时时长 (`timeout`)**: 人工审核的等待时间（单位：分钟）。
+- **默认超时操作 (`timeoutAction`)**: 超时未处理时执行的操作（同意/拒绝）。
+- **最低好友等级 (`friendLevel`)**: 申请人 QQ 等级需达到的标准（-1 为不限制）。
+- **好友验证正则 (`friendRegex`)**: 匹配好友申请时的验证信息。
+- **最低群成员数 (`minMembers`)**: 机器人被邀请进群时，该群的现有人数要求。
+- **最低受邀容量 (`maxCapacity`)**: 机器人被邀请进群时，该群的群上限人数要求。
+
+### 3. 加群请求配置 (用户加群)
+
+- **处理模式 (`verifyMode`)**:
+  - `规则`: 仅处理在下方“加群验证配置”中列出的群。
+  - `超时`: 匹配不到规则时，发送人工审核，超时后执行默认操作。
+  - `手动`: 所有申请直接进入人工审核。
+- **加群验证配置 (`verifyRules`)**:
+  - 为特定群设置专属的验证正则、最低等级要求及超时处理动作。
+
+## 🎮 使用方法
+
+### 人工审核交互
+
+当有新的申请触发人工审核时，插件会向 `notifyTarget` 发送通知。你只需**引用该通知消息**并回复：
+
+- **通过申请**：回复 `y` 或 `通过`。
+  - *提示：若是好友申请，后面可跟备注（如：`y 朋友`）。*
+- **拒绝申请**：回复 `n` 或 `拒绝`。
+  - *提示：后面可以跟拒绝理由（如：`n 等级太低`）。*
+
+### 自动处理逻辑
+
+1. **好友申请**：先匹配正则，再校验等级。
+2. **机器人进群**：管理员（权限 > 1）邀请直接通过；普通用户邀请则校验成员数和群容量。
+3. **用户进群**：按照 `verifyRules` 中的设置执行。若不满足条件，则根据 `verifyMode` 决定直接拒绝或转人工。
+
+## 🛠️ 技术细节
+
+- 插件会自动剥离 OneBot 验证信息中的 `回答：` 等前缀，直接提取核心答案进行正则匹配。
+- 对于已经进入群组但被判定不符合条件的邀请，插件会自动发送通知并执行退群操作。