mioku-plugin-admin 2.3.5 → 3.0.1

package/verify/index.ts

@@ -1,4 +1,5 @@
-import type { MiokiContext } from "mioki";
+import type { Bot, MiokuContext, RouteEvent } from "mioku";
+
 import { existsSync } from "fs";
 import { getMemberRole } from "../config";
 import { resolveMemberName, triggerSingleWelcome } from "../notify/welcome";
@@ -50,21 +51,17 @@ export function createVerifyController(
     }
   }
 
-  async function recallMessage(bot: any, messageId: number) {
+  async function recallMessage(bot: Bot, messageId: number) {
     try {
-      await bot.api("delete_msg", { message_id: messageId });
+      await bot.recallMessage(messageId);
     } catch (err) {
       ctx.logger.warn(`admin verify 撤回消息失败: ${err}`);
     }
   }
 
-  async function kickMember(bot: any, groupId: number, userId: number) {
+  async function kickMember(bot: Bot, groupId: number, userId: number) {
     try {
-      await bot.api("set_group_kick", {
-        group_id: groupId,
-        user_id: userId,
-        reject_add_request: false,
-      });
+      await bot.kickMember(groupId, userId, false);
     } catch (err) {
       ctx.logger.warn(`admin verify 踢出成员失败: ${err}`);
     }
@@ -78,20 +75,32 @@ export function createVerifyController(
     }
   }
 
-  async function passVerification(p: PendingVerify) {
+  async function passVerification(p: PendingVerify, bot?: Bot) {
     if (p.passed) return;
     p.passed = true;
     clearTimers(p);
     pending.delete(pendingKey(p.selfId, p.groupId, p.userId));
 
-    if (p.mode === "reaction" && p.promptMessageId) {
-      const bot = ctx.pickBot(p.selfId);
-      if (bot) {
-        try {
-          await bot.addReaction(p.promptMessageId, PASS_REACTION_EMOJI_ID);
-        } catch (err) {
-          ctx.logger.warn(`admin verify 通过表态失败: ${err}`);
+    if (
+      p.mode === "reaction" &&
+      p.promptMessageId &&
+      bot &&
+      (bot.adapter === "onebotv11" || bot.adapter === "icqq")
+    ) {
+      try {
+        if (bot.adapter === "onebotv11") {
+          // onebot：set_msg_emoji_like 专属 action
+          await bot.sendApi("set_msg_emoji_like", {
+            message_id: p.promptMessageId,
+            emoji_id: PASS_REACTION_EMOJI_ID,
+            set: true,
+          });
+        } else {
+          // icqq：Group.setReaction（0x9082）
+          await bot.setReaction(p.promptMessageId, PASS_REACTION_EMOJI_ID, true);
         }
+      } catch (err) {
+        ctx.logger.warn(`admin verify 通过表态失败: ${err}`);
       }
     }
 
@@ -102,7 +111,7 @@ export function createVerifyController(
         groupId: p.groupId,
         userId: p.userId,
         groupName: p.groupName,
-      });
+      }, bot);
       if (customSent) return;
       await triggerSingleWelcome({
         ctx,
@@ -120,33 +129,33 @@ export function createVerifyController(
     }
   }
 
-  async function failKick(p: PendingVerify, reason: string) {
+  async function failKick(p: PendingVerify, reason: string, bot?: Bot) {
     clearTimers(p);
     pending.delete(pendingKey(p.selfId, p.groupId, p.userId));
     const cfg = getVerifyConfig();
     if (!cfg.kickOnFail) return;
-    const bot = ctx.pickBot(p.selfId);
-    if (!bot) return;
+    const target = bot ?? p.bot;
+    if (!target) return;
     ctx.logger.info(
       `admin verify 踢出群 ${p.groupId} 用户 ${p.userId}（${reason}）`,
     );
-    await kickMember(bot, p.groupId, p.userId);
+    await kickMember(target, p.groupId, p.userId);
   }
 
-  async function timeoutExpire(p: PendingVerify) {
+  async function timeoutExpire(p: PendingVerify, bot?: Bot) {
     p.timeoutTimer = null;
     const cfg = getVerifyConfig();
     if (!cfg.kickOnTimeout) {
       pending.delete(pendingKey(p.selfId, p.groupId, p.userId));
       return;
     }
-    const bot = ctx.pickBot(p.selfId);
-    if (!bot) {
+    const target = bot ?? p.bot;
+    if (!target) {
       pending.delete(pendingKey(p.selfId, p.groupId, p.userId));
       return;
     }
     try {
-      await bot.sendGroupMsg(p.groupId, [
+      await target.sendMessage({ type: "group", group_id: p.groupId}, [
         ctx.segment.at(String(p.userId)),
         ctx.segment.text(" 验证超时啦，下次再来哦～"),
       ]);
@@ -154,25 +163,25 @@ export function createVerifyController(
       ctx.logger.warn(`admin verify 超时提示发送失败: ${err}`);
     }
     ctx.logger.info(`admin verify 超时踢出群 ${p.groupId} 用户 ${p.userId}`);
-    await kickMember(bot, p.groupId, p.userId);
+    await kickMember(target, p.groupId, p.userId);
     pending.delete(pendingKey(p.selfId, p.groupId, p.userId));
   }
 
   async function startVerification(
     info: MemberJoinInfo,
+    bot?: Bot,
     skipDelay = false,
   ): Promise<boolean> {
     const cfg = getVerifyConfig();
     const groupCfg = getGroupVerifyConfig(cfg, info.groupId);
     if (!groupCfg.enabled) return false;
 
-    const bot = ctx.pickBot(info.selfId);
     if (!bot) return false;
 
     const botRole = await getMemberRole(bot, info.groupId, info.selfId);
     if (botRole !== "owner" && botRole !== "admin") {
       try {
-        await bot.sendGroupMsg(info.groupId, [
+        await bot.sendMessage({ type: "group", group_id: info.groupId}, [
           ctx.segment.text("我在不是管理员，没法入群验证啦，本群验证已关闭~"),
         ]);
       } catch (err) {
@@ -188,9 +197,9 @@ export function createVerifyController(
     const mode = groupCfg.mode;
     const memberName = await resolveMemberName(
       ctx,
+      bot,
       info.groupId,
       info.userId,
-      info.selfId,
     );
 
     const entry: PendingVerify = {
@@ -200,6 +209,7 @@ export function createVerifyController(
       memberName,
       groupName: info.groupName,
       mode,
+      bot,
       invalidCount: 0,
       startedAt: Date.now(),
       passed: false,
@@ -232,7 +242,7 @@ export function createVerifyController(
 
     entry.timeoutTimer = setTimeout(
       () => {
-        void timeoutExpire(entry);
+        void timeoutExpire(entry, bot);
       },
       Math.max(1000, cfg.verifyTimeoutMs),
     );
@@ -240,7 +250,7 @@ export function createVerifyController(
     return true;
   }
 
-  async function onGroupMessage(event: any) {
+  async function onGroupMessage(event: RouteEvent<"message.group">) {
     if (event?.message_type !== "group") return;
     const selfId = Number(event?.self_id || 0);
     const groupId = Number(event?.group_id || 0);
@@ -255,23 +265,23 @@ export function createVerifyController(
     const cfg = getVerifyConfig();
     const text = ctx.text(event) || "";
     const messageId = Number(event?.message_id || 0);
-    const bot = ctx.pickBot(selfId);
+    const bot = event.bot;
 
     if (p.mode === "number" && isNumberAnswerCorrect(p, text)) {
-      await passVerification(p);
+      await passVerification(p, bot);
       return;
     }
 
     if (p.mode === "chiral") {
       const result = checkChiralAnswer(p, text);
       if (result.status === "pass") {
-        await passVerification(p);
+        await passVerification(p, bot);
         return;
       }
       if (result.status === "progress") {
         if (bot) {
           try {
-            await bot.sendGroupMsg(groupId, [
+            await bot.sendMessage({ type: "group", group_id: groupId}, [
               ctx.segment.at(String(userId)),
               ctx.segment.text(` 答对一部分啦，还差 ${result.remaining} 个哦~`),
             ]);
@@ -289,24 +299,25 @@ export function createVerifyController(
 
     p.invalidCount += 1;
     if (p.invalidCount >= cfg.maxInvalidMessages) {
-      await failKick(p, `连续 ${cfg.maxInvalidMessages} 次无关消息`);
+      await failKick(p, `连续 ${cfg.maxInvalidMessages} 次无关消息`, bot);
     }
   }
 
-  async function onGroupReaction(event: any) {
+  async function onGroupReaction(event: RouteEvent<"notice.group.reaction">) {
     const selfId = Number(event?.self_id || 0);
     const groupId = Number(event?.group_id || 0);
     const userId = Number(event?.user_id || 0);
     if (!selfId || !groupId || !userId) return;
     if (userId === selfId) return;
-    if (event?.is_add === false) return;
+    const raw = event.raw as { is_add?: boolean } | undefined;
+    if (raw?.is_add === false) return;
 
     const key = pendingKey(selfId, groupId, userId);
     const p = pending.get(key);
     if (!p || p.passed || p.mode !== "reaction") return;
 
     if (isReactionPass(p, event)) {
-      await passVerification(p);
+      await passVerification(p, event.bot);
     }
   }
 
@@ -348,20 +359,23 @@ export function createVerifyController(
     },
   );
 
-  async function restartVerification(info: MemberJoinInfo): Promise<boolean> {
+  async function restartVerification(info: MemberJoinInfo, bot?: Bot): Promise<boolean> {
     removePending(pendingKey(info.selfId, info.groupId, info.userId));
-    return startVerification(info, true);
+    return startVerification(info, bot, true);
   }
 
   async function bypassVerification(info: MemberJoinInfo): Promise<void> {
     removePending(pendingKey(info.selfId, info.groupId, info.userId));
   }
 
-  async function trySendCustomWelcome(info: MemberJoinInfo): Promise<boolean> {
+  async function trySendCustomWelcome(
+    info: MemberJoinInfo,
+    bot?: Bot,
+  ): Promise<boolean> {
     const groupCfg = getGroupVerifyConfig(getVerifyConfig(), info.groupId);
     if (!hasCustomPrompt(groupCfg)) return false;
-    const bot = ctx.pickBot(info.selfId);
     if (!bot) return false;
+    const target = bot;
     const segments: any[] = [];
     const prompt = String(groupCfg.customPrompt || "").trim();
     if (prompt) {
@@ -380,7 +394,7 @@ export function createVerifyController(
     }
     if (!segments.length) return false;
     try {
-      await bot.sendGroupMsg(info.groupId, segments);
+      await target.sendMessage({ type: "group", group_id: info.groupId}, segments);
       return true;
     } catch (err) {
       ctx.logger.error(`admin verify 发送自定义入群提示失败: ${err}`);

package/verify/number.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { VerifyConfig } from "./config";
 import type { PendingVerify } from "./types";
 
@@ -17,17 +17,17 @@ function extractNumbers(text: string): number[] {
 }
 
 export async function sendNumberPrompt(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   cfg: VerifyConfig,
   p: PendingVerify,
 ): Promise<void> {
-  const bot = ctx.pickBot(p.selfId);
+  const bot = p.bot;
   if (!bot) return;
   const { question, answer } = genNumberQuestion();
   p.numberAnswer = answer;
   const prompt = cfg.numberPrompt.replace("{question}", question);
   try {
-    await bot.sendGroupMsg(p.groupId, [
+    await bot.sendMessage({ type: "group", group_id: p.groupId}, [
       ctx.segment.at(String(p.userId)),
       ctx.segment.text(` ${prompt}`),
     ]);

package/verify/reaction.ts

@@ -1,38 +1,86 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { VerifyConfig } from "./config";
 import type { PendingVerify } from "./types";
 
 export async function sendReactionPrompt(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   cfg: VerifyConfig,
   p: PendingVerify,
 ): Promise<void> {
-  const bot = ctx.pickBot(p.selfId);
+  const bot = p.bot;
   if (!bot) return;
-  let messageId: number | undefined;
+  let messageId: string | number | undefined;
   try {
-    const res = await bot.sendGroupMsg(p.groupId, [
+    const res = await bot.sendMessage({ type: "group", group_id: p.groupId }, [
       ctx.segment.at(String(p.userId)),
       ctx.segment.text(` ${cfg.reactionPrompt}`),
     ]);
-    messageId = Number(res?.message_id || 0) || undefined;
+    messageId = res?.message_id;
   } catch (err) {
     ctx.logger.warn(`admin verify 发送回应提示失败: ${err}`);
     return;
   }
-  if (!messageId) return;
+  if (messageId == null || messageId === "") return;
   p.promptMessageId = messageId;
+  if (bot.adapter === "onebotv11") {
+    try {
+      await bot.sendApi("set_msg_emoji_like", {
+        message_id: messageId,
+        emoji_id: cfg.reactionEmojiId,
+        set: true,
+      });
+    } catch (err) {
+      ctx.logger.warn(`admin verify 添加表态失败: ${err}`);
+    }
+  } else if (bot.adapter === "icqq") {
+    // icqq：Group.setReaction（0x9082），message_id 为群消息 cqhttp 格式
+    try {
+      await bot.setReaction(messageId, cfg.reactionEmojiId, true);
+    } catch (err) {
+      ctx.logger.warn(`admin verify 添加表态失败: ${err}`);
+    }
+  }
+}
+
+/** icqq GroupReactionEvent 的 seq 提取（cqhttp message_id 为 base64，seq 在第 9-12 字节，与 icqq parseGroupMessageId 同布局） */
+function seqOfIcqqMessageId(messageId: string | number): number {
   try {
-    await bot.addReaction(messageId, cfg.reactionEmojiId);
-  } catch (err) {
-    ctx.logger.warn(`admin verify 添加表态失败: ${err}`);
+    const buf = Buffer.from(String(messageId), "base64");
+    return buf.length >= 12 ? buf.readUInt32BE(8) : 0;
+  } catch {
+    return 0;
   }
 }
 
-export function isReactionPass(p: PendingVerify, event: any): boolean {
+export function isReactionPass(p: PendingVerify, event: unknown): boolean {
   if (!p.promptMessageId) return false;
-  if (Number(event?.message_id || 0) !== p.promptMessageId) return false;
+  const ev = event as { raw?: unknown };
+  const raw = (ev.raw ?? event) as {
+    message_id?: unknown;
+    likes?: unknown;
+    notice_type?: unknown;
+    sub_type?: unknown;
+    set?: unknown;
+    seq?: unknown;
+    id?: unknown;
+  };
   const emojiId = String(p.reactionEmojiId || "");
-  const likes: any[] = Array.isArray(event?.likes) ? event.likes : [];
-  return likes.some((l) => String(l?.emoji_id || "") === emojiId);
+
+  if (
+    raw?.sub_type === "reaction" &&
+    String(raw.notice_type ?? "") === "group"
+  ) {
+    if (raw.set === false) return false;
+    const seq = seqOfIcqqMessageId(p.promptMessageId);
+    return (
+      seq > 0 && Number(raw.seq) === seq && String(raw.id ?? "") === emojiId
+    );
+  }
+
+  if (Number(raw?.message_id || 0) !== Number(p.promptMessageId)) return false;
+  const likes: unknown[] = Array.isArray(raw?.likes) ? raw.likes : [];
+  return likes.some((l) => {
+    const item = l as { emoji_id?: unknown };
+    return String(item?.emoji_id || "") === emojiId;
+  });
 }

package/verify/state.ts

@@ -12,7 +12,7 @@ export function getPendingMap(): Map<string, PendingVerify> {
 }
 
 export function pendingKey(
-  selfId: number,
+  selfId: string | number,
   groupId: number,
   userId: number,
 ): string {

package/verify/types.ts

@@ -1,10 +1,10 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { AIService } from "mioku";
 import type { AdminConfig } from "../config";
 import type { VerifyConfig, VerifyMode } from "./config";
 
 export interface VerifyControllerOptions {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   aiService?: AIService;
   getConfig: () => AdminConfig;
   getVerifyConfig: () => VerifyConfig;
@@ -13,20 +13,21 @@ export interface VerifyControllerOptions {
 }
 
 export interface MemberJoinInfo {
-  selfId: number;
+  selfId: string | number;
   groupId: number;
   userId: number;
   groupName: string;
 }
 
 export interface PendingVerify {
-  selfId: number;
+  selfId: string | number;
   groupId: number;
   userId: number;
   memberName: string;
   groupName: string;
   mode: VerifyMode;
-  promptMessageId?: number;
+  bot?: import("mioku").Bot;
+  promptMessageId?: string | number;
   reactionEmojiId?: string;
   numberAnswer?: number;
   requiredRegions?: string[];
@@ -39,9 +40,18 @@ export interface PendingVerify {
 }
 
 export interface VerifyController {
-  handleMemberJoin(info: MemberJoinInfo): Promise<boolean>;
-  restartVerification(info: MemberJoinInfo): Promise<boolean>;
+  handleMemberJoin(
+    info: MemberJoinInfo,
+    bot?: import("mioku").Bot,
+  ): Promise<boolean>;
+  restartVerification(
+    info: MemberJoinInfo,
+    bot?: import("mioku").Bot,
+  ): Promise<boolean>;
   bypassVerification(info: MemberJoinInfo): Promise<void>;
-  trySendCustomWelcome(info: MemberJoinInfo): Promise<boolean>;
+  trySendCustomWelcome(
+    info: MemberJoinInfo,
+    bot?: import("mioku").Bot,
+  ): Promise<boolean>;
   dispose(): void;
 }