mioku-plugin-deerpipe 2.0.1 → 2.0.3

package/README.md

@@ -21,13 +21,13 @@
 
 | 指令                | 说明                  | 权限   |
 |-------------------|---------------------|------|
-| `🦌` / `鹿`        | 自🦌一次               | 全员   |
-| `🦌 @某人`          | 帮某人🦌一次（仅群组）        | 全员   |
-| `补🦌 <日>`         | 补签本月某天              | 全员   |
-| `🦌历` / `🦌历 @某人` | 查看本月🦌日历            | 全员   |
-| `🦌榜`             | 查看本月本群🦌排行榜（仅群组）    | 全员   |
-| `帮🦌 on/off`      | 允许/禁止别人帮自己🦌        | 全员   |
-| `帮🦌 on/off @某人`  | 允许/禁止帮某人🦌          | 群管理员 |
-| `禁🦌 @某人 [时长]`    | 禁止某人🦌一段时间，省略时长视为解禁 | 群管理员 |
+| `.🦌` / `.鹿`      | 自🦌一次               | 全员   |
+| `.🦌 @某人`        | 帮某人🦌一次（仅群组）        | 全员   |
+| `.补🦌 <日>`       | 补签本月某天              | 全员   |
+| `.🦌历` / `.🦌历 @某人` | 查看本月🦌日历            | 全员   |
+| `.🦌榜`           | 查看本月本群🦌排行榜（仅群组）    | 全员   |
+| `.帮🦌 on/off`    | 允许/禁止别人帮自己🦌        | 全员   |
+| `.帮🦌 on/off @某人` | 允许/禁止帮某人🦌          | 群管理员 |
+| `.禁🦌 @某人 [时长]`  | 禁止某人🦌一段时间，省略时长视为解禁 | 群管理员 |
 
 时长支持 `30s` / `5m` / `2h` / `1d` / `1w` 等写法，最长 30 天。

package/commands.ts

@@ -7,6 +7,7 @@ import {
   getAtUserId,
   parseDuration,
   replyImage,
+  resolveAvatarUrl,
   resolveScene,
   resolveUserName,
 } from "./utils";
@@ -30,12 +31,12 @@ function isGroupAdmin(event: any): boolean {
 }
 
 export type DeerCommand =
-  | { type: "deer"; targetUserId?: number }
+  | { type: "deer"; targetUserId?: string }
   | { type: "past"; day: number }
-  | { type: "calendar"; targetUserId?: number }
+  | { type: "calendar"; targetUserId?: string }
   | { type: "rank" }
-  | { type: "set_can_be_helped"; allowed: boolean; targetUserId?: number }
-  | { type: "set_no_deer"; targetUserId: number; durationText?: string }
+  | { type: "set_can_be_helped"; allowed: boolean; targetUserId?: string }
+  | { type: "set_no_deer"; targetUserId: string; durationText?: string }
   | { type: "invalid_past" }
   | { type: "none" };
 
@@ -124,7 +125,7 @@ export async function handleDeerCommand(
 
 async function handleDeer(
   cmdCtx: CommandContext,
-  targetUserId?: number,
+  targetUserId?: string,
 ): Promise<void> {
   const { ctx, db, screenshot, event } = cmdCtx;
   const scene = resolveScene(event);
@@ -136,7 +137,7 @@ async function handleDeer(
   }
 
   const userId =
-    targetUserId != null ? targetUserId : Number(event.user_id);
+    targetUserId != null ? targetUserId : String(event.user_id ?? "").trim();
   const user = db.getOrCreateUser(scene.key, userId);
 
   if (targetUserId && !user.canBeHelped) {
@@ -173,10 +174,11 @@ async function handleDeer(
     records: result.records,
     name,
     userId,
+    avatar: resolveAvatarUrl(event, userId),
   });
 
   const prefix = targetUserId
-    ? [{ type: "text", data: { text: "成功帮 " } }, ctx.segment.at(String(targetUserId)), { type: "text", data: { text: " 🦌了\n" } }]
+    ? [{ type: "text", data: { text: "成功帮 " } }, ctx.segment.at(targetUserId), { type: "text", data: { text: " 🦌了\n" } }]
     : [{ type: "text", data: { text: "成功🦌了\n" } }];
 
   await replyImage(event, ctx.segment, imagePath, prefix);
@@ -195,7 +197,7 @@ async function handlePast(
     return;
   }
 
-  const userId = Number(event.user_id);
+  const userId = String(event.user_id ?? "").trim();
   db.getOrCreateUser(scene.key, userId);
 
   const result = await db.checkIn(
@@ -215,6 +217,7 @@ async function handlePast(
     records: result.records,
     name,
     userId,
+    avatar: resolveAvatarUrl(event, userId),
   });
 
   const text = result.ok ? "成功补🦌\n" : "不能补🦌已经🦌过的日子捏\n";
@@ -228,14 +231,14 @@ async function handlePast(
 
 async function handleCalendar(
   cmdCtx: CommandContext,
-  targetUserId?: number,
+  targetUserId?: string,
 ): Promise<void> {
   const { ctx, db, screenshot, event } = cmdCtx;
   const scene = resolveScene(event);
   if (targetUserId && !scene.isGroup) return;
 
   const now = new Date();
-  const userId = targetUserId ?? Number(event.user_id);
+  const userId = targetUserId ?? String(event.user_id ?? "").trim();
   db.getOrCreateUser(scene.key, userId);
   const records = db.getRecords(
     scene.key,
@@ -252,6 +255,7 @@ async function handleCalendar(
     records,
     name,
     userId,
+    avatar: resolveAvatarUrl(event, userId),
   });
 
   await replyImage(event, ctx.segment, imagePath);
@@ -275,6 +279,7 @@ async function handleRank(cmdCtx: CommandContext): Promise<void> {
       rank: idx + 1,
       userId: entry.userId,
       name: await resolveUserName(ctx, event, entry.userId),
+      avatar: resolveAvatarUrl(event, entry.userId),
       count: entry.count,
     })),
   );
@@ -292,7 +297,7 @@ async function handleRank(cmdCtx: CommandContext): Promise<void> {
 async function handleSetCanBeHelped(
   cmdCtx: CommandContext,
   allowed: boolean,
-  targetUserId?: number,
+  targetUserId?: string,
 ): Promise<void> {
   const { ctx, db, event } = cmdCtx;
   const scene = resolveScene(event);
@@ -303,7 +308,7 @@ async function handleSetCanBeHelped(
     return;
   }
 
-  const userId = targetUserId ?? Number(event.user_id);
+  const userId = targetUserId ?? String(event.user_id ?? "").trim();
   const user = db.getOrCreateUser(scene.key, userId);
   user.canBeHelped = allowed;
   await db.updateUser(user);
@@ -312,7 +317,7 @@ async function handleSetCanBeHelped(
     await event.reply(
       [
         { type: "text", data: { text: `已${allowed ? "允许" : "禁止"}帮 ` } },
-        ctx.segment.at(String(targetUserId)),
+        ctx.segment.at(targetUserId),
         { type: "text", data: { text: " 🦌" } },
       ],
       true,
@@ -324,7 +329,7 @@ async function handleSetCanBeHelped(
 
 async function handleSetNoDeer(
   cmdCtx: CommandContext,
-  targetUserId: number,
+  targetUserId: string,
   durationText?: string,
 ): Promise<void> {
   const { ctx, db, event } = cmdCtx;
@@ -361,7 +366,7 @@ async function handleSetNoDeer(
     await event.reply(
       [
         { type: "text", data: { text: "已解禁 " } },
-        ctx.segment.at(String(targetUserId)),
+        ctx.segment.at(targetUserId),
         { type: "text", data: { text: " 的🦌权" } },
       ],
       true,
@@ -370,7 +375,7 @@ async function handleSetNoDeer(
     await event.reply(
       [
         { type: "text", data: { text: "已禁止 " } },
-        ctx.segment.at(String(targetUserId)),
+        ctx.segment.at(targetUserId),
         {
           type: "text",
           data: {

package/db.ts

@@ -18,17 +18,17 @@ interface RecordRow {
 }
 
 export interface DeerDatabase {
-  getOrCreateUser(scene: string, userId: number): DeerUser;
+  getOrCreateUser(scene: string, userId: string): DeerUser;
   updateUser(user: DeerUser): Promise<void>;
   getRecords(
     scene: string,
-    userId: number,
+    userId: string,
     year: number,
     month: number,
   ): Map<number, number>;
   checkIn(
     scene: string,
-    userId: number,
+    userId: string,
     year: number,
     month: number,
     day: number,
@@ -44,7 +44,7 @@ export interface DeerDatabase {
   close(): void;
 }
 
-function userKey(scene: string, userId: number): string {
+function userKey(scene: string, userId: string): string {
   return `${scene}:${userId}`;
 }
 
@@ -125,7 +125,7 @@ export async function initDeerDatabase(): Promise<DeerDatabase> {
 
   function loadRecords(
     scene: string,
-    userId: number,
+    userId: string,
     year: number,
     month: number,
   ): Map<number, number> {
@@ -214,9 +214,9 @@ export async function initDeerDatabase(): Promise<DeerDatabase> {
         $scene: scene,
         $monthKey: monthKey(year, month),
         $limit: limit,
-      }) as Array<{ user_id: number; total: number }>;
+      }) as Array<{ user_id: string; total: number }>;
       return rows.map((row) => ({
-        userId: row.user_id,
+        userId: String(row.user_id),
         count: row.total,
       }));
     },

package/image.ts

@@ -2,7 +2,7 @@ import * as fs from "fs/promises";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import type { ScreenshotService } from "mioku";
-import { escapeHtml, getAvatarUrl, isNightMode } from "./utils";
+import { escapeHtml, isNightMode } from "./utils";
 
 interface CalendarOptions {
   year: number;
@@ -10,13 +10,15 @@ interface CalendarOptions {
   todayDay: number;
   records: Map<number, number>;
   name: string;
-  userId: number;
+  userId: string;
+  avatar?: string;
 }
 
 interface RankRow {
   rank: number;
   name: string;
-  userId: number;
+  userId: string;
+  avatar?: string;
   count: number;
 }
 
@@ -127,7 +129,7 @@ export async function generateCalendarImage(
   screenshotService: ScreenshotService,
   options: CalendarOptions,
 ): Promise<string> {
-  const { year, month, records, name, userId } = options;
+  const { year, month, records, name, avatar } = options;
   const assets = await loadAssets();
   // 日历始终使用白天主题（按用户要求 🦌 / 🦌历 / 补🦌 不适配夜间模式）
   const theme = DAY_THEME;
@@ -237,7 +239,7 @@ export async function generateCalendarImage(
   </head>
   <body>
     <div class="canvas">
-      <img class="avatar" src="${escapeHtml(getAvatarUrl(userId))}" onerror="this.onerror=null;this.src='${assets.defaultAvatar}'" />
+      <img class="avatar" src="${escapeHtml(String(avatar ?? "").trim() || assets.defaultAvatar)}" onerror="this.onerror=null;this.src='${assets.defaultAvatar}'" />
       <div class="title">${year}-${String(month).padStart(2, "0")} 🦌签到日历</div>
       <div class="subtitle">@${escapeHtml(name)}</div>
       ${cellsHtml}
@@ -271,7 +273,7 @@ export async function generateRankImage(
     .map((row, idx) => {
       const y = headerHeight + idx * rowHeight;
       return `
-        <img class="rank-avatar" src="${escapeHtml(getAvatarUrl(row.userId))}" onerror="this.onerror=null;this.src='${assets.defaultAvatar}'" style="top:${y + 10}px" />
+        <img class="rank-avatar" src="${escapeHtml(String(row.avatar ?? "").trim() || assets.defaultAvatar)}" onerror="this.onerror=null;this.src='${assets.defaultAvatar}'" style="top:${y + 10}px" />
         <div class="rank-name" style="top:${y + 10}px">@${escapeHtml(row.name)}</div>
         <div class="rank-count" style="top:${y + 50}px">x${row.count}</div>
       `;

package/index.ts

@@ -1,12 +1,15 @@
-import { definePlugin, type MiokuContext } from "mioku";
+import {
+  definePlugin,
+  type CommandDefinition,
+  type MessageEvent,
+  type MiokuContext,
+} from "mioku";
 import { getService, Services } from "mioku";
 import { initDeerDatabase, type DeerDatabase } from "./db";
 import { handleDeerCommand, parseDeerCommand } from "./commands";
 
 const deerpipePlugin = definePlugin({
   name: "deerpipe",
-  version: "1.0.0",
-  description: "🦌管签到插件，支持自🦌、帮🦌、补🦌、🦌历、🦌榜",
 
   async setup(ctx: MiokuContext) {
     ctx.logger.info("deerpipe 插件正在初始化...");
@@ -30,7 +33,6 @@ const deerpipePlugin = definePlugin({
       };
     }
 
-    // 启动时清掉非本月的旧数据，与原版 cleanup 行为一致
     try {
       const now = new Date();
       await db.cleanupOtherMonths(now.getFullYear(), now.getMonth() + 1);
@@ -38,7 +40,6 @@ const deerpipePlugin = definePlugin({
       ctx.logger.warn(`deerpipe 启动期数据清理失败: ${error}`);
     }
 
-    // 每周一 4:00 清理跨月数据
     ctx.cron("0 4 * * 1", async () => {
       try {
         const now = new Date();
@@ -49,13 +50,9 @@ const deerpipePlugin = definePlugin({
       }
     });
 
-    ctx.handle("message", async (event) => {
-      const text = ctx.text(event);
-      if (!text) return;
-
+    const run = async (event: MessageEvent, text: string) => {
       const cmd = parseDeerCommand(text, Array.from(event.message ?? []));
       if (cmd.type === "none") return;
-
       try {
         await handleDeerCommand(cmd, {
           ctx,
@@ -71,6 +68,52 @@ const deerpipePlugin = definePlugin({
           // 忽略二次失败
         }
       }
+    };
+
+    const cmd = (command: CommandDefinition) =>
+      ctx.command({ ...command, prefixes: false });
+
+    cmd({
+      name: "🦌",
+      match: /^(?:🦌|鹿)(?:\s|$|@)/,
+      description: "签到一次（可加 @某人 帮其签到）",
+      usage: ".🦌 / .🦌 @张三",
+      handler: ({ event, body }) => run(event, body),
+    });
+    cmd({
+      name: "补🦌",
+      match: /^补(?:🦌|鹿)(?:\s|\d|$)/,
+      description: "补签本月之前未签到的某天",
+      usage: ".补🦌 5",
+      handler: ({ event, body }) => run(event, body),
+    });
+    cmd({
+      name: "🦌历",
+      match: /^(?:🦌|鹿)历(?:\s|$|@)/,
+      description: "查看本月🦌签到日历（可加 @某人）",
+      usage: ".🦌历 / .🦌历 @张三",
+      handler: ({ event, body }) => run(event, body),
+    });
+    cmd({
+      name: "🦌榜",
+      match: /^(?:🦌|鹿)榜(?:\s|$)/,
+      description: "查看本月本群🦌签到排行榜（仅群组）",
+      usage: ".🦌榜",
+      handler: ({ event, body }) => run(event, body),
+    });
+    cmd({
+      name: "帮🦌",
+      match: /^帮(?:🦌|鹿)(?:\s|$|@)/,
+      description: "允许/禁止被别人帮🦌；@某人需管理员",
+      usage: ".帮🦌 off",
+      handler: ({ event, body }) => run(event, body),
+    });
+    cmd({
+      name: "禁🦌",
+      match: /^禁(?:🦌|鹿)(?:\s|@|$)/,
+      description: "禁止某人在一段时间内🦌，省略时长视为解禁（仅管理员）",
+      usage: ".禁🦌 @张三 1d",
+      handler: ({ event, body }) => run(event, body),
     });
 
     ctx.logger.info("deerpipe 插件初始化完成");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-deerpipe",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "🦌管签到插件，支持自🦌、帮🦌、补🦌、🦌历、🦌榜",
   "main": "index.ts",
   "type": "module",
@@ -15,81 +15,7 @@
     "services": [
       "screenshot",
       "help"
-    ],
-    "accessHooks": [
-      {
-        "id": "🦌",
-        "match": "/^(?:🦌|鹿)(?:\\s|$|@)/",
-        "description": "自🦌或帮🦌"
-      },
-      {
-        "id": "补🦌",
-        "match": "/^补(?:🦌|鹿)(?:\\s|\\d|$)/",
-        "description": "补签本月之前未签到的某天"
-      },
-      {
-        "id": "🦌历",
-        "match": "/^(?:🦌|鹿)历(?:\\s|$|@)/",
-        "description": "查看本月🦌签到日历"
-      },
-      {
-        "id": "🦌榜",
-        "match": "/^(?:🦌|鹿)榜(?:\\s|$)/",
-        "description": "查看本月🦌签到排行榜"
-      },
-      {
-        "id": "帮🦌",
-        "match": "/^帮(?:🦌|鹿)(?:\\s|$|@)/",
-        "description": "允许/禁止被别人帮🦌"
-      },
-      {
-        "id": "禁🦌",
-        "match": "/^禁(?:🦌|鹿)(?:\\s|@|$)/",
-        "description": "禁止某人在一段时间内🦌"
-      }
-    ],
-    "help": {
-      "title": "🦌管签到",
-      "description": "每月🦌管签到，含日历与排行榜",
-      "commands": [
-        {
-          "cmd": "🦌",
-          "desc": "签到一次（可加 @某人 帮其签到）",
-          "usage": "🦌 / 🦌 @张三",
-          "role": "member"
-        },
-        {
-          "cmd": "补🦌 <日>",
-          "desc": "补签本月之前未签到的某天",
-          "usage": "补🦌 5",
-          "role": "member"
-        },
-        {
-          "cmd": "🦌历",
-          "desc": "查看本月🦌签到日历（可加 @某人）",
-          "usage": "🦌历 / 🦌历 @张三",
-          "role": "member"
-        },
-        {
-          "cmd": "🦌榜",
-          "desc": "查看本月本群🦌签到排行榜（仅群组）",
-          "usage": "🦌榜",
-          "role": "member"
-        },
-        {
-          "cmd": "帮🦌 <on|off> [@某人]",
-          "desc": "允许/禁止被别人帮🦌；@某人需管理员",
-          "usage": "帮🦌 off",
-          "role": "member"
-        },
-        {
-          "cmd": "禁🦌 @某人 [时长]",
-          "desc": "禁止某人在一段时间内🦌，省略时长视为解禁（仅管理员）",
-          "usage": "禁🦌 @张三 1d",
-          "role": "admin"
-        }
-      ]
-    }
+    ]
   },
   "peerDependencies": {
     "mioku": "^1.0.0"

package/types.ts

@@ -1,6 +1,6 @@
 export interface DeerUser {
   scene: string;
-  userId: number;
+  userId: string;
   canBeHelped: boolean;
   noDeerUntil: number | null;
 }
@@ -11,13 +11,13 @@ export interface DeerCheckInResult {
 }
 
 export interface DeerRankEntry {
-  userId: number;
+  userId: string;
   count: number;
 }
 
 export interface DeerScene {
   key: string;
   isGroup: boolean;
-  groupId?: number;
-  privateUserId?: number;
+  groupId?: string;
+  privateUserId?: string;
 }

package/utils.ts

@@ -2,18 +2,41 @@ import { createGroupRef, type MiokuContext } from "mioku";
 import * as fs from "fs/promises";
 import type { DeerScene } from "./types";
 
-export function getAvatarUrl(userId: number): string {
-  return `https://q1.qlogo.cn/g?b=qq&nk=${userId}&s=640`;
+const QQ_AVATAR_ADAPTERS = new Set(["onebotv11", "icqq"]);
+const QQ_ID_RE = /^\d{4,12}$/;
+
+/**
+ * 生成头像地址。仅在 QQ 系适配器且 id 是 QQ 号时才回退到 qlogo，
+ * 其他平台（如 qq-official 的 openid）没有通用头像接口，返回空串由调用方降级。
+ */
+export function getAvatarUrl(
+  userId: string,
+  options?: { avatar?: unknown; adapter?: unknown },
+): string {
+  const direct = String(options?.avatar ?? "").trim();
+  if (direct) return direct;
+  const id = String(userId ?? "").trim();
+  const adapter = String(options?.adapter ?? "").trim().toLowerCase();
+  if (adapter && !QQ_AVATAR_ADAPTERS.has(adapter)) return "";
+  return QQ_ID_RE.test(id) ? `https://q1.qlogo.cn/g?b=qq&nk=${id}&s=640` : "";
+}
+
+export function resolveAvatarUrl(event: any, userId: string): string {
+  const id = String(userId ?? "").trim();
+  const isSelf = id !== "" && id === String(event?.user_id ?? "").trim();
+  const avatar = isSelf ? event?.sender?.avatar ?? event?.avatar : undefined;
+  return getAvatarUrl(id, { avatar, adapter: event?.bot?.adapter });
 }
 
-export function getAtUserId(message: any[]): number | undefined {
+export function getAtUserId(message: any[]): string | undefined {
   if (!Array.isArray(message)) return undefined;
   for (const seg of message) {
     if (seg?.type !== "at") continue;
-    const raw = seg?.qq ?? seg?.data?.qq;
-    if (raw === "all" || raw == null) continue;
-    const qq = Number(raw);
-    if (Number.isFinite(qq)) return qq;
+    const raw = seg?.data?.qq ?? seg?.qq ?? seg?.data?.target ?? seg?.target;
+    if (raw == null) continue;
+    const id = String(raw).trim();
+    if (!id || id === "all") continue;
+    return id;
   }
   return undefined;
 }
@@ -21,22 +44,22 @@ export function getAtUserId(message: any[]): number | undefined {
 export function resolveScene(event: any): DeerScene {
   if (event?.message_type === "group" && event?.group_id != null) {
     return {
-      key: `g:${event.group_id}`,
+      key: `g:${String(event.group_id)}`,
       isGroup: true,
-      groupId: Number(event.group_id),
+      groupId: String(event.group_id),
     };
   }
   return {
-    key: `p:${event.user_id}`,
+    key: `p:${String(event.user_id ?? "")}`,
     isGroup: false,
-    privateUserId: Number(event.user_id),
+    privateUserId: String(event?.user_id ?? ""),
   };
 }
 
 export async function resolveUserName(
   ctx: MiokuContext,
   event: any,
-  userId: number,
+  userId: string,
 ): Promise<string> {
   const bot = event?.bot;
   if (event?.message_type === "group" && event?.group_id != null && bot) {
@@ -50,7 +73,7 @@ export async function resolveUserName(
       // fall through
     }
   }
-  if (Number(event?.user_id) === userId && event?.sender) {
+  if (String(event?.user_id ?? "") === userId && event?.sender) {
     const name =
       String(event.sender?.card || "").trim() ||
       String(event.sender?.nickname || "").trim();