koishi-plugin-onebot-group-manage 0.0.4 → 0.0.6

package/lib/index.js

@@ -31,10 +31,13 @@ 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(runMute, verbose) {
+  constructor(ctx, handlers, config, logger, logVerbose) {
     super();
-    this.runMute = runMute;
-    this.verbose = verbose;
+    this.ctx = ctx;
+    this.handlers = handlers;
+    this.config = config;
+    this.logger = logger;
+    this.logVerbose = logVerbose;
   }
   static {
     __name(this, "GroupMuteTool");
@@ -44,24 +47,35 @@ var GroupMuteTool = class extends import_tools.StructuredTool {
   schema = import_zod.z.object({
     groupId: import_zod.z.string().trim().min(1).describe("目标群号，不填则使用当前会话群").optional(),
     userId: import_zod.z.string().trim().min(1).describe("要禁言的成员 QQ 号"),
-    duration: import_zod.z.number().int().positive().describe("禁言时长（秒），0秒为解除禁言")
+    duration: import_zod.z.number().int().positive().describe("禁言时长（秒）")
   });
   async _call(input, _runManager, runnableConfig) {
     const session = runnableConfig?.configurable?.session;
     if (!session) return "缺少 session，无法执行禁言";
-    const result = await this.runMute(session, {
-      targetId: input.userId,
-      duration: input.duration,
-      guildId: input.groupId
-    });
-    return typeof result === "string" ? result : JSON.stringify(result);
+    try {
+      const result = await this.handlers.performMute(
+        this.ctx,
+        session,
+        { targetId: input.userId, duration: input.duration, guildId: input.groupId },
+        this.config,
+        this.logger,
+        this.logVerbose
+      );
+      return typeof result === "string" ? result : JSON.stringify(result);
+    } catch (error) {
+      this.logger.warn(error);
+      return `禁言失败：${error?.message || String(error)}`;
+    }
   }
 };
 var GroupTitleTool = class extends import_tools.StructuredTool {
-  constructor(runTitle, verbose) {
+  constructor(ctx, handlers, config, logger, logVerbose) {
     super();
-    this.runTitle = runTitle;
-    this.verbose = verbose;
+    this.ctx = ctx;
+    this.handlers = handlers;
+    this.config = config;
+    this.logger = logger;
+    this.logVerbose = logVerbose;
   }
   static {
     __name(this, "GroupTitleTool");
@@ -76,12 +90,20 @@ var GroupTitleTool = class extends import_tools.StructuredTool {
   async _call(input, _runManager, runnableConfig) {
     const session = runnableConfig?.configurable?.session;
     if (!session) return "缺少 session，无法设置头衔";
-    const result = await this.runTitle(session, {
-      targetId: input.userId,
-      title: input.title,
-      guildId: input.groupId
-    });
-    return typeof result === "string" ? result : JSON.stringify(result);
+    try {
+      const result = await this.handlers.performTitle(
+        this.ctx,
+        session,
+        { targetId: input.userId, title: input.title, guildId: input.groupId },
+        this.config,
+        this.logger,
+        this.logVerbose
+      );
+      return typeof result === "string" ? result : JSON.stringify(result);
+    } catch (error) {
+      this.logger.warn(error);
+      return `设置头衔失败：${error?.message || String(error)}`;
+    }
   }
 };
 function registerChatlunaTools(ctx, config, logger, verbose, handlers) {
@@ -92,19 +114,13 @@ function registerChatlunaTools(ctx, config, logger, verbose, handlers) {
   }
   ctx.effect(
     () => platform.registerTool("group_mute", {
-      createTool: /* @__PURE__ */ __name(() => new GroupMuteTool(
-        (session, params) => handlers.performMute(ctx, session, params, config, logger, verbose),
-        verbose
-      ), "createTool"),
+      createTool: /* @__PURE__ */ __name(() => new GroupMuteTool(ctx, handlers, config, logger, verbose), "createTool"),
       selector: /* @__PURE__ */ __name(() => true, "selector")
     })
   );
   ctx.effect(
     () => platform.registerTool("group_set_title", {
-      createTool: /* @__PURE__ */ __name(() => new GroupTitleTool(
-        (session, params) => handlers.performTitle(ctx, session, params, config, logger, verbose),
-        verbose
-      ), "createTool"),
+      createTool: /* @__PURE__ */ __name(() => new GroupTitleTool(ctx, handlers, config, logger, verbose), "createTool"),
       selector: /* @__PURE__ */ __name(() => true, "selector")
     })
   );

package/lib/tools.d.ts

@@ -1,17 +1,16 @@
 import { Context, Session } from 'koishi';
+import type { Config } from '.';
 interface Handlers {
     performMute: (ctx: Context, session: Session, params: {
         targetId: string;
         duration: number;
         guildId?: string;
-    }, ...rest: any[]) => Promise<string>;
+    }, config: Config, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
     performTitle: (ctx: Context, session: Session, params: {
         targetId: string;
         title: string;
         guildId?: string;
-    }, ...rest: any[]) => Promise<string>;
+    }, config: Config, logger: ReturnType<Context['logger']>, verbose?: boolean) => Promise<string>;
 }
-export declare function registerChatlunaTools(ctx: Context, config: {
-    chatlunaTools?: boolean;
-}, 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.4",
+  "version": "0.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [