mioku-plugin-admin 3.0.1 → 3.0.3

package/commands/group.ts

@@ -21,7 +21,7 @@ function formatGroupRole(role: string): string {
 
 type GroupContext = CommandExecutionContext & {
   bot: Bot;
-  groupIdNum: number;
+  groupIdNum: string;
   senderRole: string;
 };
 
@@ -32,19 +32,20 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
   ) => {
     ctx.command({
       ...def,
-      prefixes: false,
+      // 原设计:裸命令与 /命令 都可用;这里保留两者并补上 . 前缀
+      prefixes: ["", ".", "/"],
       handler: async (c) => {
         const event = c.event;
         if (event.user_id === event.self_id) return;
         if (event.message_type !== "group") return;
         const bot = event.bot;
         if (!bot) return;
-        const groupIdNum = event.group_id ? Number(event.group_id) : 0;
+        const groupIdNum = String(event.group_id ?? "").trim();
         if (!groupIdNum) return;
         const senderRole = await getMemberRole(
           bot,
           groupIdNum,
-          Number(event.user_id),
+          String(event.user_id ?? "").trim(),
         );
         try {
           await run({ ...c, bot, groupIdNum, senderRole });
@@ -64,7 +65,7 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   const ensureDangerousTargetPermission = async (
     c: GroupContext,
-    targetUserId: number,
+    targetUserId: string,
     actionName: string,
   ): Promise<boolean> => {
     const { bot, groupIdNum, senderRole, event } = c;
@@ -89,7 +90,7 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
       const atUser = getAtUserId(event.message);
-      if (atUser != null && atUser !== Number(event.user_id)) {
+      if (atUser != null && atUser !== String(event.user_id ?? "").trim()) {
         await event.reply("管好自己呗～", true);
         return;
       }
@@ -115,47 +116,43 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/改头衔",
-      match: /^\/?改头衔(?:\s|$)/,
+      name: "改头衔",
+      match: /^\/??改头衔(?:\s|$)/,
       permission: "admin",
       description: "设置群成员专属头衔",
-      usage: "/改头衔 qq号或@人 头衔",
+      usage: ".改头衔 <用户ID或@人> 头衔",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
-      const rest = body.replace(/^\/?改头衔\s*/, "").trim();
+      const rest = body.replace(/^\/??改头衔\s*/, "").trim();
       const atUser = getAtUserId(event.message);
-      let targetUser: number | undefined = atUser;
+      let targetUser: string | undefined = atUser;
       let title: string;
 
-      const isSlashCommand = body.startsWith("/");
-
       if (atUser) {
-        title = rest.replace(/@\d+\s*/, "").trim();
+        title = rest.replace(/@[A-Za-z0-9_-]{4,64}\s*/, "").trim();
       } else {
         const parts = rest.split(/\s+/);
         if (parts.length < 2) {
-          if (!isSlashCommand) return;
           await replyAdminErrorNotice({
             ctx,
             event,
             instruction:
-              "用户在让你修改别人的头衔时缺少参数，请提示用户命令后需要加qq号或@人",
+              "用户在让你修改别人的头衔时缺少参数，请提示用户命令后需要加用户ID或@人",
             fallbackMessage: "想改谁的头衔呀～",
           });
           return;
         }
-        targetUser = parseInt(parts[0], 10);
+        targetUser = String(parts[0]).trim();
         title = parts.slice(1).join(" ");
       }
 
       if (!targetUser || !title) {
-        if (!isSlashCommand) return;
         await replyAdminErrorNotice({
           ctx,
           event,
           instruction:
-            "用户触发改头衔时参数无效，请提示用户命令后需要加qq号或@人",
+            "用户触发改头衔时参数无效，请提示用户命令后需要加用户ID或@人",
           fallbackMessage: "想改谁的头衔呀～",
         });
         return;
@@ -178,16 +175,14 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/踢",
-      match: /^\/?踢(?:\s|$)/,
+      name: "踢",
+      match: /^\/??踢(?:\s|$)/,
       permission: "admin",
       description: "踢出群成员",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
       const atUser = getAtUserId(event.message);
-      const isSlashCommand = body.startsWith("/");
-      if (!atUser && !isSlashCommand) return;
       if (!atUser) {
         await replyAdminErrorNotice({
           ctx,
@@ -216,17 +211,15 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/禁言",
-      match: /^\/?禁(?:言)?(?:\s|$)/,
+      name: "禁言",
+      match: /^\/??禁(?:言)?(?:\s|$)/,
       permission: "admin",
       description: "禁言群成员（支持分钟/小时/天）",
-      usage: "/禁言 @人 10分钟",
+      usage: ".禁言 @人 10分钟",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
       const atUser = getAtUserId(event.message);
-      const isSlashCommand = body.startsWith("/");
-      if (!atUser && !isSlashCommand) return;
       if (!atUser) {
         await replyAdminErrorNotice({
           ctx,
@@ -238,8 +231,8 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
         return;
       }
       if (!(await ensureDangerousTargetPermission(c, atUser, "禁言"))) return;
-      const rest = body.replace(/^\/?禁言\s*/, "").trim();
-      const durationStr = rest.replace(/@\d+\s*/, "").trim();
+      const rest = body.replace(/^\/??禁言\s*/, "").trim();
+      const durationStr = rest.replace(/@[A-Za-z0-9_-]{4,64}\s*/, "").trim();
       const durationSec = parseDuration(durationStr) || 10 * 60;
       try {
         await bot.banMember(groupIdNum, atUser, durationSec);
@@ -258,16 +251,14 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/解禁",
-      match: /^\/?解(?:禁)?(?:\s|$)/,
+      name: "解禁",
+      match: /^\/??解(?:禁)?(?:\s|$)/,
       permission: "admin",
       description: "解除群成员禁言",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
       const atUser = getAtUserId(event.message);
-      const isSlashCommand = body.startsWith("/");
-      if (!atUser && !isSlashCommand) return;
       if (!atUser) {
         await replyAdminErrorNotice({
           ctx,
@@ -295,16 +286,14 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/设管理",
-      match: /^\/?设管理(?:\s|$)/,
+      name: "设管理",
+      match: /^\/??设管理(?:\s|$)/,
       permission: "admin",
       description: "设置群管理员",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
       const atUser = getAtUserId(event.message);
-      const isSlashCommand = body.startsWith("/");
-      if (!atUser && !isSlashCommand) return;
       if (!atUser) {
         await replyAdminErrorNotice({
           ctx,
@@ -332,8 +321,8 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/全体禁言",
-      match: /^\/全体禁言$/,
+      name: "全体禁言",
+      match: /^\/?全体禁言$/,
       permission: "admin",
       description: "开启全体禁言",
     },
@@ -356,8 +345,8 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/全体解禁",
-      match: /^\/全体解禁$/,
+      name: "全体解禁",
+      match: /^\/?全体解禁$/,
       permission: "admin",
       description: "关闭全体禁言",
     },
@@ -380,14 +369,14 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/改群名片",
-      match: /^\/?改群名片(?:\s|$)/,
+      name: "改群名片",
+      match: /^\/??改群名片(?:\s|$)/,
       permission: "admin",
       description: "修改Bot在群里的名片",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
-      const card = body.replace(/^\/?改群名片\s*/, "").trim();
+      const card = body.replace(/^\/??改群名片\s*/, "").trim();
       if (!card) {
         await replyAdminErrorNotice({
           ctx,
@@ -414,14 +403,14 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/改群昵称",
-      match: /^\/改群昵称/,
+      name: "改群昵称",
+      match: /^\/?改群昵称/,
       permission: "admin",
       description: "修改群聊名称",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, body } = c;
-      const groupName = body.replace(/^\/改群昵称\s*/, "").trim();
+      const groupName = body.replace(/^\/?改群昵称\s*/, "").trim();
       if (!groupName) {
         await replyAdminErrorNotice({
           ctx,
@@ -449,8 +438,8 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/改群头像",
-      match: /^\/改群头像/,
+      name: "改群头像",
+      match: /^\/?改群头像/,
       permission: "admin",
       description: "修改群头像",
     },
@@ -484,8 +473,8 @@ export function registerGroupAdminCommands(ctx: MiokuContext) {
 
   register(
     {
-      name: "/撤回",
-      match: /^\/?撤回(?:\s|$)/,
+      name: "撤回",
+      match: /^\/??撤回(?:\s|$)/,
       permission: "admin",
       description: "撤回别人的消息",
       usage: "引用一条消息后输入 /撤回",

package/commands/notice.ts

@@ -23,8 +23,8 @@ export async function replyAdminErrorNotice(options: {
   error?: unknown;
 }): Promise<void> {
   const text = options.ctx.text(options.event)?.trim() ?? "";
-  const hasSlashPrefix = text.startsWith("/");
-  if (!hasSlashPrefix) {
+  // 只对真正的命令消息做 AI 兜底提示,普通聊天不打扰(命令支持 / 与 . 前缀)
+  if (!/^[./]/.test(text)) {
     return;
   }
   if (options.error != null) {

package/commands/personal.ts

@@ -154,7 +154,6 @@ export function registerPersonalCommands(ctx: MiokuContext) {
     const { handler, ...rest } = command;
     ctx.command({
       ...rest,
-      prefixes: false,
       handler: async (c) => {
         if (c.event.user_id === c.event.self_id) return;
         await handler(c);
@@ -163,8 +162,8 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   };
 
   register({
-    name: "/改头像",
-    match: /^\/改头像/,
+    name: "改头像",
+    match: /^\/?改头像/,
     permission: "master",
     description: "修改Bot头像",
     handler: async ({ event }) => {
@@ -191,14 +190,14 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/改昵称",
-    match: /^\/改昵称/,
+    name: "改昵称",
+    match: /^\/?改昵称/,
     permission: "master",
     description: "修改Bot昵称",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
-      const nickname = body.replace(/^\/改昵称\s*/, "").trim();
+      const nickname = body.replace(/^\/?改昵称\s*/, "").trim();
       if (!nickname) {
         await event.reply("想改成什么昵称呀～", true);
         return;
@@ -219,14 +218,14 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/改签名",
-    match: /^\/改签名/,
+    name: "改签名",
+    match: /^\/?改签名/,
     permission: "master",
     description: "修改Bot个性签名",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
-      const personalNote = body.replace(/^\/改签名\s*/, "").trim();
+      const personalNote = body.replace(/^\/?改签名\s*/, "").trim();
       if (!personalNote) {
         await event.reply("想改成什么签名呀～", true);
         return;
@@ -247,14 +246,14 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/改性别",
-    match: /^\/改性别/,
+    name: "改性别",
+    match: /^\/?改性别/,
     permission: "master",
     description: "修改Bot性别",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
-      const sex = parseProfileSex(body.replace(/^\/改性别\s*/, ""));
+      const sex = parseProfileSex(body.replace(/^\/?改性别\s*/, ""));
       try {
         await bot.setProfile({ sex });
         await event.reply("done");
@@ -271,15 +270,15 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/删好友",
-    match: /^\/删好友(?:\s|$)/,
+    name: "删好友",
+    match: /^\/?删好友(?:\s|$)/,
     permission: "master",
     description: "删除好友",
-    usage: "/删好友 qq号",
+    usage: ".删好友 qq号",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
-      const qq = parseInt(body.replace(/^\/删好友\s*/, "").trim(), 10);
+      const qq = parseInt(body.replace(/^\/?删好友\s*/, "").trim(), 10);
       if (!qq) {
         await replyAdminErrorNotice({
           ctx,
@@ -305,15 +304,15 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/退群",
-    match: /^\/退群(?:\s|$)/,
+    name: "退群",
+    match: /^\/?退群(?:\s|$)/,
     permission: "master",
     description: "退出群聊",
-    usage: "/退群 群号",
+    usage: ".退群 群号",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
-      const targetGroup = parseInt(body.replace(/^\/退群\s*/, "").trim(), 10);
+      const targetGroup = parseInt(body.replace(/^\/?退群\s*/, "").trim(), 10);
       if (!targetGroup) {
         await replyAdminErrorNotice({
           ctx,
@@ -339,11 +338,11 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/发好友",
-    match: /^\/发好友(?:\s|$)/,
+    name: "发好友",
+    match: /^\/?发好友(?:\s|$)/,
     permission: "master",
     description: "给好友发送私聊消息",
-    usage: "/发好友 qq号 内容",
+    usage: ".发好友 qq号 内容",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
@@ -392,11 +391,11 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/发群聊",
-    match: /^\/发群聊(?:\s|$)/,
+    name: "发群聊",
+    match: /^\/?发群聊(?:\s|$)/,
     permission: "master",
     description: "给群聊发送消息",
-    usage: "/发群聊 群号 内容",
+    usage: ".发群聊 群号 内容",
     handler: async ({ event, body }) => {
       const bot = event.bot;
       if (!bot) return;
@@ -445,8 +444,8 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/全部好友",
-    match: /^\/全部好友$/,
+    name: "全部好友",
+    match: /^\/?全部好友$/,
     permission: "master",
     description: "获取全部好友列表",
     handler: async ({ event }) => {
@@ -496,8 +495,8 @@ export function registerPersonalCommands(ctx: MiokuContext) {
   });
 
   register({
-    name: "/全部群聊",
-    match: /^\/全部群聊$/,
+    name: "全部群聊",
+    match: /^\/?全部群聊$/,
     permission: "master",
     description: "获取全部群聊列表",
     handler: async ({ event }) => {

package/commands/verify.ts

@@ -37,9 +37,9 @@ const VERIFY_MODE_LABELS: Record<string, string> = {
 
 type VerifyContext = CommandExecutionContext & {
   bot: Bot;
-  groupIdNum: number;
+  groupIdNum: string;
   groupName: string;
-  selfId: number;
+  selfId: string;
 };
 
 async function extractQuoteImageUrls(event: MessageEvent): Promise<string[]> {
@@ -61,22 +61,21 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
   ) => {
     ctx.command({
       ...def,
-      prefixes: false,
       handler: async (c) => {
         const event = c.event;
         if (event.user_id === event.self_id) return;
         if (event.message_type !== "group") return;
         const bot = event.bot;
         if (!bot) return;
-        const groupIdNum = event.group_id ? Number(event.group_id) : 0;
+        const groupIdNum = String(event.group_id ?? "").trim();
         if (!groupIdNum) return;
         try {
           await run({
             ...c,
             bot,
             groupIdNum,
-            groupName: String(event?.group?.group_name || "").trim() || String(groupIdNum),
-            selfId: Number(event.self_id),
+            groupName: String(event?.group?.group_name || "").trim() || groupIdNum,
+            selfId: String(event.self_id ?? "").trim(),
           });
         } catch (err) {
           ctx.logger.error(`[admin verify] 未捕获异常: ${String(err)}`);
@@ -94,7 +93,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/开启验证",
+      name: "开启验证",
       match: /^[/#]开启验证$/,
       permission: "admin",
       description: "开启本群入群验证",
@@ -128,7 +127,7 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/关闭验证",
+      name: "关闭验证",
       match: /^[/#]关闭验证$/,
       permission: "admin",
       description: "关闭本群入群验证",
@@ -151,11 +150,11 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/切换验证模式",
+      name: "切换验证模式",
       match: /^[/#]切换验证模式(?:\s|$)/,
       permission: "admin",
       description: "切换验证模式：回应/数字/手性碳",
-      usage: "/切换验证模式 回应",
+      usage: ".切换验证模式 回应",
     },
     async (c) => {
       const { ctx, event, groupIdNum, body } = c;
@@ -183,11 +182,11 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/绕过验证",
+      name: "绕过验证",
       match: /^[/#]绕过验证(?:\s|$)/,
       permission: "admin",
       description: "绕过指定新成员的验证直接欢迎",
-      usage: "/绕过验证 @新成员",
+      usage: ".绕过验证 @新成员",
     },
     async (c) => {
       const { ctx, event, groupIdNum, groupName, selfId } = c;
@@ -224,11 +223,11 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/重新验证",
+      name: "重新验证",
       match: /^[/#]重新验证(?:\s|$)/,
       permission: "admin",
       description: "让指定成员重新进行入群验证",
-      usage: "/重新验证 @成员",
+      usage: ".重新验证 @成员",
     },
     async (c) => {
       const { ctx, event, bot, groupIdNum, groupName, selfId } = c;
@@ -282,11 +281,11 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
   register(
     {
-      name: "/入群提示",
+      name: "入群提示",
       match: /^[/#]入群提示(?:\s|$)/,
       permission: "admin",
       description: "设置本群自定义入群提示，可附带文字+图片",
-      usage: "/入群提示 xxx；/入群提示 关闭",
+      usage: ".入群提示 xxx；/入群提示 关闭",
     },
     async (c) => {
       const { ctx, event, groupIdNum, body } = c;

package/config.ts

@@ -1,7 +1,6 @@
-import type { RecvAtElement, RecvElement, RecvImageElement } from "napcat-sdk";
 
 export interface AdminConfig {
-  notifyTarget: number[];
+  notifyTarget: string[];
   notifyFriendMsg: boolean;
   notifyFriendRequest: boolean;
   notifyGroupInvite: boolean;
@@ -37,7 +36,9 @@ export const DEFAULT_CONFIG: AdminConfig = {
 export function normalizeConfig(raw: any): AdminConfig {
   return {
     notifyTarget: Array.isArray(raw?.notifyTarget)
-      ? raw.notifyTarget.map((v: any) => Number(v)).filter((n: number) => n > 0)
+      ? raw.notifyTarget
+          .map((v: unknown) => String(v ?? "").trim())
+          .filter((id: string) => id.length > 0)
       : DEFAULT_CONFIG.notifyTarget,
     notifyFriendMsg: raw?.notifyFriendMsg ?? DEFAULT_CONFIG.notifyFriendMsg,
     notifyFriendRequest:
@@ -136,7 +137,9 @@ export function extractImageUrls(message: readonly SegmentLike[] | null | undefi
 }
 
 // 从消息中提取被@的人的QQ号
-export function getAtUserId(message: readonly SegmentLike[] | null | undefined): number | undefined {
+export function getAtUserId(
+  message: readonly SegmentLike[] | null | undefined,
+): string | undefined {
   if (!Array.isArray(message)) return undefined;
   const atSeg = message.find(
     (seg) =>
@@ -144,18 +147,25 @@ export function getAtUserId(message: readonly SegmentLike[] | null | undefined):
       String(seg.data?.qq ?? seg.data?.target) !== "all",
   );
   if (!atSeg) return undefined;
-  const qq = Number(atSeg.data?.qq ?? atSeg.data?.target);
-  return Number.isFinite(qq) ? qq : undefined;
+  const id = String(atSeg.data?.qq ?? atSeg.data?.target ?? "").trim();
+  return id || undefined;
+}
+
+/** qlogo 头像服务只认数字 QQ 号,openid 一律返回空串 */
+function qlogoUrl(host: string, id: string, suffix: string): string {
+  if (!/^\d+$/.test(id)) return "";
+  return `https://${host}/${id}${suffix}`;
 }
 
 // 获取群成员头像URL
-export function getAvatarUrl(userId: number | string): string {
-  return `https://q1.qlogo.cn/g?b=qq&nk=${String(userId)}&s=640`;
+export function getAvatarUrl(userId: string): string {
+  return qlogoUrl("q1.qlogo.cn/g?b=qq&nk=", String(userId ?? "").trim(), "&s=640");
 }
 
 // 获取群头像URL
-export function getGroupAvatarUrl(groupId: number | string): string {
-  const g = String(groupId);
+export function getGroupAvatarUrl(groupId: string): string {
+  const g = String(groupId ?? "").trim();
+  if (!/^\d+$/.test(g)) return "";
   return `https://p.qlogo.cn/gh/${g}/${g}/640/`;
 }