koishi-plugin-onebot-verifier 1.1.3 → 1.1.4

package/lib/index.d.ts

@@ -28,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

@@ -84,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 = {}) {
@@ -128,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 {
@@ -156,12 +157,14 @@ function apply(ctx, config = {}) {
       return [];
     }
   }, "sendNotice");
-  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode) => {
+  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu) => {
     const waitMinutes = config.timeout ?? 0;
     const action = kind === "member" ? config.verifyMode : config.timeoutAction;
-    const msgIds = await sendNotice(session, kind, "waiting");
+    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 };
@@ -177,7 +180,7 @@ function apply(ctx, config = {}) {
         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(() => {
@@ -214,7 +217,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 +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;
@@ -296,7 +299,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 +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();
@@ -387,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.3",
+  "version": "1.1.4",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],