mioku-plugin-meme 2.1.2 → 3.0.0

package/index.ts

@@ -1,10 +1,14 @@
-import type { AIService, ConfigService } from "mioku";
-import { definePlugin, type MiokiContext } from "mioki";
+import {
+  definePlugin,
+  type MiokuContext,
+  getService,
+  Services,
+} from "mioku";
 import { MEME_BASE_CONFIG } from "./configs/base";
 import { MEME_FILTER_CONFIG } from "./configs/filters";
 import { MemePluginRuntime, replyWithParts } from "./shared";
-import { resetMemeRuntimeState, setMemeRuntimeState } from "./runtime";
 import type { MemeBaseConfig, MemeFilterConfig } from "./types";
+import { createMemeSkills } from "./skills/meme";
 
 function cloneConfig<T>(value: T): T {
   return JSON.parse(JSON.stringify(value)) as T;
@@ -41,9 +45,9 @@ const memePlugin = definePlugin({
   version: "1.0.0",
   description: "基于 meme-generator API 的表情包制作插件",
 
-  async setup(ctx: MiokiContext) {
-    const configService = ctx.services?.config as ConfigService | undefined;
-    const aiService = ctx.services?.ai as AIService | undefined;
+  async setup(ctx: MiokuContext) {
+    const configService = getService(ctx, Services.Config);
+    const aiService = getService(ctx, Services.AI);
 
     let baseConfig = cloneConfig(MEME_BASE_CONFIG);
     let filterConfig = cloneConfig(MEME_FILTER_CONFIG);
@@ -123,7 +127,9 @@ const memePlugin = definePlugin({
       );
     }
 
-    setMemeRuntimeState({ runtime });
+    if (aiService) {
+      for (const skill of createMemeSkills(runtime)) aiService.registerSkill(skill);
+    }
 
     const disposers: Array<() => void> = [];
     if (configService) {
@@ -141,7 +147,7 @@ const memePlugin = definePlugin({
       );
     }
 
-    ctx.handle("message", async (event: any) => {
+    ctx.handle("message", async (event) => {
       const rawText = ctx.text(event)?.trim();
       if (!rawText) {
         return;
@@ -366,10 +372,8 @@ const memePlugin = definePlugin({
     });
 
     return () => {
-      for (const dispose of disposers) {
-        dispose();
-      }
-      resetMemeRuntimeState();
+      for (const dispose of disposers) dispose();
+      if (aiService) aiService.removeSkill("meme");
       ctx.logger.info("meme 插件已卸载");
     };
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-meme",
-  "version": "2.1.2",
+  "version": "3.0.0",
   "description": "基于 meme-generator API 的表情包制作插件",
   "main": "index.ts",
   "type": "module",
@@ -82,11 +82,9 @@
     }
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0"
+    "mioku": "^1.0.0"
   },
   "devDependencies": {
-    "mioku": "workspace:*",
-    "mioki": "^0.16.0"
+    "mioku": "workspace:*"
   }
 }

package/shared.ts

@@ -187,10 +187,10 @@ export async function replyWithParts(options: {
   parts: any[];
   quoteReply?: boolean;
 }): Promise<void> {
-  const { event, parts, quoteReply = false } = options;
+  const { ctx, event, parts, quoteReply = false } = options;
   const payload = [...parts];
   if (quoteReply && event?.message_id != null) {
-    payload.unshift({ type: "reply", id: String(event.message_id) });
+    payload.unshift(ctx.segment.reply(event.message_id));
   }
   await event.reply(payload.length === 1 ? payload[0] : payload);
 }
@@ -208,9 +208,7 @@ export async function replyWithImage(options: {
     parts.push(caption);
   }
 
-  const imageSegment = ctx?.segment?.image
-    ? ctx.segment.image(image)
-    : { type: "image", file: image };
+  const imageSegment = ctx.segment.image(image);
   parts.push(imageSegment);
 
   try {
@@ -228,11 +226,7 @@ export async function replyWithImage(options: {
   if (caption) {
     fallbackParts.push(caption);
   }
-  fallbackParts.push(
-    ctx?.segment?.image
-      ? ctx.segment.image(base64Image)
-      : { type: "image", file: base64Image },
-  );
+  fallbackParts.push(ctx.segment.image(base64Image));
   await replyWithParts({ ctx, event, parts: fallbackParts, quoteReply });
 }
 
@@ -244,11 +238,7 @@ export async function sendSkillImage(options: {
   quoteReply?: boolean;
 }): Promise<void> {
   const { ctx, event, image, caption, quoteReply = false } = options;
-  const selfId = event?.self_id != null ? Number(event.self_id) : undefined;
-  const bot =
-    selfId != null && typeof ctx?.pickBot === "function"
-      ? ctx.pickBot(selfId)
-      : undefined;
+  const bot = event?.bot;
 
   if (!bot) {
     throw new Error("当前上下文不支持发送图片");
@@ -257,14 +247,12 @@ export async function sendSkillImage(options: {
   const buildPayload = (file: string) => {
     const payload: any[] = [];
     if (quoteReply && event?.message_id != null) {
-      payload.push({ type: "reply", id: String(event.message_id) });
+      payload.push(ctx.segment.reply(event.message_id));
     }
     if (caption) {
       payload.push(caption);
     }
-    payload.push(
-      ctx?.segment?.image ? ctx.segment.image(file) : { type: "image", file },
-    );
+    payload.push(ctx.segment.image(file));
     return payload;
   };
 
@@ -622,11 +610,7 @@ export class MemePluginRuntime {
         );
         const previewBuffer = Buffer.from(await previewResponse.arrayBuffer());
         const previewBase64 = await imageBufferToBase64(previewBuffer);
-        parts.push(
-          ctx?.segment?.image
-            ? ctx.segment.image(previewBase64)
-            : { type: "image", file: previewBase64 },
-        );
+        parts.push(ctx.segment.image(previewBase64));
       } catch (error) {
         this.logger.warn(`[meme] 获取预览失败: ${error}`);
       }
@@ -978,11 +962,11 @@ export class MemePluginRuntime {
     messageId: number,
   ): Promise<string | null> {
     try {
-      const selfId = event?.self_id != null ? Number(event.self_id) : undefined;
-      if (selfId == null || !ctx?.pickBot) {
+      const bot = event?.bot;
+      if (!bot) {
         return null;
       }
-      const msg = await ctx.pickBot(selfId).getMsg(messageId);
+      const msg = await bot.getMessage(messageId);
       if (!msg?.message || !Array.isArray(msg.message)) {
         return null;
       }
@@ -1013,11 +997,8 @@ export class MemePluginRuntime {
       ];
     }
 
-    const bot =
-      event?.self_id != null && typeof ctx?.pickBot === "function"
-        ? ctx.pickBot(event.self_id)
-        : undefined;
-    if (!bot?.getGroupMemberInfo) {
+    const bot = event?.bot;
+    if (!bot) {
       return atUserIds.map((userId) => ({
         name: String(userId),
         gender: "unknown",
@@ -1027,7 +1008,7 @@ export class MemePluginRuntime {
     const infos = await Promise.all(
       atUserIds.map(async (userId) => {
         try {
-          const member = await bot.getGroupMemberInfo(event.group_id, userId);
+          const member = await bot.getMemberInfo(event.group_id, userId);
           return {
             name: member?.card || member?.nickname || String(userId),
             gender: String(member?.sex || "unknown"),

package/skills/meme.ts

@@ -0,0 +1,149 @@
+import type { AISkill, AITool } from "mioku";
+import type { MemePluginRuntime } from "../shared";
+import type { MemeImageSourceOptions } from "../types";
+
+function parseImageSource(args: any): {
+  ok: boolean;
+  source?: MemeImageSourceOptions;
+  message?: string;
+} {
+  const sourceType = String(args?.source_type || "").trim();
+  if (!sourceType) {
+    return {
+      ok: false,
+      message: "缺少 source_type。可选值: user_avatar 或 message_image。",
+    };
+  }
+
+  if (sourceType === "user_avatar") {
+    const qq = Number(args?.qq);
+    if (!Number.isFinite(qq) || qq <= 0) {
+      return {
+        ok: false,
+        message: "source_type=user_avatar 时必须提供有效的 qq。",
+      };
+    }
+    return {
+      ok: true,
+      source: {
+        type: "user_avatar",
+        qq,
+      },
+    };
+  }
+
+  if (sourceType === "message_image") {
+    const messageId = Number(args?.message_id);
+    if (!Number.isFinite(messageId) || messageId <= 0) {
+      return {
+        ok: false,
+        message: "source_type=message_image 时必须提供有效的 message_id。",
+      };
+    }
+    return {
+      ok: true,
+      source: {
+        type: "message_image",
+        messageId,
+      },
+    };
+  }
+
+  return {
+    ok: false,
+    message: "source_type 无效。只能是 user_avatar 或 message_image。",
+  };
+}
+
+export function createMemeSkills(runtime: MemePluginRuntime): AISkill[] {
+  return [
+    {
+      name: "meme",
+      description:
+        "搜索,制作和发送各种各样的整蛊群友的表情包,可以使用聊天中的图片或用户头像制作",
+      permission: "member",
+      tools: [
+        {
+          name: "search_memes",
+          description: "按关键词搜索可用的 meme 表情关键词",
+          parameters: {
+            type: "object",
+            properties: {
+              query: {
+                type: "string",
+                description: "搜索关键词，可以是中文或英文片段",
+              },
+            },
+            required: ["query"],
+          },
+          handler: async (args: any) => {
+            await runtime.ensureCache();
+            const hits = runtime.searchKeywords(String(args?.query || ""));
+            return hits.length > 0
+              ? hits.join("、")
+              : "没有找到匹配的 meme 关键词";
+          },
+        } as AITool,
+        {
+          name: "send_meme",
+          description:
+            "发送 meme。必须指定图片来源：用户头像(qq)或聊天图片(message_id)。",
+          parameters: {
+            type: "object",
+            properties: {
+              keyword: {
+                type: "string",
+                description: "要生成的 meme 关键词",
+              },
+              text: {
+                type: "string",
+                description: "文本内容，多段文本用 / 分隔",
+              },
+              args: {
+                type: "string",
+                description: "额外参数，例如 圆、左、循环 等",
+              },
+              source_type: {
+                type: "string",
+                description:
+                  "图片来源类型，只能是 user_avatar 或 message_image",
+                enum: ["user_avatar", "message_image"],
+              },
+              qq: {
+                type: "number",
+                description: "source_type=user_avatar 时必填，头像对应 QQ 号",
+              },
+              message_id: {
+                type: "number",
+                description:
+                  "source_type=message_image 时必填，包含图片的消息 message_id",
+              },
+            },
+            required: ["keyword", "source_type"],
+          },
+          handler: async (args: any, runtimeCtx?: any) => {
+            const ctx = runtimeCtx?.ctx;
+            const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
+            if (!ctx || !event) {
+              return "当前上下文不支持发送 meme";
+            }
+
+            const source = parseImageSource(args);
+            if (!source.ok) {
+              return source.message || "图片来源参数不合法";
+            }
+
+            const result = await runtime.generateByKeyword(ctx, event, {
+              keyword: String(args?.keyword || ""),
+              text: args?.text ? String(args.text) : "",
+              args: args?.args ? String(args.args) : "",
+              imageSource: source.source,
+              send: true,
+            });
+            return result.message;
+          },
+        } as AITool,
+      ],
+    },
+  ];
+}

package/runtime.ts

@@ -1,26 +0,0 @@
-import type { MemePluginRuntime } from "./shared";
-import {
-  getPluginRuntimeState,
-  resetPluginRuntimeState,
-  setPluginRuntimeState,
-} from "mioku";
-
-export interface MemeRuntimeState {
-  runtime?: MemePluginRuntime;
-}
-
-const MEME_PLUGIN_NAME = "meme";
-
-export function setMemeRuntimeState(
-  nextState: MemeRuntimeState,
-): MemeRuntimeState {
-  return setPluginRuntimeState(MEME_PLUGIN_NAME, nextState) as MemeRuntimeState;
-}
-
-export function getMemeRuntimeState(): MemeRuntimeState {
-  return getPluginRuntimeState(MEME_PLUGIN_NAME) as MemeRuntimeState;
-}
-
-export function resetMemeRuntimeState(): void {
-  resetPluginRuntimeState(MEME_PLUGIN_NAME);
-}

package/skills.ts

@@ -1,157 +0,0 @@
-import type { AISkill, AITool } from "mioku";
-import type { MemeImageSourceOptions } from "./types";
-import { getMemeRuntimeState } from "./runtime";
-
-function parseImageSource(args: any): {
-  ok: boolean;
-  source?: MemeImageSourceOptions;
-  message?: string;
-} {
-  const sourceType = String(args?.source_type || "").trim();
-  if (!sourceType) {
-    return {
-      ok: false,
-      message: "缺少 source_type。可选值: user_avatar 或 message_image。",
-    };
-  }
-
-  if (sourceType === "user_avatar") {
-    const qq = Number(args?.qq);
-    if (!Number.isFinite(qq) || qq <= 0) {
-      return {
-        ok: false,
-        message: "source_type=user_avatar 时必须提供有效的 qq。",
-      };
-    }
-    return {
-      ok: true,
-      source: {
-        type: "user_avatar",
-        qq,
-      },
-    };
-  }
-
-  if (sourceType === "message_image") {
-    const messageId = Number(args?.message_id);
-    if (!Number.isFinite(messageId) || messageId <= 0) {
-      return {
-        ok: false,
-        message: "source_type=message_image 时必须提供有效的 message_id。",
-      };
-    }
-    return {
-      ok: true,
-      source: {
-        type: "message_image",
-        messageId,
-      },
-    };
-  }
-
-  return {
-    ok: false,
-    message: "source_type 无效。只能是 user_avatar 或 message_image。",
-  };
-}
-
-const memeSkills: AISkill[] = [
-  {
-    name: "meme",
-    description:
-      "搜索,制作和发送各种各样的整蛊群友的表情包,可以使用聊天中的图片或用户头像制作",
-    permission: "member",
-    tools: [
-      {
-        name: "search_memes",
-        description: "按关键词搜索可用的 meme 表情关键词",
-        parameters: {
-          type: "object",
-          properties: {
-            query: {
-              type: "string",
-              description: "搜索关键词，可以是中文或英文片段",
-            },
-          },
-          required: ["query"],
-        },
-        handler: async (args: any) => {
-          const runtime = getMemeRuntimeState().runtime;
-          if (!runtime) {
-            return "meme 插件尚未初始化";
-          }
-
-          await runtime.ensureCache();
-          const hits = runtime.searchKeywords(String(args?.query || ""));
-          return hits.length > 0
-            ? hits.join("、")
-            : "没有找到匹配的 meme 关键词";
-        },
-      } as AITool,
-      {
-        name: "send_meme",
-        description:
-          "发送 meme。必须指定图片来源：用户头像(qq)或聊天图片(message_id)。",
-        parameters: {
-          type: "object",
-          properties: {
-            keyword: {
-              type: "string",
-              description: "要生成的 meme 关键词",
-            },
-            text: {
-              type: "string",
-              description: "文本内容，多段文本用 / 分隔",
-            },
-            args: {
-              type: "string",
-              description: "额外参数，例如 圆、左、循环 等",
-            },
-            source_type: {
-              type: "string",
-              description: "图片来源类型，只能是 user_avatar 或 message_image",
-              enum: ["user_avatar", "message_image"],
-            },
-            qq: {
-              type: "number",
-              description: "source_type=user_avatar 时必填，头像对应 QQ 号",
-            },
-            message_id: {
-              type: "number",
-              description:
-                "source_type=message_image 时必填，包含图片的消息 message_id",
-            },
-          },
-          required: ["keyword", "source_type"],
-        },
-        handler: async (args: any, runtimeCtx?: any) => {
-          const runtime = getMemeRuntimeState().runtime;
-          const ctx = runtimeCtx?.ctx;
-          const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
-          if (!runtime) {
-            return "meme 插件尚未初始化";
-          }
-          if (!ctx || !event) {
-            return "当前上下文不支持发送 meme";
-          }
-
-          const source = parseImageSource(args);
-          if (!source.ok) {
-            return source.message || "图片来源参数不合法";
-          }
-
-          const result = await runtime.generateByKeyword(ctx, event, {
-            keyword: String(args?.keyword || ""),
-            text: args?.text ? String(args.text) : "",
-            args: args?.args ? String(args.args) : "",
-            imageSource: source.source,
-            send: true,
-          });
-          return result.message;
-        },
-      } as AITool,
-    ],
-  },
-];
-
-export default memeSkills;