mioku-plugin-impact 2.0.1 → 2.0.3

package/README.md

@@ -20,22 +20,20 @@
 npx mioku install plugin impact
 ```
 
-启用后请先在群里让管理员/群主/主人发送 `开启淫趴`（也支持 `开启银趴`、`开始银趴`），关闭则用 `关闭银趴` / `禁止淫趴` 等。
+启用后请先在群里让管理员/群主/主人发送 `.开启淫趴`（也支持 `.开启银趴`、`.开始银趴`），关闭则用 `.关闭银趴` / `.禁止淫趴` 等。
 
 ## 命令一览
 
 | 命令 | 说明 |
 | --- | --- |
-| `开启淫趴` / `关闭银趴` 等 | 在本群启用/关闭淫趴功能（仅管理/群主/主人） |
-| `打胶` / `开导` | 给自己增加随机长度（默认 5 分钟 CD） |
-| `嗦牛子 [@某人]` | 嗦自己或被 @ 群友的牛子（默认 5 分钟 CD） |
-| `pk @某人` / `对决 @某人` | 牛子对决，胜者抢走败者的部分长度（默认 1 分钟 CD） |
-| `查询 [@某人]` | 查询自己或目标的牛子长度 |
-| `jj排行榜` / `jj排名` / `jj榜单` / `jjrank` | 输出 Top5 与倒数 5 名图表，并附上自己的排名 |
-| `日群友` / `透群友 [@某人]` / `透群主` / `透管理` | 随机或定向选取一位幸运儿进行注入（默认 1 小时 CD，主人无 CD） |
-| `注入查询 [历史/全部] [@某人]` | 查询当日或全部历史被注入量；带 `历史` / `全部` 时附走势图 |
-
-> 帮助信息已经接入 mioku 自带的 `mioku-plugin-help`，群里使用对应的帮助命令即可看到上述命令列表，不再单独提供 `淫趴介绍`。
+| `.开启淫趴` / `.关闭银趴` 等 | 在本群启用/关闭淫趴功能（仅管理/群主/主人） |
+| `.打胶` / `.开导` | 给自己增加随机长度（默认 5 分钟 CD） |
+| `.嗦牛子 [@某人]` | 嗦自己或被 @ 群友的牛子（默认 5 分钟 CD） |
+| `.pk @某人` / `.对决 @某人` | 牛子对决，胜者抢走败者的部分长度（默认 1 分钟 CD） |
+| `.查询 [@某人]` | 查询自己或目标的牛子长度 |
+| `.jj排行榜` / `.jj排名` / `.jj榜单` / `.jjrank` | 输出 Top5 与倒数 5 名图表，并附上自己的排名 |
+| `.日群友` / `.透群友 [@某人]` / `.透群主` / `.透管理` | 随机或定向选取一位幸运儿进行注入（默认 1 小时 CD，主人无 CD） |
+| `.注入查询 [历史/全部] [@某人]` | 查询当日或全部历史被注入量；带 `历史` / `全部` 时附走势图 |
 
 ## 数据存储
 

package/db.ts

@@ -10,17 +10,17 @@ import { getToday, nowSeconds } from "./utils";
 export const DEFAULT_JJ_LENGTH = 10.0;
 
 export interface ImpactDatabase {
-  isUserInTable(userId: number): boolean;
-  addNewUser(userId: number): Promise<void>;
-  updateActivity(userId: number): Promise<void>;
-  getJjLength(userId: number): number;
+  isUserInTable(userId: string): boolean;
+  addNewUser(userId: string): Promise<void>;
+  updateActivity(userId: string): Promise<void>;
+  getJjLength(userId: string): number;
   /** 累加长度（可负）。先确保用户存在再调用。 */
-  addJjLength(userId: number, delta: number): Promise<void>;
-  isGroupAllowed(groupId: number): boolean;
-  setGroupAllow(groupId: number, allow: boolean): Promise<void>;
-  insertEjaculation(userId: number, volume: number): Promise<void>;
-  getEjaculationData(userId: number): EjaculationRecord[];
-  getTodayEjaculationVolume(userId: number): number;
+  addJjLength(userId: string, delta: number): Promise<void>;
+  isGroupAllowed(groupId: string): boolean;
+  setGroupAllow(groupId: string, allow: boolean): Promise<void>;
+  insertEjaculation(userId: string, volume: number): Promise<void>;
+  getEjaculationData(userId: string): EjaculationRecord[];
+  getTodayEjaculationVolume(userId: string): number;
   /** 一天没活跃的用户随机扣 0–1cm（仅对 jj_length > 1 的用户生效） */
   punishInactiveUsers(): Promise<number>;
   /** 全表按 jjLength 倒序排列 */
@@ -29,11 +29,73 @@ export interface ImpactDatabase {
 }
 
 interface UserRow {
-  user_id: number;
+  user_id: string;
   jj_length: number;
   last_masturbation_time: number;
 }
 
+/**
+ * 旧库的 users.user_id / groups.group_id 是 INTEGER PRIMARY KEY(rowid 别名),
+ * 写入 openid 会抛 SQLiteError: datatype mismatch,这里重建成 TEXT 并保留原数据。
+ */
+function widenLegacyIdColumns(db: Database): void {
+  const rebuild = (
+    table: string,
+    idColumn: string,
+    createSql: string,
+    columns: string,
+  ): void => {
+    const info = db
+      .query(`PRAGMA table_info(${table})`)
+      .all() as Array<{ name?: string; type?: string }>;
+    const column = info.find((item) => item.name === idColumn);
+    if (!column || String(column.type ?? "").toUpperCase() === "TEXT") return;
+
+    db.exec("BEGIN");
+    try {
+      db.exec(`ALTER TABLE ${table} RENAME TO ${table}_legacy`);
+      db.exec(createSql);
+      db.exec(
+        `INSERT INTO ${table} (${columns})
+           SELECT ${columns
+             .split(",")
+             .map((name) =>
+               name.trim() === idColumn
+                 ? `CAST(${idColumn} AS TEXT)`
+                 : name.trim(),
+             )
+             .join(", ")}
+           FROM ${table}_legacy`,
+      );
+      db.exec(`DROP TABLE ${table}_legacy`);
+      db.exec("COMMIT");
+    } catch (err) {
+      db.exec("ROLLBACK");
+      throw err;
+    }
+  };
+
+  rebuild(
+    "users",
+    "user_id",
+    `CREATE TABLE users (
+       user_id TEXT PRIMARY KEY,
+       jj_length REAL NOT NULL,
+       last_masturbation_time INTEGER NOT NULL
+     )`,
+    "user_id, jj_length, last_masturbation_time",
+  );
+  rebuild(
+    "groups",
+    "group_id",
+    `CREATE TABLE groups (
+       group_id TEXT PRIMARY KEY,
+       allow INTEGER NOT NULL DEFAULT 0
+     )`,
+    "group_id, allow",
+  );
+}
+
 export async function initImpactDatabase(): Promise<ImpactDatabase> {
   const dir = ensureDataDir("impact");
   const dbPath = path.join(dir, "impact.db");
@@ -43,19 +105,19 @@ export async function initImpactDatabase(): Promise<ImpactDatabase> {
 
   db.exec(`
     CREATE TABLE IF NOT EXISTS users (
-      user_id INTEGER PRIMARY KEY,
+      user_id TEXT PRIMARY KEY,
       jj_length REAL NOT NULL,
       last_masturbation_time INTEGER NOT NULL
     );
 
     CREATE TABLE IF NOT EXISTS groups (
-      group_id INTEGER PRIMARY KEY,
+      group_id TEXT PRIMARY KEY,
       allow INTEGER NOT NULL DEFAULT 0
     );
 
     CREATE TABLE IF NOT EXISTS ejaculations (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
-      user_id INTEGER NOT NULL,
+      user_id TEXT NOT NULL,
       date TEXT NOT NULL,
       volume REAL NOT NULL,
       UNIQUE(user_id, date)
@@ -63,6 +125,8 @@ export async function initImpactDatabase(): Promise<ImpactDatabase> {
     CREATE INDEX IF NOT EXISTS idx_ejaculations_user ON ejaculations(user_id, date);
   `);
 
+  widenLegacyIdColumns(db);
+
   const stmts = {
     insertUser: db.prepare(`
       INSERT INTO users (user_id, jj_length, last_masturbation_time)
@@ -214,7 +278,7 @@ export async function initImpactDatabase(): Promise<ImpactDatabase> {
     getRanking() {
       const rows = stmts.selectAllUsers.all({}) as UserRow[];
       return rows
-        .map((row) => ({ userId: row.user_id, jjLength: row.jj_length }))
+        .map((row) => ({ userId: String(row.user_id), jjLength: row.jj_length }))
         .sort((a, b) => b.jjLength - a.jjLength);
     },
 

package/handlers/dajiao.ts

@@ -4,12 +4,12 @@ import type { HandlerContext } from "./types";
 
 export async function handleDajiao(h: HandlerContext): Promise<void> {
   const { ctx, db, cd, config, event } = h;
-  const uid = String(event.user_id);
+  const uid = String(event.user_id ?? "").trim();
   const cdState = checkCooldown(cd.dj, uid, config.djCd);
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你已经打不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再打喵`,
         ),
@@ -21,25 +21,23 @@ export async function handleDajiao(h: HandlerContext): Promise<void> {
 
   markCooldown(cd.dj, uid);
 
-  if (db.isUserInTable(Number(uid))) {
+  if (db.isUserInTable(uid)) {
     const delta = getRandomNum();
-    await db.addJjLength(Number(uid), delta);
+    await db.addJjLength(uid, delta);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
-          `打胶结束喵, 你的${pickJj()}很满意喵, 长了${delta}cm喵, 目前长度为${db.getJjLength(
-            Number(uid),
-          )}cm喵`,
+          `打胶结束喵, 你的${pickJj()}很满意喵, 长了${delta}cm喵, 目前长度为${db.getJjLength(uid)}cm喵`,
         ),
       ],
       false,
     );
   } else {
-    await db.addNewUser(Number(uid));
+    await db.addNewUser(uid);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你还没有创建${pickJj()}, 咱帮你创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/open-module.ts

@@ -1,5 +1,3 @@
-import { isOwner } from "mioku";
-import { isGroupAdmin } from "../utils";
 import type { HandlerContext } from "./types";
 
 export async function handleOpenModule(
@@ -7,14 +5,7 @@ export async function handleOpenModule(
   enable: boolean,
 ): Promise<void> {
   const { ctx, db, event } = h;
-  if (!isOwner(event) && !isGroupAdmin(event)) {
-    await event.reply(
-      [ctx.segment.text("权限不足喵, 仅管理员/群主/主人可以开关淫趴")],
-      false,
-    );
-    return;
-  }
-  await db.setGroupAllow(Number(event.group_id), enable);
+  await db.setGroupAllow(String(event.group_id ?? "").trim(), enable);
   await event.reply(
     [ctx.segment.text(enable ? "功能已开启喵" : "功能已禁用喵")],
     false,

package/handlers/pk.ts

@@ -4,12 +4,12 @@ import type { HandlerContext } from "./types";
 
 export async function handlePk(h: HandlerContext): Promise<void> {
   const { ctx, db, cd, config, event } = h;
-  const uid = String(event.user_id);
+  const uid = String(event.user_id ?? "").trim();
   const cdState = checkCooldown(cd.pk, uid, config.pkCd);
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你已经pk不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再pk喵`,
         ),
@@ -24,10 +24,10 @@ export async function handlePk(h: HandlerContext): Promise<void> {
     // pk 必须带 @，无 @ 时不响应
     return;
   }
-  if (at === Number(uid)) {
+  if (at === uid) {
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text("你不能pk自己喵"),
       ],
       false,
@@ -37,15 +37,15 @@ export async function handlePk(h: HandlerContext): Promise<void> {
 
   markCooldown(cd.pk, uid);
 
-  const meIn = db.isUserInTable(Number(uid));
+  const meIn = db.isUserInTable(uid);
   const otherIn = db.isUserInTable(at);
   if (!meIn || !otherIn) {
-    if (!meIn) await db.addNewUser(Number(uid));
+    if (!meIn) await db.addNewUser(uid);
     if (!otherIn) await db.addNewUser(at);
     clearCooldown(cd.pk, uid);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你或对面还没有创建${pickJj()}喵, 咱全帮你创建了喵, 你们的${pickJj()}长度都是10cm喵`,
         ),
@@ -58,11 +58,11 @@ export async function handlePk(h: HandlerContext): Promise<void> {
   const win = Math.random() > 0.5;
   const delta = getRandomNum();
   if (win) {
-    await db.addJjLength(Number(uid), delta / 2);
+    await db.addJjLength(uid, delta / 2);
     await db.addJjLength(at, -delta);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `对决胜利喵, 你的${pickJj()}增加了${roundTo(
             delta / 2,
@@ -73,11 +73,11 @@ export async function handlePk(h: HandlerContext): Promise<void> {
       false,
     );
   } else {
-    await db.addJjLength(Number(uid), -delta);
+    await db.addJjLength(uid, -delta);
     await db.addJjLength(at, delta / 2);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `对决失败喵, 在对面牛子的阴影笼罩下你的${pickJj()}减小了${delta}cm喵, 对面增加了${roundTo(
             delta / 2,

package/handlers/query-injection.ts

@@ -8,7 +8,7 @@ export async function handleQueryInjection(
 ): Promise<void> {
   const { ctx, db, screenshot, event } = h;
   const at = getAtUserId(event.message);
-  const target = at ?? Number(event.user_id);
+  const target = at ?? String(event.user_id ?? "").trim();
   // 有 @ 用"该用户"，无 @ 用"您"
   const replay1 = at != null ? "该用户" : "您";
 

package/handlers/queryjj.ts

@@ -3,14 +3,14 @@ import type { HandlerContext } from "./types";
 
 export async function handleQueryJj(h: HandlerContext): Promise<void> {
   const { ctx, db, event } = h;
-  const uid = Number(event.user_id);
+  const uid = String(event.user_id ?? "").trim();
   const at = getAtUserId(event.message);
 
   if (at == null) {
     if (db.isUserInTable(uid)) {
       await event.reply(
         [
-          ctx.segment.at(String(uid)),
+          ctx.segment.at(uid),
           ctx.segment.text(`你的${pickJj()}目前长度为${db.getJjLength(uid)}cm喵`),
         ],
         false,
@@ -19,7 +19,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
       await db.addNewUser(uid);
       await event.reply(
         [
-          ctx.segment.at(String(uid)),
+          ctx.segment.at(uid),
           ctx.segment.text(
             `你还没有创建${pickJj()}喵, 咱帮你创建了喵, 目前长度是10cm喵`,
           ),
@@ -33,7 +33,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
   if (db.isUserInTable(at)) {
     await event.reply(
       [
-        ctx.segment.at(String(uid)),
+        ctx.segment.at(uid),
         ctx.segment.text(`TA的${pickJj()}目前长度为${db.getJjLength(at)}cm喵`),
       ],
       false,
@@ -42,7 +42,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
     await db.addNewUser(at);
     await event.reply(
       [
-        ctx.segment.at(String(uid)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `TA还没有创建${pickJj()}喵, 咱帮他创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/rank.ts

@@ -1,5 +1,5 @@
 import { renderRankChart, type RankRow } from "../image";
-import { getStrangerNickname, pickJj } from "../utils";
+import { getStrangerNickname, pickJj, resolveAvatarUrl } from "../utils";
 import type { HandlerContext } from "./types";
 
 export async function handleRank(h: HandlerContext): Promise<void> {
@@ -21,12 +21,14 @@ export async function handleRank(h: HandlerContext): Promise<void> {
   const top5 = ranking.slice(0, 5);
   const last5 = ranking.slice(-5);
 
-  const myIndex = ranking.findIndex((r) => r.userId === Number(event.user_id));
+  const myIndex = ranking.findIndex(
+    (r) => r.userId === String(event.user_id ?? "").trim(),
+  );
   if (myIndex < 0) {
-    await db.addNewUser(Number(event.user_id));
+    await db.addNewUser(String(event.user_id ?? "").trim());
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(String(event.user_id ?? "").trim()),
         ctx.segment.text(
           `你还没有创建${pickJj()}看不到rank喵, 咱帮你创建了喵, 目前长度是10cm喵`,
         ),
@@ -40,6 +42,7 @@ export async function handleRank(h: HandlerContext): Promise<void> {
     [...top5, ...last5].map(async (r) => ({
       name: await getStrangerNickname(event.bot, r.userId),
       userId: r.userId,
+      avatar: resolveAvatarUrl(event, r.userId),
       jjLength: r.jjLength,
     })),
   );
@@ -48,7 +51,7 @@ export async function handleRank(h: HandlerContext): Promise<void> {
 
   await event.reply(
     [
-      ctx.segment.at(String(event.user_id)),
+      ctx.segment.at(String(event.user_id ?? "").trim()),
       ctx.segment.image(imagePath),
       ctx.segment.text(`你的排名为${myIndex + 1}喵`),
     ],

package/handlers/suo.ts

@@ -4,12 +4,12 @@ import type { HandlerContext } from "./types";
 
 export async function handleSuo(h: HandlerContext): Promise<void> {
   const { ctx, db, cd, config, event } = h;
-  const uid = String(event.user_id);
+  const uid = String(event.user_id ?? "").trim();
   const cdState = checkCooldown(cd.suo, uid, config.suoCd);
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你已经嗦不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再嗦喵`,
         ),
@@ -22,26 +22,24 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
 
   const at = getAtUserId(event.message);
   if (at == null) {
-    if (db.isUserInTable(Number(uid))) {
+    if (db.isUserInTable(uid)) {
       const delta = getRandomNum();
-      await db.addJjLength(Number(uid), delta);
+      await db.addJjLength(uid, delta);
       await event.reply(
         [
-          ctx.segment.at(String(event.user_id)),
+          ctx.segment.at(uid),
           ctx.segment.text(
-            `你的${pickJj()}很满意喵, 嗦长了${delta}cm喵, 目前长度为${db.getJjLength(
-              Number(uid),
-            )}cm喵`,
+            `你的${pickJj()}很满意喵, 嗦长了${delta}cm喵, 目前长度为${db.getJjLength(uid)}cm喵`,
           ),
         ],
         false,
       );
     } else {
-      await db.addNewUser(Number(uid));
+      await db.addNewUser(uid);
       clearCooldown(cd.suo, uid);
       await event.reply(
         [
-          ctx.segment.at(String(event.user_id)),
+          ctx.segment.at(uid),
           ctx.segment.text(
             `你还没有创建${pickJj()}喵, 咱帮你创建了喵, 目前长度是10cm喵`,
           ),
@@ -57,7 +55,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
     await db.addJjLength(at, delta);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `对方的${pickJj()}很满意喵, 嗦长了${delta}cm喵, 目前长度为${db.getJjLength(
             at,
@@ -71,7 +69,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
     clearCooldown(cd.suo, uid);
     await event.reply(
       [
-        ctx.segment.at(String(event.user_id)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `TA还没有创建${pickJj()}喵, 咱帮TA创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/yinpa.ts

@@ -1,15 +1,15 @@
-import { isOwner } from "mioku";
+import type { MiokuContext } from "mioku";
 import { checkCooldown, clearCooldown, markCooldown } from "../state";
 import {
   getAtUserId,
-  getAvatarUrl,
   getSenderName,
+  resolveAvatarUrl,
   roundTo,
 } from "../utils";
 import type { HandlerContext } from "./types";
 
 interface PrepMember {
-  user_id: number;
+  user_id: string;
   role: "owner" | "admin" | "member";
   card?: string;
   nickname?: string;
@@ -27,15 +27,15 @@ export async function handleYinpa(
   subject: "owner" | "admin" | "member",
 ): Promise<void> {
   const { ctx, db, cd, config, event } = h;
-  const uid = Number(event.user_id);
-  const uidKey = String(uid);
+  const miokuCtx = ctx as MiokuContext;
+  const uid = String(event.user_id ?? "").trim();
 
-  const cdState = checkCooldown(cd.fuck, uidKey, config.fuckCd);
+  const cdState = checkCooldown(cd.fuck, uid, config.fuckCd);
   // 主人不受 CD 限制
-  if (!cdState.ok && !isOwner(event)) {
+  if (!cdState.ok && !miokuCtx.isMaster?.(event)) {
     await event.reply(
       [
-        ctx.segment.at(String(uid)),
+        ctx.segment.at(uid),
         ctx.segment.text(
           `你已经榨不出来任何东西了, 请先休息${roundTo(cdState.remaining, 3)}秒`,
         ),
@@ -44,7 +44,7 @@ export async function handleYinpa(
     );
     return;
   }
-  markCooldown(cd.fuck, uidKey);
+  markCooldown(cd.fuck, uid);
 
   const reqUserCard = getSenderName(event);
   let prepList: PrepMember[];
@@ -53,19 +53,19 @@ export async function handleYinpa(
     if (!bot) throw new Error("bot not found");
     const members = await bot.getGroupMembers(String(event.group_id));
     prepList = members.map((m: import("mioku").MemberInfo) => ({
-      user_id: Number(m.user_id),
+      user_id: String(m.user_id ?? "").trim(),
       role: (m.role as PrepMember["role"]) ?? "member",
       card: m.card,
       nickname: m.nickname,
     }));
   } catch (err) {
-    clearCooldown(cd.fuck, uidKey);
+    clearCooldown(cd.fuck, uid);
     ctx.logger.error(`impact: 获取群成员列表失败: ${err}`);
     await event.reply([ctx.segment.text("喵喵喵? 拿不到群成员列表了！")], false);
     return;
   }
 
-  let lucky: number | null;
+  let lucky: string | null;
   if (subject === "owner") {
     lucky = await pickOwner(prepList, uid, reqUserCard, ctx, event);
   } else if (subject === "admin") {
@@ -75,7 +75,7 @@ export async function handleYinpa(
   }
   if (lucky == null) {
     // pickXxx 内部已 finish 并清掉 CD
-    clearCooldown(cd.fuck, uidKey);
+    clearCooldown(cd.fuck, uid);
     return;
   }
 
@@ -95,13 +95,14 @@ export async function handleYinpa(
     "群友";
   const todayTotal = db.getTodayEjaculationVolume(lucky);
   const seconds = 1 + Math.floor(Math.random() * 20);
+  const avatarUrl = resolveAvatarUrl(event, lucky);
 
   await event.reply(
     [
       ctx.segment.text(
         `好欸！${reqUserCard}(${uid})用时${seconds}秒 \n给 ${luckyCard}(${lucky}) 注入了${volume}毫升的脱氧核糖核酸, 当日总注入量为：${todayTotal}毫升\n`,
       ),
-      ctx.segment.image(getAvatarUrl(lucky)),
+      ...(avatarUrl ? [ctx.segment.image(avatarUrl)] : []),
     ],
     false,
   );
@@ -109,11 +110,11 @@ export async function handleYinpa(
 
 async function pickOwner(
   prepList: PrepMember[],
-  uid: number,
+  uid: string,
   reqUserCard: string,
   ctx: any,
   event: any,
-): Promise<number | null> {
+): Promise<string | null> {
   // 找不到群主时回退到自己
   const owner = prepList.find((p) => p.role === "owner");
   const lucky = owner?.user_id ?? uid;
@@ -130,12 +131,14 @@ async function pickOwner(
 
 async function pickAdmin(
   prepList: PrepMember[],
-  uid: number,
+  uid: string,
   reqUserCard: string,
   ctx: any,
   event: any,
-): Promise<number | null> {
-  let admins = prepList.filter((p) => p.role === "admin").map((p) => p.user_id);
+): Promise<string | null> {
+  let admins = prepList
+    .filter((p) => p.role === "admin")
+    .map((p) => p.user_id);
   if (admins.includes(uid)) {
     // 自己是管理的话移除自己
     admins = admins.filter((id) => id !== uid);
@@ -154,11 +157,11 @@ async function pickAdmin(
 
 async function pickMember(
   prepList: PrepMember[],
-  uid: number,
+  uid: string,
   reqUserCard: string,
   ctx: any,
   event: any,
-): Promise<number | null> {
+): Promise<string | null> {
   const at = getAtUserId(event.message);
   if (at != null) {
     // 有 @ 就直接指定目标，不播报抽取提示

package/image.ts

@@ -1,9 +1,10 @@
 import type { ScreenshotService } from "mioku";
-import { escapeHtml, getAvatarUrl } from "./utils";
+import { escapeHtml } from "./utils";
 
 export interface RankRow {
   name: string;
-  userId: number;
+  userId: string;
+  avatar?: string;
   jjLength: number;
 }
 
@@ -67,9 +68,14 @@ export async function renderRankChart(
       const center = trackLeft + trackWidth / 2;
       const barLeft = isPositive ? center : center - barWidth;
       const labelText = `${row.jjLength.toFixed(2)} cm`;
+      const avatar = String(row.avatar ?? "").trim();
       return `
         <div class="row" style="top:${headerHeight + i * rowHeight}px;">
-          <img class="avatar" src="${escapeHtml(getAvatarUrl(row.userId))}" />
+          ${
+            avatar
+              ? `<img class="avatar" src="${escapeHtml(avatar)}" />`
+              : ""
+          }
           <div class="name">${escapeHtml(truncate(row.name, 9))}</div>
           <div class="track" style="left:${trackLeft}px; width:${trackWidth}px;">
             <div class="axis"></div>

package/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin, type MiokuContext } from "mioku";
+import { definePlugin, type CommandDefinition, type MiokuContext } from "mioku";
 import {
   cloneConfig,
   DEFAULT_CONFIG,
@@ -16,14 +16,21 @@ import { handleRank } from "./handlers/rank";
 import { handleSuo } from "./handlers/suo";
 import { handleYinpa } from "./handlers/yinpa";
 import type { HandlerContext } from "./handlers/types";
-import { parseImpactCommand } from "./router";
 import { createCooldownState } from "./state";
 import { NOT_ALLOW_TEXT, isGroupEvent } from "./utils";
 
+type HandlerType =
+  | "pk"
+  | "dajiao"
+  | "suo"
+  | "queryjj"
+  | "rank"
+  | "yinpa"
+  | "open_module"
+  | "query_injection";
+
 const impactPlugin = definePlugin({
   name: "impact",
-  version: "1.0.0",
-  description: "让群友们眼前一黑的淫趴插件（牛子比拼），移植自 nonebot_plugin_impact",
 
   async setup(ctx: MiokuContext) {
     ctx.logger.info("impact 插件正在初始化...");
@@ -74,33 +81,22 @@ const impactPlugin = definePlugin({
       });
     }
 
-    ctx.handle("message", async (event: any) => {
+    const run = (type: HandlerType) => async (event: any, extra?: unknown) => {
       if (!isGroupEvent(event)) return;
-      const text = ctx.text(event);
-      if (!text) return;
-
-      const cmd = parseImpactCommand(text);
-      if (cmd.type === "none") return;
-
       const h: HandlerContext = { ctx, db, cd, config, screenshot, event };
-
       try {
-        // open_module 始终可用，不受群开关限制
-        if (cmd.type === "open_module") {
-          await handleOpenModule(h, cmd.enable);
+        if (type === "open_module") {
+          await handleOpenModule(h, extra as boolean);
           return;
         }
-
-        // 其余命令需要群开启了银趴
-        if (!db.isGroupAllowed(Number(event.group_id))) {
+        if (!db.isGroupAllowed(String(event.group_id ?? "").trim())) {
           await event.reply(
-            [ctx.segment.at(String(event.user_id)), ctx.segment.text(NOT_ALLOW_TEXT)],
+            [ctx.segment.at(String(event.user_id ?? "").trim()), ctx.segment.text(NOT_ALLOW_TEXT)],
             false,
           );
           return;
         }
-
-        switch (cmd.type) {
+        switch (type) {
           case "pk":
             return await handlePk(h);
           case "dajiao":
@@ -112,12 +108,12 @@ const impactPlugin = definePlugin({
           case "rank":
             return await handleRank(h);
           case "yinpa":
-            return await handleYinpa(h, cmd.subject);
+            return await handleYinpa(h, extra as "owner" | "admin" | "member");
           case "query_injection":
-            return await handleQueryInjection(h, cmd.mode);
+            return await handleQueryInjection(h, extra as "today" | "history");
         }
       } catch (error) {
-        ctx.logger.error(`impact 命令 ${cmd.type} 执行失败: ${error}`);
+        ctx.logger.error(`impact 命令 ${type} 执行失败: ${error}`);
         try {
           await event.reply(
             [ctx.segment.text(`淫趴插件出错了喵: ${String(error)}`)],
@@ -127,6 +123,81 @@ const impactPlugin = definePlugin({
           // 忽略二次失败
         }
       }
+    };
+
+    // 裸触发设计:开启淫趴 / .开启淫趴 都可用
+    const cmd = (command: CommandDefinition) =>
+      ctx.command({ ...command, prefixes: false });
+
+    cmd({
+      id: "开启淫趴",
+      name: "开启淫趴",
+      match: /^(?:开始银趴|关闭银趴|开启淫趴|禁止淫趴|开启银趴|禁止银趴)\s*$/,
+      permission: "admin",
+      description: "在本群开启或关闭淫趴功能",
+      usage: ".开启淫趴 / .关闭银趴",
+      handler: ({ event, match }) =>
+        run("open_module")(event, match![0].startsWith("开启") || match![0].startsWith("开始")),
+    });
+    cmd({
+      id: "日透",
+      name: "日群友",
+      match: /^(日群友|透群友|日群主|透群主|日管理|透管理)(?:\s|$|@)/,
+      description: "随机或定向选取一位幸运儿进行注入，按命令决定身份",
+      usage: ".日群友 / .透群友 @某人 / .透群主 / .透管理",
+      handler: ({ event, match }) => {
+        const word = match![1];
+        const subject = word.includes("群主") ? "owner" : word.includes("管理") ? "admin" : "member";
+        return run("yinpa")(event, subject);
+      },
+    });
+    cmd({
+      id: "pk",
+      name: "pk",
+      match: /^(?:pk|PK|对决)(?:\s|@|$)/,
+      description: "和 @ 的群友进行牛子对决，胜者抢走败者的随机长度",
+      usage: ".pk @某人",
+      handler: ({ event }) => run("pk")(event),
+    });
+    cmd({
+      id: "打胶",
+      name: "打胶",
+      match: /^(?:打胶|开导)\s*$/,
+      description: "给自己的牛子增加一段随机长度",
+      handler: ({ event }) => run("dajiao")(event),
+    });
+    cmd({
+      id: "嗦牛子",
+      name: "嗦牛子",
+      match: /^嗦牛子(?:\s|@|$)/,
+      description: "嗦自己或被 @ 的群友的牛子，增加随机长度",
+      usage: ".嗦牛子 / .嗦牛子 @某人",
+      handler: ({ event }) => run("suo")(event),
+    });
+    cmd({
+      id: "查询",
+      name: "查询",
+      match: /^查询(?:\s|@|$)/,
+      description: "查询自己或 @ 的群友的牛子长度",
+      usage: ".查询 / .查询 @某人",
+      handler: ({ event }) => run("queryjj")(event),
+    });
+    cmd({
+      id: "注入查询",
+      name: "注入查询",
+      match: /^(?:注入查询|摄入查询|射入查询)(.*)$/,
+      description: "查询当日或全部历史被注入量，加 历史/全部 看走势图",
+      usage: ".注入查询 / .注入查询 历史 / .注入查询 @某人 全部",
+      handler: ({ event, match }) =>
+        run("query_injection")(event, /历史|全部/.test(match![1] || "") ? "history" : "today"),
+    });
+    cmd({
+      id: "jj排行榜",
+      name: "jj排行榜",
+      match: /^(?:jj|JJ)(?:排行榜|排名|榜单|rank|RANK)(?:\s|$)/,
+      description: "查看牛子长度前五与倒数五名的图表",
+      usage: ".jj排行榜 / .jjrank",
+      handler: ({ event }) => run("rank")(event),
     });
 
     ctx.logger.info("impact 插件初始化完成");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-impact",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "让群友们眼前一黑的淫趴插件",
   "main": "index.ts",
   "type": "module",
@@ -16,102 +16,7 @@
       "screenshot",
       "help",
       "config"
-    ],
-    "accessHooks": [
-      {
-        "id": "开启淫趴",
-        "match": "/^(?:开启|禁止|开始|关闭)(?:淫趴|银趴)\\s*$/",
-        "description": "群内开启或关闭淫趴功能"
-      },
-      {
-        "id": "日透",
-        "match": "/^(?:日群友|透群友|日群主|透群主|日管理|透管理)(?:\\s|$|@)/",
-        "description": "日 / 透 系列命令"
-      },
-      {
-        "id": "打胶",
-        "match": "/^(?:打胶|开导)\\s*$/",
-        "description": "打胶 / 开导"
-      },
-      {
-        "id": "嗦牛子",
-        "match": "/^嗦牛子(?:\\s|$|@)/",
-        "description": "嗦自己或被 @ 群友的牛子"
-      },
-      {
-        "id": "pk",
-        "match": "/^(?:pk|PK|对决)(?:\\s|@|$)/",
-        "description": "牛子对决"
-      },
-      {
-        "id": "查询",
-        "match": "/^查询(?:\\s|@|$)/",
-        "description": "查询自己或被 @ 群友的牛子长度"
-      },
-      {
-        "id": "注入查询",
-        "match": "/^(?:注入查询|摄入查询|射入查询)/",
-        "description": "查询当日或历史被注入量"
-      },
-      {
-        "id": "jj排行榜",
-        "match": "/^(?:jj|JJ)(?:排行榜|排名|榜单|rank|RANK)(?:\\s|$)/",
-        "description": "牛子长度排行榜"
-      }
-    ],
-    "help": {
-      "title": "淫趴 ",
-      "description": "让群友们眼前一黑的牛子比拼插件",
-      "commands": [
-        {
-          "cmd": "开启淫趴 / 禁止淫趴",
-          "desc": "在本群开启或关闭淫趴功能（管理员/群主/主人可用）",
-          "usage": "开启淫趴 / 关闭银趴",
-          "role": "admin"
-        },
-        {
-          "cmd": "打胶 / 开导",
-          "desc": "给自己的牛子增加一段随机长度",
-          "role": "member"
-        },
-        {
-          "cmd": "嗦牛子",
-          "desc": "嗦自己或被 @ 的群友的牛子，增加随机长度",
-          "usage": "嗦牛子 / 嗦牛子 @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "pk / 对决",
-          "desc": "和 @ 的群友进行牛子对决，胜者抢走败者的随机长度",
-          "usage": "pk @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "查询",
-          "desc": "查询自己或 @ 的群友的牛子长度",
-          "usage": "查询 / 查询 @某人",
-          "role": "member"
-        },
-        {
-          "cmd": "jj排行榜",
-          "desc": "查看牛子长度前五与倒数五名的图表",
-          "usage": "jj排行榜 / jjrank",
-          "role": "member"
-        },
-        {
-          "cmd": "日群友 / 透群友 / 透群主 / 透管理",
-          "desc": "随机或定向选取一位幸运儿进行注入，按命令决定身份",
-          "usage": "日群友 / 透群友 @某人 / 透群主 / 透管理",
-          "role": "member"
-        },
-        {
-          "cmd": "注入查询",
-          "desc": "查询当日或全部历史被注入量，加 历史/全部 看走势图",
-          "usage": "注入查询 / 注入查询 历史 / 注入查询 @某人 全部",
-          "role": "member"
-        }
-      ]
-    }
+    ]
   },
   "peerDependencies": {
     "mioku": "^1.0.0"

package/types.ts

@@ -5,7 +5,7 @@ export interface EjaculationRecord {
 }
 
 export interface RankEntry {
-  userId: number;
+  userId: string;
   jjLength: number;
 }
 

package/utils.ts

@@ -35,17 +35,18 @@ export function roundTo(value: number, digits: number): number {
 }
 
 /**
- * 提取消息里第一个 @ 的 QQ 号，忽略 @全体。
- * 找不到返回 undefined。
+ * 提取消息里第一个 @ 的目标 id，忽略 @全体。
+ * 兼容 qq-official 的 target 段。找不到返回 undefined。
  */
-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 == null || raw === "all") 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;
 }
@@ -54,11 +55,6 @@ export function isGroupEvent(event: any): boolean {
   return event?.message_type === "group" && event?.group_id != null;
 }
 
-export function isGroupAdmin(event: any): boolean {
-  const role = event?.sender?.role;
-  return role === "admin" || role === "owner";
-}
-
 export function getSenderName(event: any): string {
   const card = String(event?.sender?.card || "").trim();
   if (card) return card;
@@ -69,7 +65,7 @@ export function getSenderName(event: any): string {
 
 export async function getStrangerNickname(
   bot: import("mioku").Bot | undefined,
-  userId: number,
+  userId: string,
 ): Promise<string> {
   try {
     const info = bot ? await bot.getFriendInfo(userId) : undefined;
@@ -81,8 +77,30 @@ export async function getStrangerNickname(
   return String(userId);
 }
 
-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 escapeHtml(value: string): string {

package/router.ts

@@ -1,94 +0,0 @@
-export type ImpactCommand =
-  | { type: "pk" }
-  | { type: "dajiao" }
-  | { type: "suo" }
-  | { type: "queryjj" }
-  | { type: "rank" }
-  | { type: "yinpa"; subject: "member" | "owner" | "admin" }
-  | { type: "open_module"; enable: boolean }
-  | { type: "query_injection"; mode: "today" | "history" }
-  | { type: "none" };
-
-const YINPA_RE =
-  /^(?:日群友|透群友|日群主|透群主|日管理|透管理)(?:\s|$|@)/u;
-
-const OPEN_MODULE_RE =
-  /^(?:开始银趴|关闭银趴|开启淫趴|禁止淫趴|开启银趴|禁止银趴)\s*$/u;
-
-const RANK_HEADS = new Set([
-  "jj排行榜",
-  "jj排名",
-  "jj榜单",
-  "jjrank",
-  "JJ排行榜",
-  "JJ排名",
-  "JJ榜单",
-  "JJrank",
-  "JJRANK",
-]);
-
-/**
- * 把消息文本解析成 impact 命令。
- * 仅看消息开头（去掉前导空白），命中失败返回 { type: "none" }。
- */
-export function parseImpactCommand(text: string): ImpactCommand {
-  const head = text.replace(/^\s+/, "");
-  if (!head) return { type: "none" };
-
-  // 银趴开关：完整匹配
-  const open = head.match(OPEN_MODULE_RE);
-  if (open) {
-    const word = open[0];
-    const enable = word.startsWith("开启") || word.startsWith("开始");
-    return { type: "open_module", enable };
-  }
-
-  // 透/日 系列
-  const yinpa = head.match(YINPA_RE);
-  if (yinpa) {
-    const word = yinpa[0];
-    const subject: "owner" | "admin" | "member" = word.includes("群主")
-      ? "owner"
-      : word.includes("管理")
-      ? "admin"
-      : "member";
-    return { type: "yinpa", subject };
-  }
-
-  // pk / 对决：要求形如 "pk @某人" 或 "pk"。具体的 at 校验放到 handler。
-  if (/^(pk|PK|对决)(\s|@|$)/.test(head)) {
-    return { type: "pk" };
-  }
-
-  // 打胶 / 开导：完整匹配
-  if (/^(打胶|开导)\s*$/.test(head)) {
-    return { type: "dajiao" };
-  }
-
-  // 嗦牛子
-  if (/^嗦牛子(\s|@|$)/.test(head)) {
-    return { type: "suo" };
-  }
-
-  // 注入查询 / 摄入查询 / 射入查询
-  const inj = head.match(/^(?:注入查询|摄入查询|射入查询)(.*)$/u);
-  if (inj) {
-    const rest = inj[1] || "";
-    const mode = /历史|全部/.test(rest) ? "history" : "today";
-    return { type: "query_injection", mode };
-  }
-
-  // 排行榜
-  for (const word of RANK_HEADS) {
-    if (head === word || head.startsWith(`${word} `) || head.startsWith(`${word}\n`)) {
-      return { type: "rank" };
-    }
-  }
-
-  // 只匹配 "查询" + 空白/at/结束，避免误吞太多文本
-  if (/^查询(\s|@|$)/.test(head)) {
-    return { type: "queryjj" };
-  }
-
-  return { type: "none" };
-}