koishi-plugin-onebot-verifier 1.2.8 → 1.2.9

package/lib/index.js

@@ -160,7 +160,9 @@ 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.comment) infoLines.push(`验证信息：${eventData.comment}`);
+      if (eventData.via) infoLines.push(`来源：${eventData.via}`);
       if (status === "waiting" && kind !== "removed") {
         if (specialMode === "vote") infoLines.push(`[投票模式]需${config.voteRatio.split(":")[0]}人同意或${config.voteRatio.split(":")[1]}人拒绝`);
         infoLines.push(`使用"y/n"回复本消息以处理该请求`);
@@ -212,25 +214,34 @@ function apply(ctx, config) {
     if (session.guildId && config.blacklist?.includes(session.guildId)) return;
     try {
       if (config.debugMode) logger.info(`[请求] 类型: ${kind} 数据: ${JSON.stringify(eventData)}`);
+      const verifyText = getComment(eventData.comment);
       if (kind === "friend") {
-        const flag = eventData.flag || `${session.userId}:${eventData.time}`;
-        const now = Date.now();
-        const flagKey = `flag:${flag}`;
-        if (historyMap.has(flagKey) && now - historyMap.get(flagKey) < 3e4) return;
-        historyMap.set(flagKey, now);
-        let updatedPending = false;
-        for (const task of new Set(activeTasks.values())) {
-          if (task.kind === "friend" && task.session.userId === session.userId) {
-            task.session = session;
-            updatedPending = true;
+        const existingTask = [...activeTasks.values()].find((t) => t.kind === "friend" && t.session.userId === session.userId);
+        if (existingTask) {
+          if (existingTask.timer) clearTimeout(existingTask.timer);
+          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);
+            }
+            return;
           }
+          existingTask.messages.forEach((id) => activeTasks.delete(id));
         }
-        if (updatedPending) return;
-        const userKey = `friend:${session.userId}`;
-        if (historyMap.has(userKey) && now - historyMap.get(userKey) < 3e4) return;
-        historyMap.set(userKey, now);
       }
-      const verifyText = getComment(eventData.comment);
       if (kind === "member") {
         const rules = config.verifyRules?.filter((r) => r.guildId === session.guildId) || [];
         for (const rule of rules) {

package/package.json

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