mioku-plugin-admin 2.3.4 → 3.0.0

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;
 }

package/skills.ts

@@ -1,7 +0,0 @@
-import type { AISkill } from "mioku";
-import groupAdminSkill from "./skills/group";
-import personalSkill from "./skills/personal";
-
-const adminSkills: AISkill[] = [groupAdminSkill, personalSkill];
-
-export default adminSkills;