mioku-plugin-meme 2.1.3 → 3.0.1

package/index.ts

@@ -1,6 +1,6 @@
 import {
   definePlugin,
-  type MiokiContext,
+  type MiokuContext,
   getService,
   Services,
 } from "mioku";
@@ -45,7 +45,7 @@ const memePlugin = definePlugin({
   version: "1.0.0",
   description: "基于 meme-generator API 的表情包制作插件",
 
-  async setup(ctx: MiokiContext) {
+  async setup(ctx: MiokuContext) {
     const configService = getService(ctx, Services.Config);
     const aiService = getService(ctx, Services.AI);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-meme",
-  "version": "2.1.3",
+  "version": "3.0.1",
   "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}`);
       }
@@ -930,8 +914,8 @@ export class MemePluginRuntime {
     }
 
     if (sourceType === "message_image") {
-      const messageId = Number(source?.messageId);
-      if (!Number.isFinite(messageId) || messageId <= 0) {
+      const messageId = String(source?.messageId ?? "").trim();
+      if (!messageId) {
         return [];
       }
       const imageUrl = await this.getImageUrlByMessageId(ctx, event, messageId);
@@ -975,14 +959,14 @@ export class MemePluginRuntime {
   private async getImageUrlByMessageId(
     ctx: any,
     event: any,
-    messageId: number,
+    messageId: string | 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

@@ -33,8 +33,8 @@ function parseImageSource(args: any): {
   }
 
   if (sourceType === "message_image") {
-    const messageId = Number(args?.message_id);
-    if (!Number.isFinite(messageId) || messageId <= 0) {
+    const messageId = String(args?.message_id ?? "").trim();
+    if (!messageId) {
       return {
         ok: false,
         message: "source_type=message_image 时必须提供有效的 message_id。",
@@ -114,9 +114,9 @@ export function createMemeSkills(runtime: MemePluginRuntime): AISkill[] {
                 description: "source_type=user_avatar 时必填，头像对应 QQ 号",
               },
               message_id: {
-                type: "number",
+                type: ["number", "string"],
                 description:
-                  "source_type=message_image 时必填，包含图片的消息 message_id",
+                  "source_type=message_image 时必填，包含图片的消息 message_id（支持数字或含字母的字符串 id）",
               },
             },
             required: ["keyword", "source_type"],

package/types.ts

@@ -43,7 +43,7 @@ export type MemeImageSourceType = "auto" | "user_avatar" | "message_image";
 export interface MemeImageSourceOptions {
   type?: MemeImageSourceType;
   qq?: number;
-  messageId?: number;
+  messageId?: number | string;
 }
 
 export interface MemeInfoParams {