koishi-plugin-onebot-verifier 1.2.0 → 1.2.2

package/lib/index.js

@@ -88,7 +88,7 @@ var Config = import_koishi.Schema.intersect([
   }).description("加群请求配置"),
   import_koishi.Schema.object({
     voteInSitu: import_koishi.Schema.boolean().description("[投票]原群投票模式").default(true),
-    voteRatio: import_koishi.Schema.string().description("[投票]支持/反对人数").default("3:2"),
+    voteRatio: import_koishi.Schema.string().description("[投票]支持/反对人数").default("5:1"),
     captchaDiff: import_koishi.Schema.union([
       import_koishi.Schema.const("simple").description("简单"),
       import_koishi.Schema.const("medium").description("中等"),
@@ -101,8 +101,7 @@ function apply(ctx, config) {
   const activeTasks = /* @__PURE__ */ new Map();
   const activeCaptchas = /* @__PURE__ */ new Map();
   const inviterMap = /* @__PURE__ */ new Map();
-  const requestMap = /* @__PURE__ */ new Map();
-  const recentRemovals = /* @__PURE__ */ new Map();
+  const historyMap = /* @__PURE__ */ new Map();
   const getComment = /* @__PURE__ */ __name((comment) => {
     if (!comment) return "";
     const lines = comment.split(/[\r\n]+/).map((s) => s.trim());
@@ -134,7 +133,7 @@ function apply(ctx, config) {
       return false;
     }
   }, "executeAction");
-  const sendNotice = /* @__PURE__ */ __name(async (session, kind, status = "waiting", overrideTarget) => {
+  const sendNotice = /* @__PURE__ */ __name(async (session, kind, status = "waiting", overrideTarget, specialMode) => {
     const notifyConfig = overrideTarget || config.notifyTarget || "";
     const [targetType, targetId] = notifyConfig.split(":");
     if (!targetId || !session.bot) return [];
@@ -153,7 +152,10 @@ 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" && kind !== "removed") infoLines.push(`回复"y/n"以同意/拒绝该请求`);
+      if (status === "waiting" && kind !== "removed") {
+        if (specialMode === "vote") infoLines.push(`[投票模式]需${config.voteRatio.split(":")[0]}人同意或${config.voteRatio.split(":")[1]}人拒绝`);
+        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;
@@ -166,7 +168,7 @@ function apply(ctx, config) {
     const timeoutCfg = 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);
+    const msgIds = await sendNotice(session, kind, "waiting", targetStr, specialMode);
     if (!msgIds?.length) return;
     const task = { session, kind, messages: msgIds, specialMode, inSitu: useInSitu };
     if (specialMode === "vote") {
@@ -212,7 +214,7 @@ function apply(ctx, config) {
       }
       const verifyText = getComment(eventData.comment);
       if (kind === "member") {
-        const rules = config.verifyRules?.filter((r) => String(r.guildId) === String(session.guildId)) || [];
+        const rules = config.verifyRules?.filter((r) => r.guildId === session.guildId) || [];
         for (const rule of rules) {
           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);
@@ -222,12 +224,9 @@ function apply(ctx, config) {
             if (rule.keyword) logger.info(`[加群请求] ${session.userId} 内容 "${verifyText}" ${keywordMatch ? "=" : "≠"} "${rule.keyword}"`);
           }
           if (levelMatch && keywordMatch) {
-            const historyKey = `${session.userId}:${session.guildId}`;
-            const lastTime = requestMap.get(historyKey) || 0;
-            const now = Date.now();
-            const isFrequent = rule.frequency && now - lastTime < rule.frequency * 6e4;
+            const lastLeaveTime = historyMap.get(`${session.userId}:${session.guildId}`) || 0;
+            const isFrequent = rule.frequency && Date.now() - lastLeaveTime < rule.frequency * 6e4;
             if (isFrequent) {
-              requestMap.set(historyKey, now);
               if (config.frequencyMode === "reject") {
                 await executeAction(session, kind, false, "频繁申请，自动拒绝");
                 await sendNotice(session, kind, "auto_reject");
@@ -238,7 +237,6 @@ function apply(ctx, config) {
                 return await setupManual(session, kind, void 0, false, rule.action === "accept");
               }
             }
-            requestMap.set(historyKey, now);
             if (rule.action) {
               await executeAction(session, kind, rule.action === "accept", rule.action === "accept" ? "" : "错误回答，自动拒绝");
               await sendNotice(session, kind, rule.action === "accept" ? "auto_pass" : "auto_reject");
@@ -246,7 +244,7 @@ function apply(ctx, config) {
             }
           }
         }
-        const specialRule = config.specialRules?.find((r) => String(r.guildId) === String(session.guildId));
+        const specialRule = config.specialRules?.find((r) => r.guildId === session.guildId);
         if (specialRule) {
           if (specialRule.mode === "vote") return await setupManual(session, kind, "vote", config.voteInSitu);
           if (specialRule.mode === "captcha") {
@@ -329,17 +327,20 @@ function apply(ctx, config) {
     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 ? "通过" : "拒绝"}该投票` : `处理投票失败`;
-    await session.send(replyText).catch(() => {
+    if (!task.inSitu) await session.send(isSuccess ? `已${finalVerdict ? "通过" : "拒绝"}该投票` : `处理投票失败`).catch(() => {
     });
   }, "handleSpecialVote");
   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.on("guild-member-removed", async (session) => {
+    if (!session.guildId || !session.userId) return;
+    if (config.verifyRules?.some((r) => r.guildId === session.guildId)) historyMap.set(`${session.userId}:${session.guildId}`, Date.now());
+  });
   ctx.on("guild-member-added", async (session) => {
     if (!config.specialRules || !session.guildId || !session.userId) return;
-    const rule = config.specialRules.find((r) => String(r.guildId) === String(session.guildId));
+    const rule = config.specialRules.find((r) => r.guildId === session.guildId);
     if (rule?.mode === "captcha") {
       let a, b, op = "+", answer;
       if (config.captchaDiff === "simple") {
@@ -364,24 +365,23 @@ function apply(ctx, config) {
         op = "×";
         answer = (a * b).toString();
       }
-      const captchaKey = `${session.guildId}:${session.userId}`;
       await session.send(`<at id="${session.userId}"/> 请在 60 秒内回复计算结果，以进行验证：${a} ${op} ${b} =`);
       const timer = setTimeout(async () => {
-        if (activeCaptchas.has(captchaKey)) {
-          activeCaptchas.delete(captchaKey);
+        if (activeCaptchas.has(`${session.userId}:${session.guildId}`)) {
+          activeCaptchas.delete(`${session.userId}:${session.guildId}`);
           await session.send(`<at id="${session.userId}"/> 验证失败，将被移出本群。`);
           await session.onebot?.setGroupKick(session.guildId, session.userId, false);
         }
       }, 6e4);
-      activeCaptchas.set(captchaKey, { guildId: session.guildId, userId: session.userId, answer, timer });
+      activeCaptchas.set(`${session.userId}:${session.guildId}`, { guildId: session.guildId, userId: session.userId, answer, timer });
     }
   });
   ctx.on("guild-removed", async (session) => {
     if (session.guildId) {
       const eventData = session.event?._data || {};
       const curTime = eventData.time || 0;
-      if (Math.abs(curTime - (recentRemovals.get(session.guildId) || 0)) < 300) return;
-      recentRemovals.set(session.guildId, curTime);
+      if (Math.abs(curTime - (historyMap.get(session.guildId) || 0)) < 300) return;
+      historyMap.set(session.guildId, curTime);
       if (config.debugMode) logger.info(`[事件] 退出: ${session.guildId} 数据: ${JSON.stringify(eventData)}`);
       if (eventData.sub_type === "kick_me") {
         const inviterId = inviterMap.get(session.guildId);
@@ -407,40 +407,30 @@ function apply(ctx, config) {
   ctx.middleware(async (session, next) => {
     if (typeof session.content !== "string") return next();
     if (session.guildId && session.userId) {
-      const captchaKey = `${session.guildId}:${session.userId}`;
-      const captcha = activeCaptchas.get(captchaKey);
-      if (captcha) {
-        const input2 = session.content.trim();
-        if (input2 === captcha.answer) {
-          clearTimeout(captcha.timer);
-          activeCaptchas.delete(captchaKey);
-          await session.send(`<at id="${session.userId}"/> 验证成功，欢迎加入本群！`);
-          return;
-        }
+      const captcha = activeCaptchas.get(`${session.userId}:${session.guildId}`);
+      if (captcha && session.content.trim() === captcha.answer) {
+        clearTimeout(captcha.timer);
+        activeCaptchas.delete(`${session.userId}:${session.guildId}`);
+        await session.send(`<at id="${session.userId}"/> 验证成功，欢迎加入本群！`);
+        return;
       }
     }
     if (!session.quote?.id) return next();
     const task = activeTasks.get(session.quote.id);
     if (!task) 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();
+    if ((ntType === "private" ? session.userId !== ntId : session.guildId !== ntId) && !(task.inSitu && session.guildId === task.session.guildId)) return next();
     const input = session.content.replace(/<(quote|at)\s+[^>]*\/>/gi, "").trim();
     const cmdMatch = input.match(/^(y|n|通过|拒绝)(?:\s+(.*))?$/i);
     if (!cmdMatch) return next();
     const isApprove = ["y", "通过"].includes(cmdMatch[1].toLowerCase());
     const extraInfo = cmdMatch[2]?.trim() || "";
     if (config.debugMode) logger.info(`[操作] 收到指令: ${isApprove ? "同意" : "拒绝"}`);
-    if (task.specialMode === "vote") {
-      await handleSpecialVote(session, task, isApprove, extraInfo);
-      return;
-    }
+    if (task.specialMode === "vote") return await handleSpecialVote(session, task, isApprove, extraInfo);
     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 ? "通过" : "拒绝"}该请求` : `处理请求失败`;
-    await session.send(replyText).catch(() => {
+    await session.send(isSuccess ? `已${isApprove ? "通过" : "拒绝"}该请求` : `处理请求失败`).catch(() => {
     });
   });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-onebot-verifier",
   "description": "[仅支持 Onebot 平台]支持好友申请/群组邀请/加群请求等的自动审核，可根据等级与正则进行筛选，并有入群验证码、投票表决、被踢清理等功能。",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],