koishi-plugin-onebot-group-manage 0.0.7 → 0.0.8

package/lib/index.js

@@ -31,11 +31,10 @@ var import_koishi = require("koishi");
 var import_tools = require("@langchain/core/tools");
 var import_zod = require("zod");
 var GroupMuteTool = class extends import_tools.StructuredTool {
-  constructor(ctx, handlers, config, logger, logVerbose) {
+  constructor(ctx, handlers, logger, logVerbose) {
     super();
     this.ctx = ctx;
     this.handlers = handlers;
-    this.config = config;
     this.logger = logger;
     this.logVerbose = logVerbose;
   }
@@ -57,7 +56,6 @@ var GroupMuteTool = class extends import_tools.StructuredTool {
         this.ctx,
         session,
         { targetId: input.userId, duration: input.duration, guildId: input.groupId },
-        this.config,
         this.logger,
         this.logVerbose
       );
@@ -69,11 +67,10 @@ var GroupMuteTool = class extends import_tools.StructuredTool {
   }
 };
 var GroupTitleTool = class extends import_tools.StructuredTool {
-  constructor(ctx, handlers, config, logger, logVerbose) {
+  constructor(ctx, handlers, logger, logVerbose) {
     super();
     this.ctx = ctx;
     this.handlers = handlers;
-    this.config = config;
     this.logger = logger;
     this.logVerbose = logVerbose;
   }
@@ -95,7 +92,6 @@ var GroupTitleTool = class extends import_tools.StructuredTool {
         this.ctx,
         session,
         { targetId: input.userId, title: input.title, guildId: input.groupId },
-        this.config,
         this.logger,
         this.logVerbose
       );
@@ -106,7 +102,7 @@ var GroupTitleTool = class extends import_tools.StructuredTool {
     }
   }
 };
-function registerChatlunaTools(ctx, config, logger, verbose, handlers) {
+function registerChatlunaTools(ctx, _config, logger, verbose, handlers) {
   const platform = ctx.chatluna?.platform;
   if (!platform) {
     logger.debug("chatluna 未安装，跳过群管工具注册");
@@ -114,13 +110,13 @@ function registerChatlunaTools(ctx, config, logger, verbose, handlers) {
   }
   ctx.effect(
     () => platform.registerTool("group_mute", {
-      createTool: /* @__PURE__ */ __name(() => new GroupMuteTool(ctx, handlers, config, logger, verbose), "createTool"),
+      createTool: /* @__PURE__ */ __name(() => new GroupMuteTool(ctx, handlers, logger, verbose), "createTool"),
       selector: /* @__PURE__ */ __name(() => true, "selector")
     })
   );
   ctx.effect(
     () => platform.registerTool("group_set_title", {
-      createTool: /* @__PURE__ */ __name(() => new GroupTitleTool(ctx, handlers, config, logger, verbose), "createTool"),
+      createTool: /* @__PURE__ */ __name(() => new GroupTitleTool(ctx, handlers, logger, verbose), "createTool"),
       selector: /* @__PURE__ */ __name(() => true, "selector")
     })
   );
@@ -351,26 +347,26 @@ function randomInt(min, max) {
   return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 __name(randomInt, "randomInt");
-async function performMute(ctx, session, params, config, logger, verbose) {
+async function performMute(ctx, session, params, logger, verbose) {
   const guildId = params.guildId ?? session.guildId;
   if (!guildId) return "仅限群聊使用";
   const targetId = params.targetId ?? parseTargetId(params.targetRaw || "", session);
   if (!targetId) return "请提供要禁言的用户（@ 或 QQ 号）";
   const seconds = Number(params.duration);
   if (!Number.isFinite(seconds) || seconds < 0) return "禁言时长必须为大于等于 0 的整数（秒）";
-  if (!params.skipPermCheck) {
-    const msg = await verifyCaller(session, config.mute, logger, verbose, guildId);
-    if (msg) return msg;
-  }
   verbose && logger.info(
     `mute: guild=${guildId} caller=${session.userId} bot=${botKey(session.bot)} target=${targetId} seconds=${seconds}`
   );
-  const picked = await pickManageBot(ctx, guildId, false, logger, session.bot, verbose, session.onebot);
-  if (!picked) return "没有可用且有群管权限的 Bot";
-  const targetRole = await getMemberRole(picked.probeOnebot, picked.bot, guildId, targetId, logger, verbose);
+  const probeOnebot = session.onebot || getBotOnebot(session.bot);
+  const targetRole = await getMemberRole(probeOnebot, session.bot, guildId, targetId, logger, verbose);
   if (targetRole === "owner") return "无法对群主执行该操作";
+  const requireOwner = targetRole === "admin";
+  const picked = await pickManageBot(ctx, guildId, requireOwner, logger, session.bot, verbose, probeOnebot);
+  if (!picked) {
+    return requireOwner ? "目标是管理员，需要群主权限的 Bot，但没有可用" : "没有可用且有群管权限的 Bot";
+  }
   const actionOnebot = getBotOnebot(picked.bot);
-  if (!actionOnebot) return "选中的 Bot 缺少 onebot 实例，无法执行";
+  if (!actionOnebot) return "失败：选中的 Bot 缺少 onebot 实例，无法执行";
   try {
     verbose && logger.info(`mute: use bot=${botKey(picked.bot)} role=${picked.role} duration=${seconds}`);
     if (typeof actionOnebot.setGroupBan === "function") {
@@ -383,29 +379,33 @@ async function performMute(ctx, session, params, config, logger, verbose) {
       });
     }
     roleCache.clear();
-    return `已使用 ${picked.bot.selfId} 禁言 ${targetId} ${seconds} 秒`;
+    const targetRoleStr = targetRole ? `（${targetRole}）` : "";
+    if (seconds === 0) {
+      return `成功：使用 ${picked.bot.selfId}（${picked.role}）解除 ${targetId}${targetRoleStr} 的禁言`;
+    }
+    return `成功：使用 ${picked.bot.selfId}（${picked.role}）禁言 ${targetId}${targetRoleStr} ${seconds} 秒`;
   } catch (error) {
     logger.warn(error);
-    return "禁言失败，检查 Bot 权限或参数";
+    return `失败：禁言操作出错，Bot=${picked.bot.selfId}（${picked.role}），目标=${targetId}（${targetRole || "unknown"}）`;
   }
 }
 __name(performMute, "performMute");
-async function performTitle(ctx, session, params, config, logger, verbose) {
+async function performTitle(ctx, session, params, logger, verbose) {
   const guildId = params.guildId ?? session.guildId;
   if (!guildId) return "仅限群聊使用";
   const title = params.title?.trim();
   if (!title) return "请提供要设置的头衔";
   const userId = params.targetId ?? parseTargetId(params.targetRaw || "", session);
   if (!userId) return "请提供要设置头衔的用户（@ 或 QQ 号）";
-  const msg = await verifyCaller(session, config.title, logger, verbose, guildId);
-  if (msg) return msg;
   verbose && logger.info(
     `title: guild=${guildId} caller=${session.userId} bot=${botKey(session.bot)} target=${userId} title=${title}`
   );
-  const picked = await pickManageBot(ctx, guildId, true, logger, session.bot, verbose, session.onebot);
-  if (!picked) return "没有具备群主权限的 Bot 可用";
+  const probeOnebot = session.onebot || getBotOnebot(session.bot);
+  const targetRole = await getMemberRole(probeOnebot, session.bot, guildId, userId, logger, verbose);
+  const picked = await pickManageBot(ctx, guildId, true, logger, session.bot, verbose, probeOnebot);
+  if (!picked) return "失败：没有具备群主权限的 Bot 可用";
   const actionOnebot = getBotOnebot(picked.bot);
-  if (!actionOnebot) return "选中的 Bot 缺少 onebot 实例，无法执行";
+  if (!actionOnebot) return "失败：选中的 Bot 缺少 onebot 实例，无法执行";
   try {
     verbose && logger.info(`title: use bot=${botKey(picked.bot)} role=${picked.role}`);
     if (typeof actionOnebot.setGroupSpecialTitle === "function") {
@@ -419,10 +419,11 @@ async function performTitle(ctx, session, params, config, logger, verbose) {
       });
     }
     roleCache.clear();
-    return `已使用 ${picked.bot.selfId} 为 ${userId} 设置头衔：${title}`;
+    const targetRoleStr = targetRole ? `（${targetRole}）` : "";
+    return `成功：使用 ${picked.bot.selfId}（${picked.role}）为 ${userId}${targetRoleStr} 设置头衔「${title}」`;
   } catch (error) {
     logger.warn(error);
-    return "设置头衔失败，检查 Bot 权限或参数";
+    return `失败：设置头衔出错，Bot=${picked.bot.selfId}（${picked.role}），目标=${userId}（${targetRole || "unknown"}）`;
   }
 }
 __name(performTitle, "performTitle");
@@ -476,11 +477,12 @@ function apply(ctx, config) {
   });
   ctx.command("group.manage/mute <target:string> <duration:number>", "禁言目标（秒，必须指定）").alias("gmute").action(async ({ session }, target, duration) => {
     if (!session) return "缺少 session";
+    const msg = await verifyCaller(session, config.mute, logger, verbose);
+    if (msg) return msg;
     return performMute(
       ctx,
       session,
       { targetRaw: target, duration: Number(duration) },
-      config,
       logger,
       verbose
     );
@@ -492,10 +494,14 @@ function apply(ctx, config) {
     const userId = parseTargetId(target, session);
     if (!userId) return "请提供要解禁的用户（@ 或 QQ 号）";
     verbose && logger.info(`unmute: guild=${session.guildId} caller=${session.userId} bot=${botKey(session.bot)} target=${userId}`);
-    const picked = await pickManageBot(ctx, session.guildId, false, logger, session.bot, verbose, session.onebot);
-    if (!picked) return "没有可用且有群管权限的 Bot";
-    const targetRole = await getMemberRole(picked.probeOnebot, picked.bot, session.guildId, userId, logger, verbose);
+    const probeOnebot = session.onebot || getBotOnebot(session.bot);
+    const targetRole = await getMemberRole(probeOnebot, session.bot, session.guildId, userId, logger, verbose);
     if (targetRole === "owner") return "无法对群主执行该操作";
+    const requireOwner = targetRole === "admin";
+    const picked = await pickManageBot(ctx, session.guildId, requireOwner, logger, session.bot, verbose, probeOnebot);
+    if (!picked) {
+      return requireOwner ? "目标是管理员，需要群主权限的 Bot，但没有可用" : "没有可用且有群管权限的 Bot";
+    }
     const actionOnebot = getBotOnebot(picked.bot);
     if (!actionOnebot) return "选中的 Bot 缺少 onebot 实例，无法执行";
     try {
@@ -524,10 +530,14 @@ function apply(ctx, config) {
     if (!userId) return "请提供要踢出的用户（@ 或 QQ 号）";
     const reject = Boolean(options?.reject ?? rejectFlag);
     verbose && logger.info(`kick: guild=${session.guildId} caller=${session.userId} bot=${botKey(session.bot)} target=${userId} reject=${reject}`);
-    const picked = await pickManageBot(ctx, session.guildId, false, logger, session.bot, verbose, session.onebot);
-    if (!picked) return "没有可用且有群管权限的 Bot";
-    const targetRole = await getMemberRole(picked.probeOnebot, picked.bot, session.guildId, userId, logger, verbose);
+    const probeOnebot = session.onebot || getBotOnebot(session.bot);
+    const targetRole = await getMemberRole(probeOnebot, session.bot, session.guildId, userId, logger, verbose);
     if (targetRole === "owner") return "无法对群主执行该操作";
+    const requireOwner = targetRole === "admin";
+    const picked = await pickManageBot(ctx, session.guildId, requireOwner, logger, session.bot, verbose, probeOnebot);
+    if (!picked) {
+      return requireOwner ? "目标是管理员，需要群主权限的 Bot，但没有可用" : "没有可用且有群管权限的 Bot";
+    }
     const actionOnebot = getBotOnebot(picked.bot);
     if (!actionOnebot) return "选中的 Bot 缺少 onebot 实例，无法执行";
     try {
@@ -550,11 +560,12 @@ function apply(ctx, config) {
   });
   ctx.command("group.manage/title <target:string> <title:text>", "设置群头衔（需群主 Bot）").alias("gtitle").action(async ({ session }, target, title) => {
     if (!session) return "缺少 session";
+    const msg = await verifyCaller(session, config.title, logger, verbose);
+    if (msg) return msg;
     return performTitle(
       ctx,
       session,
       { targetRaw: target, title: title || "", guildId: session.guildId },
-      config,
       logger,
       verbose
     );
@@ -569,12 +580,11 @@ function apply(ctx, config) {
     const result = await performMute(
       ctx,
       session,
-      { targetId: session.userId, duration: seconds, guildId: session.guildId, skipPermCheck: true },
-      config,
+      { targetId: session.userId, duration: seconds, guildId: session.guildId },
       logger,
       verbose
     );
-    if (typeof result === "string" && result.startsWith("已使用")) return `你已被禁言 ${seconds} 秒`;
+    if (typeof result === "string" && result.startsWith("成功")) return `你已被禁言 ${seconds} 秒`;
     return result;
   });
   ctx.command("group.manage/title.apply <title:text>", "申请群头衔（给自己）").alias("gtitle.apply").action(async ({ session }, title) => {
@@ -583,11 +593,10 @@ function apply(ctx, config) {
       ctx,
       session,
       { targetId: session.userId, title: title || "", guildId: session.guildId },
-      config,
       logger,
       verbose
     );
-    if (typeof result === "string" && result.startsWith("已使用")) {
+    if (typeof result === "string" && result.startsWith("成功")) {
       return `已为你设置头衔：${(title || "").trim()}`;
     }
     return result;

package/lib/tools.d.ts

@@ -5,12 +5,12 @@ interface Handlers {
         targetId: string;
         duration: number;
         guildId?: string;
-    }, config: Config, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
+    }, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
     performTitle: (ctx: Context, session: Session, params: {
         targetId: string;
         title: string;
         guildId?: string;
-    }, config: Config, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
+    }, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
 }
-export declare function registerChatlunaTools(ctx: Context, config: Config, logger: ReturnType<Context['logger']>, verbose: boolean | undefined, handlers: Handlers): void;
+export declare function registerChatlunaTools(ctx: Context, _config: Config, logger: ReturnType<Context['logger']>, verbose: boolean | undefined, handlers: Handlers): void;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-onebot-group-manage",
   "description": "主要针对多bot环境的群管插件，自动使用有权限的bot",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [