koishi-plugin-bind-bot 2.1.8 → 2.2.1

package/lib/export-utils.js

@@ -37,6 +37,7 @@ exports.GroupExporter = void 0;
 const XLSX = __importStar(require("xlsx"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const bind_status_1 = require("./utils/bind-status");
 class GroupExporter {
     logger;
     ctx;
@@ -142,8 +143,8 @@ class GroupExporter {
             // 判断绑定状态
             let bindingStatus = '未绑定';
             if (binding) {
-                const hasMc = binding.mcUsername && !binding.mcUsername.startsWith('_temp_');
-                const hasBuid = binding.buidUid;
+                const hasMc = bind_status_1.BindStatus.hasValidMcBind(binding);
+                const hasBuid = bind_status_1.BindStatus.hasValidBuidBind(binding);
                 if (hasMc && hasBuid) {
                     bindingStatus = '完全绑定';
                 }
@@ -164,7 +165,7 @@ class GroupExporter {
                 角色: member.role,
                 加群时间: this.formatTimestamp(member.join_time),
                 最后发言: this.formatTimestamp(member.last_sent_time),
-                MC用户名: binding?.mcUsername && !binding.mcUsername.startsWith('_temp_') ? binding.mcUsername : '',
+                MC用户名: bind_status_1.BindStatus.getDisplayMcUsername(binding, ''),
                 MC_UUID: binding?.mcUuid || '',
                 B站UID: binding?.buidUid || '',
                 B站用户名: binding?.buidUsername || '',

package/lib/handlers/binding.handler.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BindingHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
+const bind_status_1 = require("../utils/bind-status");
 /**
  * 交互式绑定命令处理器
  * 处理 "绑定" 命令，引导用户完成 MC 和 B站双重绑定
@@ -60,12 +61,10 @@ class BindingHandler extends base_handler_1.BaseHandler {
                     // 检查目标用户当前绑定状态
                     const targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
                     // 如果两个账号都已绑定，不需要进入绑定流程
-                    if (targetBind && targetBind.mcUsername && targetBind.buidUid) {
+                    if (bind_status_1.BindStatus.hasCompletedAllBinds(targetBind)) {
                         this.logger.info('交互绑定', `QQ(${normalizedTargetId})已完成全部绑定`, true);
                         // 显示当前绑定信息
-                        const displayUsername = targetBind.mcUsername && !targetBind.mcUsername.startsWith('_temp_')
-                            ? targetBind.mcUsername
-                            : '未绑定';
+                        const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(targetBind, '未绑定');
                         let bindInfo = `用户 ${normalizedTargetId} 已完成全部账号绑定：\n✅ MC账号: ${displayUsername}\n✅ B站账号: ${targetBind.buidUsername} (UID: ${targetBind.buidUid})`;
                         if (targetBind.guardLevel > 0) {
                             bindInfo += `\n舰长等级: ${targetBind.guardLevelText}`;
@@ -78,20 +77,18 @@ class BindingHandler extends base_handler_1.BaseHandler {
                     // 为目标用户创建绑定会话
                     this.deps.createBindingSession(target, channelId, 'waiting_buid');
                     // 如果已绑定MC但未绑定B站，直接进入B站绑定流程
-                    if (targetBind && targetBind.mcUsername && !targetBind.buidUid) {
+                    if (bind_status_1.BindStatus.hasValidMcBind(targetBind) && !bind_status_1.BindStatus.hasValidBuidBind(targetBind)) {
                         this.logger.info('交互绑定', `QQ(${normalizedTargetId})已绑定MC，进入B站绑定流程`, true);
                         // 更新会话状态
                         this.deps.updateBindingSession(target, channelId, {
                             state: 'waiting_buid',
-                            mcUsername: targetBind.mcUsername && !targetBind.mcUsername.startsWith('_temp_')
+                            mcUsername: bind_status_1.BindStatus.hasValidMcBind(targetBind)
                                 ? targetBind.mcUsername
                                 : null,
                             mcUuid: targetBind.mcUuid
                         });
                         // 向目标用户发送提示（@他们）
-                        const displayUsername = targetBind.mcUsername && !targetBind.mcUsername.startsWith('_temp_')
-                            ? targetBind.mcUsername
-                            : '未绑定';
+                        const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(targetBind, '未绑定');
                         await this.deps.sendMessage(session, [
                             koishi_1.h.at(normalizedTargetId),
                             koishi_1.h.text(` 管理员为您启动了B站绑定流程\n🎮 已绑定MC: ${displayUsername}\n🔗 请发送您的B站UID`)
@@ -118,10 +115,7 @@ class BindingHandler extends base_handler_1.BaseHandler {
                 // 检查用户当前绑定状态
                 const existingBind = await this.deps.databaseService.getMcBindByQQId(normalizedUserId);
                 // 如果两个账号都已绑定（且MC不是temp用户名），不需要进入绑定流程
-                if (existingBind &&
-                    existingBind.mcUsername &&
-                    !existingBind.mcUsername.startsWith('_temp_') &&
-                    existingBind.buidUid) {
+                if (existingBind && bind_status_1.BindStatus.hasValidMcBind(existingBind) && existingBind.buidUid) {
                     this.logger.info('交互绑定', `QQ(${normalizedUserId})已完成全部绑定`, true);
                     // 显示当前绑定信息
                     const displayUsername = existingBind.mcUsername;
@@ -136,10 +130,7 @@ class BindingHandler extends base_handler_1.BaseHandler {
                     return this.deps.sendMessage(session, [koishi_1.h.text(bindInfo)]);
                 }
                 // 如果已绑定MC（且不是temp用户名）但未绑定B站，直接进入B站绑定流程
-                if (existingBind &&
-                    existingBind.mcUsername &&
-                    !existingBind.mcUsername.startsWith('_temp_') &&
-                    !existingBind.buidUid) {
+                if (existingBind && bind_status_1.BindStatus.hasValidMcBind(existingBind) && !existingBind.buidUid) {
                     this.logger.info('交互绑定', `QQ(${normalizedUserId})已绑定MC，进入B站绑定流程`, true);
                     // 创建绑定会话，状态直接设为等待B站UID
                     const timeout = setTimeout(() => {
@@ -172,8 +163,7 @@ class BindingHandler extends base_handler_1.BaseHandler {
                 if (existingBind &&
                     existingBind.buidUid &&
                     existingBind.buidUsername &&
-                    existingBind.mcUsername &&
-                    existingBind.mcUsername.startsWith('_temp_')) {
+                    !bind_status_1.BindStatus.hasValidMcBind(existingBind)) {
                     this.logger.info('交互绑定', `QQ(${normalizedUserId})只绑定了B站，进入MC绑定流程`, true);
                     // 创建绑定会话，状态设为等待MC用户名
                     this.deps.createBindingSession(session.userId, channelId, 'waiting_mc_username');

package/lib/handlers/buid.handler.js

@@ -7,6 +7,7 @@ exports.BuidHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
 const axios_1 = __importDefault(require("axios"));
+const bind_status_1 = require("../utils/bind-status");
 /**
  * BUID 命令处理器
  * 处理 B站账号相关命令
@@ -256,27 +257,16 @@ class BuidHandler extends base_handler_1.BaseHandler {
         try {
             const normalizedUserId = this.deps.normalizeQQId(session.userId);
             this.logger.info('解绑', `QQ(${normalizedUserId})尝试解绑B站账号`);
-            // 查询当前绑定
-            const bind = await this.repos.mcidbind.findByQQId(normalizedUserId);
-            if (!bind || !bind.buidUid) {
-                this.logger.warn('解绑', `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站账号')]);
             }
-            // 更新绑定信息
-            const updateData = {
-                buidUid: '',
-                buidUsername: '',
-                guardLevel: 0,
-                guardLevelText: '',
-                medalName: '',
-                medalLevel: 0,
-                wealthMedalLevel: 0,
-                lastActiveTime: null,
-                lastModified: new Date()
-            };
-            await this.repos.mcidbind.update(normalizedUserId, updateData);
-            this.logger.info('解绑', `QQ(${normalizedUserId})成功解绑B站账号`);
-            return this.deps.sendMessage(session, [koishi_1.h.text('已成功解绑B站账号')]);
         }
         catch (error) {
             this.logger.error('解绑', session.userId, error);
@@ -400,22 +390,25 @@ class BuidHandler extends base_handler_1.BaseHandler {
                 lastModified: new Date()
             };
             if (bind) {
+                // 添加 hasBuidBind 标志
+                updateData.hasBuidBind = true;
                 await this.repos.mcidbind.update(normalizedQQId, updateData);
                 this.logger.info('B站账号绑定', `更新绑定: QQ=${normalizedQQId}, B站UID=${buidUser.uid}, 用户名=${buidUser.username}`);
             }
             else {
-                const tempMcUsername = `_temp_skip_${normalizedQQId}_${Date.now()}`;
                 const newBind = {
                     qqId: normalizedQQId,
-                    mcUsername: tempMcUsername,
+                    mcUsername: '',
                     mcUuid: '',
                     isAdmin: false,
                     whitelist: [],
                     tags: [],
+                    hasMcBind: false,
+                    hasBuidBind: true,
                     ...updateData
                 };
                 await this.repos.mcidbind.create(newBind);
-                this.logger.info('B站账号绑定', `创建绑定(跳过MC): QQ=${normalizedQQId}, B站UID=${buidUser.uid}, 用户名=${buidUser.username}, 临时MC用户名=${tempMcUsername}`);
+                this.logger.info('B站账号绑定', `创建绑定(跳过MC): QQ=${normalizedQQId}, B站UID=${buidUser.uid}, 用户名=${buidUser.username}`);
             }
             return true;
         }
@@ -523,7 +516,7 @@ class BuidHandler extends base_handler_1.BaseHandler {
                     try {
                         const latestTargetBind = await this.repos.mcidbind.findByQQId(normalizedTargetId);
                         if (latestTargetBind) {
-                            const mcName = latestTargetBind.mcUsername && !latestTargetBind.mcUsername.startsWith('_temp_')
+                            const mcName = bind_status_1.BindStatus.hasValidMcBind(latestTargetBind)
                                 ? latestTargetBind.mcUsername
                                 : null;
                             await this.deps.nicknameService.autoSetGroupNickname(session, mcName, enhancedUser.username, String(enhancedUser.uid), normalizedTargetId);
@@ -560,7 +553,7 @@ class BuidHandler extends base_handler_1.BaseHandler {
                     try {
                         const latestBind = await this.repos.mcidbind.findByQQId(operatorQQId);
                         if (latestBind) {
-                            const mcName = latestBind.mcUsername && !latestBind.mcUsername.startsWith('_temp_')
+                            const mcName = bind_status_1.BindStatus.hasValidMcBind(latestBind)
                                 ? latestBind.mcUsername
                                 : null;
                             await this.deps.nicknameService.autoSetGroupNickname(session, mcName, enhancedUser.username, String(enhancedUser.uid));
@@ -641,7 +634,7 @@ class BuidHandler extends base_handler_1.BaseHandler {
         try {
             const latestTargetBind = await this.repos.mcidbind.findByQQId(normalizedTargetId);
             if (latestTargetBind) {
-                const mcName = latestTargetBind.mcUsername && !latestTargetBind.mcUsername.startsWith('_temp_')
+                const mcName = bind_status_1.BindStatus.hasValidMcBind(latestTargetBind)
                     ? latestTargetBind.mcUsername
                     : null;
                 await this.deps.nicknameService.autoSetGroupNickname(session, mcName, buidUser.username, actualUid, normalizedTargetId);
@@ -701,7 +694,7 @@ class BuidHandler extends base_handler_1.BaseHandler {
         try {
             const latestBind = await this.repos.mcidbind.findByQQId(operatorQQId);
             if (latestBind) {
-                const mcName = latestBind.mcUsername && !latestBind.mcUsername.startsWith('_temp_')
+                const mcName = bind_status_1.BindStatus.hasValidMcBind(latestBind)
                     ? latestBind.mcUsername
                     : null;
                 await this.deps.nicknameService.autoSetGroupNickname(session, mcName, buidUser.username, actualUid);

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupRequestReviewHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
+const bind_status_1 = require("../utils/bind-status");
 /**
  * 入群申请审批处理器
  *
@@ -85,7 +86,7 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                 status: 'pending'
             };
             this.pendingRequests.set(broadcastMsgId, pendingReq);
-            this.logger.info('入群审批', `[DEBUG] 已保存待审批记录 - 申请人: ${normalizedUserId}, 播报消息ID: ${broadcastMsgId}, 目标群: ${this.reviewConfig.reviewGroupId}`, true);
+            this.logger.info('入群审批', `已保存待审批记录 - 申请人: ${normalizedUserId}, 播报消息ID: ${broadcastMsgId}`, true);
             // 自动添加表情回应选项
             await this.addReactionOptions(broadcastMsgId, session.bot);
         }
@@ -98,23 +99,12 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
      */
     async handleNotice(session) {
         try {
-            // 【调试】最早期日志 - 记录所有收到的notice事件
-            this.logger.info('入群审批', `[DEBUG] 收到notice事件 - type: ${session.type}, subtype: ${session.subtype}, guildId: ${session.guildId}`, true);
             // 只处理群表情回应事件
             if (session.subtype !== 'group-msg-emoji-like') {
                 return;
             }
             // 获取原始事件数据（直接访问 session.onebot，参考luckydraw实现）
             const data = session.onebot;
-            // 【调试】输出完整的原始事件数据
-            this.logger.info('入群审批', `[DEBUG] 表情回应原始数据: ${JSON.stringify({
-                session_guildId: session.guildId,
-                session_channelId: session.channelId,
-                onebot_group_id: data?.group_id,
-                onebot_message_id: data?.message_id,
-                onebot_user_id: data?.user_id,
-                onebot_likes: data?.likes
-            })}`, true);
             const messageId = data?.message_id;
             const userId = data?.user_id?.toString();
             const likes = data?.likes || [];
@@ -128,8 +118,6 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             // 检查是否是待审批的消息
             const pendingReq = this.pendingRequests.get(msgId);
             if (!pendingReq) {
-                this.logger.info('入群审批', `[DEBUG] 消息${msgId}不在待审批列表中`, true);
-                this.logger.info('入群审批', `[DEBUG] 当前待审批消息ID列表: [${Array.from(this.pendingRequests.keys()).join(', ')}]`, true);
                 return;
             }
             // 检查是否已处理
@@ -249,7 +237,7 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             koishi_1.h.image(avatar),
             koishi_1.h.text(`\n👤 QQ 昵称：${nickname}\n`),
             koishi_1.h.text(`🆔 QQ 号：${qq}\n`),
-            koishi_1.h.text(`💬 入群问题：${answer}\n\n`)
+            koishi_1.h.text(`💬 ${answer}\n\n`)
         ];
         // B 站信息
         if (buidUid) {
@@ -265,7 +253,7 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
         else {
             elements.push(koishi_1.h.text(`⚠️ 未提供有效的 B 站 UID\n\n`));
         }
-        elements.push(koishi_1.h.text('━━━━━━━━━━━━━━━\n'), koishi_1.h.text('请管理员点击表情回应：\n'), koishi_1.h.text('👍 /太赞了 - 通过并自动绑定\n'), koishi_1.h.text('😊 /偷感 - 通过并交互式绑定\n'), koishi_1.h.text('❌ /NO - 拒绝申请'));
+        elements.push(koishi_1.h.text('请点击表情回应：\n'), koishi_1.h.text('👍 - 通过并自动绑定\n'), koishi_1.h.text('😊 - 通过并交互式绑定\n'), koishi_1.h.text('❌ - 拒绝申请'));
         try {
             const result = await session.bot.sendMessage(this.reviewConfig.reviewGroupId, elements);
             // result 通常是数组，第一个元素是消息ID
@@ -627,11 +615,10 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
             // 3. 获取或创建绑定记录
             let bind = await this.repos.mcidbind.findByQQId(qq);
             if (!bind) {
-                // 创建新绑定（使用临时MC用户名）
-                const tempMcUsername = `_temp_${Date.now()}`;
+                // 创建新绑定（不使用临时MC用户名）
                 bind = await this.repos.mcidbind.create({
                     qqId: qq,
-                    mcUsername: tempMcUsername,
+                    mcUsername: '',
                     mcUuid: '',
                     buidUid: zminfoUser.uid,
                     buidUsername: finalUsername,
@@ -643,7 +630,9 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                     medalLevel: zminfoUser.medal?.level || 0,
                     wealthMedalLevel: zminfoUser.wealthMedalLevel || 0,
                     lastActiveTime: new Date(),
-                    lastModified: new Date()
+                    lastModified: new Date(),
+                    hasMcBind: false,
+                    hasBuidBind: true
                 });
                 this.logger.info('入群审批', `已创建新绑定 - QQ: ${qq}, UID: ${uid}`, true);
             }
@@ -662,16 +651,15 @@ class GroupRequestReviewHandler extends base_handler_1.BaseHandler {
                     medalLevel: zminfoUser.medal?.level || 0,
                     wealthMedalLevel: zminfoUser.wealthMedalLevel || 0,
                     lastActiveTime: new Date(),
-                    lastModified: new Date()
+                    lastModified: new Date(),
+                    hasBuidBind: true
                 });
                 this.logger.info('入群审批', `已更新绑定 - QQ: ${qq}, UID: ${uid}`, true);
             }
             // 4. 更新群昵称（使用标准格式）
             try {
                 const groupId = this.reviewConfig.targetGroupId;
-                const mcInfo = bind.mcUsername && !bind.mcUsername.startsWith('_temp_')
-                    ? bind.mcUsername
-                    : '未绑定';
+                const mcInfo = bind_status_1.BindStatus.getDisplayMcUsername(bind, '未绑定');
                 const nickname = `${finalUsername}（ID:${mcInfo}）`;
                 await bot.internal.setGroupCard(groupId, qq, nickname);
                 this.logger.info('入群审批', `已更新群昵称 - QQ: ${qq}, 昵称: ${nickname}`);

package/lib/handlers/lottery.handler.js

@@ -140,7 +140,8 @@ class LotteryHandler extends base_handler_1.BaseHandler {
                 for (let i = 0; i < displayUsers.length; i++) {
                     const user = displayUsers[i];
                     const index = i + 1;
-                    const displayMcName = user.mcUsername && !user.mcUsername.startsWith('_temp_') ? user.mcUsername : '未绑定';
+                    // 注意：这里的user是简化对象，不是完整的MCIDBIND
+                    const displayMcName = user.mcUsername || '未绑定';
                     groupMessage += `${index}. ${user.buidUsername} (UID: ${user.uid})\n`;
                     groupMessage += `   QQ: ${user.qqId} | MC: ${displayMcName}\n`;
                 }
@@ -176,9 +177,8 @@ class LotteryHandler extends base_handler_1.BaseHandler {
                     // 查找对应的绑定用户
                     const matchedUser = stats.matchedUsers.find(user => user.uid === winner.uid);
                     if (matchedUser) {
-                        const displayMcName = matchedUser.mcUsername && !matchedUser.mcUsername.startsWith('_temp_')
-                            ? matchedUser.mcUsername
-                            : '未绑定';
+                        // 注意：matchedUser是简化对象，不是完整的MCIDBIND
+                        const displayMcName = matchedUser.mcUsername || '未绑定';
                         privateMessage += `${index}. ${winner.username} (UID: ${winner.uid})\n`;
                         privateMessage += `   QQ: ${matchedUser.qqId} | MC: ${displayMcName}\n`;
                     }

package/lib/handlers/mcid.handler.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.McidCommandHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
+const bind_status_1 = require("../utils/bind-status");
 class McidCommandHandler extends base_handler_1.BaseHandler {
     /**
      * 注册所有MCID命令
@@ -80,7 +81,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                 }
                 this.logger.info('查询', `QQ(${normalizedUserId})查询QQ(${normalizedTargetId})的MC账号信息`);
                 const targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
-                if (!targetBind || !targetBind.mcUsername || targetBind.mcUsername.startsWith('_temp_')) {
+                if (!targetBind || !bind_status_1.BindStatus.hasValidMcBind(targetBind)) {
                     this.logger.info('查询', `QQ(${normalizedTargetId})未绑定MC账号`);
                     // 检查是否绑定了B站
                     if (targetBind && targetBind.buidUid) {
@@ -120,7 +121,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             // 查询自己
             this.logger.info('查询', `QQ(${normalizedUserId})查询自己的MC账号信息`);
             const selfBind = await this.deps.databaseService.getMcBindByQQId(normalizedUserId);
-            if (!selfBind || !selfBind.mcUsername || selfBind.mcUsername.startsWith('_temp_')) {
+            if (!selfBind || !bind_status_1.BindStatus.hasValidMcBind(selfBind)) {
                 this.logger.info('查询', `QQ(${normalizedUserId})未绑定MC账号`);
                 // 检查是否绑定了B站
                 if (selfBind && selfBind.buidUid) {
@@ -237,7 +238,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                 : `您尚未绑定B站账号，使用 ${this.deps.formatCommand('buid bind <B站UID>')} 进行绑定`;
         }
         this.logger.info('查询', `QQ(${bind.qqId})的MC账号信息：用户名=${bind.mcUsername}, UUID=${bind.mcUuid}`);
-        const displayUsername = bind.mcUsername && !bind.mcUsername.startsWith('_temp_') ? bind.mcUsername : '未绑定';
+        const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(bind, '未绑定');
         const prefix = targetId ? `用户 ${targetId} 的` : '您的';
         const messageElements = [
             koishi_1.h.text(`${prefix}MC账号信息：\n用户名: ${displayUsername}\nUUID: ${formattedUuid}${whitelistInfo}`),
@@ -249,7 +250,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
         const sendPromise = this.deps.sendMessage(session, messageElements);
         // 异步设置群昵称
         if (bind.buidUid && bind.buidUsername) {
-            const mcName = bind.mcUsername && !bind.mcUsername.startsWith('_temp_') ? bind.mcUsername : null;
+            const mcName = bind_status_1.BindStatus.hasValidMcBind(bind) ? bind.mcUsername : null;
             this.deps.nicknameService
                 .autoSetGroupNickname(session, mcName, bind.buidUsername, bind.buidUid, targetId || undefined)
                 .catch(err => this.logger.warn('查询', `群昵称设置失败: ${err.message}`));
@@ -310,7 +311,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                 adminInfo += `\n管理员权限: ${bind.isAdmin ? '是' : '否'}`;
             }
             this.logger.info('反向查询', `成功: MC用户名"${username}"被QQ(${bind.qqId})绑定`);
-            const displayUsername = bind.mcUsername && !bind.mcUsername.startsWith('_temp_') ? bind.mcUsername : '未绑定';
+            const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(bind, '未绑定');
             return this.deps.sendMessage(session, [
                 koishi_1.h.text(`MC用户名"${displayUsername}"绑定信息:\nQQ号: ${bind.qqId}\nUUID: ${formattedUuid}${adminInfo}`),
                 ...(mcAvatarUrl ? [koishi_1.h.image(mcAvatarUrl)] : [])
@@ -432,7 +433,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
         // 检查是否已绑定
         const selfBind = await this.deps.databaseService.getMcBindByQQId(operatorId);
         if (selfBind && selfBind.mcUsername) {
-            const isTempUsername = selfBind.mcUsername.startsWith('_temp_');
+            const isTempUsername = !bind_status_1.BindStatus.hasValidMcBind(selfBind);
             if (!isTempUsername) {
                 // 检查冷却时间
                 if (!(await this.deps.isAdmin(session.userId)) &&
@@ -443,9 +444,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                     const passedDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
                     const remainingDays = days - passedDays;
                     this.logger.warn('绑定', `QQ(${operatorId})已绑定MC账号"${selfBind.mcUsername}"，且在冷却期内`);
-                    const displayUsername = selfBind.mcUsername && !selfBind.mcUsername.startsWith('_temp_')
-                        ? selfBind.mcUsername
-                        : '未绑定';
+                    const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(selfBind, '未绑定');
                     return this.deps.sendMessage(session, [
                         koishi_1.h.text(`您已绑定MC账号: ${displayUsername}，如需修改，请在冷却期结束后(还需${remainingDays}天)使用 ` +
                             this.deps.formatCommand('mcid change') +
@@ -453,9 +452,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                     ]);
                 }
                 this.logger.debug('绑定', `QQ(${operatorId})已绑定MC账号"${selfBind.mcUsername}"，建议使用change命令`);
-                const displayUsername = selfBind.mcUsername && !selfBind.mcUsername.startsWith('_temp_')
-                    ? selfBind.mcUsername
-                    : '未绑定';
+                const displayUsername = bind_status_1.BindStatus.getDisplayMcUsername(selfBind, '未绑定');
                 return this.deps.sendMessage(session, [
                     koishi_1.h.text(`您已绑定MC账号: ${displayUsername}，如需修改请使用 ` +
                         this.deps.formatCommand('mcid change') +
@@ -714,17 +711,16 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             this.logger.warn('解绑', `QQ(${normalizedTargetId})尚未绑定MC账号`);
             return this.deps.sendMessage(session, [koishi_1.h.text(`用户 ${normalizedTargetId} 尚未绑定MC账号`)]);
         }
-        const oldUsername = targetBind.mcUsername && !targetBind.mcUsername.startsWith('_temp_')
-            ? targetBind.mcUsername
-            : '未绑定';
-        const oldBuidInfo = targetBind.buidUid
-            ? ` 和 B站账号: ${targetBind.buidUsername}(${targetBind.buidUid})`
+        const oldUsername = bind_status_1.BindStatus.getDisplayMcUsername(targetBind, '未绑定');
+        const hasBuidBind = targetBind.buidUid && targetBind.buidUid.trim() !== '';
+        const buidKeepInfo = hasBuidBind
+            ? `\n✅ 该用户的B站绑定已保留: ${targetBind.buidUsername}(${targetBind.buidUid})`
             : '';
-        // 删除绑定记录
+        // 解绑MC账号
         await this.deps.databaseService.deleteMcBind(target);
-        this.logger.info('解绑', `成功: 管理员QQ(${operatorId})为QQ(${normalizedTargetId})解绑MC账号: ${oldUsername}${oldBuidInfo}`);
+        this.logger.info('解绑', `成功: 管理员QQ(${operatorId})为QQ(${normalizedTargetId})解绑MC账号: ${oldUsername}`);
         return this.deps.sendMessage(session, [
-            koishi_1.h.text(`已成功为用户 ${normalizedTargetId} 解绑MC账号: ${oldUsername}${oldBuidInfo}`)
+            koishi_1.h.text(`已成功为用户 ${normalizedTargetId} 解绑MC账号: ${oldUsername}${buidKeepInfo}`)
         ]);
     }
     async handleUnbindForSelf(session, operatorId) {
@@ -734,17 +730,16 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             this.logger.warn('解绑', `QQ(${operatorId})尚未绑定MC账号`);
             return this.deps.sendMessage(session, [koishi_1.h.text('您尚未绑定MC账号')]);
         }
-        const oldUsername = selfBind.mcUsername && !selfBind.mcUsername.startsWith('_temp_')
-            ? selfBind.mcUsername
-            : '未绑定';
-        const oldBuidInfo = selfBind.buidUid
-            ? ` 和 B站账号: ${selfBind.buidUsername}(${selfBind.buidUid})`
+        const oldUsername = bind_status_1.BindStatus.getDisplayMcUsername(selfBind, '未绑定');
+        const hasBuidBind = selfBind.buidUid && selfBind.buidUid.trim() !== '';
+        const buidKeepInfo = hasBuidBind
+            ? `\n✅ 您的B站绑定已保留: ${selfBind.buidUsername}(${selfBind.buidUid})`
             : '';
-        // 删除绑定记录
+        // 解绑MC账号
         await this.deps.databaseService.deleteMcBind(operatorId);
-        this.logger.info('解绑', `成功: QQ(${operatorId})解绑MC账号: ${oldUsername}${oldBuidInfo}`);
+        this.logger.info('解绑', `成功: QQ(${operatorId})解绑MC账号: ${oldUsername}`);
         return this.deps.sendMessage(session, [
-            koishi_1.h.text(`已成功解绑MC账号: ${oldUsername}${oldBuidInfo}`)
+            koishi_1.h.text(`已成功解绑MC账号: ${oldUsername}${buidKeepInfo}`)
         ]);
     }
     /**
@@ -779,14 +774,15 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             }
             else {
                 // 用户不存在绑定记录，创建一个新记录并设为管理员
-                const tempUsername = `_temp_${normalizedTargetId}`;
                 try {
                     await this.repos.mcidbind.create({
                         qqId: normalizedTargetId,
-                        mcUsername: tempUsername,
+                        mcUsername: '',
                         mcUuid: '',
                         lastModified: new Date(),
-                        isAdmin: true
+                        isAdmin: true,
+                        hasMcBind: false,
+                        hasBuidBind: false
                     });
                     this.logger.info('管理员', `成功: 主人QQ(${normalizedUserId})将QQ(${normalizedTargetId})设为管理员 (创建新记录)`);
                     return this.deps.sendMessage(session, [
@@ -865,7 +861,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             // 格式化管理员列表
             const adminList = admins
                 .map(admin => {
-                const displayUsername = admin.mcUsername && !admin.mcUsername.startsWith('_temp_') ? admin.mcUsername : null;
+                const displayUsername = bind_status_1.BindStatus.hasValidMcBind(admin) ? admin.mcUsername : null;
                 return `- ${admin.qqId}${displayUsername ? ` (MC: ${displayUsername})` : ''}`;
             })
                 .join('\n');
@@ -898,12 +894,10 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
             let mcidBoundUsers = 0;
             let buidBoundUsers = 0;
             for (const bind of allBinds) {
-                const hasMcid = bind.mcUsername && !bind.mcUsername.startsWith('_temp_');
-                if (hasMcid) {
+                if (bind_status_1.BindStatus.hasValidMcBind(bind)) {
                     mcidBoundUsers++;
                 }
-                const hasBuid = bind.buidUid && bind.buidUid.trim() !== '';
-                if (hasBuid) {
+                if (bind_status_1.BindStatus.hasValidBuidBind(bind)) {
                     buidBoundUsers++;
                 }
             }
@@ -977,7 +971,7 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                         continue;
                     }
                     // 检查昵称格式
-                    const mcInfo = bind.mcUsername && !bind.mcUsername.startsWith('_temp_') ? bind.mcUsername : null;
+                    const mcInfo = bind_status_1.BindStatus.hasValidMcBind(bind) ? bind.mcUsername : null;
                     const isCorrect = this.deps.nicknameService.checkNicknameFormat(currentNickname, bind.buidUsername, mcInfo);
                     if (!isCorrect) {
                         // 修复群昵称

package/lib/handlers/tag.handler.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
+const bind_status_1 = require("../utils/bind-status");
 class TagHandler extends base_handler_1.BaseHandler {
     register() {
         const cmd = this.ctx.command('mcid', 'Minecraft账号和B站账号绑定管理');
@@ -78,15 +79,16 @@ class TagHandler extends base_handler_1.BaseHandler {
                 this.logger.info('标签', `管理员QQ(${normalizedUserId})尝试为QQ(${normalizedTargetId})添加标签"${tagName}"`, true);
                 let targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
                 if (!targetBind) {
-                    const tempUsername = `_temp_${normalizedTargetId}`;
                     await this.repos.mcidbind.create({
                         qqId: normalizedTargetId,
-                        mcUsername: tempUsername,
+                        mcUsername: '',
                         mcUuid: '',
                         lastModified: new Date(),
                         isAdmin: false,
                         whitelist: [],
-                        tags: []
+                        tags: [],
+                        hasMcBind: false,
+                        hasBuidBind: false
                     });
                     targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
                 }
@@ -115,15 +117,16 @@ class TagHandler extends base_handler_1.BaseHandler {
                 try {
                     let targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
                     if (!targetBind) {
-                        const tempUsername = `_temp_${normalizedTargetId}`;
                         await this.repos.mcidbind.create({
                             qqId: normalizedTargetId,
-                            mcUsername: tempUsername,
+                            mcUsername: '',
                             mcUuid: '',
                             lastModified: new Date(),
                             isAdmin: false,
                             whitelist: [],
-                            tags: []
+                            tags: [],
+                            hasMcBind: false,
+                            hasBuidBind: false
                         });
                         targetBind = await this.deps.databaseService.getMcBindByQQId(normalizedTargetId);
                     }
@@ -314,7 +317,7 @@ class TagHandler extends base_handler_1.BaseHandler {
             }
             const userList = usersWithTag
                 .map(bind => {
-                const mcInfo = bind.mcUsername && !bind.mcUsername.startsWith('_temp_')
+                const mcInfo = bind_status_1.BindStatus.hasValidMcBind(bind)
                     ? ` (MC: ${bind.mcUsername})`
                     : '';
                 return `• ${bind.qqId}${mcInfo}`;