koishi-plugin-onebot-verifier 1.1.3 → 1.1.5

package/lib/index.d.ts

@@ -8,13 +8,18 @@ export interface Config {
     notifyTarget?: string;
     debugMode?: boolean;
     kickBan?: boolean;
-    timeout?: number;
-    timeoutAction?: 'accept' | 'reject';
+    friendTimeout: 'manual' | {
+        action: 'accept' | 'reject';
+        timeout: number;
+    };
     friendLevel?: number;
     friendRegex?: string;
     minMembers?: number;
     maxCapacity?: number;
-    verifyMode?: 'accept' | 'reject' | 'manual';
+    memberTimeout: 'manual' | {
+        action: 'accept' | 'reject';
+        timeout: number;
+    };
     verifyRules?: {
         guildId: string;
         keyword?: string;
@@ -28,6 +33,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;
+export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -49,22 +49,32 @@ var Config = import_koishi.Schema.intersect([
     kickBan: 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"),
+    friendTimeout: import_koishi.Schema.union([
+      import_koishi.Schema.const("manual").description("手动"),
+      import_koishi.Schema.object({
+        action: import_koishi.Schema.union([
+          import_koishi.Schema.const("accept").description("同意"),
+          import_koishi.Schema.const("reject").description("拒绝")
+        ]).description("操作").required(),
+        timeout: import_koishi.Schema.number().description("时长").default(360).min(1)
+      }).description("自动")
+    ]).description("模式").default("manual"),
     friendLevel: import_koishi.Schema.number().description("最低好友等级").default(0).min(0).max(256),
     friendRegex: import_koishi.Schema.string().description("好友验证正则"),
     minMembers: import_koishi.Schema.number().description("最低群成员数").default(0).min(0).max(3e3),
     maxCapacity: import_koishi.Schema.number().description("最低受邀容量").default(0).min(0).max(3e3)
   }).description("好友邀群配置"),
   import_koishi.Schema.object({
-    verifyMode: import_koishi.Schema.union([
-      import_koishi.Schema.const("accept").description("同意"),
-      import_koishi.Schema.const("reject").description("拒绝"),
-      import_koishi.Schema.const("manual").description("手动")
-    ]).description("处理模式").default("manual"),
+    memberTimeout: import_koishi.Schema.union([
+      import_koishi.Schema.const("manual").description("手动"),
+      import_koishi.Schema.object({
+        action: import_koishi.Schema.union([
+          import_koishi.Schema.const("accept").description("同意"),
+          import_koishi.Schema.const("reject").description("拒绝")
+        ]).description("操作").required(),
+        timeout: import_koishi.Schema.number().description("超时").default(360).min(1)
+      }).description("自动")
+    ]).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("正则"),
@@ -84,15 +94,16 @@ 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 = {}) {
+function apply(ctx, config) {
   const logger = new import_koishi.Logger("onebot-verifier");
   const activeTasks = /* @__PURE__ */ new Map();
   const activeCaptchas = /* @__PURE__ */ new Map();
@@ -128,8 +139,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 {
@@ -156,35 +167,36 @@ function apply(ctx, config = {}) {
       return [];
     }
   }, "sendNotice");
-  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode) => {
-    const waitMinutes = config.timeout ?? 0;
-    const action = kind === "member" ? config.verifyMode : config.timeoutAction;
-    const msgIds = await sendNotice(session, kind, "waiting");
+  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu) => {
+    const mode = kind === "member" ? config.memberTimeout : config.friendTimeout;
+    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 };
+    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")) {
+    if (mode !== "manual" && typeof mode === "object") {
+      const { action, timeout } = mode;
       task.timer = setTimeout(async () => {
         if (!activeTasks.has(msgIds[0])) return;
         msgIds.forEach((id) => activeTasks.delete(id));
         let finalAction = action;
-        if (specialMode === "vote" && finalAction === "manual") finalAction = "reject";
-        if (finalAction === "manual") return;
+        if (specialMode === "vote") finalAction = "reject";
         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(() => {
           });
         }
         if (config.debugMode) logger.info(`[操作] 等待超时，默认${isPass ? "通过" : "拒绝"}`);
-      }, waitMinutes * 6e4);
+      }, timeout * 6e4);
     }
   }, "setupManual");
   const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {
@@ -214,7 +226,7 @@ function apply(ctx, config = {}) {
         }
         const specialRule = config.specialRules?.find((r) => String(r.guildId) === String(session.guildId) && r.enabled);
         if (specialRule) {
-          if (specialRule.mode === "vote") return await setupManual(session, kind, "vote");
+          if (specialRule.mode === "vote") return await setupManual(session, kind, "vote", config.voteInSitu);
           if (specialRule.mode === "captcha") {
             await executeAction(session, kind, true, "验证码验证，自动通过");
             await sendNotice(session, kind, "auto_pass");
@@ -270,7 +282,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;
@@ -296,7 +308,7 @@ function apply(ctx, config = {}) {
     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"));
@@ -377,9 +389,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();
@@ -387,14 +400,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.3",
+  "version": "1.1.5",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],