koishi-plugin-bind-bot 2.2.5 → 2.2.7

package/lib/handlers/buid.handler.d.ts

@@ -21,13 +21,17 @@ export declare class BuidHandler extends BaseHandler {
      */
     private handleFindUser;
     /**
-     * 处理 mcid.bindbuid 命令
+     * 处理 buid.unbind 命令
      */
-    private handleBindBuid;
+    private handleUnbind;
     /**
-     * 处理 mcid.unbindbuid 命令
+     * 管理员为他人解绑B站账号
      */
-    private handleUnbindBuid;
+    private handleUnbindForOther;
+    /**
+     * 为自己解绑B站账号
+     */
+    private handleUnbindForSelf;
     /**
      * 解析UID输入（支持多种格式）
      */

package/lib/handlers/buid.handler.js

@@ -37,17 +37,11 @@ class BuidHandler extends base_handler_1.BaseHandler {
             .action(async ({ session }, uid) => {
             return this.handleFindUser(session, uid);
         });
-        // mcid 命令组中的 BUID 相关子命令
-        const mcidCmd = this.ctx.command('mcid');
-        // 绑定B站账号（mcid.bindbuid）
-        mcidCmd
-            .subcommand('.bindbuid <buid:string>', '绑定B站账号')
-            .action(async ({ session }, buid) => {
-            return this.handleBindBuid(session, buid);
-        });
-        // 解绑B站账号（mcid.unbindbuid）
-        mcidCmd.subcommand('.unbindbuid', '解绑B站账号').action(async ({ session }) => {
-            return this.handleUnbindBuid(session);
+        // 解绑BUID
+        buidCmd
+            .subcommand('.unbind [target:string]', '解绑B站账号')
+            .action(async ({ session }, target) => {
+            return this.handleUnbind(session, target);
         });
     }
     /**
@@ -71,12 +65,16 @@ class BuidHandler extends base_handler_1.BaseHandler {
                         : `您尚未绑定B站账号，请使用 ${this.deps.formatCommand('buid bind <UID>')} 进行绑定`)
                 ]);
             }
-            // 每次查询都刷新B站数据
+            // 每次查询都必须从API获取最新数据
             const buidUser = await this.validateBUID(bind.buidUid);
-            if (buidUser) {
-                await this.updateBuidInfoOnly(bind.qqId, buidUser);
-                bind = await this.repos.mcidbind.findByQQId(bind.qqId);
+            if (!buidUser) {
+                return this.deps.sendMessage(session, [
+                    koishi_1.h.text(`无法从API获取B站UID ${bind.buidUid} 的最新数据，该用户可能不存在或API服务暂时不可用`)
+                ]);
             }
+            // 更新本地数据库中的信息
+            await this.updateBuidInfoOnly(bind.qqId, buidUser);
+            bind = await this.repos.mcidbind.findByQQId(bind.qqId);
             const userInfo = `${target ? `用户 ${bind.qqId} 的` : '您的'}B站账号信息：\nB站UID: ${bind.buidUid}\n用户名: ${bind.buidUsername}`;
             let detailInfo = '';
             if (bind.guardLevel > 0) {
@@ -192,88 +190,86 @@ class BuidHandler extends base_handler_1.BaseHandler {
         }
     }
     /**
-     * 处理 mcid.bindbuid 命令
+     * 处理 buid.unbind 命令
      */
-    async handleBindBuid(session, buid) {
+    async handleUnbind(session, target) {
         try {
             const normalizedUserId = this.deps.normalizeQQId(session.userId);
-            this.logger.info('绑定', `QQ(${normalizedUserId})尝试绑定B站UID(${buid})`);
-            // 验证格式
-            if (!buid || !/^\d+$/.test(buid)) {
-                this.logger.warn('绑定', `QQ(${normalizedUserId})尝试绑定无效的B站UID格式: ${buid}`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('无效的B站UID格式，请输入正确的B站UID')]);
-            }
-            // 检查是否已被他人绑定
-            const existingBind = await this.repos.mcidbind.findByBuidUid(buid);
-            if (existingBind) {
-                const existingQQId = existingBind.qqId;
-                this.logger.warn('绑定', `QQ(${normalizedUserId})尝试绑定已被QQ(${existingQQId})绑定的B站UID(${buid})`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('该B站UID已被其他用户绑定')]);
-            }
-            // 验证B站UID
-            const buidUser = await this.validateBUID(buid);
-            if (!buidUser) {
-                this.logger.warn('绑定', `QQ(${normalizedUserId})尝试绑定不存在的B站UID(${buid})`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('无法验证B站UID，请确认输入正确')]);
-            }
-            // 创建或更新绑定
-            const success = await this.createOrUpdateBuidBind(normalizedUserId, buidUser);
-            if (success) {
-                this.logger.info('绑定', `QQ(${normalizedUserId})成功绑定B站UID(${buid})`);
-                return this.deps.sendMessage(session, [
-                    koishi_1.h.text('成功绑定B站账号！\n'),
-                    koishi_1.h.text(`B站UID: ${buidUser.uid}\n`),
-                    koishi_1.h.text(`用户名: ${buidUser.username}\n`),
-                    buidUser.guard_level > 0
-                        ? koishi_1.h.text(`舰长等级: ${buidUser.guard_level_text} (${buidUser.guard_level})\n`)
-                        : null,
-                    buidUser.medal
-                        ? koishi_1.h.text(`粉丝牌: ${buidUser.medal.name} Lv.${buidUser.medal.level}\n`)
-                        : null,
-                    buidUser.wealthMedalLevel > 0
-                        ? koishi_1.h.text(`荣耀等级: ${buidUser.wealthMedalLevel}\n`)
-                        : null,
-                    ...(this.config?.showAvatar
-                        ? [koishi_1.h.image(`https://workers.vrp.moe/bilibili/avatar/${buidUser.uid}?size=160`)]
-                        : [])
-                ].filter(Boolean));
-            }
-            else {
-                this.logger.error('绑定', normalizedUserId, `QQ(${normalizedUserId})绑定B站UID(${buid})失败`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('绑定失败，请稍后重试')]);
+            // 管理员为他人解绑
+            if (target) {
+                return this.handleUnbindForOther(session, target, normalizedUserId);
             }
+            // 为自己解绑
+            return this.handleUnbindForSelf(session, normalizedUserId);
         }
         catch (error) {
-            this.logger.error('绑定', session.userId, error);
-            return this.deps.sendMessage(session, [
-                koishi_1.h.text(`绑定失败：${this.getFriendlyErrorMessage(error)}`)
-            ]);
+            const normalizedUserId = this.deps.normalizeQQId(session.userId);
+            const targetInfo = target ? `为QQ(${this.deps.normalizeQQId(target)})` : '';
+            this.logger.error('解绑', `QQ(${normalizedUserId})${targetInfo}解绑B站账号失败: ${error.message}`);
+            return this.deps.sendMessage(session, [koishi_1.h.text(this.deps.getFriendlyErrorMessage(error))]);
         }
     }
     /**
-     * 处理 mcid.unbindbuid 命令
+     * 管理员为他人解绑B站账号
      */
-    async handleUnbindBuid(session) {
-        try {
-            const normalizedUserId = this.deps.normalizeQQId(session.userId);
-            this.logger.info('解绑', `QQ(${normalizedUserId})尝试解绑B站账号`);
-            // 使用 DatabaseService 的解绑方法
-            const success = await this.deps.databaseService.deleteBuidBind(normalizedUserId);
-            if (success) {
-                this.logger.info('解绑', `QQ(${normalizedUserId})成功解绑B站账号`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('已成功解绑B站账号')]);
-            }
-            else {
-                this.logger.warn('解绑', `QQ(${normalizedUserId})解绑B站账号失败`);
-                return this.deps.sendMessage(session, [koishi_1.h.text('您尚未绑定B站账号')]);
+    async handleUnbindForOther(session, target, operatorId) {
+        const normalizedTargetId = this.deps.normalizeQQId(target);
+        if (!normalizedTargetId) {
+            this.logger.warn('解绑', `QQ(${operatorId})提供的目标用户ID"${target}"无效`);
+            if (target.startsWith('@')) {
+                return this.deps.sendMessage(session, [
+                    koishi_1.h.text('❌ 请使用真正的@功能，而不是手动输入@符号\n正确做法：点击或长按用户头像选择@功能')
+                ]);
             }
-        }
-        catch (error) {
-            this.logger.error('解绑', session.userId, error);
             return this.deps.sendMessage(session, [
-                koishi_1.h.text(`解绑失败：${this.getFriendlyErrorMessage(error)}`)
+                koishi_1.h.text('❌ 目标用户ID无效\n请提供有效的QQ号或使用@功能选择用户')
             ]);
         }
+        this.logger.info('解绑', `QQ(${operatorId})尝试为QQ(${normalizedTargetId})解绑B站账号`);
+        // 检查权限
+        if (!(await this.deps.isAdmin(session.userId))) {
+            this.logger.warn('解绑', `权限不足: QQ(${operatorId})不是管理员`);
+            return this.deps.sendMessage(session, [koishi_1.h.text('只有管理员才能为其他用户解绑B站账号')]);
+        }
+        // 获取目标用户信息
+        const targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
+        if (!targetBind || !targetBind.buidUid) {
+            this.logger.warn('解绑', `QQ(${normalizedTargetId})尚未绑定B站账号`);
+            return this.deps.sendMessage(session, [koishi_1.h.text(`用户 ${normalizedTargetId} 尚未绑定B站账号`)]);
+        }
+        const oldBuidUsername = targetBind.buidUsername || targetBind.buidUid;
+        const hasMcBind = targetBind.mcUsername && targetBind.mcUsername.trim() !== '';
+        const mcKeepInfo = hasMcBind
+            ? `\n✅ 该用户的MC绑定已保留: ${targetBind.mcUsername}`
+            : '';
+        // 解绑B站账号
+        await this.deps.databaseService.deleteBuidBind(normalizedTargetId);
+        this.logger.info('解绑', `成功: 管理员QQ(${operatorId})为QQ(${normalizedTargetId})解绑B站账号: ${oldBuidUsername}(${targetBind.buidUid})`);
+        return this.deps.sendMessage(session, [
+            koishi_1.h.text(`已成功为用户 ${normalizedTargetId} 解绑B站账号: ${oldBuidUsername}(${targetBind.buidUid})${mcKeepInfo}`)
+        ]);
+    }
+    /**
+     * 为自己解绑B站账号
+     */
+    async handleUnbindForSelf(session, operatorId) {
+        this.logger.info('解绑', `QQ(${operatorId})尝试解绑自己的B站账号`);
+        const selfBind = await this.deps.databaseService.getMcBindByQQId(operatorId);
+        if (!selfBind || !selfBind.buidUid) {
+            this.logger.warn('解绑', `QQ(${operatorId})尚未绑定B站账号`);
+            return this.deps.sendMessage(session, [koishi_1.h.text('您尚未绑定B站账号')]);
+        }
+        const oldBuidUsername = selfBind.buidUsername || selfBind.buidUid;
+        const hasMcBind = selfBind.mcUsername && selfBind.mcUsername.trim() !== '';
+        const mcKeepInfo = hasMcBind
+            ? `\n✅ 您的MC绑定已保留: ${selfBind.mcUsername}`
+            : '';
+        // 解绑B站账号
+        await this.deps.databaseService.deleteBuidBind(operatorId);
+        this.logger.info('解绑', `成功: QQ(${operatorId})解绑B站账号: ${oldBuidUsername}`);
+        return this.deps.sendMessage(session, [
+            koishi_1.h.text(`已成功解绑B站账号: ${oldBuidUsername}${mcKeepInfo}`)
+        ]);
     }
     // ========== 私有辅助方法 ==========
     /**

package/lib/handlers/group-request-review.handler.js

@@ -495,30 +495,19 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
      * 检查管理员权限
      */
     async checkAdminPermission(userId, groupId, bot) {
-        // 检查是否是 masterId
-        if (userId === this.config.masterId) {
-            return true;
-        }
-        // 先检查缓存
-        const cache = this.adminCache.get(groupId);
-        if (cache && Date.now() - cache.lastUpdate < 5 * 60 * 1000) {
-            return cache.admins.includes(userId);
-        }
-        // 调用 NapCat 扩展 API 获取群信息
         try {
-            const groupInfo = await bot.internal.getGroupInfoEx(groupId);
-            const admins = (groupInfo.admins || []).map(String);
-            // 更新缓存
-            this.adminCache.set(groupId, {
-                admins,
-                lastUpdate: Date.now()
-            });
-            return admins.includes(userId);
+            const normalizedUserId = this.deps.normalizeQQId(userId);
+            // 检查是否是 masterId
+            if (this.config.masterId && normalizedUserId === this.config.masterId) {
+                return true;
+            }
+            // 检查数据库中的管理员标记（与其他功能保持一致）
+            const bind = await this.repos.mcidbind.findByQQId(normalizedUserId);
+            return bind?.isAdmin === true;
         }
         catch (error) {
-            this.logger.error('入群审批', `获取管理员列表失败: ${error.message}`);
-            // 降级方案：只允许 masterId
-            return userId === this.config.masterId;
+            this.logger.error('入群审批', `检查管理员权限失败: ${error.message}`);
+            return false;
         }
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bind-bot",
   "description": "[WittF自用] BIND-BOT - 账号绑定管理机器人，支持Minecraft账号和B站账号绑定与管理。",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [