koishi-plugin-onebot-verifier 1.2.7 → 1.2.9

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export declare const name = "onebot-verifier";
 export declare const inject: {
     optional: string[];
 };
-export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n  <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n  <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n  <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n  <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
+export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n  <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n  <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n  <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n  <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
 export interface Config {
     notifyTarget?: string;
     debugMode?: boolean;

package/lib/index.js

@@ -39,7 +39,7 @@ var usage = `
 <div style="border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);">
   <h2 style="margin-top: 0; color: #e0574a;">❤️ 支持与反馈</h2>
   <p>🌟 喜欢这个插件？请在 <a href="https://github.com/YisRime" style="color:#e0574a;text-decoration:none;">GitHub</a> 上给我一个 Star！</p>
-  <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
+  <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
 </div>
 `;
 var Config = import_koishi.Schema.intersect([
@@ -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.7",
+  "version": "1.2.9",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],