koishi-plugin-group-command-blocker 0.0.2 → 0.0.4

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "group-command-blocker";
 export interface Config {
+    admins: string[];
 }
 export declare const Config: Schema<Config>;
 declare module 'koishi' {
@@ -25,4 +26,4 @@ export interface GroupBlockedUser {
     guildId: string;
     userId: string;
 }
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -27,63 +27,55 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var name = "group-command-blocker";
-var Config = import_koishi.Schema.object({});
-function apply(ctx) {
+var Config = import_koishi.Schema.object({
+  admins: import_koishi.Schema.array(import_koishi.Schema.string()).description("允许执行管理指令的用户 ID 列表")
+});
+function apply(ctx, config) {
   ctx.model.extend("group_disabled_plugins", { id: "unsigned", guildId: "string", pluginName: "string" }, { primary: "id", autoInc: true });
   ctx.model.extend("group_disabled_commands", { id: "unsigned", guildId: "string", commandName: "string" }, { primary: "id", autoInc: true });
   ctx.model.extend("group_blocked_users", { id: "unsigned", guildId: "string", userId: "string" }, { primary: "id", autoInc: true });
-  ctx.command("plugin.disable <name:string>", "在本群禁用指定插件").action(async ({ session }, name2) => {
-    if (!session?.guildId || !name2) return "缺少参数";
-    const [record] = await ctx.database.get("group_disabled_plugins", { guildId: session.guildId, pluginName: name2 });
-    if (record) return "该插件已在禁用名单";
+  const isAuthorized = /* @__PURE__ */ __name((session) => {
+    if (!config.admins || config.admins.length === 0) return true;
+    return config.admins.includes(session.userId);
+  }, "isAuthorized");
+  ctx.command("plugin.disable <name:string>", "禁用插件").action(async ({ session }, name2) => {
+    if (!isAuthorized(session)) return "无权操作";
+    if (!session?.guildId || !name2) return "参数缺失";
     await ctx.database.create("group_disabled_plugins", { guildId: session.guildId, pluginName: name2 });
     return `已禁用插件: ${name2}`;
   });
-  ctx.command("plugin.enable <name:string>", "在本群启用指定插件").action(async ({ session }, name2) => {
-    if (!session?.guildId) return "";
-    await ctx.database.remove("group_disabled_plugins", { guildId: session.guildId, pluginName: name2 });
-    return `已恢复插件: ${name2}`;
-  });
-  ctx.command("cmd.disable <name:string>", "在本群禁用指定指令（如 jrrp）").action(async ({ session }, name2) => {
-    if (!session?.guildId || !name2) return "缺少参数";
-    const [record] = await ctx.database.get("group_disabled_commands", { guildId: session.guildId, commandName: name2 });
-    if (record) return "该指令已在禁用名单";
+  ctx.command("cmd.disable <name:string>", "禁用指令（及其所有子指令）").action(async ({ session }, name2) => {
+    if (!isAuthorized(session)) return "无权操作";
+    if (!session?.guildId || !name2) return "参数缺失";
     await ctx.database.create("group_disabled_commands", { guildId: session.guildId, commandName: name2 });
-    return `已禁用指令: ${name2}`;
+    return `已禁用指令及其子级: ${name2}`;
   });
-  ctx.command("cmd.enable <name:string>", "在本群恢复指定指令").action(async ({ session }, name2) => {
-    if (!session?.guildId) return "";
-    await ctx.database.remove("group_disabled_commands", { guildId: session.guildId, commandName: name2 });
-    return `已恢复指令: ${name2}`;
-  });
-  ctx.command("block.user <target:user>", "在本群屏蔽特定用户消息").action(async ({ session }, target) => {
+  ctx.command("block.user <target:user>", "屏蔽用户").action(async ({ session }, target) => {
+    if (!isAuthorized(session)) return "无权操作";
     if (!session?.guildId || !target) return "请指定用户";
     const userId = import_koishi.h.parse(target)[0]?.attrs?.id || target;
     await ctx.database.create("group_blocked_users", { guildId: session.guildId, userId });
     return `已屏蔽用户: ${userId}`;
   });
-  ctx.command("unblock.user <target:user>", "在本群解除用户屏蔽").action(async ({ session }, target) => {
-    if (!session?.guildId) return "";
-    const userId = import_koishi.h.parse(target)[0]?.attrs?.id || target;
-    await ctx.database.remove("group_blocked_users", { guildId: session.guildId, userId });
-    return `已解除屏蔽`;
+  ctx.command("cmd.enable <name:string>", "恢复指令").action(async ({ session }, name2) => {
+    if (!isAuthorized(session) || !session?.guildId) return "";
+    await ctx.database.remove("group_disabled_commands", { guildId: session.guildId, commandName: name2 });
+    return `已恢复指令: ${name2}`;
   });
   ctx.middleware(async (session, next) => {
     if (!session?.guildId || !session?.userId || session.userId === session.selfId) return next();
     const [blocked] = await ctx.database.get("group_blocked_users", { guildId: session.guildId, userId: session.userId });
     if (blocked) return;
     return next();
-  });
+  }, true);
   ctx.on("command/before-execute", async ({ command, session }) => {
     if (!command || !session?.guildId) return;
+    let current = command;
+    while (current) {
+      if (current.plugin?.name === "group-command-blocker") return;
+      current = current.parent;
+    }
     const pluginName = command?.plugin?.name;
-    const cmdName = command.name;
-    if (pluginName === "group-command-blocker") return;
-    const [disabledCmd] = await ctx.database.get("group_disabled_commands", {
-      guildId: session.guildId,
-      commandName: cmdName
-    });
-    if (disabledCmd) return "";
     if (pluginName) {
       const [disabledPlg] = await ctx.database.get("group_disabled_plugins", {
         guildId: session.guildId,
@@ -91,6 +83,15 @@ function apply(ctx) {
       });
       if (disabledPlg) return "";
     }
+    let cmdToCheck = command;
+    while (cmdToCheck) {
+      const [disabledCmd] = await ctx.database.get("group_disabled_commands", {
+        guildId: session.guildId,
+        commandName: cmdToCheck.name
+      });
+      if (disabledCmd) return "";
+      cmdToCheck = cmdToCheck.parent;
+    }
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-command-blocker",
   "description": "这个东西也可以用来屏蔽群员",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [