koishi-plugin-onebot-verifier 1.1.2 → 1.1.4

package/lib/index.d.ts

@@ -21,7 +21,6 @@ export interface Config {
         minLevel?: number;
         action?: 'accept' | 'reject';
     }[];
-    syncNotify?: boolean;
     specialRules?: {
         guildId: string;
         enabled: boolean;
@@ -29,6 +28,7 @@ export interface Config {
     }[];
     captchaDiff?: 'simple' | 'medium' | 'hard';
     voteRatio?: string;
+    voteInSitu?: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config?: Config): void;

package/lib/index.js

@@ -76,7 +76,6 @@ var Config = import_koishi.Schema.intersect([
     })).description("普通验证配置").role("table")
   }).description("加群请求配置"),
   import_koishi.Schema.object({
-    syncNotify: import_koishi.Schema.boolean().description("同步通知目标").default(true),
     specialRules: import_koishi.Schema.array(import_koishi.Schema.object({
       guildId: import_koishi.Schema.string().description("群号").required(),
       mode: import_koishi.Schema.union([
@@ -85,12 +84,13 @@ var Config = import_koishi.Schema.intersect([
       ]).description("模式").default("vote"),
       enabled: import_koishi.Schema.boolean().description("前置规则").default(true)
     })).description("配置列表").role("table"),
-    voteRatio: import_koishi.Schema.string().description("[投票]人数").default("3:2"),
+    voteRatio: import_koishi.Schema.string().description("[投票]支持/反对人数").default("3:2"),
+    voteInSitu: import_koishi.Schema.boolean().description("[投票]对应群中发起").default(true),
     captchaDiff: import_koishi.Schema.union([
       import_koishi.Schema.const("simple").description("简单"),
       import_koishi.Schema.const("medium").description("中等"),
       import_koishi.Schema.const("hard").description("困难")
-    ]).description("[验证码]难度").default("simple")
+    ]).description("[验证]难度").default("simple")
   }).description("特殊验证配置")
 ]);
 function apply(ctx, config = {}) {
@@ -129,8 +129,8 @@ function apply(ctx, config = {}) {
       return false;
     }
   }, "executeAction");
-  const sendNotice = /* @__PURE__ */ __name(async (session, kind, status = "waiting") => {
-    const notifyConfig = config.notifyTarget || "";
+  const sendNotice = /* @__PURE__ */ __name(async (session, kind, status = "waiting", overrideTarget) => {
+    const notifyConfig = overrideTarget || config.notifyTarget || "";
     const [targetType, targetId] = notifyConfig.split(":");
     if (!targetId || !session.bot) return [];
     try {
@@ -148,7 +148,7 @@ function apply(ctx, config = {}) {
       if (adminId) infoLines.push(`管理：${adminInfo?.name ? `${adminInfo.name}(${adminId})` : adminId}`);
       if (session.guildId) infoLines.push(`群组：${groupInfo?.name ? `${groupInfo.name}(${session.guildId})` : session.guildId}`);
       if (eventData.comment) infoLines.push(`验证信息：${eventData.comment}`);
-      if (status === "waiting") infoLines.push(`使用"y/n"回复本消息，以同意/拒绝该请求`);
+      if (status === "waiting" && kind !== "removed") infoLines.push(`回复"y/n"以同意/拒绝该请求`);
       const content = infoLines.join("\n");
       const msgIds = await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, content) : session.bot.sendMessage(targetId, content)) || [];
       return msgIds;
@@ -157,22 +157,30 @@ function apply(ctx, config = {}) {
       return [];
     }
   }, "sendNotice");
-  const setupManual = /* @__PURE__ */ __name(async (session, kind) => {
+  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu) => {
     const waitMinutes = config.timeout ?? 0;
     const action = kind === "member" ? config.verifyMode : config.timeoutAction;
-    if (waitMinutes > 0) {
-      const msgIds = await sendNotice(session, kind, "waiting");
-      if (!msgIds?.length) return;
-      const task = { session, kind, messages: msgIds };
-      msgIds.forEach((id) => activeTasks.set(id, task));
+    let targetStr = config.notifyTarget || "";
+    if (useInSitu && kind === "member" && session.guildId) targetStr = `guild:${session.guildId}`;
+    const msgIds = await sendNotice(session, kind, "waiting", targetStr);
+    if (!msgIds?.length) return;
+    const task = { session, kind, messages: msgIds, specialMode, inSitu: useInSitu };
+    if (specialMode === "vote") {
+      const [yesStr, noStr] = config.voteRatio.split(":");
+      task.voteTarget = { yes: parseInt(yesStr) || 0, no: parseInt(noStr) || 0 };
+      task.votes = { yes: /* @__PURE__ */ new Set(), no: /* @__PURE__ */ new Set() };
+    }
+    msgIds.forEach((id) => activeTasks.set(id, task));
+    if (waitMinutes > 0 && (specialMode === "vote" || action !== "manual")) {
       task.timer = setTimeout(async () => {
         if (!activeTasks.has(msgIds[0])) return;
         msgIds.forEach((id) => activeTasks.delete(id));
-        const finalAction = kind === "member" ? config.verifyMode ?? "manual" : config.timeoutAction ?? "accept";
+        let finalAction = action;
+        if (specialMode === "vote" && finalAction === "manual") finalAction = "reject";
         if (finalAction === "manual") return;
         const isPass = finalAction === "accept";
         await executeAction(session, kind, isPass, isPass ? "" : "等待超时，自动拒绝");
-        const [targetType, targetId] = (config.notifyTarget || "").split(":");
+        const [targetType, targetId] = targetStr.split(":");
         if (targetId && session.bot) {
           const statusText = `已自动${isPass ? "通过" : "拒绝"}该请求`;
           await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, statusText) : session.bot.sendMessage(targetId, statusText)).catch(() => {
@@ -180,12 +188,6 @@ function apply(ctx, config = {}) {
         }
         if (config.debugMode) logger.info(`[操作] 等待超时，默认${isPass ? "通过" : "拒绝"}`);
       }, waitMinutes * 6e4);
-    } else {
-      if (action === "manual" || !action) return await sendNotice(session, kind, "waiting");
-      const isPass = action === "accept";
-      await executeAction(session, kind, isPass, "等待超时，自动处理");
-      await sendNotice(session, kind, isPass ? "auto_pass" : "auto_reject");
-      if (config.debugMode) logger.info(`[操作] 无需等待，默认${isPass ? "通过" : "拒绝"}`);
     }
   }, "setupManual");
   const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {
@@ -193,43 +195,32 @@ function apply(ctx, config = {}) {
     if (eventData.user_id) session.userId = String(eventData.user_id);
     if (eventData.group_id) session.guildId = String(eventData.group_id);
     try {
-      if (config.debugMode) logger.info(`[收到请求] 类型: ${kind} 数据: ${JSON.stringify(session.event?._data || {})}`);
-      const verifyText = getComment(session.event?._data?.comment);
+      if (config.debugMode) logger.info(`[请求] 类型: ${kind} 数据: ${JSON.stringify(eventData)}`);
+      const verifyText = getComment(eventData.comment);
       if (kind === "member") {
         const rules = config.verifyRules?.filter((r) => String(r.guildId) === String(session.guildId)) || [];
         for (const rule of rules) {
-          const minL = rule.minLevel ?? 0;
-          const stats = minL > 0 && session.onebot && session.userId ? await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({})) : null;
+          const stats = (rule.minLevel ?? 0) > 0 && session.onebot && session.userId ? await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({})) : null;
+          const levelMatch = (stats?.qqLevel ?? 0) >= (rule.minLevel ?? 0);
           const keywordMatch = !rule.keyword || new RegExp(rule.keyword, "i").test(verifyText);
-          const levelMatch = !stats || (stats.qqLevel ?? 0) >= minL;
           if (config.debugMode) {
-            if (rule.keyword) logger.info(`[加群验证] 内容 "${verifyText}" ${keywordMatch ? "匹配" : "不匹配"}正则 "${rule.keyword}"`);
-            if (stats) logger.info(`[加群验证] 用户 ${session.userId} 等级 ${stats.qqLevel ?? 0}${levelMatch ? ">" : "<"}${minL}`);
+            if ((rule.minLevel ?? 0) > 0) logger.info(`[加群请求] ${session.userId} 等级 ${stats?.qqLevel ?? 0} ${levelMatch ? ">" : "<"} "${rule.minLevel ?? 0}"`);
+            if (rule.keyword) logger.info(`[加群请求] ${session.userId} 内容 "${verifyText}" ${keywordMatch ? "=" : "≠"} "${rule.keyword}"`);
           }
-          if (keywordMatch && levelMatch && rule.action) {
-            const isApprove = rule.action === "accept";
-            await executeAction(session, kind, isApprove, isApprove ? "" : "命中规则，自动拒绝");
-            await sendNotice(session, kind, isApprove ? "auto_pass" : "auto_reject");
-            return;
+          if (levelMatch && keywordMatch) {
+            if (rule.action) {
+              await executeAction(session, kind, rule.action === "accept", rule.action === "accept" ? "" : "命中规则，自动拒绝");
+              await sendNotice(session, kind, rule.action === "accept" ? "auto_pass" : "auto_reject");
+              return;
+            }
           }
         }
         const specialRule = config.specialRules?.find((r) => String(r.guildId) === String(session.guildId) && r.enabled);
         if (specialRule) {
-          if (specialRule.mode === "vote") {
-            const [yesStr, noStr] = config.voteRatio.split(":");
-            const targetYes = parseInt(yesStr) || 0;
-            const targetNo = parseInt(noStr) || 0;
-            let msgIds = [];
-            if (config.syncNotify !== false) msgIds = await sendNotice(session, kind, "waiting");
-            if (msgIds.length > 0) {
-              const task = { session, kind, messages: msgIds, specialMode: "vote", voteTarget: { yes: targetYes, no: targetNo }, votes: { yes: /* @__PURE__ */ new Set(), no: /* @__PURE__ */ new Set() } };
-              msgIds.forEach((id) => activeTasks.set(id, task));
-            }
-            return;
-          }
+          if (specialRule.mode === "vote") return await setupManual(session, kind, "vote", config.voteInSitu);
           if (specialRule.mode === "captcha") {
             await executeAction(session, kind, true, "验证码验证，自动通过");
-            if (config.syncNotify !== false) await sendNotice(session, kind, "auto_pass");
+            await sendNotice(session, kind, "auto_pass");
             return;
           }
         }
@@ -237,42 +228,36 @@ function apply(ctx, config = {}) {
       }
       let verdict = false;
       if (kind === "friend") {
-        if (config.friendRegex) {
-          const isRegexMatched = new RegExp(config.friendRegex, "i").test(verifyText);
-          if (config.debugMode) logger.info(`[好友验证] 内容 "${verifyText}" ${isRegexMatched ? "匹配" : "不匹配"}正则 "${config.friendRegex}" `);
-          if (isRegexMatched) verdict = true;
+        let levelPass = true, regexPass = true;
+        if (config.friendLevel && config.friendLevel > 0 && session.onebot && session.userId) {
+          const stats = await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({}));
+          levelPass = (stats.qqLevel ?? 0) >= config.friendLevel;
+          if (config.debugMode) logger.info(`[好友验证] ${session.userId} 等级 ${stats.qqLevel ?? 0} ${levelPass ? ">" : "<"} "${config.friendLevel}"`);
         }
-        if (verdict !== true) {
-          const fLevel = config.friendLevel ?? 0;
-          if (fLevel > 0 && session.onebot && session.userId) {
-            const stats = await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({}));
-            const isLevelMatched = (stats.qqLevel ?? 0) >= fLevel;
-            if (config.debugMode) logger.info(`[好友验证] 用户 ${session.userId} 等级 ${stats.qqLevel ?? 0}${isLevelMatched ? ">" : "<"}${fLevel}`);
-            if (isLevelMatched) verdict = true;
-          }
+        if (config.friendRegex) {
+          regexPass = new RegExp(config.friendRegex, "i").test(verifyText);
+          if (config.debugMode) logger.info(`[好友验证] ${session.userId} 内容 "${verifyText}" ${regexPass ? "=" : "≠"} "${config.friendRegex}"`);
         }
+        verdict = levelPass && regexPass;
       } else if (kind === "guild") {
         if (ctx.database && session.userId) {
-          const userData = await ctx.database.getUser(session.platform, session.userId, ["authority"]).catch(() => null);
-          if (userData && userData.authority > 3) {
-            if (config.debugMode) logger.info(`[群组邀请] 用户 ${session.userId} 权限 ${userData.authority}>3`);
+          const auth = (await ctx.database.getUser(session.platform, session.userId, ["authority"]).catch(() => null))?.authority ?? 0;
+          if (auth > 3) {
+            if (config.debugMode) logger.info(`[群组邀请] ${session.userId} 权限 ${auth} > 3`);
             verdict = true;
           }
         }
         if (verdict !== true && session.onebot && session.guildId) {
           const stats = await session.onebot.getGroupInfo(session.guildId, true).catch(() => ({}));
-          const minM = config.minMembers ?? 0;
-          const maxC = config.maxCapacity ?? 0;
-          if (minM > 0 && (stats.member_count ?? 0) < minM) {
-            verdict = `群成员不足 ${minM} 人`;
-            if (config.debugMode) logger.info(`[群组邀请] 群组 ${session.guildId} 成员数 ${stats.member_count ?? 0}<${minM}`);
-          } else if (maxC > 0 && (stats.max_member_count ?? 0) < maxC) {
-            verdict = `群容量不足 ${maxC} 人`;
-            if (config.debugMode) logger.info(`[群组邀请] 群组 ${session.guildId} 受邀容量 ${stats.max_member_count ?? 0}<${maxC}`);
-          } else {
-            verdict = minM > 0 || maxC > 0;
-            if (config.debugMode && verdict) logger.info(`[群组邀请] 群组 ${session.guildId} 成员数 ${stats.member_count ?? 0}>${minM}，受邀容量 ${stats.max_member_count ?? 0}>${maxC}`);
+          const minPass = (stats.member_count ?? 0) >= (config.minMembers ?? 0);
+          const maxPass = (stats.max_member_count ?? 0) >= (config.maxCapacity ?? 0);
+          if (config.debugMode) {
+            if ((config.minMembers ?? 0) > 0) logger.info(`[群组邀请] ${session.guildId} 人数 ${stats.member_count ?? 0} ${minPass ? ">" : "<"} "${config.minMembers ?? 0}"`);
+            if ((config.maxCapacity ?? 0) > 0) logger.info(`[群组邀请] ${session.guildId} 容量 ${stats.max_member_count ?? 0} ${maxPass ? ">" : "<"} "${config.maxCapacity ?? 0}"`);
           }
+          if (!minPass) verdict = `群人数不足 ${config.minMembers ?? 0} 人`;
+          else if (!maxPass) verdict = `群容量不足 ${config.maxCapacity ?? 0} 人`;
+          else verdict = (config.minMembers ?? 0) > 0 || (config.maxCapacity ?? 0) > 0;
         }
       }
       if (verdict === true) {
@@ -288,7 +273,7 @@ function apply(ctx, config = {}) {
       logger.error(`处理失败: ${error}`);
     }
   }, "hookEvent");
-  const handleSpecialVote = /* @__PURE__ */ __name(async (session, task, isApprove, extraInfo, targetType, targetId) => {
+  const handleSpecialVote = /* @__PURE__ */ __name(async (session, task, isApprove, extraInfo) => {
     if (!task.voteTarget || !task.votes) return;
     const voterId = session.userId;
     if (!voterId) return;
@@ -310,10 +295,11 @@ function apply(ctx, config = {}) {
       finalVerdict = false;
     }
     if (!thresholdMet) return;
+    if (task.timer) clearTimeout(task.timer);
     task.messages.forEach((msg) => activeTasks.delete(msg));
     const isSuccess = await executeAction(task.session, task.kind, finalVerdict, finalVerdict ? "" : extraInfo);
     const replyText = isSuccess ? `已${finalVerdict ? "通过" : "拒绝"}该投票` : `处理投票失败`;
-    if (session.bot) await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, replyText) : session.bot.sendMessage(targetId, replyText)).catch(() => {
+    await session.send(replyText).catch(() => {
     });
   }, "handleSpecialVote");
   ctx.on("friend-request", hookEvent("friend"));
@@ -360,19 +346,19 @@ function apply(ctx, config = {}) {
     }
   });
   ctx.on("guild-removed", async (session) => {
-    if (session.event?._data?.sub_type === "kick_me") {
-      const gid = session.guildId;
-      if (gid) {
-        const inviterId = inviterMap.get(gid);
+    if (session.guildId) {
+      if (session.event?._data?.sub_type === "kick_me") {
+        const inviterId = inviterMap.get(session.guildId);
         if (inviterId) {
           await session.onebot?.deleteFriend(inviterId).catch(() => {
           });
-          inviterMap.delete(gid);
+          inviterMap.delete(session.guildId);
           if (config.debugMode) logger.info(`[操作] 删除好友: ${inviterId}`);
         }
-        await session.execute(`analyse.clear -g ${gid}`).catch(() => {
-        });
       }
+      await session.execute(`analyse.clear -g ${session.guildId}`).catch(() => {
+      });
+      if (config.debugMode) logger.info(`[操作] 清理群组数据: ${session.guildId}`);
     }
     await sendNotice(session, "removed");
   });
@@ -394,9 +380,10 @@ function apply(ctx, config = {}) {
     if (!session.quote?.id) return next();
     const task = activeTasks.get(session.quote.id);
     if (!task) return next();
-    const [targetType, targetId] = (config.notifyTarget || "").split(":");
-    const isMatched = targetType === "private" ? session.userId === targetId : session.guildId === targetId;
-    if (!isMatched) return next();
+    const [ntType, ntId] = (config.notifyTarget || "").split(":");
+    const isGlobalNotifyTarget = ntType === "private" ? session.userId === ntId : session.guildId === ntId;
+    const isInSituGuild = task.inSitu && session.guildId && session.guildId === task.session.guildId;
+    if (!isGlobalNotifyTarget && !isInSituGuild) return next();
     const input = session.content.replace(/<(quote|at)\s+[^>]*\/>/gi, "").trim();
     const cmdMatch = input.match(/^(y|n|通过|拒绝)(?:\s+(.*))?$/i);
     if (!cmdMatch) return next();
@@ -404,14 +391,14 @@ function apply(ctx, config = {}) {
     const extraInfo = cmdMatch[2]?.trim() || "";
     if (config.debugMode) logger.info(`[操作] 收到指令: ${isApprove ? "同意" : "拒绝"}`);
     if (task.specialMode === "vote") {
-      await handleSpecialVote(session, task, isApprove, extraInfo, targetType, targetId);
+      await handleSpecialVote(session, task, isApprove, extraInfo);
       return;
     }
     if (task.timer) clearTimeout(task.timer);
     task.messages.forEach((msg) => activeTasks.delete(msg));
     const isSuccess = await executeAction(task.session, task.kind, isApprove, isApprove ? "" : extraInfo, isApprove && task.kind === "friend" ? extraInfo : "");
     const replyText = isSuccess ? `已${isApprove ? "通过" : "拒绝"}该请求` : `处理请求失败`;
-    if (session.bot) await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, replyText) : session.bot.sendMessage(targetId, replyText)).catch(() => {
+    await session.send(replyText).catch(() => {
     });
   });
 }

package/package.json

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