mioku-plugin-admin 2.3.5 → 3.0.0

package/skills/personal.ts

@@ -1,18 +1,30 @@
-import type { AISkill } from "mioku";
+import type { AISkill, Bot, MessageEvent } from "mioku";
+
 import { getImageUrlByMessageId } from "./message-image";
 
+import type { MessageSegment } from "mioku";
+
+interface SkillRuntimeContext {
+  ctx?: {
+    segment: { text(text: string): MessageSegment };
+    logger?: { error?: (...args: unknown[]) => void };
+  };
+  event?: MessageEvent;
+  rawEvent?: MessageEvent;
+}
+
 function parseProfileSex(value: string): 0 | 1 | 2 {
-  const normalized = String(value || "")
-    .trim()
-    .toLowerCase();
-  if (normalized === "男" || normalized === "male" || normalized === "1")
-    return 1;
-  if (normalized === "女" || normalized === "female" || normalized === "2")
-    return 2;
+  const normalized = String(value || "").trim().toLowerCase();
+  if (normalized === "男" || normalized === "male" || normalized === "1") return 1;
+  if (normalized === "女" || normalized === "female" || normalized === "2") return 2;
   return 0;
 }
 
-function logAdminSkillError(runtimeCtx: any, toolName: string, err: unknown) {
+function logAdminSkillError(
+  runtimeCtx: SkillRuntimeContext | undefined,
+  toolName: string,
+  err: unknown,
+) {
   runtimeCtx?.ctx?.logger?.error?.(
     `[admin skills] ${toolName} failed: ${String(err)}`,
   );
@@ -51,10 +63,7 @@ const personalSkill: AISkill = {
             type: "number",
             description: "包含图片的消息 message_id，仅 set_avatar 需要",
           },
-          nickname: {
-            type: "string",
-            description: "新昵称，仅 set_nickname 需要",
-          },
+          nickname: { type: "string", description: "新昵称，仅 set_nickname 需要" },
           personal_note: {
             type: "string",
             description: "新个性签名，仅 set_signature 需要",
@@ -79,94 +88,72 @@ const personalSkill: AISkill = {
         },
         required: ["action"],
       },
-      handler: async (args: any, runtimeCtx?: any) => {
+      handler: async (args: unknown, runtimeCtx?: SkillRuntimeContext) => {
         const ctx = runtimeCtx?.ctx;
         if (!ctx) return { error: "无法获取上下文" };
-        const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
-        const selfId = event?.self_id;
-        if (!selfId) return { error: "无法获取Bot ID" };
-        const bot = ctx.pickBot(selfId);
+        const event = runtimeCtx?.event ?? runtimeCtx?.rawEvent;
+        if (!event) return { error: "无法获取事件" };
+        const bot = event.bot;
         if (!bot) return { error: "Bot不可用" };
-        const action = String(args?.action || "");
+        const a = args as Record<string, unknown>;
+        const action = String(a?.action ?? "");
 
         try {
           switch (action) {
             case "set_avatar": {
-              const messageId = Number(args?.message_id);
+              const messageId = Number(a?.message_id);
               if (!Number.isFinite(messageId) || messageId <= 0) {
                 return { error: "set_avatar 需要提供有效的 message_id" };
               }
               const imageUrl = await getImageUrlByMessageId(bot, messageId);
-              if (!imageUrl) {
-                return { error: "指定 message_id 中未找到图片" };
-              }
-              await bot.api("set_qq_avatar", { file: imageUrl });
+              if (!imageUrl) return { error: "指定 message_id 中未找到图片" };
+              await bot.setAvatar(imageUrl);
               return { success: true, message: "Bot头像已修改" };
             }
             case "set_nickname": {
-              const nickname = String(args?.nickname || "").trim();
-              if (!nickname) {
-                return { error: "set_nickname 需要提供 nickname" };
-              }
-              await bot.api("set_qq_profile", { nickname });
-              return {
-                success: true,
-                message: `Bot昵称已修改为: ${nickname}`,
-              };
+              const nickname = String(a?.nickname ?? "").trim();
+              if (!nickname) return { error: "set_nickname 需要提供 nickname" };
+              await bot.setProfile({ nickname });
+              return { success: true, message: `Bot昵称已修改为: ${nickname}` };
             }
             case "set_signature": {
-              const personalNote = String(args?.personal_note || "").trim();
-              if (!personalNote) {
-                return { error: "set_signature 需要提供 personal_note" };
-              }
-              await bot.api("set_qq_profile", { personal_note: personalNote });
+              const personalNote = String(a?.personal_note ?? "").trim();
+              if (!personalNote) return { error: "set_signature 需要提供 personal_note" };
+              await bot.setProfile({ personal_note: personalNote });
               return { success: true, message: "Bot个性签名已修改" };
             }
             case "set_gender": {
-              const sex = parseProfileSex(args?.gender);
-              await bot.api("set_qq_profile", { sex });
-              const genderMap: Record<number, string> = {
-                0: "无",
-                1: "男",
-                2: "女",
-              };
-              return {
-                success: true,
-                message: `Bot性别已修改为: ${genderMap[sex]}`,
-              };
+              const sex = parseProfileSex(String(a?.gender ?? ""));
+              await bot.setProfile({ sex });
+              const genderMap: Record<number, string> = { 0: "无", 1: "男", 2: "女" };
+              return { success: true, message: `Bot性别已修改为: ${genderMap[sex]}` };
             }
             case "send_private": {
-              const userId = Number(args?.user_id);
-              const content = String(args?.content || "");
-              if (!userId || !content) {
-                return { error: "send_private 需要提供 user_id 和 content" };
-              }
-              await bot.sendPrivateMsg(userId, [ctx.segment.text(content)]);
-              return {
-                success: true,
-                message: `已发送私聊消息给 ${userId}`,
-              };
+              const userId = Number(a?.user_id);
+              const content = String(a?.content ?? "");
+              if (!userId || !content) return { error: "send_private 需要提供 user_id 和 content" };
+              await bot.sendMessage(
+                { type: "private", user_id: userId},
+                [ctx.segment.text(content)],
+              );
+              return { success: true, message: `已发送私聊消息给 ${userId}` };
             }
             case "send_group": {
-              const groupId = Number(args?.group_id);
-              const content = String(args?.content || "");
-              if (!groupId || !content) {
-                return { error: "send_group 需要提供 group_id 和 content" };
-              }
-              await bot.sendGroupMsg(groupId, [ctx.segment.text(content)]);
-              return {
-                success: true,
-                message: `已发送群消息到 ${groupId}`,
-              };
+              const groupId = Number(a?.group_id);
+              const content = String(a?.content ?? "");
+              if (!groupId || !content) return { error: "send_group 需要提供 group_id 和 content" };
+              await bot.sendMessage(
+                { type: "group", group_id: groupId},
+                [ctx.segment.text(content)],
+              );
+              return { success: true, message: `已发送群消息到 ${groupId}` };
             }
             case "list_friends": {
-              if (event?.message_type === "group") {
-                return { error: "在私聊使用试试看吧～" };
-              }
-              const friendList: any[] = await bot.api("get_friend_list");
+              if (event?.message_type === "group") return { error: "在私聊使用试试看吧～" };
+              const friendList = await bot.getFriendList();
               if (!Array.isArray(friendList)) return { friends: [] };
               return {
-                friends: friendList.map((f) => ({
+                friends: friendList.map((f: { user_id?: unknown; nickname?: unknown; remark?: unknown }) => ({
                   user_id: f.user_id,
                   nickname: f.nickname,
                   remark: f.remark,
@@ -174,13 +161,11 @@ const personalSkill: AISkill = {
               };
             }
             case "list_groups": {
-              if (event?.message_type === "group") {
-                return { error: "在私聊使用试试看吧～" };
-              }
-              const groupList: any[] = await bot.api("get_group_list");
+              if (event?.message_type === "group") return { error: "在私聊使用试试看吧～" };
+              const groupList = await bot.getGroupList();
               if (!Array.isArray(groupList)) return { groups: [] };
               return {
-                groups: groupList.map((g) => ({
+                groups: groupList.map((g: { group_id?: unknown; group_name?: unknown; member_count?: unknown }) => ({
                   group_id: g.group_id,
                   group_name: g.group_name,
                   member_count: g.member_count,
@@ -188,33 +173,22 @@ const personalSkill: AISkill = {
               };
             }
             case "delete_friend": {
-              const userId = Number(args?.user_id);
-              if (!userId) {
-                return { error: "delete_friend 需要提供 user_id" };
-              }
-              await bot.api("delete_friend", { user_id: userId });
+              const userId = Number(a?.user_id);
+              if (!userId) return { error: "delete_friend 需要提供 user_id" };
+              await bot.deleteFriend(userId);
               return { success: true, message: `已删除好友 ${userId}` };
             }
             case "leave_group": {
-              const groupId = Number(args?.group_id);
-              if (!groupId) {
-                return { error: "leave_group 需要提供 group_id" };
-              }
-              await bot.api("set_group_leave", {
-                group_id: groupId,
-                is_dismiss: false,
-              });
+              const groupId = Number(a?.group_id);
+              if (!groupId) return { error: "leave_group 需要提供 group_id" };
+              await bot.leaveGroup(groupId, false);
               return { success: true, message: `已退出群 ${groupId}` };
             }
             default:
               return { error: `未知的 action: ${action}` };
           }
         } catch (err) {
-          logAdminSkillError(
-            runtimeCtx,
-            `admin_personal.manage_personal.${action}`,
-            err,
-          );
+          logAdminSkillError(runtimeCtx, `admin_personal.manage_personal.${action}`, err);
           return { error: `执行 ${action} 失败: ${err}` };
         }
       },
@@ -222,4 +196,4 @@ const personalSkill: AISkill = {
   ],
 };
 
-export default personalSkill;
+export default personalSkill;

package/verify/chiral.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";
 
@@ -41,11 +41,11 @@ async function fetchChiralCaptcha(
 }
 
 export async function prepareChiral(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   cfg: VerifyConfig,
   p: PendingVerify,
 ): Promise<boolean> {
-  const bot = ctx.pickBot(p.selfId);
+  const bot = p.bot;
   if (!bot) return false;
   try {
     const captcha = await fetchChiralCaptcha(cfg.chiralApiUrl, cfg.chiralDifficulty);
@@ -55,7 +55,7 @@ export async function prepareChiral(
       "{count}",
       String(captcha.regions.length),
     );
-    await bot.sendGroupMsg(p.groupId, [
+    await bot.sendMessage({ type: "group", group_id: p.groupId}, [
       ctx.segment.at(String(p.userId)),
       ctx.segment.text(` ${prompt}`),
       ctx.segment.image(captcha.imageDataUrl),

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}`),
     ]);