mioku-plugin-admin 2.3.5 → 3.0.0

package/commands/personal.ts

@@ -1,18 +1,5 @@
-import { MiokiContext } from "mioki";
-import type {
-  MessageEvent,
-  RecvAtElement,
-  RecvElement,
-  RecvFaceElement,
-  RecvFileElement,
-  RecvForwardElement,
-  RecvImageElement,
-  RecvJsonElement,
-  RecvRecordElement,
-  RecvReplyElement,
-  RecvTextElement,
-  RecvVideoElement,
-} from "napcat-sdk";
+import type { Bot, MessageEvent, MessageInput, MessageTarget, MiokuContext, MessageSegment } from "mioku";
+import {createGroupRef} from "mioku";
 import { extractImageUrl } from "../config";
 import { replyAdminErrorNotice } from "./notice";
 
@@ -23,80 +10,70 @@ function parseProfileSex(value: string): 0 | 1 | 2 {
   return 0;
 }
 
-function toSendSegment(ctx: MiokiContext, seg: RecvElement): any | null {
-  if (seg.type === "text") {
-    const text = String((seg as RecvTextElement).text || "");
-    return text ? ctx.segment.text(text) : null;
-  }
-
-  if (seg.type === "image" || seg.type === "record" || seg.type === "video") {
-    const mediaSeg = seg as
-      | RecvImageElement
-      | RecvRecordElement
-      | RecvVideoElement;
-    const source = String(mediaSeg.url || mediaSeg.file || "").trim();
-    if (!source) return null;
-    if (seg.type === "image") {
-      return ctx.segment.image(source);
+function toSendSegment(ctx: MiokuContext, seg: MessageSegment): MessageSegment | null {
+  const data = seg.data as Record<string, unknown>;
+  switch (seg.type) {
+    case "text": {
+      const text = String(data.text ?? "").trim();
+      return text ? ctx.segment.text(text) : null;
     }
-    if (seg.type === "record") {
-      return (ctx.segment as any).record(source);
+    case "image": {
+      const source = String(data.url ?? data.file ?? "").trim();
+      return source ? ctx.segment.image(source) : null;
     }
-    return (ctx.segment as any).video(source);
-  }
-
-  if (seg.type === "file") {
-    const fileSeg = seg as RecvFileElement;
-    const source = String(fileSeg.url || fileSeg.file || "").trim();
-    if (!source) return null;
-    return (ctx.segment as any).file(source);
-  }
-
-  if (seg.type === "at") {
-    const qq = (seg as RecvAtElement).qq;
-    return qq == null ? null : ctx.segment.at(String(qq));
-  }
-
-  if (seg.type === "face") {
-    const id = (seg as RecvFaceElement).id;
-    return id == null ? null : ctx.segment.face(Number(id));
-  }
-
-  if (seg.type === "reply") {
-    const id = (seg as RecvReplyElement).id;
-    return id == null ? null : ctx.segment.reply(String(id));
-  }
-
-  if (seg.type === "forward") {
-    const id = (seg as RecvForwardElement).id;
-    return id == null
-      ? null
-      : ((ctx.segment as any).forward?.(String(id)) ?? null);
-  }
-
-  if (seg.type === "json") {
-    const data = (seg as RecvJsonElement).data;
-    return ctx.segment.json ? ctx.segment.json(data) : null;
+    case "record": {
+      const source = String(data.file ?? data.url ?? "").trim();
+      return source ? ctx.segment.raw("record", { file: source }) : null;
+    }
+    case "video": {
+      const source = String(data.file ?? data.url ?? "").trim();
+      return source ? ctx.segment.raw("video", { file: source }) : null;
+    }
+    case "file": {
+      const source = String(data.file ?? data.url ?? "").trim();
+      return source ? ctx.segment.raw("file", { file: source }) : null;
+    }
+    case "at": {
+      const target = String(data.qq ?? data.target ?? "");
+      return target && target !== "all" ? ctx.segment.at(target) : null;
+    }
+    case "face": {
+      const id = data.id;
+      return id == null ? null : ctx.segment.raw("face", { id: String(id) });
+    }
+    case "reply": {
+      const id = data.message_id ?? data.id;
+      return id == null ? null : ctx.segment.reply(String(id));
+    }
+    case "forward": {
+      const id = data.id;
+      return id == null ? null : ctx.segment.raw("forward", { id: String(id) });
+    }
+    case "json": {
+      return ctx.segment.raw("json", data);
+    }
+    default:
+      return seg;
   }
-
-  return null;
 }
 
 function normalizeIncomingSegments(
-  ctx: MiokiContext,
-  segments: RecvElement[],
-): any[] {
+  ctx: MiokuContext,
+  segments: readonly MessageSegment[],
+): MessageSegment[] {
   if (!Array.isArray(segments)) return [];
-  return segments.map((seg) => toSendSegment(ctx, seg)).filter(Boolean);
+  return segments
+    .map((seg) => toSendSegment(ctx, seg))
+    .filter((seg): seg is MessageSegment => seg !== null);
 }
 
 function buildForwardPayloadAfterCommand(
-  ctx: MiokiContext,
-  message: RecvElement[],
+  ctx: MiokuContext,
+  message: readonly MessageSegment[],
   commandPattern: RegExp,
   fallbackText?: string,
-): any[] {
-  const payload: any[] = [];
+): MessageSegment[] {
+  const payload: MessageSegment[] = [];
   let stripped = false;
 
   for (const seg of message) {
@@ -107,7 +84,7 @@ function buildForwardPayloadAfterCommand(
       }
       continue;
     }
-    const original = String((seg as RecvTextElement).text || "");
+    const original = String((seg.data as Record<string, unknown>).text ?? "");
     if (!stripped) {
       const nextText = original.replace(commandPattern, "");
       if (nextText !== original) {
@@ -134,87 +111,46 @@ function buildForwardPayloadAfterCommand(
   return payload;
 }
 
-function toForwardMessages(bot: any, nodes: any[]): any[] {
-  const normalizeElements = (elements: any[]): any[] => {
-    if (typeof bot?.normalizeSendable === "function") {
-      return bot.normalizeSendable(elements);
-    }
-    return elements.map((element: any) => {
-      if (
-        element &&
-        typeof element === "object" &&
-        "type" in element &&
-        "data" in element
-      ) {
-        return element;
-      }
-      if (element && typeof element === "object" && "type" in element) {
-        const { type, ...data } = element;
-        return { type, data };
-      }
-      return element;
-    });
-  };
-
-  return nodes.map((node: any) => {
-    const rawNode =
-      node && typeof node === "object" && "type" in node && "data" in node
-        ? { type: node.type, ...node.data }
-        : node;
-    if (!rawNode || rawNode.type !== "node") {
-      return normalizeElements([rawNode])[0];
-    }
-
-    const content = Array.isArray(rawNode.content) ? rawNode.content : [];
-    if ("id" in rawNode && rawNode.id) {
-      return {
-        type: "node",
-        data: {
-          user_id: rawNode.user_id,
-          nickname: rawNode.nickname,
-          id: rawNode.id,
-        },
-      };
-    }
-
-    return {
-      type: "node",
-      data: {
-        user_id: rawNode.user_id,
-        nickname: rawNode.nickname,
-        content: normalizeElements(content),
-      },
-    };
-  });
-}
-
 async function sendForwardByEvent(options: {
-  bot: any;
-  event: any;
-  messages: any[];
+  bot: Bot;
+  event: MessageEvent;
+  messages: readonly unknown[];
 }): Promise<void> {
   const { bot, event, messages } = options;
   const chunkSize = 50;
 
-  for (let i = 0; i < messages.length; i += chunkSize) {
-    const chunk = messages.slice(i, i + chunkSize);
-    if (event?.message_type === "group" && event?.group_id) {
-      await bot.api("send_group_forward_msg", {
-        group_id: event.group_id,
-        messages: chunk,
-      });
-      continue;
-    }
-
-    await bot.api("send_private_forward_msg", {
-      user_id: event.user_id,
-      messages: chunk,
-    });
+  const nodes = (messages as Array<{
+    type?: string;
+    data?: { user_id?: string; nickname?: string; content?: unknown };
+  }>)
+    .map((node) => ({
+      user_id: String(node?.data?.user_id ?? event.user_id ?? ""),
+      nickname:
+        String(node?.data?.nickname || "") ||
+        String(node?.data?.user_id ?? event.user_id ?? "转发"),
+      content: Array.isArray(node?.data?.content)
+        ? node.data.content
+        : [node?.data?.content],
+    }))
+    .filter((node) => node.content.length > 0)
+    .map((node) => ({
+      user_id: node.user_id,
+      nickname: node.nickname,
+      content: node.content as MessageInput,
+    }));
+
+  const target: MessageTarget =
+    event.message_type === "group" && event.group_id
+      ? { type: "group", group_id: event.group_id }
+      : { type: "private", user_id: event.user_id ?? "" };
+
+  for (let i = 0; i < nodes.length; i += chunkSize) {
+    await bot.sendForward(target, nodes.slice(i, i + chunkSize));
   }
 }
 
-export function registerPersonalCommands(ctx: MiokiContext) {
-  ctx.handle("message", async (event: MessageEvent) => {
+export function registerPersonalCommands(ctx: MiokuContext) {
+  ctx.handle("message", async (event) => {
     const text = ctx.text(event)?.trim();
     if (!text) return;
     if (event.user_id === event.self_id) return;
@@ -222,7 +158,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
     const isMaster = ctx.isOwner?.(event) ?? false;
 
     const selfId = event.self_id;
-    const bot = ctx.pickBot(selfId);
+    const bot = event.bot;
     if (!bot) return;
 
     const isGroup = event.message_type === "group";
@@ -234,10 +170,11 @@ export function registerPersonalCommands(ctx: MiokiContext) {
       }
       const imageUrl = extractImageUrl(event.message);
       if (!imageUrl) {
-        return event.reply("图片呢图片呢～", true);
+        await event.reply("图片呢图片呢～", true);
+      return;
       }
       try {
-        await bot.api("set_qq_avatar", { file: imageUrl });
+        await bot.setAvatar(imageUrl);
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -259,10 +196,11 @@ export function registerPersonalCommands(ctx: MiokiContext) {
       }
       const nickname = text.replace(/^\/改昵称\s*/, "").trim();
       if (!nickname) {
-        return event.reply("想改成什么昵称呀～", true);
+        await event.reply("想改成什么昵称呀～", true);
+      return;
       }
       try {
-        await bot.api("set_qq_profile", { nickname });
+        await bot.setProfile({ nickname });
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -283,10 +221,11 @@ export function registerPersonalCommands(ctx: MiokiContext) {
       }
       const personalNote = text.replace(/^\/改签名\s*/, "").trim();
       if (!personalNote) {
-        return event.reply("想改成什么签名呀～", true);
+        await event.reply("想改成什么签名呀～", true);
+      return;
       }
       try {
-        await bot.api("set_qq_profile", { personal_note: personalNote });
+        await bot.setProfile({ personal_note: personalNote });
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -308,7 +247,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
       const genderText = text.replace(/^\/改性别\s*/, "").trim();
       const sex = parseProfileSex(genderText);
       try {
-        await bot.api("set_qq_profile", { sex });
+        await bot.setProfile({ sex });
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -338,7 +277,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        await bot.api("delete_friend", { user_id: qq });
+        await bot.deleteFriend(qq);
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -368,10 +307,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        await bot.api("set_group_leave", {
-          group_id: targetGroup,
-          is_dismiss: false,
-        });
+        await createGroupRef(bot, String(targetGroup)).leave(false);
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -420,7 +356,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        await bot.sendPrivateMsg(targetUser, payload);
+        await bot.sendMessage({ type: "private", user_id: targetUser}, payload);
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -469,7 +405,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        await bot.sendGroupMsg(targetGroup, payload);
+        await bot.sendMessage({ type: "group", group_id: targetGroup}, payload);
         await event.reply("done");
       } catch (err) {
         await replyAdminErrorNotice({
@@ -493,7 +429,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        const friendList: any[] = await bot.api("get_friend_list");
+        const friendList = await bot.getFriendList();
         if (!Array.isArray(friendList) || friendList.length === 0) {
           await replyAdminErrorNotice({
             ctx,
@@ -503,9 +439,9 @@ export function registerPersonalCommands(ctx: MiokiContext) {
           });
           return;
         }
-        const nodes = friendList.map((friend: any) =>
-          ctx.segment.node({
-            user_id: String(friend.user_id),
+        const nodes = friendList.map((friend) =>
+          ctx.segment.raw("node", {
+            user_id: friend.user_id,
             nickname:
               friend.nickname || friend.remark || String(friend.user_id),
             content: [
@@ -518,11 +454,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
             ],
           }),
         );
-        await sendForwardByEvent({
-          bot,
-          event,
-          messages: toForwardMessages(bot, nodes),
-        });
+        await sendForwardByEvent({ bot, event, messages: nodes });
       } catch (err) {
         await replyAdminErrorNotice({
           ctx,
@@ -545,7 +477,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
         return;
       }
       try {
-        const groupList: any[] = await bot.api("get_group_list");
+        const groupList = await bot.getGroupList();
         if (!Array.isArray(groupList) || groupList.length === 0) {
           await replyAdminErrorNotice({
             ctx,
@@ -555,9 +487,9 @@ export function registerPersonalCommands(ctx: MiokiContext) {
           });
           return;
         }
-        const nodes = groupList.map((group: any) =>
-          ctx.segment.node({
-            user_id: String(selfId),
+        const nodes = groupList.map((group) =>
+          ctx.segment.raw("node", {
+            user_id: selfId,
             nickname: String(selfId),
             content: [
               ctx.segment.image(
@@ -569,11 +501,7 @@ export function registerPersonalCommands(ctx: MiokiContext) {
             ],
           }),
         );
-        await sendForwardByEvent({
-          bot,
-          event,
-          messages: toForwardMessages(bot, nodes),
-        });
+        await sendForwardByEvent({ bot, event, messages: nodes });
       } catch (err) {
         await replyAdminErrorNotice({
           ctx,

package/commands/verify.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import { extractImageUrls, getAtUserId, getMemberRole } from "../config";
 import {
   getGroupVerifyConfig,
@@ -17,7 +17,7 @@ import {
 } from "../utils/prompt-image-store";
 
 export interface VerifyCommandOptions {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   getVerifyConfig: () => VerifyConfig;
   setVerifyConfig: (next: VerifyConfig) => Promise<void>;
   verifyController: VerifyController;
@@ -29,24 +29,29 @@ const VERIFY_MODE_LABELS: Record<string, string> = {
   chiral: "手性碳",
 };
 
-async function extractQuoteImageUrls(event: any): Promise<string[]> {
-  if (!event || typeof event.getQuoteMsg !== "function") return [];
-  const quoteMsg = await event.getQuoteMsg().catch(() => null);
+import type { MessageEvent } from "mioku";
+
+async function extractQuoteImageUrls(event: MessageEvent): Promise<string[]> {
+  const eventAny = event as MessageEvent & {
+    getQuoteMsg?: () => Promise<{ message?: unknown[] } | null>;
+  };
+  if (typeof eventAny.getQuoteMsg !== "function") return [];
+  const quoteMsg = await eventAny.getQuoteMsg().catch(() => null);
   if (!quoteMsg || !Array.isArray(quoteMsg.message)) return [];
-  return extractImageUrls(quoteMsg.message);
+  return extractImageUrls(quoteMsg.message as Parameters<typeof extractImageUrls>[0]);
 }
 
 export function registerVerifyCommands(options: VerifyCommandOptions) {
   const { ctx, getVerifyConfig, setVerifyConfig, verifyController } = options;
 
-  ctx.handle("message", async (event: any) => {
+  ctx.handle("message", async (event) => {
     const text = ctx.text(event)?.trim();
     if (!text) return;
     if (event.user_id === event.self_id) return;
 
     if (event.message_type !== "group") return;
-    const groupId = Number(event.group_id || 0);
-    if (!groupId) return;
+    const groupIdNum = event.group_id ? Number(event.group_id) : 0;
+    if (!groupIdNum) return;
 
     const isVerifyCommand =
       text === "/开启验证" ||
@@ -63,12 +68,12 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
       text.startsWith("#入群提示");
 
     try {
-      const selfId = event.self_id;
-      const bot = ctx.pickBot(selfId);
+      const selfId = Number(event.self_id);
+      const bot = event.bot;
       if (!bot) return;
 
       const isMaster = ctx.isOwner?.(event) ?? false;
-      const senderRole = await getMemberRole(bot, groupId, event.user_id);
+      const senderRole = await getMemberRole(bot, groupIdNum, Number(event.user_id));
       const hasAdminPermission =
         isMaster || senderRole === "owner" || senderRole === "admin";
 
@@ -86,13 +91,13 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
       };
 
       const groupName =
-        String(event?.group?.group_name || "").trim() || String(groupId);
+        String(event?.group?.group_name || "").trim() || String(groupIdNum);
 
       // /开启验证 | #开启验证
       if (text === "/开启验证" || text === "#开启验证") {
         if (!(await ensureAdminPermission())) return;
 
-        const botRole = await getMemberRole(bot, groupId, selfId);
+        const botRole = await getMemberRole(bot, groupIdNum, selfId);
         if (botRole !== "owner" && botRole !== "admin") {
           await replyAdminErrorNotice({
             ctx,
@@ -105,12 +110,12 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         }
 
         const current = getVerifyConfig();
-        const groupCfg = getGroupVerifyConfig(current, groupId);
+        const groupCfg = getGroupVerifyConfig(current, groupIdNum);
         if (groupCfg.enabled) {
           await event.reply("本群已经开启验证啦～", true);
           return;
         }
-        const next = upsertGroupVerifyConfig(current, groupId, {
+        const next = upsertGroupVerifyConfig(current, groupIdNum, {
           enabled: true,
         });
         await setVerifyConfig(next);
@@ -123,12 +128,12 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         if (!(await ensureAdminPermission())) return;
 
         const current = getVerifyConfig();
-        const groupCfg = getGroupVerifyConfig(current, groupId);
+        const groupCfg = getGroupVerifyConfig(current, groupIdNum);
         if (!groupCfg.enabled) {
           await event.reply("本群还没开启验证哦～", true);
           return;
         }
-        const next = upsertGroupVerifyConfig(current, groupId, {
+        const next = upsertGroupVerifyConfig(current, groupIdNum, {
           enabled: false,
         });
         await setVerifyConfig(next);
@@ -159,7 +164,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         }
 
         const current = getVerifyConfig();
-        const next = upsertGroupVerifyConfig(current, groupId, { mode });
+        const next = upsertGroupVerifyConfig(current, groupIdNum, { mode });
         await setVerifyConfig(next);
         await event.reply(
           `验证模式已切换为：${VERIFY_MODE_LABELS[mode]}～`,
@@ -187,7 +192,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         try {
           await verifyController.bypassVerification({
             selfId,
-            groupId,
+            groupId: groupIdNum,
             userId: atUser,
             groupName,
           });
@@ -221,7 +226,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         }
 
         const isTargetMaster = ctx.isOwner?.(atUser) ?? false;
-        const targetRole = await getMemberRole(bot, groupId, atUser);
+        const targetRole = await getMemberRole(bot, groupIdNum, atUser);
         if (isTargetMaster || targetRole === "owner" || targetRole === "admin") {
           await replyAdminErrorNotice({
             ctx,
@@ -234,12 +239,15 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         }
 
         try {
-          const started = await verifyController.restartVerification({
-            selfId,
-            groupId,
-            userId: atUser,
-            groupName,
-          });
+          const started = await verifyController.restartVerification(
+            {
+              selfId,
+              groupId: groupIdNum,
+              userId: atUser,
+              groupName,
+            },
+            bot,
+          );
           if (!started) {
             await event.reply("本群还没开启验证哦～", true);
           }
@@ -263,7 +271,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
         const rawArg = text.replace(/^[/#]入群提示\s*/, "").trim();
         const current = getVerifyConfig();
-        const groupCfg = getGroupVerifyConfig(current, groupId);
+        const groupCfg = getGroupVerifyConfig(current, groupIdNum);
         const directImageUrls = extractImageUrls(event.message);
         const quoteImageUrls = await extractQuoteImageUrls(event).catch(() => []);
         const imageUrls =
@@ -275,14 +283,14 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
             return;
           }
           const removedFile = groupCfg.promptImage;
-          const next = upsertGroupVerifyConfig(current, groupId, {
+          const next = upsertGroupVerifyConfig(current, groupIdNum, {
             customPrompt: "",
             promptImage: "",
           });
           await setVerifyConfig(next);
-          await pruneGroupPromptImages(groupId, []).catch(() => {});
+          await pruneGroupPromptImages(groupIdNum, []).catch(() => {});
           ctx.logger.info(
-            `admin verify 关闭群 ${groupId} 自定义入群提示，清理图片 ${removedFile}`,
+            `admin verify 关闭群 ${groupIdNum} 自定义入群提示，清理图片 ${removedFile}`,
           );
           await event.reply("已关闭本群自定义入群提示～", true);
           return;
@@ -331,7 +339,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         let imageNote = "";
         if (imageUrls.length) {
           const targetUrl = imageUrls[0];
-          const savedImage = await saveRemoteImageAsPrompt(groupId, targetUrl);
+          const savedImage = await saveRemoteImageAsPrompt(groupIdNum, targetUrl);
           if (savedImage) {
             const previousImage = groupCfg.promptImage;
             nextImage = savedImage.filename;
@@ -340,7 +348,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
               : `图片已设置（${savedImage.filename}）`;
             if (previousImage) {
               ctx.logger.info(
-                `admin verify 替换群 ${groupId} 入群提示图片：${previousImage} -> ${savedImage.filename}`,
+                `admin verify 替换群 ${groupIdNum} 入群提示图片：${previousImage} -> ${savedImage.filename}`,
               );
             }
           } else {
@@ -348,12 +356,12 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
           }
         }
 
-        const next = upsertGroupVerifyConfig(current, groupId, {
+        const next = upsertGroupVerifyConfig(current, groupIdNum, {
           customPrompt: nextPrompt,
           promptImage: nextImage,
         });
         await setVerifyConfig(next);
-        await pruneGroupPromptImages(groupId, nextImage ? [nextImage] : []).catch(
+        await pruneGroupPromptImages(groupIdNum, nextImage ? [nextImage] : []).catch(
           () => {},
         );