koishi-plugin-onebot-verifier 1.2.9 → 1.2.11

package/lib/index.js

@@ -109,36 +109,47 @@ function apply(ctx, config) {
     const answers = lines.filter((s) => /^(回答|答案)[:：]/i.test(s)).map((s) => s.replace(/^(回答|答案)[:：]\s*/i, ""));
     return answers.length > 0 ? answers.join("\n") : comment;
   }, "getComment");
+  const getQQLevel = /* @__PURE__ */ __name((stats) => +(stats?.qqLevel ?? stats?.qq_level ?? stats?.level ?? 0), "getQQLevel");
+  const pushText = /* @__PURE__ */ __name(async (session, target, content) => {
+    const [type, id] = (target || "").split(":");
+    if (!id || !session.bot) return;
+    await (type === "private" ? session.bot.sendPrivateMessage(id, content) : session.bot.sendMessage(id, content)).catch(() => {
+    });
+  }, "pushText");
   const executeAction = /* @__PURE__ */ __name(async (session, kind, pass, reason = "", remark = "") => {
     try {
       const eventData = session.event?._data || {};
       if (config.debugMode) logger.info(`[操作] 类型: ${kind} 结果: ${pass ? "同意" : "拒绝"} 原因: ${reason || "无"}`);
-      if (pass && kind === "guild" && session.guildId && session.userId) inviterMap.set(session.guildId, session.userId);
-      if (!pass && kind === "guild" && session.bot) {
-        const targetId = eventData.operator_id || session.event?.operator?.id || session.userId;
-        if (targetId) {
-          const rejectMsg = `已拒绝该群组邀请${reason ? `，原因：${reason}` : ""}`;
-          await session.bot.sendPrivateMessage(targetId, rejectMsg).catch(() => {
-          });
-        }
+      if (pass && kind === "guild" && session.guildId && session.userId && session.userId !== session.selfId) inviterMap.set(session.guildId, session.userId);
+      if (!pass && kind === "guild") {
+        const targetId = eventData.operator_id || session.userId;
+        if (targetId) await pushText(session, `private:${targetId}`, `已拒绝该群组邀请${reason ? `，原因：${reason}` : ""}`);
       }
-      if (!pass && kind === "guild" && session.guildId && (session.event?.type === "guild-added" || eventData.notice_type === "group_increase")) {
-        if (reason) await session.bot?.sendMessage(session.guildId, `${reason}，将退出该群`).catch(() => {
-        });
-        await session.onebot?.setGroupLeave(session.guildId, false);
-        if (config.debugMode) logger.info(`[操作] 退出群组: ${session.guildId}`);
-        return true;
+      if (!pass && kind === "guild" && session.guildId && eventData.notice_type === "group_increase") {
+        if (reason) await pushText(session, `guild:${session.guildId}`, `${reason}，将退出该群`);
+        const left = await session.onebot?.setGroupLeave(session.guildId, false).then(() => true, () => false);
+        if (config.debugMode) logger.info(`[操作] ${left ? "退出群组" : "退出群组失败"}: ${session.guildId}`);
+        return !!left;
       }
       const flag = eventData.flag;
       if (!flag || !session.onebot) return false;
       if (kind === "friend") {
         await session.onebot.setFriendAddRequest(flag, pass, remark);
+        if (pass && remark) setTimeout(async () => {
+          const onebot = session.onebot;
+          try {
+            if (onebot.setFriendRemark) await onebot.setFriendRemark(session.userId, remark);
+            else await onebot._get("set_friend_remark", { user_id: session.userId, remark });
+          } catch (error) {
+            logger.warn(`设置好友备注失败: ${error}`);
+          }
+        }, 1e3);
       } else {
         await session.onebot.setGroupAddRequest(flag, eventData.sub_type ?? "add", pass, pass ? "" : reason);
       }
       return true;
     } catch (error) {
-      logger.error(`操作失败: ${error}`);
+      logger.error(`操作失败(${kind}${session.guildId ? ` 群 ${session.guildId}` : ""}${session.userId ? ` 用户 ${session.userId}` : ""}): ${error}`);
       return false;
     }
   }, "executeAction");
@@ -150,7 +161,7 @@ function apply(ctx, config) {
       const eventData = session.event?._data || {};
       const userInfo = session.userId ? await session.bot.getUser?.(session.userId).catch(() => null) : null;
       const groupInfo = kind !== "friend" && session.guildId ? await session.bot.getGuild?.(session.guildId).catch(() => null) : null;
-      const adminId = String(eventData.operator_id || session.event?.operator?.id || "");
+      const adminId = String(eventData.operator_id || "");
       const adminInfo = adminId && adminId !== session.userId ? await session.bot.getUser?.(adminId).catch(() => null) : null;
       const typeMap = { friend: "好友申请", member: "加群请求", guild: eventData.post_type === "notice" ? "群组邀请 (审核)" : "群组邀请 (请求)", removed: eventData.sub_type === "kick_me" ? "移出群组" : "退出群组" };
       const statusMap = { auto_pass: " [自动通过]", auto_reject: " [自动拒绝]", waiting: " [等待处理]" };
@@ -160,7 +171,7 @@ function apply(ctx, config) {
       if (kind !== "guild" && kind !== "removed" || session.userId && session.userId !== session.selfId) infoLines.push(`用户：${userInfo?.name || session.userId}${session.userId ? `(${session.userId})` : ""}`);
       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.invitor_id && String(eventData.invitor_id) !== "0") infoLines.push(`邀请者：${eventData.invitor_id}`);
+      if (eventData.inviter_id && String(eventData.inviter_id) !== "0") infoLines.push(`邀请者：${eventData.invitor_id}`);
       if (eventData.comment) infoLines.push(`验证信息：${eventData.comment}`);
       if (eventData.via) infoLines.push(`来源：${eventData.via}`);
       if (status === "waiting" && kind !== "removed") {
@@ -175,6 +186,17 @@ function apply(ctx, config) {
       return [];
     }
   }, "sendNotice");
+  const startTimer = /* @__PURE__ */ __name((task, session, timeout, forcePass, target) => {
+    if (typeof timeout !== "number") return;
+    const finalPass = task.specialMode === "vote" ? false : forcePass ?? timeout > 0;
+    task.timer = setTimeout(async () => {
+      if (!activeTasks.has(task.messages[0])) return;
+      task.messages.forEach((id) => activeTasks.delete(id));
+      await executeAction(session, task.kind, finalPass, finalPass ? "" : "等待超时，自动拒绝");
+      await pushText(session, target, `已自动${finalPass ? "通过" : "拒绝"}该请求`);
+      if (config.debugMode) logger.info(`[操作] 等待超时，默认${finalPass ? "通过" : "拒绝"}`);
+    }, Math.abs(timeout) * 6e4);
+  }, "startTimer");
   const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu, forceTimeoutResult) => {
     const timeoutCfg = kind === "member" ? config.memberTimeout : config.friendTimeout;
     let targetStr = config.notifyTarget || "";
@@ -188,32 +210,18 @@ function apply(ctx, config) {
       task.votes = { yes: /* @__PURE__ */ new Set(), no: /* @__PURE__ */ new Set() };
     }
     msgIds.forEach((id) => activeTasks.set(id, task));
-    if (typeof timeoutCfg === "number") {
-      const waitMinutes = Math.abs(timeoutCfg);
-      const isPass = forceTimeoutResult !== void 0 ? forceTimeoutResult : timeoutCfg > 0;
-      task.timer = setTimeout(async () => {
-        if (!activeTasks.has(msgIds[0])) return;
-        msgIds.forEach((id) => activeTasks.delete(id));
-        let finalActionPass = isPass;
-        if (specialMode === "vote") finalActionPass = false;
-        await executeAction(session, kind, finalActionPass, finalActionPass ? "" : "等待超时，自动拒绝");
-        const [targetType, targetId] = targetStr.split(":");
-        if (targetId && session.bot) {
-          const statusText = `已自动${finalActionPass ? "通过" : "拒绝"}该请求`;
-          await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, statusText) : session.bot.sendMessage(targetId, statusText)).catch(() => {
-          });
-        }
-        if (config.debugMode) logger.info(`[操作] 等待超时，默认${finalActionPass ? "通过" : "拒绝"}`);
-      }, waitMinutes * 6e4);
-    }
+    startTimer(task, session, timeoutCfg, forceTimeoutResult, targetStr);
   }, "setupManual");
   const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {
     const eventData = session.event?._data || {};
     if (eventData.user_id) session.userId = String(eventData.user_id);
     if (eventData.group_id) session.guildId = String(eventData.group_id);
+    const isApply = kind === "guild" && eventData.post_type === "request" && !!eventData.invited_id && String(eventData.invited_id) !== String(eventData.self_id);
+    if (isApply) session.userId = String(eventData.invited_id);
     if (session.guildId && config.blacklist?.includes(session.guildId)) return;
+    const realKind = isApply ? "member" : kind;
     try {
-      if (config.debugMode) logger.info(`[请求] 类型: ${kind} 数据: ${JSON.stringify(eventData)}`);
+      if (config.debugMode) logger.info(`[请求] 类型: ${realKind} 数据: ${JSON.stringify(eventData)}`);
       const verifyText = getComment(eventData.comment);
       if (kind === "friend") {
         const existingTask = [...activeTasks.values()].find((t) => t.kind === "friend" && t.session.userId === session.userId);
@@ -222,34 +230,20 @@ function apply(ctx, config) {
           const oldVerifyText = getComment(existingTask.session.event?._data?.comment);
           if (oldVerifyText === verifyText) {
             existingTask.session = session;
-            const timeoutCfg = config.friendTimeout;
-            if (typeof timeoutCfg === "number") {
-              const isPass = timeoutCfg > 0;
-              existingTask.timer = setTimeout(async () => {
-                if (!activeTasks.has(existingTask.messages[0])) return;
-                existingTask.messages.forEach((id) => activeTasks.delete(id));
-                await executeAction(session, "friend", isPass, isPass ? "" : "等待超时，自动拒绝");
-                const [targetType, targetId] = (config.notifyTarget || "").split(":");
-                if (targetId && session.bot) {
-                  const statusText = `已自动${isPass ? "通过" : "拒绝"}该请求`;
-                  await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, statusText) : session.bot.sendMessage(targetId, statusText)).catch(() => {
-                  });
-                }
-              }, Math.abs(timeoutCfg) * 6e4);
-            }
+            startTimer(existingTask, session, config.friendTimeout, void 0, config.notifyTarget);
             return;
           }
           existingTask.messages.forEach((id) => activeTasks.delete(id));
         }
       }
-      if (kind === "member") {
+      if (realKind === "member") {
         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);
+          const levelMatch = getQQLevel(stats) >= (rule.minLevel ?? 0);
           const keywordMatch = !rule.keyword || new RegExp(rule.keyword, "i").test(verifyText);
           if (config.debugMode) {
-            if ((rule.minLevel ?? 0) > 0) logger.info(`[加群请求] ${session.userId} 等级 ${stats?.qqLevel ?? 0} ${levelMatch ? ">" : "<"} ${rule.minLevel ?? 0}`);
+            if ((rule.minLevel ?? 0) > 0) logger.info(`[加群请求] ${session.userId} 等级 ${getQQLevel(stats)} ${levelMatch ? ">" : "<"} ${rule.minLevel ?? 0}`);
             if (rule.keyword) logger.info(`[加群请求] ${session.userId} 内容 "${verifyText}" ${keywordMatch ? "=" : "≠"} "${rule.keyword}"`);
           }
           if (levelMatch && keywordMatch) {
@@ -257,40 +251,40 @@ function apply(ctx, config) {
             const isFrequent = rule.frequency && Date.now() - lastLeaveTime < rule.frequency * 6e4;
             if (isFrequent) {
               if (config.frequencyMode === "reject") {
-                await executeAction(session, kind, false, "频繁申请，自动拒绝");
-                await sendNotice(session, kind, "auto_reject");
+                await executeAction(session, realKind, false, "频繁申请，自动拒绝");
+                await sendNotice(session, realKind, "auto_reject");
                 return;
               } else if (config.frequencyMode === "ignore") {
-                return await setupManual(session, kind);
+                return await setupManual(session, realKind);
               } else if (config.frequencyMode === "delay") {
-                return await setupManual(session, kind, void 0, false, rule.action === "accept");
+                return await setupManual(session, realKind, void 0, false, rule.action && rule.action === "accept");
               }
             }
             if (rule.action) {
-              await executeAction(session, kind, rule.action === "accept", rule.action === "accept" ? "" : "错误回答，自动拒绝");
-              await sendNotice(session, kind, rule.action === "accept" ? "auto_pass" : "auto_reject");
+              await executeAction(session, realKind, rule.action === "accept", rule.action === "accept" ? "" : "错误回答，自动拒绝");
+              await sendNotice(session, realKind, rule.action === "accept" ? "auto_pass" : "auto_reject");
               return;
             }
           }
         }
         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 === "vote") return await setupManual(session, realKind, "vote", config.voteInSitu);
           if (specialRule.mode === "captcha") {
-            await executeAction(session, kind, true, "验证码验证，自动通过");
-            await sendNotice(session, kind, "auto_pass");
+            await executeAction(session, realKind, true, "验证码验证，自动通过");
+            await sendNotice(session, realKind, "auto_pass");
             return;
           }
         }
-        return await setupManual(session, kind);
+        return await setupManual(session, realKind);
       }
       let verdict = false;
       if (kind === "friend") {
         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}`);
+          levelPass = getQQLevel(stats) >= config.friendLevel;
+          if (config.debugMode) logger.info(`[好友验证] ${session.userId} 等级 ${getQQLevel(stats)} ${levelPass ? ">" : "<"} ${config.friendLevel}`);
         }
         if (config.friendRegex) {
           regexPass = new RegExp(config.friendRegex, "i").test(verifyText);
@@ -368,7 +362,7 @@ function apply(ctx, config) {
     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 || config.blacklist?.includes(session.guildId)) return;
+    if (!config.specialRules || !session.guildId || !session.userId || session.userId === session.selfId || config.blacklist?.includes(session.guildId)) return;
     const rule = config.specialRules.find((r) => r.guildId === session.guildId);
     if (rule?.mode === "captcha") {
       let a, b, op = "+", answer;
@@ -398,8 +392,10 @@ function apply(ctx, config) {
       const timer = setTimeout(async () => {
         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);
+          await session.send(`<at id="${session.userId}"/> 验证失败，将被移出本群。`).catch(() => {
+          });
+          await session.onebot?.setGroupKick(session.guildId, session.userId, false).catch(() => {
+          });
         }
       }, 6e4);
       activeCaptchas.set(`${session.userId}:${session.guildId}`, { guildId: session.guildId, userId: session.userId, answer, timer });
@@ -418,7 +414,7 @@ function apply(ctx, config) {
           inviterMap.delete(session.guildId);
           if (config.debugMode) logger.info(`[操作] 删除邀请者好友: ${inviterId}`);
         }
-        const adminId = String(eventData.operator_id || session.event?.operator?.id || "");
+        const adminId = String(eventData.operator_id || "");
         if (adminId && adminId !== inviterId) {
           await session.onebot?.deleteFriend(adminId).catch(() => {
           });

package/package.json

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