mioku-plugin-admin 3.0.2 → 3.0.3

package/verify/index.ts

@@ -15,7 +15,7 @@ import type {
   VerifyControllerOptions,
 } from "./types";
 import { clearTimers, getPendingMap, pendingKey } from "./state";
-import { isReactionPass, sendReactionPrompt } from "./reaction";
+import { addReaction, isReactionPass, sendReactionPrompt } from "./reaction";
 import { isNumberAnswerCorrect, sendNumberPrompt } from "./number";
 import { checkChiralAnswer, prepareChiral } from "./chiral";
 import { getGroupPromptImagePath } from "../utils/prompt-image-store";
@@ -40,7 +40,7 @@ export function createVerifyController(
   } = options;
   const pending = getPendingMap();
 
-  async function disableGroupVerify(groupId: number, reason: string) {
+  async function disableGroupVerify(groupId: string, reason: string) {
     ctx.logger.warn(`admin verify 关闭群 ${groupId} 验证：${reason}`);
     try {
       await setVerifyConfig(
@@ -51,7 +51,7 @@ export function createVerifyController(
     }
   }
 
-  async function recallMessage(bot: Bot, messageId: number) {
+  async function recallMessage(bot: Bot, messageId: string) {
     try {
       await bot.recallMessage(messageId);
     } catch (err) {
@@ -59,7 +59,7 @@ export function createVerifyController(
     }
   }
 
-  async function kickMember(bot: Bot, groupId: number, userId: number) {
+  async function kickMember(bot: Bot, groupId: string, userId: string) {
     try {
       await bot.kickMember(groupId, userId, false);
     } catch (err) {
@@ -84,24 +84,9 @@ export function createVerifyController(
     if (
       p.mode === "reaction" &&
       p.promptMessageId &&
-      bot &&
-      (bot.adapter === "onebotv11" || bot.adapter === "icqq")
+      bot
     ) {
-      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}`);
-      }
+      await addReaction(bot, p.promptMessageId, PASS_REACTION_EMOJI_ID, ctx);
     }
 
     if (!getWelcomeEnabled()) return;
@@ -252,9 +237,9 @@ export function createVerifyController(
 
   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);
-    const userId = Number(event?.user_id || 0);
+    const selfId = String(event?.self_id ?? "").trim();
+    const groupId = String(event?.group_id ?? "").trim();
+    const userId = String(event?.user_id ?? "").trim();
     if (!selfId || !groupId || !userId) return;
     if (userId === selfId) return;
 
@@ -264,7 +249,7 @@ export function createVerifyController(
 
     const cfg = getVerifyConfig();
     const text = ctx.text(event) || "";
-    const messageId = Number(event?.message_id || 0);
+    const messageId = String(event?.message_id ?? "").trim();
     const bot = event.bot;
 
     if (p.mode === "number" && isNumberAnswerCorrect(p, text)) {
@@ -304,9 +289,9 @@ export function createVerifyController(
   }
 
   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);
+    const selfId = String(event?.self_id ?? "").trim();
+    const groupId = String(event?.group_id ?? "").trim();
+    const userId = String(event?.user_id ?? "").trim();
     if (!selfId || !groupId || !userId) return;
     if (userId === selfId) return;
     const raw = event.raw as { is_add?: boolean } | undefined;
@@ -346,9 +331,9 @@ export function createVerifyController(
   const decreaseDispose = ctx.handle(
     "notice.group.decrease",
     async (event) => {
-      const selfId = Number(event?.self_id || 0);
-      const groupId = Number(event?.group_id || 0);
-      const userId = Number(event?.user_id || 0);
+      const selfId = String(event?.self_id ?? "").trim();
+      const groupId = String(event?.group_id ?? "").trim();
+      const userId = String(event?.user_id ?? "").trim();
       if (!selfId || !groupId || !userId) return;
       const key = pendingKey(selfId, groupId, userId);
       if (!pending.has(key)) return;

package/verify/reaction.ts

@@ -1,4 +1,4 @@
-import type { MiokuContext } from "mioku";
+import type { Bot, MiokuContext } from "mioku";
 import type { VerifyConfig } from "./config";
 import type { PendingVerify } from "./types";
 
@@ -22,24 +22,47 @@ export async function sendReactionPrompt(
   }
   if (messageId == null || messageId === "") return;
   p.promptMessageId = messageId;
+  await addReaction(bot, messageId, cfg.reactionEmojiId, ctx);
+}
+
+/** 表态能力按平台探测:icqq 扩展方法优先,其次 OneBot 原生 action */
+export async function addReaction(
+  bot: Bot,
+  messageId: string,
+  emojiId: string,
+  ctx: { logger: { warn(message: string): void } },
+): Promise<boolean> {
+  const extended = bot as unknown as {
+    setReaction?: (
+      messageId: string,
+      emojiId: string,
+      set: boolean,
+    ) => Promise<unknown>;
+  };
+  if (typeof extended.setReaction === "function") {
+    try {
+      await extended.setReaction(messageId, emojiId, true);
+      return true;
+    } catch (err) {
+      ctx.logger.warn(`admin verify 添加表态失败: ${err}`);
+      return false;
+    }
+  }
   if (bot.adapter === "onebotv11") {
     try {
       await bot.sendApi("set_msg_emoji_like", {
         message_id: messageId,
-        emoji_id: cfg.reactionEmojiId,
+        emoji_id: emojiId,
         set: true,
       });
+      return 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}`);
+      return false;
     }
   }
+  ctx.logger.warn(`admin verify 当前平台(${bot.adapter})不支持消息表态`);
+  return false;
 }
 
 /** icqq GroupReactionEvent 的 seq 提取（cqhttp message_id 为 base64，seq 在第 9-12 字节，与 icqq parseGroupMessageId 同布局） */
@@ -77,7 +100,9 @@ export function isReactionPass(p: PendingVerify, event: unknown): boolean {
     );
   }
 
-  if (Number(raw?.message_id || 0) !== Number(p.promptMessageId)) return false;
+  if (String(raw?.message_id ?? "") !== String(p.promptMessageId ?? "")) {
+    return false;
+  }
   const likes: unknown[] = Array.isArray(raw?.likes) ? raw.likes : [];
   return likes.some((l) => {
     const item = l as { emoji_id?: unknown };

package/verify/state.ts

@@ -13,8 +13,8 @@ export function getPendingMap(): Map<string, PendingVerify> {
 
 export function pendingKey(
   selfId: string | number,
-  groupId: number,
-  userId: number,
+  groupId: string,
+  userId: string,
 ): string {
   return `${selfId}:${groupId}:${userId}`;
 }

package/verify/types.ts

@@ -13,21 +13,21 @@ export interface VerifyControllerOptions {
 }
 
 export interface MemberJoinInfo {
-  selfId: string | number;
-  groupId: number;
-  userId: number;
+  selfId: string;
+  groupId: string;
+  userId: string;
   groupName: string;
 }
 
 export interface PendingVerify {
-  selfId: string | number;
-  groupId: number;
-  userId: number;
+  selfId: string;
+  groupId: string;
+  userId: string;
   memberName: string;
   groupName: string;
   mode: VerifyMode;
   bot?: import("mioku").Bot;
-  promptMessageId?: string | number;
+  promptMessageId?: string;
   reactionEmojiId?: string;
   numberAnswer?: number;
   requiredRegions?: string[];