mioku-plugin-help 3.0.2 → 3.0.4

package/help/role.ts

@@ -33,7 +33,7 @@ export function canInvokeCommand(
  * Resolve the requesting user's effective role for help filtering.
  *
  * - `master` is honored everywhere (private or group) — it comes from
- *   mioki's `isOwner` allowlist.
+ *   mioki's `isMaster` allowlist (the bot `owners` list).
  * - Private chat skips the `isAdmin` check and defaults to `admin`,
  *   so anyone DM-ing the bot can see admin-level commands.
  * - Group chat resolves bot admin (mioki `isAdmin` allowlist), group
@@ -49,7 +49,7 @@ export async function resolveViewerRole(
   ctx: any,
   event: any,
 ): Promise<CommandRole> {
-  if (ctx?.isOwner?.(event)) {
+  if (ctx?.isMaster?.(event)) {
     return "master";
   }
 

package/index.ts

@@ -21,8 +21,6 @@ import { createHelpSkills } from "./skills";
 
 const helpPlugin = definePlugin({
   name: "help",
-  version: "2.1.0",
-  description: "帮助插件，生成帮助图片，并提供 #状态 指令",
 
   async setup(ctx: MiokuContext) {
     // 启动后台采样器
@@ -75,7 +73,7 @@ const helpPlugin = definePlugin({
       for (const skill of createHelpSkills()) aiService.registerSkill(skill);
     }
 
-    ctx.handle("message", async (event) => {
+    const handleHelpMessage = async (event: import("mioku").MessageEvent) => {
       const text = ctx.text(event);
       if (!text) {
         return;
@@ -155,6 +153,25 @@ const helpPlugin = definePlugin({
         ctx.logger.error(`生成帮助图片失败: ${error}`);
         await event.reply(`生成帮助图片失败: ${error}`);
       }
+    };
+
+    ctx.command({
+      id: "帮助菜单",
+      name: "help",
+      aliases: ["帮助", "菜单"],
+      match: /^(?:help|帮助|菜单)(?:\s|$)/i,
+      prefixes: ["#", "/", ""],
+      description: "生成帮助图片",
+      handler: ({ event }) => handleHelpMessage(event),
+    });
+    ctx.command({
+      id: "status",
+      name: "status",
+      aliases: ["状态", "zt"],
+      match: /^(?:status|状态|zt)(?:\s|$)/i,
+      prefixes: ["#", "/", ""],
+      description: "生成系统状态图片",
+      handler: ({ event }) => handleHelpMessage(event),
     });
 
     return () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-help",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "帮助插件，使用截图服务生成美观的帮助图片，并提供 #状态 指令",
   "main": "index.ts",
   "type": "module",
@@ -17,18 +17,6 @@
       "screenshot",
       "config",
       "ai"
-    ],
-    "accessHooks": [
-      {
-        "id": "帮助菜单",
-        "match": "/(?:[#/]\\s*(?:帮助|菜单|help)|^(?:帮助|菜单|help)(?:\\s|$))/",
-        "description": "匹配 #help / 帮助 / 菜单 等帮助指令"
-      },
-      {
-        "id": "状态",
-        "match": "/(?:[#/]\\s*(?:状态|zt|status)|^(?:状态|zt|status)(?:\\s|$))/",
-        "description": "匹配 #状态 / 状态 / zt / status 等系统状态指令"
-      }
     ]
   },
   "peerDependencies": {

package/status/data-collector.ts

@@ -200,8 +200,7 @@ async function collectBots(
   }
   // stdin 适配器恒排第一位（终端是本机主人通道，优先展示）
   const sorted = [...bots].sort(
-    (a, b) =>
-      Number(b.adapter === "stdin") - Number(a.adapter === "stdin"),
+    (a, b) => Number(b.adapter === "stdin") - Number(a.adapter === "stdin"),
   );
   return collectBotStatuses(sorted, ctx, stdinAvatar);
 }
@@ -226,11 +225,14 @@ async function collectBotStatuses(
     version: adapter.version,
     impl: adapter.impl,
   }));
-  const report = await withTimeout(buildAdapterReport({ bots, adapters })).catch(
-    () => null,
-  );
+  const report = await withTimeout(
+    buildAdapterReport({ bots, adapters }),
+  ).catch(() => null);
   const instances = new Map<string, AdapterInstanceStatus>();
-  const implOf = new Map<string, { name: string; version?: string } | undefined>();
+  const implOf = new Map<
+    string,
+    { name: string; version?: string } | undefined
+  >();
   for (const entry of report?.adapters ?? []) {
     implOf.set(entry.name, entry.impl);
     for (const instance of entry.instances) {
@@ -238,37 +240,58 @@ async function collectBotStatuses(
     }
   }
 
-  return bots.map((bot) => {
-    const uin = String(bot.bot_id);
-    const adapter = String(bot.adapter);
-    const isStdin = adapter === "stdin";
-    const instance = instances.get(`${adapter}:${uin}`);
-    const lib = implOf.get(adapter);
-    // 实现端优先用平台自报的（NapCat / LLOneBot），否则退回适配器的底层库（ICQQ）
-    const framework = instance?.impl || lib?.name || adapter;
-    const appVersion = instance?.version || lib?.version || "";
+  return Promise.all(
+    bots.map(async (bot) => {
+      const uin = String(bot.bot_id);
+      const adapter = String(bot.adapter);
+      const isStdin = adapter === "stdin";
+      const instance = instances.get(`${adapter}:${uin}`);
+      const lib = implOf.get(adapter);
+      const framework = instance?.impl || lib?.name || adapter;
+      const appVersion = instance?.version || lib?.version || "";
+      const avatarFromBot =
+        typeof bot.getAvatar === "function"
+          ? await bot.getAvatar().catch(() => null)
+          : null;
+      // 协议端版本文案:平台自报的用 impl/version(如 LLOneBot/7.12.4),
+      // 平台不自报的退回适配器元数据(如 ICQQ v1.12.3),与 .status 的展示约定一致
+      const implLabel = isStdin
+        ? "stdin"
+        : instance?.impl
+          ? instance.version
+            ? `${instance.impl}/${instance.version}`
+            : String(instance.impl)
+          : lib?.name
+            ? lib.version
+              ? `${lib.name} v${lib.version}`
+              : lib.name
+            : "";
 
-    return {
-      uin,
-      nickname: String(bot.nickname || "Unknown Bot"),
-      avatarUrl: isStdin
-        ? toImageSrc(stdinAvatar || "")
-        : `https://q1.qlogo.cn/g?b=qq&nk=${uin}&s=160`,
-      adapter,
-      framework: isStdin ? adapter : framework,
-      appVersion: isStdin
-        ? String(ctx.getAdapter(adapter)?.version ?? "")
-        : appVersion,
-      protocolVersion: instance?.protocol ?? "",
-      platform: instance?.platform ?? "",
-      platformVersion: instance?.platformVersion ?? "",
-      online: bot.online,
-      groupCount: instance?.stats.groups ?? 0,
-      friendCount: instance?.stats.friends ?? 0,
-      send: instance?.stats.sent ?? 0,
-      receive: instance?.stats.received ?? 0,
-    };
-  });
+      return {
+        uin,
+        nickname: String(bot.nickname || "Unknown Bot"),
+        avatarUrl: isStdin
+          ? toImageSrc(stdinAvatar || "")
+          : avatarFromBot
+            ? toImageSrc(avatarFromBot)
+            : `https://q1.qlogo.cn/g?b=qq&nk=${uin}&s=160`,
+        adapter,
+        implLabel,
+        framework: isStdin ? adapter : framework,
+        appVersion: isStdin
+          ? String(ctx.getAdapter(adapter)?.version ?? "")
+          : appVersion,
+        protocolVersion: instance?.protocol ?? "",
+        platform: instance?.platform ?? "",
+        platformVersion: instance?.platformVersion ?? "",
+        online: bot.online,
+        groupCount: instance?.stats.groups ?? 0,
+        friendCount: instance?.stats.friends ?? 0,
+        send: instance?.stats.sent ?? 0,
+        receive: instance?.stats.received ?? 0,
+      };
+    }),
+  );
 }
 
 async function collectFramework(

package/status/html-generator.ts

@@ -140,13 +140,7 @@ function renderHero(
           .map((bot) => {
             const statusText = bot.online ? "在线" : "离线";
             const statusColor = bot.online ? "#10b981" : "#ef4444";
-            const adapterLabel = displayAdapterId(bot.adapter);
-            const implText =
-              bot.adapter === "stdin"
-                ? `${adapterLabel}@${bot.appVersion}`
-                : bot.appVersion
-                  ? `${bot.framework} ${bot.appVersion}${bot.protocolVersion ? ` · 协议 ${bot.protocolVersion}` : ""}`
-                  : bot.framework;
+            const implText = bot.implLabel;
             const platformText = bot.platform
               ? `${bot.platform}${bot.platformVersion ? ` v${bot.platformVersion}` : ""}`
               : "";
@@ -159,7 +153,7 @@ function renderHero(
               { text: `群聊 ${fmtNumber(bot.groupCount)}`, kind: "data" },
               { text: `收 ${fmtNumber(bot.receive)}`, kind: "data" },
               { text: `发 ${fmtNumber(bot.send)}`, kind: "data" },
-              { text: implText, kind: "data" },
+              ...(implText ? [{ text: implText, kind: "data" }] : []),
               ...(platformText ? [{ text: platformText, kind: "data" }] : []),
             ];
             const tagsHtml = tags

package/status/types.ts

@@ -13,6 +13,8 @@ export interface BotAccountStatus {
   avatarUrl: string;
   /** 适配器名，如 "stdin" / "onebotv11" / "icqq"。 */
   adapter: string;
+  /** 协议端与版本的可展示文案，如 "ICQQ v1.12.3" / "LLOneBot/7.12.4"，取不到时为空串 */
+  implLabel: string;
   /** 实现端名称，如 "NapCat" / "LLOneBot" / "ICQQ"，取不到时为空串 */
   framework: string;
   /** 实现端版本，如 "5.0.6"*/