mioku-plugin-admin 2.3.5 → 3.0.0

package/commands/group.ts

@@ -1,4 +1,5 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
+
 import {
   extractImageUrl,
   getAtUserId,
@@ -13,8 +14,8 @@ function formatGroupRole(role: string): string {
   return "群成员";
 }
 
-export function registerGroupAdminCommands(ctx: MiokiContext) {
-  ctx.handle("message", async (event: any) => {
+export function registerGroupAdminCommands(ctx: MiokuContext) {
+  ctx.handle("message", async (event) => {
     const text = ctx.text(event)?.trim();
     if (!text) return;
     if (event.user_id === event.self_id) return;
@@ -47,15 +48,15 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
 
     try {
       const selfId = event.self_id;
-      const bot = ctx.pickBot(selfId);
+      const bot = event.bot;
       if (!bot) return;
 
       const isGroup = event.message_type === "group";
-      const groupId: number | undefined = isGroup ? event.group_id : undefined;
-      if (!isGroup || !groupId) return;
+      const groupIdNum = isGroup && event.group_id ? Number(event.group_id) : undefined;
+      if (!isGroup || !groupIdNum) 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";
 
@@ -78,7 +79,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         targetUserId: number,
         actionName: string,
       ) => {
-        const targetRole = await getMemberRole(bot, groupId, targetUserId);
+        const targetRole = await getMemberRole(bot, groupIdNum, targetUserId);
         if (senderRole !== targetRole) return true;
 
         await replyAdminErrorNotice({
@@ -90,10 +91,9 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         return false;
       };
 
-      // 普通群员只能给自己设置头衔。
       if (text.startsWith("我要头衔")) {
         const atUser = getAtUserId(event.message);
-        if (atUser && atUser !== event.user_id) {
+        if (atUser != null && atUser !== Number(event.user_id)) {
           await event.reply("管好自己呗～", true);
           return;
         }
@@ -105,11 +105,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         }
 
         try {
-          await (bot as any).setGroupSpecialTitle(
-            groupId,
-            event.user_id,
-            title,
-          );
+          await bot.setMemberTitle(groupIdNum, event.user_id!, title);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -123,7 +119,6 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         return;
       }
 
-      // 改头衔
       if (text.startsWith("改头衔") || text.startsWith("/改头衔")) {
         if (!(await ensureAdminPermission())) return;
 
@@ -166,7 +161,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         }
 
         try {
-          await (bot as any).setGroupSpecialTitle(groupId, targetUser, title);
+          await bot.setMemberTitle(groupIdNum, targetUser, title);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -201,10 +196,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         }
         if (!(await ensureDangerousTargetPermission(atUser, "踢出"))) return;
         try {
-          await bot.api("set_group_kick", {
-            group_id: groupId,
-            user_id: atUser,
-          });
+          await bot.kickMember(groupIdNum, atUser);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -251,7 +243,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         const durationStr = rest.replace(/@\d+\s*/, "").trim();
         const durationSec = parseDuration(durationStr) || 10 * 60;
         try {
-          await bot.setGroupBan(groupId, atUser, durationSec);
+          await bot.banMember(groupIdNum, atUser, durationSec);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -293,7 +285,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
           return;
         }
         try {
-          await bot.setGroupBan(groupId, atUser, 0);
+          await bot.banMember(groupIdNum, atUser, 0);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -326,11 +318,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
           return;
         }
         try {
-          await bot.api("set_group_admin", {
-            group_id: groupId,
-            user_id: atUser,
-            enable: true,
-          });
+          await bot.setMemberAdmin(groupIdNum, atUser, true);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -347,10 +335,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
       if (text === "/全体禁言") {
         if (!(await ensureAdminPermission())) return;
         try {
-          await bot.api("set_group_whole_ban", {
-            group_id: groupId,
-            enable: true,
-          });
+          await bot.setGroupWholeBan(groupIdNum, true);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -367,10 +352,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
       if (text === "/全体解禁") {
         if (!(await ensureAdminPermission())) return;
         try {
-          await bot.api("set_group_whole_ban", {
-            group_id: groupId,
-            enable: false,
-          });
+          await bot.setGroupWholeBan(groupIdNum, false);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({
@@ -385,8 +367,9 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
       }
 
       if (text.startsWith("改群名片") || text.startsWith("/改群名片")) {
-        if (!isGroup || !groupId) {
-          return event.reply("这个要在群里用哦～", true);
+        if (!isGroup || !groupIdNum) {
+          await event.reply("这个要在群里用哦～", true);
+      return;
         }
         if (!(await ensureAdminPermission())) return;
         const card = text.replace(/^\/?改群名片\s*/, "").trim();
@@ -400,7 +383,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
           return;
         }
         try {
-          await bot.setGroupCard(groupId, selfId, card);
+          await bot.setMemberCard(groupIdNum, selfId, card);
           await event.reply("done");
         } catch (err) {
           await replyAdminErrorNotice({
@@ -415,8 +398,9 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
       }
 
       if (text.startsWith("/改群昵称")) {
-        if (!isGroup || !groupId) {
-          return event.reply("这个要在群里用哦～", true);
+        if (!isGroup || !groupIdNum) {
+          await event.reply("这个要在群里用哦～", true);
+      return;
         }
         if (!(await ensureAdminPermission())) return;
         const groupName = text.replace(/^\/改群昵称\s*/, "").trim();
@@ -431,10 +415,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
           return;
         }
         try {
-          await bot.api("set_group_name", {
-            group_id: groupId,
-            group_name: groupName,
-          });
+          await bot.setGroupName(groupIdNum, groupName);
           await event.reply("done");
         } catch (err) {
           await replyAdminErrorNotice({
@@ -449,8 +430,9 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
       }
 
       if (text.startsWith("/改群头像")) {
-        if (!isGroup || !groupId) {
-          return event.reply("这个要在群里用哦～", true);
+        if (!isGroup || !groupIdNum) {
+          await event.reply("这个要在群里用哦～", true);
+      return;
         }
         if (!(await ensureAdminPermission())) return;
         const imageUrl = extractImageUrl(event.message);
@@ -465,10 +447,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
           return;
         }
         try {
-          await bot.api("set_group_portrait", {
-            group_id: groupId,
-            file: imageUrl,
-          });
+          await bot.setGroupPortrait(groupIdNum, imageUrl);
           await event.reply("done");
         } catch (err) {
           await replyAdminErrorNotice({
@@ -484,8 +463,9 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
 
       // 撤回 — 引用一条消息后，bot 撤回该消息
       if (text === "/撤回" || text === "撤回") {
-        if (!isGroup || !groupId) {
-          return event.reply("这个要在群里用哦～", true);
+        if (!isGroup || !groupIdNum) {
+          await event.reply("这个要在群里用哦～", true);
+      return;
         }
         if (!(await ensureAdminPermission())) return;
 
@@ -502,7 +482,7 @@ export function registerGroupAdminCommands(ctx: MiokiContext) {
         }
 
         try {
-          await bot.api("delete_msg", { message_id: quotedId });
+          await bot.recallMessage(quotedId);
           await replyDone();
         } catch (err) {
           await replyAdminErrorNotice({

package/commands/notice.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MessageEvent, MiokuContext } from "mioku";
 import { getService, Services } from "mioku";
 
 function normalizeErrorMessage(error: unknown): string {
@@ -16,8 +16,8 @@ function normalizeErrorMessage(error: unknown): string {
 }
 
 export async function replyAdminErrorNotice(options: {
-  ctx: MiokiContext;
-  event: any;
+  ctx: MiokuContext;
+  event: MessageEvent;
   instruction: string;
   fallbackMessage: string;
   error?: unknown;