koishi-plugin-group-control 0.2.2 → 0.2.4

package/lib/index.d.ts

@@ -49,6 +49,7 @@ export interface GroupConfig {
 export interface GroupInviteConfig {
     enabled: boolean;
     adminQQs: string[];
+    notificationGroupId: string;
     inviteWaitMessage: string;
     inviteRequestMessage: string;
     autoApprove: boolean;

package/lib/index.js

@@ -54,9 +54,10 @@ var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     invite: import_koishi.Schema.object({
       enabled: import_koishi.Schema.boolean().default(false).description("启用群聊邀请审核功能"),
-      adminQQs: import_koishi.Schema.array(String).default([]).description("管理员QQ号列表，用于接收邀请审核请求"),
+      adminQQs: import_koishi.Schema.array(String).default([]).description("管理员QQ号列表（用于权限验证）"),
+      notificationGroupId: import_koishi.Schema.string().description("通知群号（可选：若填写，邀请请求将发送到此群；若不填，则发送私聊给管理员）"),
       inviteWaitMessage: import_koishi.Schema.string().default("已收到您的群聊邀请，正在等待管理员审核，请耐心等待。").description("发送给邀请者的等待审核提示消息"),
-      inviteRequestMessage: import_koishi.Schema.string().default('收到新的群聊邀请请求：\n群名称：{groupName}\n群号：{groupId}\n邀请者：{userName} (QQ: {userId})\n\n请引用此消息回复"同意"或"拒绝"进行审核。').description("发送给管理员的邀请请求消息模板，支持变量{groupName}, {groupId}, {userName}, {userId}"),
+      inviteRequestMessage: import_koishi.Schema.string().default('收到新的群聊邀请请求：\n群名称：{groupName}\n群号：{groupId}\n邀请者：{userName} (QQ: {userId})\n\n请管理员引用此消息回复"同意"或"拒绝"。').description("发送给管理员的邀请请求消息模板，支持变量{groupName}, {groupId}, {userName}, {userId}"),
       autoApprove: import_koishi.Schema.boolean().default(false).description("是否自动同意邀请（仅在没有指定管理员时）"),
       showDetailedLog: import_koishi.Schema.boolean().default(false).description("是否显示详细日志")
     }).description("群聊邀请审核")
@@ -162,7 +163,7 @@ function apply(ctx, config) {
       }
       try {
         const waitMessage = config.invite.inviteWaitMessage.replace("{groupName}", groupName).replace("{groupId}", guildId).replace("{userName}", userName).replace("{userId}", userId);
-        await session.bot.sendMessage(userId, waitMessage, platform);
+        await session.bot.sendPrivateMessage(userId, waitMessage);
       } catch (error) {
         console.error("发送等待审核提示失败:", error);
       }
@@ -195,25 +196,47 @@ function apply(ctx, config) {
         userName,
         time: Date.now(),
         flag
-        // 保存flag用于后续处理请求
       });
       const requestMessage = config.invite.inviteRequestMessage.replace("{groupName}", groupName).replace("{groupId}", guildId).replace("{userName}", userName).replace("{userId}", userId);
-      for (const adminQQ of config.invite.adminQQs) {
+      let requestSent = false;
+      if (config.invite.notificationGroupId) {
         try {
-          const messageId = await session.bot.sendMessage(adminQQ, requestMessage, platform);
+          await session.bot.sendMessage(config.invite.notificationGroupId, requestMessage);
+          requestSent = true;
           if (config.invite.showDetailedLog) {
-            console.log(`发送群聊邀请请求给管理员 ${adminQQ}: 群号 ${guildId}, 邀请者 ${userId}`);
+            console.log(`发送群聊邀请请求到通知群 ${config.invite.notificationGroupId}`);
           }
         } catch (error) {
-          console.error(`发送邀请请求给管理员 ${adminQQ} 失败:`, error);
+          console.error(`发送邀请请求到通知群 ${config.invite.notificationGroupId} 失败:`, error);
         }
       }
+      if (!config.invite.notificationGroupId) {
+        for (const adminQQ of config.invite.adminQQs) {
+          try {
+            await session.bot.sendPrivateMessage(adminQQ, requestMessage);
+            requestSent = true;
+            if (config.invite.showDetailedLog) {
+              console.log(`发送群聊邀请请求给管理员 ${adminQQ}: 群号 ${guildId}, 邀请者 ${userId}`);
+            }
+          } catch (error) {
+            console.error(`发送邀请请求给管理员 ${adminQQ} 失败:`, error);
+          }
+        }
+      }
+      if (!requestSent && config.invite.showDetailedLog) {
+        console.warn("群邀请请求未发送给任何目标（未配置通知群且私聊发送失败或未配置管理员）");
+      }
     });
     ctx.on("message", async (session) => {
-      const { userId, content, platform } = session;
+      const { userId, content, platform, guildId } = session;
       if (!config.invite.adminQQs.includes(userId)) {
         return;
       }
+      const isNotificationGroup = config.invite.notificationGroupId && guildId === config.invite.notificationGroupId;
+      const isPrivate = !guildId;
+      if (!isNotificationGroup && !isPrivate && config.invite.notificationGroupId) {
+        return;
+      }
       const hasQuote = session.elements.some((element) => element.type === "quote");
       if (!hasQuote) {
         return;
@@ -253,15 +276,15 @@ function apply(ctx, config) {
                 if (config.invite.showDetailedLog) {
                   console.log(`管理员 ${userId} 同意群聊邀请: 群号 ${inviteData.groupId}, 邀请者 ${inviteData.userId}`);
                 }
-                await session.bot.sendMessage(userId, `已同意加入群 ${inviteData.groupId}`, platform);
+                await session.send(`已同意加入群 ${inviteData.groupId}`);
                 try {
-                  await session.bot.sendMessage(inviteData.userId, `您的群聊邀请已通过管理员审核，机器人已加入群聊。`, platform);
+                  await session.bot.sendPrivateMessage(inviteData.userId, `您的群聊邀请已通过管理员审核，机器人已加入群聊。`);
                 } catch (error) {
                   console.error("通知邀请者审核结果失败:", error);
                 }
               } catch (error) {
                 console.error("处理同意邀请失败:", error);
-                await session.bot.sendMessage(userId, `处理同意邀请失败: ${error.message}`, platform);
+                await session.send(`处理同意邀请失败: ${error.message}`);
               }
             } else if (trimmedContent === "拒绝" || trimmedContent === "reject") {
               try {
@@ -274,15 +297,15 @@ function apply(ctx, config) {
                 if (config.invite.showDetailedLog) {
                   console.log(`管理员 ${userId} 拒绝群聊邀请: 群号 ${inviteData.groupId}, 邀请者 ${inviteData.userId}`);
                 }
-                await session.bot.sendMessage(userId, `已拒绝加入群 ${inviteData.groupId}`, platform);
+                await session.send(`已拒绝加入群 ${inviteData.groupId}`);
                 try {
-                  await session.bot.sendMessage(inviteData.userId, `您的群聊邀请未通过管理员审核，机器人将不会加入该群聊。`, platform);
+                  await session.bot.sendPrivateMessage(inviteData.userId, `您的群聊邀请未通过管理员审核，机器人将不会加入该群聊。`);
                 } catch (error) {
                   console.error("通知邀请者审核结果失败:", error);
                 }
               } catch (error) {
                 console.error("处理拒绝邀请失败:", error);
-                await session.bot.sendMessage(userId, `处理拒绝邀请失败: ${error.message}`, platform);
+                await session.send(`处理拒绝邀请失败: ${error.message}`);
               }
             }
             pendingInvites.delete(targetInviteId);
@@ -345,54 +368,24 @@ function apply(ctx, config) {
   if (config.frequency.enabled) {
     ctx.on("command/before-execute", async (argv) => {
       const session = argv.session;
-      if (!session.guildId || !config.frequency.enabled) {
-        return;
-      }
+      if (!session.guildId || !config.frequency.enabled) return;
       const { guildId, platform } = session;
-      if (config.frequency.whitelist && config.frequency.whitelist.includes(guildId)) {
-        return;
-      }
+      if (config.frequency.whitelist && config.frequency.whitelist.includes(guildId)) return;
       let record = await getCommandFrequencyRecord(ctx, platform, guildId);
       function handleExpiredWindow(currentRecord, platform2, guildId2, now2, windowStart2, warnDelay) {
         if (currentRecord && currentRecord.lastCommandTime < windowStart2) {
           if (currentRecord.warningSent && currentRecord.firstWarningTime > 0) {
             if (now2 - currentRecord.firstWarningTime > warnDelay) {
-              return {
-                platform: platform2,
-                guildId: guildId2,
-                commandCount: 1,
-                lastCommandTime: now2,
-                warningSent: false,
-                // 重置警告状态
-                blockExpiryTime: 0,
-                firstWarningTime: 0
-                // 重置警告时间
-              };
+              return { platform: platform2, guildId: guildId2, commandCount: 1, lastCommandTime: now2, warningSent: false, blockExpiryTime: 0, firstWarningTime: 0 };
             } else {
               currentRecord.commandCount = 1;
               currentRecord.lastCommandTime = now2;
               return currentRecord;
             }
           } else if (isCurrentlyBlocked(currentRecord) && Date.now() >= currentRecord.blockExpiryTime * 1e3) {
-            return {
-              platform: platform2,
-              guildId: guildId2,
-              commandCount: 1,
-              lastCommandTime: now2,
-              warningSent: false,
-              blockExpiryTime: 0,
-              firstWarningTime: 0
-            };
+            return { platform: platform2, guildId: guildId2, commandCount: 1, lastCommandTime: now2, warningSent: false, blockExpiryTime: 0, firstWarningTime: 0 };
           } else {
-            return {
-              platform: platform2,
-              guildId: guildId2,
-              commandCount: 1,
-              lastCommandTime: now2,
-              warningSent: false,
-              blockExpiryTime: 0,
-              firstWarningTime: 0
-            };
+            return { platform: platform2, guildId: guildId2, commandCount: 1, lastCommandTime: now2, warningSent: false, blockExpiryTime: 0, firstWarningTime: 0 };
           }
         } else {
           if (currentRecord) {
@@ -400,15 +393,7 @@ function apply(ctx, config) {
             currentRecord.lastCommandTime = now2;
             return currentRecord;
           } else {
-            return {
-              platform: platform2,
-              guildId: guildId2,
-              commandCount: 1,
-              lastCommandTime: now2,
-              warningSent: false,
-              blockExpiryTime: 0,
-              firstWarningTime: 0
-            };
+            return { platform: platform2, guildId: guildId2, commandCount: 1, lastCommandTime: now2, warningSent: false, blockExpiryTime: 0, firstWarningTime: 0 };
           }
         }
       }
@@ -485,13 +470,7 @@ function apply(ctx, config) {
       } catch (leaveError) {
         quittingGuilds.delete(`${platform}:${guildId}`);
         console.error("退出群聊失败:", leaveError);
-        const failMessage = `退出失败: ${leaveError.message || "OneBot API 调用失败"}`;
-        try {
-          await session.bot.sendMessage(session.guildId, failMessage, platform);
-        } catch (reSendError) {
-          console.error("发送退出失败提示也失败:", reSendError);
-        }
-        return failMessage;
+        return `退出失败: ${leaveError.message || "OneBot API 调用失败"}`;
       }
       return "";
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-control",
   "description": "Koishi群聊自管理插件，支持自定义机器人进群消息、被踢出自动拉黑、刷屏自动屏蔽功能和主动退群指令等。(仅支持OneBot适配器)",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [