mioku-plugin-admin 2.3.5 → 3.0.1

package/config.ts

@@ -101,25 +101,34 @@ export function parseDuration(text: string): number {
   return 0;
 }
 
+import type { Bot } from "mioku";
+
+
+interface SegmentLike {
+  type: string;
+  data?: Record<string, unknown>;
+}
+
 // 从消息中提取图片URL
-export function extractImageUrl(message: RecvElement[]): string | undefined {
+export function extractImageUrl(message: readonly SegmentLike[] | null | undefined): string | undefined {
   if (!Array.isArray(message)) return undefined;
   for (const seg of message) {
     if (seg.type === "image") {
-      const imageSeg = seg as RecvImageElement;
-      return imageSeg.url || imageSeg.file;
+      const data = seg.data ?? {};
+      const url = String(data.url ?? data.file ?? "");
+      return url || undefined;
     }
   }
   return undefined;
 }
 
-export function extractImageUrls(message: RecvElement[]): string[] {
+export function extractImageUrls(message: readonly SegmentLike[] | null | undefined): string[] {
   if (!Array.isArray(message)) return [];
   const urls: string[] = [];
   for (const seg of message) {
     if (seg.type === "image") {
-      const imageSeg = seg as RecvImageElement;
-      const url = String(imageSeg.url || imageSeg.file || "").trim();
+      const data = seg.data ?? {};
+      const url = String(data.url ?? data.file ?? "").trim();
       if (url) urls.push(url);
     }
   }
@@ -127,34 +136,37 @@ export function extractImageUrls(message: RecvElement[]): string[] {
 }
 
 // 从消息中提取被@的人的QQ号
-export function getAtUserId(message: RecvElement[]): number | undefined {
+export function getAtUserId(message: readonly SegmentLike[] | null | undefined): number | undefined {
   if (!Array.isArray(message)) return undefined;
   const atSeg = message.find(
-    (seg): seg is RecvAtElement => seg.type === "at" && seg.qq !== "all",
+    (seg) =>
+      seg.type === "at" &&
+      String(seg.data?.qq ?? seg.data?.target) !== "all",
   );
   if (!atSeg) return undefined;
-  const qq = Number(atSeg.qq);
+  const qq = Number(atSeg.data?.qq ?? atSeg.data?.target);
   return Number.isFinite(qq) ? qq : undefined;
 }
 
 // 获取群成员头像URL
-export function getAvatarUrl(userId: number): string {
-  return `https://q1.qlogo.cn/g?b=qq&nk=${userId}&s=640`;
+export function getAvatarUrl(userId: number | string): string {
+  return `https://q1.qlogo.cn/g?b=qq&nk=${String(userId)}&s=640`;
 }
 
 // 获取群头像URL
-export function getGroupAvatarUrl(groupId: number): string {
-  return `https://p.qlogo.cn/gh/${groupId}/${groupId}/640/`;
+export function getGroupAvatarUrl(groupId: number | string): string {
+  const g = String(groupId);
+  return `https://p.qlogo.cn/gh/${g}/${g}/640/`;
 }
 
 // 获取Bot群成员角色
 export async function getMemberRole(
-  bot: any,
-  groupId: number,
-  userId: number,
+  bot: Bot,
+  groupId: string | number,
+  userId: string | number,
 ): Promise<string> {
   try {
-    const info = await bot.getGroupMemberInfo(groupId, userId);
+    const info = await bot.getMemberInfo(groupId, userId);
     return info?.role || "member";
   } catch {
     return "member";

package/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin, type MiokiContext } from "mioki";
+import { definePlugin, type MiokuContext } from "mioku";
 import {
   setPluginRuntimeState,
   resetPluginRuntimeState,
@@ -21,16 +21,14 @@ import { registerWelcomeHandler } from "./notify/welcome";
 import { createVerifyController } from "./verify";
 
 interface RuntimeState {
-  ctx?: MiokiContext;
+  ctx?: MiokuContext;
   config?: AdminConfig;
 }
 
 export default definePlugin({
   name: "admin",
-  version: "1.0.0",
-  description: "管理插件，提供事件通知与群管/个人管理指令",
 
-  async setup(ctx: MiokiContext) {
+  async setup(ctx: MiokuContext) {
     const configService = getService(ctx, Services.Config);
     const aiService = getService(ctx, Services.AI);
 
@@ -91,8 +89,8 @@ export default definePlugin({
       ctx,
       aiService,
       getConfig,
-      (info) => verifyController.handleMemberJoin(info),
-      (info) => verifyController.trySendCustomWelcome(info),
+      (info, bot) => verifyController.handleMemberJoin(info, bot),
+      (info, bot) => verifyController.trySendCustomWelcome(info, bot),
     );
 
     // 注册入群验证指令

package/notify/index.ts

@@ -1,30 +1,18 @@
-import { botConfig, type MiokiContext } from "mioki";
 import type {
-  FriendRequestEvent,
-  GroupBanNoticeEvent,
-  GroupDecreaseNoticeEvent,
-  GroupInviteRequestEvent,
   MessageEvent,
-  PrivateMessageEvent,
-  RecvAtElement,
-  RecvElement,
-  RecvFaceElement,
-  RecvFileElement,
-  RecvForwardElement,
-  RecvImageElement,
-  RecvJsonElement,
-  RecvRecordElement,
-  RecvReplyElement,
-  RecvTextElement,
-  RecvVideoElement,
-} from "napcat-sdk";
+  MessageSegment,
+  MiokuContext,
+  NoticeEvent,
+  RequestEvent,
+} from "mioku";
+import {botConfig} from "mioku";
 import type { AdminConfig } from "../config";
 import { formatDuration, getAvatarUrl, getGroupAvatarUrl } from "../config";
 
 interface NotifyPayload {
   avatarUrl?: string;
   lines: string[];
-  rawSegments?: any[];
+  rawSegments?: MessageSegment[];
 }
 
 interface PendingFriendRequest {
@@ -32,6 +20,8 @@ interface PendingFriendRequest {
   userId: number;
   flag: string;
   createdAt: number;
+  approve: () => Promise<void>;
+  reject: (reason?: string) => Promise<void>;
 }
 
 interface PendingGroupInvite {
@@ -41,6 +31,8 @@ interface PendingGroupInvite {
   flag: string;
   subType: string;
   createdAt: number;
+  approve: () => Promise<void>;
+  reject: (reason?: string) => Promise<void>;
 }
 
 const PENDING_TTL_MS = 24 * 60 * 60 * 1000;
@@ -66,7 +58,7 @@ function getNotifyOwners(config: AdminConfig): number[] {
 
 /** 注册所有事件通知处理器 */
 export function registerNotificationHandlers(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   getConfig: () => AdminConfig,
 ) {
   const pendingFriendRequests: PendingFriendRequest[] = [];
@@ -121,8 +113,8 @@ export function registerNotificationHandlers(
     return true;
   }
 
-  function buildNotifyMessage(payload: NotifyPayload): any[] {
-    const message: any[] = [];
+  function buildNotifyMessage(payload: NotifyPayload): MessageSegment[] {
+    const message: MessageSegment[] = [];
     if (payload.avatarUrl) {
       message.push(ctx.segment.image(payload.avatarUrl));
     }
@@ -139,82 +131,60 @@ export function registerNotificationHandlers(
     return message.length > 0 ? message : [ctx.segment.text("")];
   }
 
-  function normalizeIncomingSegments(segments: RecvElement[]): any[] {
+  function normalizeIncomingSegments(segments: readonly MessageSegment[]): MessageSegment[] {
     if (!Array.isArray(segments)) return [];
     return segments
       .map((seg) => {
-        if (!seg || typeof seg !== "object") return null;
-        const type = String(seg.type || "");
-
-        if (!type) return null;
-
-        if (type === "text") {
-          const text = String((seg as RecvTextElement).text || "");
-          return text ? ctx.segment.text(text) : null;
-        }
-
-        if (type === "image" || type === "record" || type === "video") {
-          const mediaSeg = seg as
-            | RecvImageElement
-            | RecvRecordElement
-            | RecvVideoElement;
-          const source = String(mediaSeg.url || mediaSeg.file || "").trim();
-          if (!source) return null;
-          if (type === "image") {
-            return ctx.segment.image(source);
+        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 (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 (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 (type === "at") {
-          const qq = (seg as RecvAtElement).qq;
-          if (qq == null) return null;
-          return ctx.segment.at(String(qq));
-        }
-
-        if (type === "face") {
-          const id = (seg as RecvFaceElement).id;
-          if (id == null) return null;
-          return ctx.segment.face(Number(id));
-        }
-
-        if (type === "reply") {
-          const id = (seg as RecvReplyElement).id;
-          if (id == null) return null;
-          return ctx.segment.reply(String(id));
-        }
-
-        if (type === "forward") {
-          const id = (seg as RecvForwardElement).id;
-          if (id == null) return null;
-          return (ctx.segment as any).forward?.(String(id)) ?? null;
-        }
-
-        if (type === "json") {
-          const data = (seg as RecvJsonElement).data;
-          if (type === "json" && ctx.segment.json) {
-            return ctx.segment.json(data);
+          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 ? 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));
           }
-          return null;
+          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;
       })
-      .filter(Boolean);
+      .filter((seg): seg is MessageSegment => seg !== null);
   }
 
-  function isOwnerPrivateMessage(event: PrivateMessageEvent): boolean {
-    if (ctx.isOwner?.(event)) {
+  function isOwnerPrivateMessage(event: MessageEvent): boolean {
+    if (ctx.isMaster?.(event)) {
       return true;
     }
     const userId = Number(event.user_id || 0);
@@ -224,19 +194,18 @@ export function registerNotificationHandlers(
     return owners().includes(userId);
   }
 
-  async function sendNotify(selfId: number, payload: NotifyPayload) {
-    const bot = ctx.pickBot(selfId);
+  async function sendNotify(bot: import("mioku").Bot | undefined, payload: NotifyPayload) {
     if (!bot) return;
     for (const ownerId of owners()) {
       try {
-        await bot.sendPrivateMsg(ownerId, buildNotifyMessage(payload));
+        await bot.sendMessage({ type: "private", user_id: ownerId}, buildNotifyMessage(payload));
       } catch (err) {
         ctx.logger.error(`admin notify owner ${ownerId} failed: ${err}`);
       }
     }
   }
 
-  function pushPendingFriendRequest(event: FriendRequestEvent) {
+  function pushPendingFriendRequest(event: RequestEvent) {
     const selfId = Number(event.self_id || 0);
     const userId = Number(event.user_id || 0);
     const flag = String(event.flag || "").trim();
@@ -246,11 +215,13 @@ export function registerNotificationHandlers(
       userId,
       flag,
       createdAt: Date.now(),
+      approve: () => event.approve(),
+      reject: (reason?: string) => event.reject(reason),
     });
     prunePendingRequests();
   }
 
-  function pushPendingGroupInvite(event: GroupInviteRequestEvent) {
+  function pushPendingGroupInvite(event: RequestEvent) {
     const selfId = Number(event.self_id || 0);
     const groupId = Number(event.group_id || 0);
     const userId = Number(event.user_id || 0);
@@ -264,6 +235,8 @@ export function registerNotificationHandlers(
       flag,
       subType,
       createdAt: Date.now(),
+      approve: () => event.approve(),
+      reject: (reason?: string) => event.reject(reason),
     });
     prunePendingRequests();
   }
@@ -299,12 +272,12 @@ export function registerNotificationHandlers(
     return undefined;
   }
 
-  function extractTextFromSegments(segments: RecvElement[]): string {
+  function extractTextFromSegments(segments: readonly MessageSegment[]): string {
     if (!Array.isArray(segments)) return "";
     return segments
       .map((seg) => {
         if (seg.type !== "text") return "";
-        return String((seg as RecvTextElement).text || "");
+        return String((seg.data as Record<string, unknown>).text ?? "");
       })
       .join("")
       .trim();
@@ -313,7 +286,7 @@ export function registerNotificationHandlers(
   async function resolveQuotedText(event: MessageEvent): Promise<string> {
     if (!event.quote_id) return "";
     try {
-      const quoted = await event.getQuoteMsg();
+      const quoted = await event.bot.getMessage(event.quote_id);
       return extractTextFromSegments(quoted?.message || []);
     } catch {
       return "";
@@ -369,13 +342,10 @@ export function registerNotificationHandlers(
     return null;
   }
 
-  function extractReplyPayloadSegments(event: MessageEvent): any[] {
-    return normalizeIncomingSegments(event?.message || []).filter(
-      (seg: any) => {
-        const type = String(seg?.type || "");
-        return type !== "reply";
-      },
-    );
+  function extractReplyPayloadSegments(event: MessageEvent): MessageSegment[] {
+    return normalizeIncomingSegments(event?.message || []).filter((seg) => {
+      return seg.type !== "reply";
+    });
   }
 
   function isApproveText(text: string): boolean {
@@ -389,7 +359,7 @@ export function registerNotificationHandlers(
   }
 
   async function notifyGroupInvite(
-    event: GroupInviteRequestEvent,
+    event: RequestEvent,
   ): Promise<void> {
     if (!getConfig().notifyGroupInvite) return;
 
@@ -405,7 +375,7 @@ export function registerNotificationHandlers(
     pushPendingGroupInvite(event);
 
     const comment = event.comment || "无";
-    await sendNotify(selfId, {
+    await sendNotify(event.bot, {
       avatarUrl: getGroupAvatarUrl(groupId),
       lines: [
         "[群邀请]",
@@ -417,26 +387,27 @@ export function registerNotificationHandlers(
     });
   }
 
-  async function notifyGroupBan(event: GroupBanNoticeEvent): Promise<void> {
+  async function notifyGroupBan(event: NoticeEvent): Promise<void> {
     const selfId = Number(event.self_id || 0);
     const groupId = Number(event.group_id || 0);
     const userId = Number(event.user_id || 0);
-    const duration = Number(event.duration || 0);
+    const rawBan = event.raw as { action_type?: string; duration?: number } | undefined;
+    const duration = Number(rawBan?.duration || 0);
     if (!selfId || !groupId) return;
     if (userId !== selfId) return;
 
     const operatorId = Number(event.operator_id || 0);
-    const isUnban = event.action_type === "lift_ban";
+    const isUnban = rawBan?.action_type === "lift_ban";
     if (isUnban) {
       if (!getConfig().notifyGroupUnban) return;
     } else if (!getConfig().notifyGroupBan) {
       return;
     }
 
-    const eventKey = `group-ban:${selfId}:${groupId}:${operatorId}:${duration}:${event.action_type}:${Number(event.time || 0)}`;
+    const eventKey = `group-ban:${selfId}:${groupId}:${operatorId}:${duration}:${rawBan?.action_type}:${Number(event.time || 0)}`;
     if (!markEventOnce(eventKey)) return;
 
-    await sendNotify(selfId, {
+    await sendNotify(event.bot, {
       avatarUrl: getGroupAvatarUrl(groupId),
       lines: [
         isUnban ? "[Bot被解除禁言]" : "[Bot被禁言]",
@@ -449,14 +420,15 @@ export function registerNotificationHandlers(
   }
 
   async function notifyGroupKick(
-    event: GroupDecreaseNoticeEvent,
+    event: NoticeEvent,
   ): Promise<void> {
     if (!getConfig().notifyGroupKick) return;
 
     const selfId = Number(event.self_id || 0);
     const groupId = Number(event.group_id || 0);
     const userId = Number(event.user_id || 0);
-    const leaveType = String((event as any).action_type || "").trim();
+    const rawKick = event.raw as { action_type?: string } | undefined;
+    const leaveType = String(rawKick?.action_type || "").trim();
     if (!selfId || !groupId) return;
     if (userId !== selfId) return;
     if (leaveType !== "kick" && leaveType !== "kick_me") return;
@@ -465,7 +437,7 @@ export function registerNotificationHandlers(
     const eventKey = `group-kick:${selfId}:${groupId}:${operatorId}:${leaveType}:${Number(event.time || 0)}`;
     if (!markEventOnce(eventKey)) return;
 
-    await sendNotify(selfId, {
+    await sendNotify(event.bot, {
       avatarUrl:
         operatorId > 0 ? getAvatarUrl(operatorId) : getGroupAvatarUrl(groupId),
       lines: ["[Bot被踢]", `群号：${groupId}`, `操作者QQ：${operatorId}`],
@@ -473,16 +445,16 @@ export function registerNotificationHandlers(
   }
 
   // 好友私聊消息通知
-  ctx.handle("message.private", async (event: PrivateMessageEvent) => {
+  ctx.handle("message.private", async (event) => {
     if (!getConfig().notifyFriendMsg) return;
     if (event.user_id === event.self_id) return;
     if (isOwnerPrivateMessage(event)) return;
 
-    const userId = event.user_id;
-    const nickname = event.sender?.nickname || String(userId);
+    const userId = String(event.user_id ?? "");
+    const nickname = event.sender?.nickname || userId;
     const rawSegments = normalizeIncomingSegments(event.message || []);
 
-    await sendNotify(event.self_id, {
+    await sendNotify(event.bot, {
       avatarUrl: getAvatarUrl(userId),
       lines: [
         "[好友消息]",
@@ -496,14 +468,14 @@ export function registerNotificationHandlers(
   });
 
   // 好友申请通知
-  ctx.handle("request.friend", async (event: FriendRequestEvent) => {
+  ctx.handle("request.friend", async (event) => {
     pushPendingFriendRequest(event);
     if (!getConfig().notifyFriendRequest) return;
 
-    const userId = event.user_id;
+    const userId = String(event.user_id ?? "");
     const comment = event.comment || "无";
 
-    await sendNotify(event.self_id, {
+    await sendNotify(event.bot, {
       avatarUrl: getAvatarUrl(userId),
       lines: [
         "[好友申请]",
@@ -515,27 +487,27 @@ export function registerNotificationHandlers(
   });
 
   // 群邀请通知
-  ctx.handle("request.group.invite", async (event: GroupInviteRequestEvent) => {
+  ctx.handle("request.group.invite", async (event) => {
     await notifyGroupInvite(event);
   });
 
   // Bot被禁言通知
-  ctx.handle("notice.group.ban", async (event: GroupBanNoticeEvent) => {
+  ctx.handle("notice.group.ban", async (event) => {
     await notifyGroupBan(event);
   });
 
   // Bot被踢通知
   ctx.handle(
     "notice.group.decrease",
-    async (event: GroupDecreaseNoticeEvent) => {
+    async (event) => {
       await notifyGroupKick(event);
     },
   );
 
   // 引用回复处理
-  ctx.handle("message", async (event: MessageEvent) => {
+  ctx.handle("message", async (event) => {
     if (event.message_type !== "private") return;
-    if (!ctx.isOwner?.(event)) return;
+    if (!ctx.isMaster?.(event)) return;
 
     const quotedText = await resolveQuotedText(event);
     if (!quotedText) {
@@ -549,7 +521,7 @@ export function registerNotificationHandlers(
     const text = (ctx.text(event) || "").trim();
 
     const selfId = Number(event.self_id || 0);
-    const bot = ctx.pickBot(selfId);
+    const bot = event.bot;
     if (!bot) {
       await event.reply("Bot不可用", true);
       return;
@@ -562,7 +534,7 @@ export function registerNotificationHandlers(
         return;
       }
       try {
-        await bot.sendPrivateMsg(target.userId, payload);
+        await bot.sendMessage({ type: "private", user_id: target.userId}, payload);
         await event.reply("done");
       } catch (err) {
         ctx.logger.error(
@@ -585,10 +557,11 @@ export function registerNotificationHandlers(
       }
 
       try {
-        await bot.api("set_friend_add_request", {
-          flag: pending.flag,
-          approve: isApproveText(text),
-        });
+        if (isApproveText(text)) {
+          await pending.approve();
+        } else {
+          await pending.reject();
+        }
         await event.reply("done");
       } catch (err) {
         ctx.logger.error(
@@ -605,10 +578,7 @@ export function registerNotificationHandlers(
         return;
       }
       try {
-        await bot.api("set_group_leave", {
-          group_id: target.groupId,
-          is_dismiss: false,
-        });
+        await bot.leaveGroup(String(target.groupId), false);
         await event.reply("done");
       } catch (err) {
         ctx.logger.error(
@@ -636,11 +606,11 @@ export function registerNotificationHandlers(
       }
 
       try {
-        await bot.api("set_group_add_request", {
-          flag: pending.flag,
-          sub_type: pending.subType || "invite",
-          approve: isApproveText(text),
-        });
+        if (isApproveText(text)) {
+          await pending.approve();
+        } else {
+          await pending.reject();
+        }
         await event.reply("done");
       } catch (err) {
         ctx.logger.error(