koishi-plugin-group-control 0.2.8 → 0.2.9

package/lib/index.js

@@ -214,7 +214,19 @@ var ADMIN_COMMANDS = /* @__PURE__ */ new Set([
 // src/modules/basic.ts
 var name2 = "group-control-basic";
 function apply2(ctx, config) {
-  const quittingGuilds = /* @__PURE__ */ new Set();
+  const quittingGuilds = /* @__PURE__ */ new Map();
+  const processedKicks = /* @__PURE__ */ new Map();
+  const QUITTING_EXPIRE_MS = 60 * 1e3;
+  const KICK_DEDUP_MS = 60 * 1e3;
+  setInterval(() => {
+    const now = Date.now();
+    for (const [key, time] of quittingGuilds) {
+      if (now - time > QUITTING_EXPIRE_MS) quittingGuilds.delete(key);
+    }
+    for (const [key, time] of processedKicks) {
+      if (now - time > KICK_DEDUP_MS) processedKicks.delete(key);
+    }
+  }, 30 * 1e3);
   ctx.on("guild-added", async (session) => {
     const { guildId, platform } = session;
     if (config.basic.enableBlacklist) {
@@ -224,7 +236,7 @@ function apply2(ctx, config) {
           await session.bot.sendMessage(guildId, config.basic.blacklistMessage, platform);
         } catch (e) {
         }
-        quittingGuilds.add(`${platform}:${guildId}`);
+        quittingGuilds.set(`${platform}:${guildId}`, Date.now());
         try {
           await session.bot.internal.setGroupLeave(parseInt(guildId));
         } catch (e) {
@@ -269,7 +281,7 @@ function apply2(ctx, config) {
 机器人已自动退出该群。`;
               await notifyAdmins(session.bot, config, adminMsg);
             }
-            quittingGuilds.add(`${platform}:${guildId}`);
+            quittingGuilds.set(`${platform}:${guildId}`, Date.now());
             try {
               await session.bot.internal.setGroupLeave(parseInt(guildId));
             } catch (e) {
@@ -293,9 +305,12 @@ function apply2(ctx, config) {
     const { guildId, platform } = session;
     const quittingKey = `${platform}:${guildId}`;
     if (quittingGuilds.has(quittingKey)) {
-      quittingGuilds.delete(quittingKey);
       return;
     }
+    if (processedKicks.has(quittingKey)) {
+      return;
+    }
+    processedKicks.set(quittingKey, Date.now());
     if (config.basic.enableBlacklist) {
       await ctx.model.upsert("blacklisted_guild", [{
         platform,
@@ -324,7 +339,7 @@ function apply2(ctx, config) {
       const adminMsg = `收到来自 ${userId} 的退群指令
 群号：${guildId}`;
       await notifyAdmins(session.bot, config, adminMsg);
-      quittingGuilds.add(`${platform}:${guildId}`);
+      quittingGuilds.set(`${platform}:${guildId}`, Date.now());
       try {
         await session.bot.sendMessage(session.guildId, config.basic.quitMessage.replace("{userId}", userId), platform);
       } catch (e) {
@@ -390,7 +405,7 @@ function apply3(ctx, config) {
       console.error("获取群信息失败:", error);
     }
     try {
-      const waitMessage = config.invite.inviteWaitMessage.replace("{groupName}", groupName).replace("{groupId}", rawGroupId).replace("{userName}", userName).replace("{userId}", rawUserId);
+      const waitMessage = config.invite.inviteWaitMessage.replaceAll("{groupName}", groupName).replaceAll("{groupId}", rawGroupId).replaceAll("{userName}", userName).replaceAll("{userId}", rawUserId);
       await session.bot.sendPrivateMessage(rawUserId, waitMessage);
     } catch (error) {
       console.error(`发送等待审核提示给 ${rawUserId} 失败:`, error);
@@ -398,12 +413,7 @@ function apply3(ctx, config) {
     if (!config.invite.adminQQs || config.invite.adminQQs.length === 0) {
       if (config.invite.autoApprove) {
         try {
-          await session.bot.internal.setGroupAddRequest({
-            flag,
-            sub_type: "invite",
-            approve: true,
-            reason: ""
-          });
+          await session.bot.internal.setGroupAddRequest(flag, "invite", true, "");
           if (config.invite.showDetailedLog) {
             console.log(`自动同意群聊邀请: 群号 ${rawGroupId}, 邀请者 ${rawUserId}`);
           }
@@ -421,7 +431,7 @@ function apply3(ctx, config) {
       time: Date.now(),
       flag
     });
-    const requestMessage = config.invite.inviteRequestMessage.replace("{groupName}", groupName).replace("{groupId}", rawGroupId).replace("{userName}", userName).replace("{userId}", rawUserId);
+    const requestMessage = config.invite.inviteRequestMessage.replaceAll("{groupName}", groupName).replaceAll("{groupId}", rawGroupId).replaceAll("{userName}", userName).replaceAll("{userId}", rawUserId);
     let requestSent = false;
     if (config.invite.notificationGroupId) {
       try {
@@ -461,12 +471,7 @@ function apply3(ctx, config) {
       return `未找到群号 ${groupId} 的待处理邀请。当前待处理邀请：${pendingInvites.size > 0 ? Array.from(pendingInvites.values()).map((i) => `${i.groupId}(${i.groupName})`).join(", ") : "无"}`;
     }
     try {
-      await session.bot.internal.setGroupAddRequest({
-        flag: inviteData.flag,
-        sub_type: "invite",
-        approve: true,
-        reason: ""
-      });
+      await session.bot.internal.setGroupAddRequest(inviteData.flag, "invite", true, "");
       try {
         await session.bot.sendPrivateMessage(inviteData.userId, `您的群聊邀请已通过管理员审核，机器人已加入群聊。`);
       } catch (error) {
@@ -489,12 +494,7 @@ function apply3(ctx, config) {
       return `未找到群号 ${groupId} 的待处理邀请。当前待处理邀请：${pendingInvites.size > 0 ? Array.from(pendingInvites.values()).map((i) => `${i.groupId}(${i.groupName})`).join(", ") : "无"}`;
     }
     try {
-      await session.bot.internal.setGroupAddRequest({
-        flag: inviteData.flag,
-        sub_type: "invite",
-        approve: false,
-        reason: "已拒绝"
-      });
+      await session.bot.internal.setGroupAddRequest(inviteData.flag, "invite", false, "已拒绝");
       try {
         await session.bot.sendPrivateMessage(inviteData.userId, `您的群聊邀请未通过管理员审核，机器人将不会加入该群聊。`);
       } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-control",
   "description": "Koishi 插件，一个多功能的群聊自管理工具。支持被踢出自动拉黑、刷屏自动屏蔽、开关控制等功能。(仅支持 OneBot 适配器)",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [