koishi-plugin-onebot-verifier 1.1.4 → 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;
@@ -31,4 +36,4 @@ export interface Config {
     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("正则"),
@@ -93,7 +103,7 @@ var Config = import_koishi.Schema.intersect([
     ]).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();
@@ -158,8 +168,7 @@ function apply(ctx, config = {}) {
     }
   }, "sendNotice");
   const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu) => {
-    const waitMinutes = config.timeout ?? 0;
-    const action = kind === "member" ? config.verifyMode : config.timeoutAction;
+    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);
@@ -171,13 +180,13 @@ function apply(ctx, config = {}) {
       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] = targetStr.split(":");
@@ -187,7 +196,7 @@ function apply(ctx, config = {}) {
           });
         }
         if (config.debugMode) logger.info(`[操作] 等待超时，默认${isPass ? "通过" : "拒绝"}`);
-      }, waitMinutes * 6e4);
+      }, timeout * 6e4);
     }
   }, "setupManual");
   const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {

package/package.json

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