koishi-plugin-group-control 1.0.0 → 1.0.2

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 muyni
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/config.d.ts

@@ -26,6 +26,9 @@ export interface GroupInviteConfig {
     inviteWaitMessage: string;
     inviteRequestMessage: string;
     autoApprove: boolean;
+    notifyAdminOnApprove: boolean;
+    inviteApproveMessage: string;
+    inviteApproveNotificationMessage: string;
     showDetailedLog: boolean;
     inviteExpireDays: number;
 }

package/lib/index.js

@@ -142,13 +142,20 @@ async function updateCommandFrequencyRecord(ctx, platform, guildId, data) {
   }]);
 }
 __name(updateCommandFrequencyRecord, "updateCommandFrequencyRecord");
+var groupBotStatusCache = /* @__PURE__ */ new Map();
+var groupBotStatusCacheKey = /* @__PURE__ */ __name((platform, guildId) => `${platform}:${guildId}`, "groupBotStatusCacheKey");
 async function getGroupBotStatus(ctx, platform, guildId) {
+  const key = groupBotStatusCacheKey(platform, guildId);
+  if (groupBotStatusCache.has(key)) return groupBotStatusCache.get(key);
   const records = await ctx.model.get("group_bot_status", { platform, guildId });
-  return records.length > 0 ? records[0] : null;
+  const status = records.length > 0 ? records[0] : null;
+  groupBotStatusCache.set(key, status);
+  return status;
 }
 __name(getGroupBotStatus, "getGroupBotStatus");
 async function setGroupBotStatus(ctx, platform, guildId, botEnabled) {
   await ctx.model.upsert("group_bot_status", [{ platform, guildId, botEnabled }]);
+  groupBotStatusCache.set(groupBotStatusCacheKey(platform, guildId), { platform, guildId, botEnabled });
 }
 __name(setGroupBotStatus, "setGroupBotStatus");
 async function isInSmallGroupWhitelist(ctx, guildId) {
@@ -575,12 +582,6 @@ function apply3(ctx, config) {
     } catch (error) {
       console.error("获取群信息失败:", error);
     }
-    try {
-      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);
-    }
     if (config.invite.autoApprove) {
       try {
         await session.bot.internal.setGroupAddRequest(flag, "invite", true, "");
@@ -590,9 +591,26 @@ function apply3(ctx, config) {
         }
       } catch (error) {
         console.error("自动同意群聊邀请失败:", error);
+        return;
+      }
+      try {
+        const approveMessage = config.invite.inviteApproveMessage.replaceAll("{groupName}", groupName).replaceAll("{groupId}", rawGroupId).replaceAll("{userName}", userName).replaceAll("{userId}", rawUserId);
+        await session.bot.sendPrivateMessage(rawUserId, approveMessage);
+      } catch (error) {
+        console.error(`发送自动通过提示给 ${rawUserId} 失败:`, error);
+      }
+      if (config.invite.notifyAdminOnApprove) {
+        const notifyMessage = config.invite.inviteApproveNotificationMessage.replaceAll("{groupName}", groupName).replaceAll("{groupId}", rawGroupId).replaceAll("{userName}", userName).replaceAll("{userId}", rawUserId);
+        await notifyAdmins(session.bot, config, notifyMessage);
       }
       return;
     }
+    try {
+      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);
+    }
     if (!config.admin.adminQQs || config.admin.adminQQs.length === 0) {
       return;
     }
@@ -1039,7 +1057,9 @@ function apply6(ctx, config) {
     if (isBotEnabled) {
       return next();
     }
-    if (ADMIN_COMMANDS.has(session["event"]["_data"]["message"])) {
+    const content = session.stripped?.content ?? session.content ?? "";
+    const firstWord = content.match(/^\s*[/.!！。]*(\S+)/)?.[1];
+    if (firstWord && ADMIN_COMMANDS.has(firstWord)) {
       return next();
     }
     const isMentioned = session.elements?.some((e) => e.type === "at" && e.attrs.id === session.bot.userId);
@@ -1184,8 +1204,11 @@ var Config = import_koishi.Schema.intersect([
     invite: import_koishi.Schema.object({
       enabled: import_koishi.Schema.boolean().default(false).description("启用群聊邀请审核"),
       autoApprove: import_koishi.Schema.boolean().default(false).description("自动同意邀请"),
+      notifyAdminOnApprove: import_koishi.Schema.boolean().default(true).description("自动同意时是否仍通知管理员"),
       inviteWaitMessage: import_koishi.Schema.string().default("已收到您的群聊邀请，正在等待管理员审核，请耐心等待。").description("发给邀请者的等待提示"),
+      inviteApproveMessage: import_koishi.Schema.string().default("已自动通过您的群聊邀请，机器人正在加入群聊。").description("自动同意时发给邀请者的提示，支持变量 {groupName}, {groupId}, {userName}, {userId}"),
       inviteRequestMessage: import_koishi.Schema.string().default("收到新的群聊邀请请求：\n群名称：{groupName}\n群号：{groupId}\n邀请者：{userName} (QQ: {userId})\n\n请使用指令 gc.approve {groupId} 同意或 gc.reject {groupId} 拒绝。").description("发给管理员的请求消息模板，支持变量 {groupName}, {groupId}, {userName}, {userId}"),
+      inviteApproveNotificationMessage: import_koishi.Schema.string().default("已自动通过群聊邀请\n群名称：{groupName}\n群号：{groupId}\n邀请者：{userName} (QQ: {userId})").description("自动同意时发给管理员的通知模板，支持变量 {groupName}, {groupId}, {userName}, {userId}"),
       inviteExpireDays: import_koishi.Schema.number().default(3).description("邀请记录过期天数"),
       showDetailedLog: import_koishi.Schema.boolean().default(false).description("显示详细日志")
     }).description("群聊邀请审核")

package/package.json

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