koishi-plugin-bind-bot 2.2.6 → 2.2.8

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

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

package/lib/handlers/buid.handler.js

@@ -39,9 +39,9 @@ class BuidHandler extends base_handler_1.BaseHandler {
         });
         // 解绑BUID
         buidCmd
-            .subcommand('.unbind', '解绑B站账号')
-            .action(async ({ session }) => {
-            return this.handleUnbind(session);
+            .subcommand('.unbind [target:string]', '解绑B站账号')
+            .action(async ({ session }, target) => {
+            return this.handleUnbind(session, target);
         });
     }
     /**
@@ -192,27 +192,84 @@ class BuidHandler extends base_handler_1.BaseHandler {
     /**
      * 处理 buid.unbind 命令
      */
-    async handleUnbind(session) {
+    async handleUnbind(session, target) {
         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站账号')]);
+            // 管理员为他人解绑
+            if (target) {
+                return this.handleUnbindForOther(session, target, normalizedUserId);
             }
+            // 为自己解绑
+            return this.handleUnbindForSelf(session, normalizedUserId);
         }
         catch (error) {
-            this.logger.error('解绑', session.userId, 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))]);
+        }
+    }
+    /**
+     * 管理员为他人解绑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正确做法：点击或长按用户头像选择@功能')
+                ]);
+            }
             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

@@ -114,6 +114,12 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             const msgId = messageId.toString();
             const emojiData = likes;
             const operatorId = this.deps.normalizeQQId(userId);
+            // 忽略 bot 自己的表情回应（addReactionOptions 添加表情时也会触发此事件）
+            const botId = this.deps.normalizeQQId(session.bot.selfId);
+            if (operatorId === botId) {
+                this.logger.debug('入群审批', `忽略 bot 自己的表情回应 - 消息: ${msgId}`);
+                return;
+            }
             this.logger.debug('入群审批', `收到表情回应 - 消息: ${msgId}, 操作者: ${operatorId}, 表情数: ${emojiData.length}`);
             // 检查是否是待审批的消息
             const pendingReq = this.pendingRequests.get(msgId);
@@ -177,6 +183,8 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             buidUid = parsedUid;
             // 尝试使用强制绑定模式获取完整信息（避免频率限制）
             let zminfoData = null;
+            // 存储强制绑定模式下获取的目标粉丝牌信息
+            let targetMedalInfo = null;
             if (this.config.forceBindSessdata) {
                 try {
                     this.logger.debug('入群审批', '使用强制绑定模式获取用户信息...');
@@ -184,7 +192,9 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                     const standardUser = this.deps.forceBinder.convertToZminfoUser(enhancedUser);
                     buidUsername = standardUser.username;
                     zminfoData = standardUser;
-                    this.logger.debug('入群审批', `✅ 强制绑定模式获取成功: ${buidUsername}`);
+                    // 保存目标粉丝牌信息，用于后续显示
+                    targetMedalInfo = enhancedUser.targetMedal || null;
+                    this.logger.debug('入群审批', `✅ 强制绑定模式获取成功: ${buidUsername}, 目标粉丝牌: ${targetMedalInfo?.found ? '已找到' : '未找到'}`);
                 }
                 catch (error) {
                     this.logger.warn('入群审批', `强制绑定获取用户信息失败: ${error.message}，降级到ZMINFO`);
@@ -205,8 +215,21 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                     this.logger.debug('入群审批', `✅ ZMINFO用户名: ${buidUsername}`);
                 }
             }
-            // 粉丝牌信息：从ZMINFO或强制绑定结果获取
-            if (zminfoData) {
+            // 粉丝牌信息：优先使用强制绑定获取的目标粉丝牌，其次使用ZMINFO的当前佩戴粉丝牌
+            if (targetMedalInfo) {
+                // 使用强制绑定模式获取的目标粉丝牌信息（从B站粉丝牌墙获取，更准确）
+                if (targetMedalInfo.found && targetMedalInfo.name && targetMedalInfo.level !== undefined) {
+                    medalInfo = `🎖️ ${targetMedalInfo.name} Lv.${targetMedalInfo.level}`;
+                    if (targetMedalInfo.wearing_status === 1) {
+                        medalInfo += ' 【已佩戴】';
+                    }
+                }
+                else {
+                    medalInfo = `⚠️ 未获取到 "${this.config.forceBindTargetMedalName}" 粉丝牌`;
+                }
+            }
+            else if (zminfoData) {
+                // 降级：使用ZMINFO的当前佩戴粉丝牌信息
                 const medalLevel = zminfoData.medal?.level || 0;
                 const medalName = zminfoData.medal?.name || '';
                 if (medalName === this.config.forceBindTargetMedalName) {
@@ -495,30 +518,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.6",
+  "version": "2.2.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [