mioku-plugin-meme 3.0.1 → 3.0.3

package/configs/base.ts

@@ -7,7 +7,7 @@ export const MEME_BASE_CONFIG: MemeBaseConfig = {
   },
   trigger: {
     requirePrefix: true,
-    prefixes: ["/", "#"],
+    prefixes: [".", "/", "#"],
     directKeywordNeedPrefix: false,
   },
   behavior: {

package/index.ts

@@ -42,8 +42,6 @@ function stripCommandPrefix(
 
 const memePlugin = definePlugin({
   name: "meme",
-  version: "1.0.0",
-  description: "基于 meme-generator API 的表情包制作插件",
 
   async setup(ctx: MiokuContext) {
     const configService = getService(ctx, Services.Config);
@@ -80,8 +78,8 @@ const memePlugin = definePlugin({
         );
       }
       const rawText = ctx.text(event)?.trim() ?? "";
-      const hasSlashPrefix = baseConfig.trigger.prefixes.some((p: string) => rawText.startsWith(p));
-      if (!hasSlashPrefix) {
+      const hasPrefix = baseConfig.trigger.prefixes.some((p: string) => rawText.startsWith(p));
+      if (!hasPrefix) {
         return;
       }
       const chatRuntime = aiService?.getChatRuntime();
@@ -147,6 +145,96 @@ const memePlugin = definePlugin({
       );
     }
 
+    ctx.command({
+      name: "meme 菜单",
+      match: /^(?:(?:表情|meme)包?(?:菜单|展示|制作(?:列表)?)|meme\s+(?:菜单|列表|展示))$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      description: "查看已同步的表情菜单",
+      usage: ".meme 菜单",
+      handler: ({ event }) => runtime.sendMenu(ctx, event),
+    });
+    ctx.command({
+      name: "随机表情",
+      match: /^随机(?:表情|meme)(?:包)?$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      description: "随机生成一个头像类表情",
+      usage: ".随机表情",
+      handler: ({ event }) => runtime.sendRandom(ctx, event),
+    });
+    ctx.command({
+      name: "meme 帮助",
+      match: /^(?:(?:头像|文字)?(?:表情|meme)包?(?:制作(?:菜单|教程)?|帮助|说明|指令|使用说明)|(?:头像|文字)(?:表情|meme)包?|meme\s+帮助)$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      description: "查看表情制作教程与参数说明",
+      usage: ".meme 帮助",
+      handler: ({ event }) => runtime.sendHelp(ctx, event),
+    });
+    ctx.command({
+      name: "meme 搜索",
+      match: /^(?:表情|meme)包?(?:搜索|检索)\s*(.*)$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      description: "搜索相关表情关键词",
+      usage: ".meme 搜索 摸",
+      handler: async ({ event, match }) => {
+        const query = String(match?.[1] ?? "").trim();
+        if (!query) {
+          await notifyByAIRuntime(
+            event,
+            "用户发起了 meme 搜索但没有给关键词。请自然提醒他补一个搜索词",
+            "你想搜什么？",
+          );
+          return;
+        }
+        await runtime.sendSearch(ctx, event, query);
+      },
+    });
+    ctx.command({
+      name: "meme 详情",
+      match: /^meme包?\s+详情\s+(.+)$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      description: "查看表情参数和预览",
+      usage: ".meme 详情 摸头",
+      handler: async ({ event, match }) => {
+        const keyword = String(match?.[1] ?? "").trim();
+        if (!runtime.getDetail(keyword)) {
+          await notifyByAIRuntime(
+            event,
+            `用户查询了不存在的表情详情关键词 "${keyword}"。请自然提醒先搜索可用关键词`,
+            `未找到表情关键词：${keyword}`,
+          );
+          return;
+        }
+        await runtime.sendDetail(ctx, event, keyword);
+      },
+    });
+    ctx.command({
+      name: "meme 更新",
+      match: /^(?:(?:表情|meme)包?更新|meme\s+更新)$/i,
+      prefixes: baseConfig.trigger.prefixes,
+      permission: baseConfig.permissions.ownerOnlyUpdate ? "master" : "member",
+      description: "刷新远端表情缓存",
+      usage: ".meme 更新",
+      handler: async ({ event }) => {
+        await replyWithParts({
+          ctx,
+          event,
+          parts: ["开始刷新 meme 缓存，请稍等..."],
+          quoteReply: baseConfig.behavior.quoteReply,
+        });
+        try {
+          await runtime.refreshCache();
+          await runtime.sendMenu(ctx, event);
+        } catch (error) {
+          await notifyByAIRuntime(
+            event,
+            `meme 缓存刷新失败，错误信息：${error}。请自然告知用户稍后重试或让管理员检查 meme API 服务状态。`,
+            `刷新 meme 缓存失败：${error}`,
+            error,
+          );
+        }
+      },
+    });
+
     ctx.handle("message", async (event) => {
       const rawText = ctx.text(event)?.trim();
       if (!rawText) {
@@ -169,99 +257,6 @@ const memePlugin = definePlugin({
           : rawText;
 
       try {
-        if (
-          commandText &&
-          (/^(?:表情|meme)包?(?:菜单|展示|制作(?:列表)?)$/i.test(commandText) ||
-            /^meme\s+(?:菜单|列表|展示)$/i.test(commandText))
-        ) {
-          await runtime.sendMenu(ctx, event);
-          return;
-        }
-
-        if (commandText && /^随机(?:表情|meme)(?:包)?$/i.test(commandText)) {
-          await runtime.sendRandom(ctx, event);
-          return;
-        }
-
-        if (
-          commandText &&
-          (/^(?:(?:头像|文字)?(?:表情|meme)包?(?:制作(?:菜单|教程)?|帮助|说明|指令|使用说明)|(?:头像|文字)(?:表情|meme)包?)$/i.test(
-            commandText,
-          ) ||
-            /^meme\s+帮助$/i.test(commandText))
-        ) {
-          await runtime.sendHelp(ctx, event);
-          return;
-        }
-
-        const searchMatch = commandText.match(
-          /^(?:表情|meme)包?(?:搜索|检索)\s*(.*)$/i,
-        );
-        if (searchMatch) {
-          const query = (searchMatch[1] || "").trim();
-          if (!query) {
-            await notifyByAIRuntime(
-              event,
-              "用户发起了 meme 搜索但没有给关键词。请自然提醒他补一个搜索词",
-              "你想搜什么？",
-            );
-            return;
-          }
-          await runtime.sendSearch(ctx, event, query);
-          return;
-        }
-
-        const detailCommandMatch =
-          commandText.match(/^meme包?\s+详情\s+(.+)$/i);
-        if (detailCommandMatch) {
-          const keyword = detailCommandMatch[1].trim();
-          if (!runtime.getDetail(keyword)) {
-            await notifyByAIRuntime(
-              event,
-              `用户查询了不存在的表情详情关键词 "${keyword}"。请自然提醒先搜索可用关键词`,
-              `未找到表情关键词：${keyword}`,
-            );
-            return;
-          }
-          await runtime.sendDetail(ctx, event, keyword);
-          return;
-        }
-
-        if (
-          commandText &&
-          (/^(?:表情|meme)包?更新$/i.test(commandText) ||
-            /^meme\s+更新$/i.test(commandText))
-        ) {
-          if (baseConfig.permissions.ownerOnlyUpdate && !ctx.isOwner(event)) {
-            await notifyByAIRuntime(
-              event,
-              "用户尝试刷新 meme 缓存，但权限不足。请自然提醒该操作仅主人可用",
-              "不支持小男娘使用喵",
-            );
-            return;
-          }
-
-          await replyWithParts({
-            ctx,
-            event,
-            parts: ["开始刷新 meme 缓存，请稍等..."],
-            quoteReply: baseConfig.behavior.quoteReply,
-          });
-
-          try {
-            await runtime.refreshCache();
-            await runtime.sendMenu(ctx, event);
-          } catch (error) {
-            await notifyByAIRuntime(
-              event,
-              `meme 缓存刷新失败，错误信息：${error}。请自然告知用户稍后重试或让管理员检查 meme API 服务状态。`,
-              `刷新 meme 缓存失败：${error}`,
-              error,
-            );
-          }
-          return;
-        }
-
         const genericGenerateMatch = commandText.match(
           /^meme包?\s+(?:生成|制作)\s+(.+)$/i,
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-meme",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "基于 meme-generator API 的表情包制作插件",
   "main": "index.ts",
   "type": "module",
@@ -15,71 +15,7 @@
     "services": [
       "config",
       "ai"
-    ],
-    "accessHooks": [
-      {
-        "id": "meme-菜单",
-        "match": "/^\\/meme\\s*菜单/"
-      },
-      {
-        "id": "meme-搜索",
-        "match": "/^\\/meme\\s*搜索/"
-      },
-      {
-        "id": "meme-详情",
-        "match": "/^\\/meme\\s*详情/"
-      },
-      {
-        "id": "meme-更新",
-        "match": "/^\\/meme\\s*更新/"
-      },
-      {
-        "id": "随机表情",
-        "match": "/^\\/随机表情/"
-      }
-    ],
-    "help": {
-      "title": "Meme 表情包",
-      "description": "接入 meme-generator API 的表情包制作插件",
-      "commands": [
-        {
-          "cmd": "/meme 菜单",
-          "desc": "查看已同步的表情菜单",
-          "usage": "/meme 菜单",
-          "role": "member"
-        },
-        {
-          "cmd": "/meme 搜索 <关键词>",
-          "desc": "搜索相关表情关键词",
-          "usage": "/meme 搜索 摸",
-          "role": "member"
-        },
-        {
-          "cmd": "/meme 详情 <关键词>",
-          "desc": "查看表情参数和预览",
-          "usage": "/meme 详情 摸头",
-          "role": "member"
-        },
-        {
-          "cmd": "/随机表情",
-          "desc": "随机生成一个头像类表情",
-          "usage": "/随机表情",
-          "role": "member"
-        },
-        {
-          "cmd": "<表情关键词> [文本1/文本2][#参数]",
-          "desc": "直接按关键词生成表情",
-          "usage": "摸头 小明#圆",
-          "role": "member"
-        },
-        {
-          "cmd": "/meme 更新",
-          "desc": "刷新远端表情缓存",
-          "usage": "/meme 更新",
-          "role": "master"
-        }
-      ]
-    }
+    ]
   },
   "peerDependencies": {
     "mioku": "^1.0.0"

package/shared.ts

@@ -74,8 +74,15 @@ function getSenderName(event: any): string {
   );
 }
 
-function getAvatarUrl(userId: number | string | undefined): string {
-  return `https://q1.qlogo.cn/g?b=qq&s=640&nk=${userId || 0}`;
+/** qlogo 头像服务只认数字 QQ 号,openid 平台直接跳过 */
+function getAvatarUrl(
+  userId: string | number | undefined,
+  adapter?: string,
+): string {
+  const id = String(userId ?? "").trim();
+  if (!id || !/^\d+$/.test(id)) return "";
+  if (adapter && adapter !== "onebotv11" && adapter !== "icqq") return "";
+  return `https://q1.qlogo.cn/g?b=qq&s=640&nk=${id}`;
 }
 
 function extractTextAndArgs(input: string): { text: string; args: string } {
@@ -906,11 +913,11 @@ export class MemePluginRuntime {
   ): Promise<string[]> {
     const sourceType = source?.type || "auto";
     if (sourceType === "user_avatar") {
-      const qq = Number(source?.qq);
-      if (!Number.isFinite(qq) || qq <= 0) {
-        return [];
-      }
-      return [getAvatarUrl(qq)].slice(0, params.max_images || 1);
+      const qq = String(source?.qq ?? "").trim();
+      if (!qq) return [];
+      return [getAvatarUrl(qq, event?.bot?.adapter)]
+        .filter(Boolean)
+        .slice(0, params.max_images || 1);
     }
 
     if (sourceType === "message_image") {
@@ -942,15 +949,20 @@ export class MemePluginRuntime {
 
     const atUserIds = getAtUserIds(event?.message || []);
     if (urls.length < (params.min_images || 0) && atUserIds.length > 0) {
-      urls.push(...atUserIds.map((userId) => getAvatarUrl(userId)));
+      urls.push(
+        ...atUserIds
+          .map((userId) => getAvatarUrl(userId, event?.bot?.adapter))
+          .filter(Boolean),
+      );
     }
 
     if (
       urls.length === 0 &&
       this.baseConfig.behavior.useSenderAvatarFallback &&
-      event?.user_id != null
+      String(event?.user_id ?? "").trim()
     ) {
-      urls.push(getAvatarUrl(event.user_id));
+      const selfAvatar = getAvatarUrl(event.user_id, event?.bot?.adapter);
+      if (selfAvatar) urls.push(selfAvatar);
     }
 
     return uniqueStrings(urls).slice(0, maxImages);
@@ -1008,7 +1020,10 @@ export class MemePluginRuntime {
     const infos = await Promise.all(
       atUserIds.map(async (userId) => {
         try {
-          const member = await bot.getMemberInfo(event.group_id, userId);
+          const member = await bot.getMemberInfo(
+            String(event.group_id ?? ""),
+            String(userId),
+          );
           return {
             name: member?.card || member?.nickname || String(userId),
             gender: String(member?.sex || "unknown"),