mioku-plugin-admin 2.3.5 → 3.0.1

package/notify/welcome.ts

@@ -1,17 +1,16 @@
-import { type MiokiContext, wait } from "mioki";
+import { type MiokuContext, wait } from "mioku";
 import { getPluginRuntimeState, type AIService } from "mioku";
 import type { AdminConfig } from "../config";
 
 export async function resolveMemberName(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
+  bot: import("mioku").Bot | undefined,
   groupId: number,
   userId: number,
-  selfId: number,
 ): Promise<string> {
   try {
-    const member = await ctx
-      .pickBot(selfId)
-      .getGroupMemberInfo(groupId, userId);
+    if (!bot) return String(userId);
+    const member = await bot.getMemberInfo(groupId, userId);
     return (
       String(member?.card || "").trim() ||
       String(member?.nickname || "").trim() ||
@@ -43,7 +42,7 @@ function getBatchMap(): Map<string, BatchState> {
   return state[RUNTIME_KEY] as Map<string, BatchState>;
 }
 
-function batchKey(selfId: number, groupId: number): string {
+function batchKey(selfId: string | number, groupId: number): string {
   return `${selfId}:${groupId}`;
 }
 
@@ -66,20 +65,21 @@ function normalizeGeneratedText(value: string): string {
 }
 
 async function flushBatch(options: {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   aiService?: AIService;
   config: AdminConfig;
-  selfId: number;
+  selfId: string | number;
   groupId: number;
   groupName: string;
   members: PendingMember[];
   promptInjections?: { content: string; title?: string }[];
+  bot?: import("mioku").Bot;
   tryCustomPrompt?: (info: {
-    selfId: number;
+    selfId: string | number;
     groupId: number;
     userId: number;
     groupName: string;
-  }) => Promise<boolean>;
+  }, bot?: import("mioku").Bot) => Promise<boolean>;
 }): Promise<string> {
   const {
     ctx,
@@ -90,6 +90,7 @@ async function flushBatch(options: {
     groupName,
     members,
     promptInjections,
+    bot,
     tryCustomPrompt,
   } = options;
   if (!members.length) return "";
@@ -97,12 +98,15 @@ async function flushBatch(options: {
   if (tryCustomPrompt) {
     let anyCustom = false;
     for (const m of members) {
-      const handled = await tryCustomPrompt({
-        selfId,
-        groupId,
-        userId: m.userId,
-        groupName,
-      });
+      const handled = await tryCustomPrompt(
+        {
+          selfId,
+          groupId,
+          userId: m.userId,
+          groupName,
+        },
+        bot,
+      );
       if (handled) anyCustom = true;
     }
     if (anyCustom) return "";
@@ -152,21 +156,22 @@ async function flushBatch(options: {
 }
 
 async function sendSingleWelcome(options: {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   aiService?: AIService;
   config: AdminConfig;
-  selfId: number;
+  selfId: string | number;
   groupId: number;
   groupName: string;
   userId: number;
   memberName: string;
   promptInjections?: { content: string; title?: string }[];
+  bot?: import("mioku").Bot;
   tryCustomPrompt?: (info: {
-    selfId: number;
+    selfId: string | number;
     groupId: number;
     userId: number;
     groupName: string;
-  }) => Promise<boolean>;
+  }, bot?: import("mioku").Bot) => Promise<boolean>;
 }): Promise<void> {
   const {
     ctx,
@@ -178,6 +183,7 @@ async function sendSingleWelcome(options: {
     userId,
     memberName,
     promptInjections,
+    bot,
     tryCustomPrompt,
   } = options;
   const welcomeMessage = await flushBatch({
@@ -189,42 +195,42 @@ async function sendSingleWelcome(options: {
     groupName,
     members: [{ userId, memberName }],
     promptInjections,
+    bot,
     tryCustomPrompt,
   });
   if (!welcomeMessage) return;
-  const bot = ctx.pickBot(selfId);
   if (!bot) return;
   try {
-    await bot.sendGroupMsg(groupId, [ctx.segment.text(welcomeMessage)]);
+    await bot.sendMessage({ type: "group", group_id: groupId}, [ctx.segment.text(welcomeMessage)]);
   } catch (error) {
     ctx.logger.warn(`发送入群欢迎失败: ${error}`);
   }
 }
 
 export async function triggerSingleWelcome(options: {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   aiService?: AIService;
   getConfig: () => AdminConfig;
-  selfId: number;
+  selfId: string | number;
   groupId: number;
   groupName: string;
   userId: number;
   memberName?: string;
   promptInjections?: { content: string; title?: string }[];
   tryCustomPrompt?: (info: {
-    selfId: number;
+    selfId: string | number;
     groupId: number;
     userId: number;
     groupName: string;
-  }) => Promise<boolean>;
-}): Promise<void> {
+  }, bot?: import("mioku").Bot) => Promise<boolean>;
+}, bot?: import("mioku").Bot): Promise<void> {
   const memberName =
     options.memberName ||
     (await resolveMemberName(
       options.ctx,
+      bot,
       options.groupId,
       options.userId,
-      options.selfId,
     ));
   await sendSingleWelcome({
     ctx: options.ctx,
@@ -236,26 +242,27 @@ export async function triggerSingleWelcome(options: {
     userId: options.userId,
     memberName,
     promptInjections: options.promptInjections,
+    bot,
     tryCustomPrompt: options.tryCustomPrompt,
   });
 }
 
 export function registerWelcomeHandler(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   aiService: AIService | undefined,
   getConfig: () => AdminConfig,
   shouldSuppress?: (info: {
-    selfId: number;
+    selfId: string | number;
     groupId: number;
     userId: number;
     groupName: string;
-  }) => Promise<boolean> | boolean,
+  }, bot?: import("mioku").Bot) => Promise<boolean> | boolean,
   tryCustomPrompt?: (info: {
-    selfId: number;
+    selfId: string | number;
     groupId: number;
     userId: number;
     groupName: string;
-  }) => Promise<boolean>,
+  }, bot?: import("mioku").Bot) => Promise<boolean>,
 ): () => void {
   const batches = getBatchMap();
 
@@ -263,18 +270,19 @@ export function registerWelcomeHandler(
     "notice.group.increase",
     async (event) => {
       const cfg = getConfig();
-      const selfId = Number(event?.self_id || ctx.self_id);
+      const bot = event.bot;
+      const selfId = event?.self_id || ctx.self_id || "";
       const groupId = Number(event?.group_id || 0);
       const userId = Number(event?.user_id || 0);
       if (!groupId || !userId) return;
-      if (userId === selfId) return;
+      if (selfId != null && String(userId) === String(selfId)) return;
 
       const groupName =
-        String(event?.group?.group_name || "").trim() || String(groupId);
+        String((event.raw as { group_name?: string } | undefined)?.group_name || "").trim() || String(groupId);
 
       if (
         shouldSuppress &&
-        (await shouldSuppress({ selfId, groupId, userId, groupName }))
+        (await shouldSuppress({ selfId, groupId, userId, groupName }, bot))
       ) {
         return;
       }
@@ -286,9 +294,9 @@ export function registerWelcomeHandler(
       if (batchWindowMs === 0) {
         const memberName = await resolveMemberName(
           ctx,
+          bot,
           groupId,
           userId,
-          selfId,
         );
         const welcomeMessage = await flushBatch({
           ctx,
@@ -298,12 +306,12 @@ export function registerWelcomeHandler(
           groupId,
           groupName,
           members: [{ userId, memberName }],
+          bot,
         });
         if (!welcomeMessage) return;
-        const bot = ctx.pickBot(selfId);
         if (!bot) return;
         try {
-          await bot.sendGroupMsg(groupId, [ctx.segment.text(welcomeMessage)]);
+          await bot.sendMessage({ type: "group", group_id: groupId}, [ctx.segment.text(welcomeMessage)]);
         } catch (error) {
           ctx.logger.warn(`发送入群欢迎失败: ${error}`);
         }
@@ -320,7 +328,7 @@ export function registerWelcomeHandler(
         state.groupName = groupName;
       }
 
-      const memberName = await resolveMemberName(ctx, groupId, userId, selfId);
+      const memberName = await resolveMemberName(ctx, bot, groupId, userId);
       if (!state.members.some((m) => m.userId === userId)) {
         state.members.push({ userId, memberName });
       }
@@ -344,14 +352,14 @@ export function registerWelcomeHandler(
             groupId,
             groupName: pending.groupName,
             members: pending.members,
+            bot,
             tryCustomPrompt,
           });
           if (!welcomeMessage) return;
 
-          const bot = ctx.pickBot(selfId);
           if (!bot) return;
           try {
-            await bot.sendGroupMsg(groupId, [ctx.segment.text(welcomeMessage)]);
+            await bot.sendMessage({ type: "group", group_id: groupId}, [ctx.segment.text(welcomeMessage)]);
           } catch (error) {
             ctx.logger.warn(`发送入群欢迎失败: ${error}`);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-admin",
-  "version": "2.3.5",
+  "version": "3.0.1",
   "description": "管理插件，提供事件通知与群管/个人管理指令",
   "main": "index.ts",
   "type": "module",
@@ -12,294 +12,15 @@
     "url": "https://github.com/mioku-lab/mioku-plugin-admin.git"
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0"
+    "mioku": "^1.0.0"
   },
   "devDependencies": {
-    "mioku": "workspace:*",
-    "mioki": "^0.16.0"
+    "mioku": "workspace:*"
   },
   "mioku": {
     "services": [
       "config",
       "ai"
-    ],
-    "accessHooks": [
-      {
-        "id": "/改头像",
-        "match": "/^\\/改头像/"
-      },
-      {
-        "id": "/改昵称",
-        "match": "/^\\/改昵称/"
-      },
-      {
-        "id": "/改签名",
-        "match": "/^\\/改签名/"
-      },
-      {
-        "id": "/改性别",
-        "match": "/^\\/改性别/"
-      },
-      {
-        "id": "/改群名片",
-        "match": "/^\\/改群名片/"
-      },
-      {
-        "id": "/改群昵称",
-        "match": "/^\\/改群昵称/"
-      },
-      {
-        "id": "/改群头像",
-        "match": "/^\\/改群头像/"
-      },
-      {
-        "id": "/撤回",
-        "match": "/^(\\/撤回|撤回)/"
-      },
-      {
-        "id": "/改头衔",
-        "match": "/^\\/改头衔/"
-      },
-      {
-        "id": "我要头衔",
-        "match": "/^我要头衔/"
-      },
-      {
-        "id": "/踢",
-        "match": "/^\\/踢/"
-      },
-      {
-        "id": "/禁言",
-        "match": "/^\\/禁言/"
-      },
-      {
-        "id": "/解禁",
-        "match": "/^\\/解禁/"
-      },
-      {
-        "id": "/设管理",
-        "match": "/^\\/设管理/"
-      },
-      {
-        "id": "/全体禁言",
-        "match": "/^\\/全体禁言/"
-      },
-      {
-        "id": "/全体解禁",
-        "match": "/^\\/全体解禁/"
-      },
-      {
-        "id": "/删好友",
-        "match": "/^\\/删好友/"
-      },
-      {
-        "id": "/退群",
-        "match": "/^\\/退群/"
-      },
-      {
-        "id": "/发好友",
-        "match": "/^\\/发好友/"
-      },
-      {
-        "id": "/发群聊",
-        "match": "/^\\/发群聊/"
-      },
-      {
-        "id": "/全部好友",
-        "match": "/^\\/全部好友/"
-      },
-      {
-        "id": "/全部群聊",
-        "match": "/^\\/全部群聊/"
-      },
-      {
-        "id": "welcome",
-        "event": "notice.group.increase",
-        "description": "新人入群相关功能"
-      },
-      {
-        "id": "/开启验证",
-        "match": "/^[/#]开启验证$/"
-      },
-      {
-        "id": "/关闭验证",
-        "match": "/^[/#]关闭验证$/"
-      },
-      {
-        "id": "/切换验证模式",
-        "match": "/^[/#]切换验证模式/"
-      },
-      {
-        "id": "/绕过验证",
-        "match": "/^[/#]绕过验证/"
-      },
-      {
-        "id": "/重新验证",
-        "match": "/^[/#]重新验证/"
-      },
-      {
-        "id": "/入群提示",
-        "match": "/^[/#]入群提示/"
-      }
-    ],
-    "help": {
-      "title": "管理",
-      "description": "Bot管理插件，提供事件通知与管理指令",
-      "commands": [
-        {
-          "cmd": "/改头像",
-          "desc": "修改Bot头像",
-          "role": "master"
-        },
-        {
-          "cmd": "/改昵称",
-          "desc": "修改Bot昵称",
-          "role": "master"
-        },
-        {
-          "cmd": "/改签名",
-          "desc": "修改Bot个性签名",
-          "role": "master"
-        },
-        {
-          "cmd": "/改性别",
-          "desc": "修改Bot性别",
-          "role": "master"
-        },
-        {
-          "cmd": "/改群名片",
-          "desc": "修改Bot在群里的名片",
-          "role": "admin"
-        },
-        {
-          "cmd": "/改群昵称",
-          "desc": "修改群聊名称",
-          "role": "admin"
-        },
-        {
-          "cmd": "/改群头像",
-          "desc": "修改群头像",
-          "role": "admin"
-        },
-        {
-          "cmd": "/撤回",
-          "desc": "撤回别人的消息",
-          "usage": "引用一条消息后输入 /撤回",
-          "role": "admin"
-        },
-        {
-          "cmd": "/改头衔",
-          "desc": "设置群成员专属头衔",
-          "usage": "/改头衔 qq号或@人 头衔",
-          "role": "admin"
-        },
-        {
-          "cmd": "我要头衔",
-          "desc": "普通群员给自己设置专属头衔",
-          "usage": "我要头衔 头衔内容",
-          "role": "member"
-        },
-        {
-          "cmd": "/踢",
-          "desc": "踢出群成员",
-          "role": "admin"
-        },
-        {
-          "cmd": "/禁言",
-          "desc": "禁言群成员（支持分钟/小时/天）",
-          "usage": "/禁言 @人 10分钟",
-          "role": "admin"
-        },
-        {
-          "cmd": "/解禁",
-          "desc": "解除群成员禁言",
-          "role": "admin"
-        },
-        {
-          "cmd": "/设管理",
-          "desc": "设置群管理员",
-          "role": "admin"
-        },
-        {
-          "cmd": "/全体禁言",
-          "desc": "开启全体禁言",
-          "role": "admin"
-        },
-        {
-          "cmd": "/全体解禁",
-          "desc": "关闭全体禁言",
-          "role": "admin"
-        },
-        {
-          "cmd": "/删好友",
-          "desc": "删除好友",
-          "usage": "/删好友 qq号",
-          "role": "master"
-        },
-        {
-          "cmd": "/退群",
-          "desc": "退出群聊",
-          "usage": "/退群 群号",
-          "role": "master"
-        },
-        {
-          "cmd": "/发好友",
-          "desc": "给好友发送私聊消息",
-          "usage": "/发好友 qq号 内容",
-          "role": "master"
-        },
-        {
-          "cmd": "/发群聊",
-          "desc": "给群聊发送消息",
-          "usage": "/发群聊 群号 内容",
-          "role": "master"
-        },
-        {
-          "cmd": "/全部好友",
-          "desc": "获取全部好友列表",
-          "role": "master"
-        },
-        {
-          "cmd": "/全部群聊",
-          "desc": "获取全部群聊列表",
-          "role": "master"
-        },
-        {
-          "cmd": "/开启验证",
-          "desc": "开启本群入群验证",
-          "role": "admin"
-        },
-        {
-          "cmd": "/关闭验证",
-          "desc": "关闭本群入群验证",
-          "role": "admin"
-        },
-        {
-          "cmd": "/切换验证模式",
-          "desc": "切换验证模式：回应/数字/手性碳",
-          "usage": "/切换验证模式 回应",
-          "role": "admin"
-        },
-        {
-          "cmd": "/绕过验证",
-          "desc": "绕过指定新成员的验证直接欢迎",
-          "usage": "/绕过验证 @新成员",
-          "role": "admin"
-        },
-        {
-          "cmd": "/重新验证",
-          "desc": "让指定成员重新进行入群验证",
-          "usage": "/重新验证 @成员",
-          "role": "admin"
-        },
-        {
-          "cmd": "/入群提示",
-          "desc": "设置本群自定义入群提示，可附带文字+图片",
-          "usage": "/入群提示 xxx；/入群提示 关闭",
-          "role": "admin"
-        }
-      ]
-    }
+    ]
   }
 }