koishi-plugin-bind-bot 2.0.5 → 2.1.1

package/lib/services/nickname.service.js

@@ -0,0 +1,225 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NicknameService = void 0;
+const helpers_1 = require("../utils/helpers");
+/**
+ * 群昵称管理服务
+ * 负责自动设置和验证群昵称
+ */
+class NicknameService {
+    logger;
+    config;
+    normalizeQQId;
+    validateBUID;
+    getBilibiliOfficialUserInfo;
+    updateBuidInfoOnly;
+    constructor(logger, config, normalizeQQId, validateBUID, getBilibiliOfficialUserInfo, updateBuidInfoOnly) {
+        this.logger = logger;
+        this.config = config;
+        this.normalizeQQId = normalizeQQId;
+        this.validateBUID = validateBUID;
+        this.getBilibiliOfficialUserInfo = getBilibiliOfficialUserInfo;
+        this.updateBuidInfoOnly = updateBuidInfoOnly;
+    }
+    /**
+     * 检查群昵称格式是否正确
+     */
+    checkNicknameFormat(nickname, buidUsername, mcUsername) {
+        if (!nickname || !buidUsername)
+            return false;
+        // 期望格式：B站名称（ID:MC用户名）或 B站名称（ID:未绑定）
+        const mcInfo = mcUsername && !mcUsername.startsWith('_temp_') ? mcUsername : "未绑定";
+        const expectedFormat = `${buidUsername}（ID:${mcInfo}）`;
+        return nickname === expectedFormat;
+    }
+    /**
+     * 使用四层判断逻辑获取最准确的B站用户名
+     * 优先级：官方API > ZMINFO > 数据库
+     */
+    async getLatestBuidUsername(buidUid, currentDbUsername) {
+        // 1. 尝试获取B站官方API的用户信息（最权威）
+        let officialUsername = null;
+        try {
+            this.logger.debug('群昵称设置', `正在查询B站官方API...`);
+            const officialInfo = await this.getBilibiliOfficialUserInfo(buidUid);
+            if (officialInfo && officialInfo.name) {
+                officialUsername = officialInfo.name;
+                this.logger.info('群昵称设置', `[层1-官方API] ✅ "${officialUsername}"`, true);
+            }
+            else {
+                this.logger.warn('群昵称设置', `[层1-官方API] ❌ 查询失败`);
+            }
+        }
+        catch (officialError) {
+            this.logger.warn('群昵称设置', `[层1-官方API] ❌ 查询出错: ${officialError.message}`);
+        }
+        // 2. 尝试获取ZMINFO API的用户信息（可能有缓存）
+        let zminfoUserData = null;
+        try {
+            this.logger.debug('群昵称设置', `正在查询ZMINFO API...`);
+            zminfoUserData = await this.validateBUID(buidUid);
+            if (zminfoUserData && zminfoUserData.username) {
+                this.logger.debug('群昵称设置', `[层2-ZMINFO] "${zminfoUserData.username}"`);
+            }
+            else {
+                this.logger.warn('群昵称设置', `[层2-ZMINFO] 查询失败`);
+            }
+        }
+        catch (zminfoError) {
+            this.logger.warn('群昵称设置', `[层2-ZMINFO] 查询出错: ${zminfoError.message}`);
+        }
+        // 3. 根据优先级返回结果
+        if (officialUsername) {
+            this.logger.info('群昵称设置', `🎯 采用官方API结果: "${officialUsername}"`, true);
+            return {
+                username: officialUsername,
+                source: 'official',
+                zminfoData: zminfoUserData || undefined
+            };
+        }
+        else if (zminfoUserData && zminfoUserData.username) {
+            this.logger.info('群昵称设置', `⚠️ 官方API不可用，降级使用ZMINFO: "${zminfoUserData.username}"`, true);
+            return {
+                username: zminfoUserData.username,
+                source: 'zminfo',
+                zminfoData: zminfoUserData
+            };
+        }
+        else {
+            this.logger.warn('群昵称设置', `⚠️ 官方API和ZMINFO都不可用，使用数据库名称: "${currentDbUsername}"`);
+            return {
+                username: currentDbUsername,
+                source: 'database'
+            };
+        }
+    }
+    /**
+     * 同步数据库中的B站用户信息
+     */
+    async syncDatabaseIfNeeded(normalizedUserId, latestUsername, currentDbUsername, zminfoData) {
+        if (latestUsername === currentDbUsername) {
+            return; // 无需更新
+        }
+        if (!zminfoData) {
+            this.logger.debug('群昵称设置', `无ZMINFO数据，跳过数据库同步`);
+            return;
+        }
+        try {
+            const updatedData = { ...zminfoData, username: latestUsername };
+            await this.updateBuidInfoOnly(normalizedUserId, updatedData);
+            this.logger.info('群昵称设置', `已同步数据库: "${currentDbUsername}" → "${latestUsername}"`, true);
+        }
+        catch (updateError) {
+            this.logger.warn('群昵称设置', `数据库同步失败: ${updateError.message}`);
+        }
+    }
+    /**
+     * 设置群昵称并验证
+     */
+    async setAndVerifyNickname(session, targetGroupId, normalizedUserId, nickname, currentNickname) {
+        try {
+            await session.bot.internal.setGroupCard(targetGroupId, normalizedUserId, nickname);
+            if (currentNickname) {
+                this.logger.info('群昵称设置', `成功在群${targetGroupId}中将QQ(${normalizedUserId})群昵称从"${currentNickname}"修改为"${nickname}"`, true);
+            }
+            else {
+                this.logger.info('群昵称设置', `成功在群${targetGroupId}中将QQ(${normalizedUserId})群昵称设置为: ${nickname}`, true);
+            }
+            // 验证设置是否生效
+            try {
+                await new Promise(resolve => setTimeout(resolve, 1000)); // 等待1秒
+                const verifyGroupInfo = await session.bot.internal.getGroupMemberInfo(targetGroupId, normalizedUserId);
+                const verifyNickname = verifyGroupInfo.card || verifyGroupInfo.nickname || '';
+                if (verifyNickname === nickname) {
+                    this.logger.info('群昵称设置', `✅ 验证成功，群昵称已生效: "${verifyNickname}"`, true);
+                }
+                else {
+                    this.logger.warn('群昵称设置', `⚠️ 验证失败，期望"${nickname}"，实际"${verifyNickname}"，可能是权限不足或API延迟`);
+                    if (!currentNickname) {
+                        this.logger.warn('群昵称设置', `建议检查: 1.机器人是否为群管理员 2.群设置是否允许管理员修改昵称 3.OneBot实现是否支持该功能`);
+                    }
+                }
+            }
+            catch (verifyError) {
+                this.logger.warn('群昵称设置', `无法验证群昵称设置结果: ${verifyError.message}`);
+            }
+        }
+        catch (setCardError) {
+            this.logger.error('群昵称设置', `设置群昵称失败: ${setCardError.message}`);
+            this.logger.error('群昵称设置', `错误详情: ${JSON.stringify(setCardError)}`);
+            throw setCardError;
+        }
+    }
+    /**
+     * 自动群昵称设置功能（重构版）
+     */
+    async autoSetGroupNickname(session, mcUsername, buidUsername, buidUid, targetUserId, specifiedGroupId) {
+        try {
+            // 准备基本参数
+            const actualUserId = targetUserId || session.userId;
+            const normalizedUserId = this.normalizeQQId(actualUserId);
+            const targetGroupId = specifiedGroupId || this.config.autoNicknameGroupId;
+            const mcInfo = (mcUsername && !mcUsername.startsWith('_temp_')) ? mcUsername : "未绑定";
+            this.logger.debug('群昵称设置', `开始处理QQ(${normalizedUserId})的群昵称设置，目标群: ${targetGroupId}`);
+            // 检查前置条件
+            if (!session.bot.internal) {
+                this.logger.debug('群昵称设置', `QQ(${normalizedUserId})bot不支持OneBot内部API，跳过自动群昵称设置`);
+                return;
+            }
+            if (!targetGroupId) {
+                this.logger.debug('群昵称设置', `QQ(${normalizedUserId})未配置自动群昵称设置目标群，跳过群昵称设置`);
+                return;
+            }
+            // 获取最新的B站用户名
+            let latestBuidUsername = buidUsername;
+            if (buidUid) {
+                this.logger.debug('群昵称设置', `开始四层判断获取最新B站用户名...`);
+                this.logger.debug('群昵称设置', `[层3-数据库] "${buidUsername}"`);
+                const result = await this.getLatestBuidUsername(buidUid, buidUsername);
+                latestBuidUsername = result.username;
+                // 尝试同步数据库
+                await this.syncDatabaseIfNeeded(normalizedUserId, latestBuidUsername, buidUsername, result.zminfoData);
+            }
+            // 生成目标昵称
+            const targetNickname = `${latestBuidUsername}（ID:${mcInfo}）`;
+            this.logger.debug('群昵称设置', `目标昵称: "${targetNickname}"`);
+            // 尝试获取当前昵称并比对
+            try {
+                this.logger.debug('群昵称设置', `正在获取QQ(${normalizedUserId})在群${targetGroupId}的当前昵称...`);
+                const currentGroupInfo = await session.bot.internal.getGroupMemberInfo(targetGroupId, normalizedUserId);
+                const currentNickname = currentGroupInfo.card || currentGroupInfo.nickname || '';
+                this.logger.debug('群昵称设置', `当前昵称: "${currentNickname}"`);
+                // 智能判断：如果当前昵称已包含最新用户名，跳过修改
+                if (buidUid && currentNickname) {
+                    const currentNicknameUsername = (0, helpers_1.extractBuidUsernameFromNickname)(currentNickname);
+                    this.logger.debug('群昵称设置', `[层4-群昵称] "${currentNicknameUsername || '(无法提取)'}"`);
+                    if (currentNicknameUsername && currentNicknameUsername === latestBuidUsername) {
+                        this.logger.info('群昵称设置', `✅ 群昵称已包含最新名称"${latestBuidUsername}"，跳过修改`, true);
+                        return;
+                    }
+                }
+                // 如果昵称完全一致，也跳过
+                if (currentNickname === targetNickname) {
+                    this.logger.info('群昵称设置', `QQ(${normalizedUserId})群昵称已经是"${targetNickname}"，跳过修改`, true);
+                    return;
+                }
+                // 昵称需要更新
+                this.logger.debug('群昵称设置', `昵称不一致，正在修改群昵称为: "${targetNickname}"`);
+                await this.setAndVerifyNickname(session, targetGroupId, normalizedUserId, targetNickname, currentNickname);
+            }
+            catch (getInfoError) {
+                // 无法获取当前昵称，直接设置新昵称
+                this.logger.warn('群昵称设置', `获取QQ(${normalizedUserId})当前群昵称失败: ${getInfoError.message}`);
+                this.logger.debug('群昵称设置', `将直接尝试设置新昵称...`);
+                await this.setAndVerifyNickname(session, targetGroupId, normalizedUserId, targetNickname);
+            }
+        }
+        catch (error) {
+            const actualUserId = targetUserId || session.userId;
+            const normalizedUserId = this.normalizeQQId(actualUserId);
+            this.logger.error('群昵称设置', `QQ(${normalizedUserId})自动群昵称设置失败: ${error.message}`);
+            this.logger.error('群昵称设置', `完整错误信息: ${JSON.stringify(error)}`);
+        }
+    }
+}
+exports.NicknameService = NicknameService;

package/lib/services/service-container.d.ts

@@ -0,0 +1,17 @@
+import { Context } from 'koishi';
+import { LoggerService } from '../utils/logger';
+import { MCIDBINDRepository } from '../repositories/mcidbind.repository';
+import { ApiService } from './api.service';
+import { DatabaseService } from './database.service';
+import { NicknameService } from './nickname.service';
+import { Config } from '../types/config';
+/**
+ * 服务容器类
+ * 统一管理所有服务的实例化，解决服务初始化分散的问题
+ */
+export declare class ServiceContainer {
+    readonly api: ApiService;
+    readonly database: DatabaseService;
+    readonly nickname: NicknameService;
+    constructor(ctx: Context, config: Config, logger: LoggerService, mcidbindRepo: MCIDBINDRepository, normalizeQQId: (userId: string) => string);
+}

package/lib/services/service-container.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceContainer = void 0;
+const api_service_1 = require("./api.service");
+const database_service_1 = require("./database.service");
+const nickname_service_1 = require("./nickname.service");
+/**
+ * 服务容器类
+ * 统一管理所有服务的实例化，解决服务初始化分散的问题
+ */
+class ServiceContainer {
+    api;
+    database;
+    nickname;
+    constructor(ctx, config, logger, mcidbindRepo, normalizeQQId) {
+        // 1. 实例化 API 服务（无依赖）
+        this.api = new api_service_1.ApiService(logger.createChild('API服务'), { zminfoApiUrl: config.zminfoApiUrl });
+        // 2. 实例化数据库服务（依赖 API 服务）
+        this.database = new database_service_1.DatabaseService(ctx, logger.createChild('数据库服务'), mcidbindRepo, normalizeQQId, (uuid) => this.api.getUsernameByUuid(uuid));
+        // 3. 实例化群昵称服务（依赖 API 和数据库服务）
+        this.nickname = new nickname_service_1.NicknameService(logger.createChild('群昵称服务'), { autoNicknameGroupId: config.autoNicknameGroupId }, normalizeQQId, (buid) => this.api.validateBUID(buid), (uid) => this.api.getBilibiliOfficialUserInfo(uid), (userId, buidUser) => this.database.updateBuidInfoOnly(userId, buidUser));
+    }
+}
+exports.ServiceContainer = ServiceContainer;

package/lib/types/config.d.ts

@@ -18,6 +18,8 @@ export interface Config {
     showMcSkin: boolean;
     zminfoApiUrl: string;
     enableLotteryBroadcast: boolean;
+    lotteryTargetGroupId: string;
+    lotteryTargetPrivateId: string;
     autoNicknameGroupId: string;
     forceBindSessdata: string;
     forceBindTargetUpUid: number;

package/lib/types/index.d.ts

@@ -6,3 +6,4 @@ export * from './config';
 export * from './database';
 export * from './api';
 export * from './common';
+export * from './update-data';

package/lib/types/index.js

@@ -26,3 +26,5 @@ __exportStar(require("./database"), exports);
 __exportStar(require("./api"), exports);
 // 通用类型
 __exportStar(require("./common"), exports);
+// 更新数据类型
+__exportStar(require("./update-data"), exports);

package/lib/types/update-data.d.ts

@@ -0,0 +1,68 @@
+/**
+ * 数据库更新数据类型定义
+ */
+/**
+ * MC绑定更新数据接口
+ */
+export interface UpdateMcBindData {
+    mcUsername?: string;
+    mcUuid?: string;
+    lastModified?: Date;
+    isAdmin?: boolean;
+    usernameLastChecked?: Date;
+    usernameCheckFailCount?: number;
+}
+/**
+ * BUID绑定更新数据接口（完整更新）
+ */
+export interface UpdateBuidBindData {
+    buidUid?: string;
+    buidUsername?: string;
+    guardLevel?: number;
+    guardLevelText?: string;
+    maxGuardLevel?: number;
+    maxGuardLevelText?: string;
+    medalName?: string;
+    medalLevel?: number;
+    wealthMedalLevel?: number;
+    lastActiveTime?: Date;
+    lastModified?: Date;
+}
+/**
+ * BUID信息更新数据接口（仅更新信息，不更新lastModified）
+ */
+export interface UpdateBuidInfoData {
+    buidUsername?: string;
+    guardLevel?: number;
+    guardLevelText?: string;
+    maxGuardLevel?: number;
+    maxGuardLevelText?: string;
+    medalName?: string;
+    medalLevel?: number;
+    wealthMedalLevel?: number;
+    lastActiveTime?: Date;
+}
+/**
+ * 创建新绑定时的完整数据接口
+ */
+export interface CreateBindData {
+    qqId: string;
+    mcUsername: string;
+    mcUuid: string;
+    isAdmin: boolean;
+    whitelist: string[];
+    tags: string[];
+    [key: string]: any;
+}
+/**
+ * 标签更新数据接口
+ */
+export interface UpdateTagsData {
+    tags?: string[];
+}
+/**
+ * 白名单更新数据接口
+ */
+export interface UpdateWhitelistData {
+    whitelist?: string[];
+}

package/lib/types/update-data.js

@@ -0,0 +1,5 @@
+"use strict";
+/**
+ * 数据库更新数据类型定义
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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