koishi-plugin-bind-bot 2.2.8 → 2.3.0

package/lib/handlers/mcid.handler.js

@@ -4,6 +4,7 @@ exports.McidCommandHandler = void 0;
 const koishi_1 = require("koishi");
 const base_handler_1 = require("./base.handler");
 const bind_status_1 = require("../utils/bind-status");
+const helpers_1 = require("../utils/helpers");
 class McidCommandHandler extends base_handler_1.BaseHandler {
     /**
      * 注册所有MCID命令
@@ -92,14 +93,14 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                             if (refreshedBind) {
                                 let buidInfo = `该用户尚未绑定MC账号\n\nB站账号信息：\nB站UID: ${refreshedBind.buidUid}\n用户名: ${refreshedBind.buidUsername}`;
                                 if (refreshedBind.guardLevel > 0) {
-                                    buidInfo += `\n舰长等级: ${refreshedBind.guardLevelText} (${refreshedBind.guardLevel})`;
+                                    buidInfo += `\n舰长等级: ${(0, helpers_1.getGuardLevelText)(refreshedBind.guardLevel)} (${refreshedBind.guardLevel})`;
                                     if (refreshedBind.maxGuardLevel > 0 &&
                                         refreshedBind.maxGuardLevel < refreshedBind.guardLevel) {
-                                        buidInfo += `\n历史最高: ${refreshedBind.maxGuardLevelText} (${refreshedBind.maxGuardLevel})`;
+                                        buidInfo += `\n历史最高: ${(0, helpers_1.getGuardLevelText)(refreshedBind.maxGuardLevel)} (${refreshedBind.maxGuardLevel})`;
                                     }
                                 }
                                 else if (refreshedBind.maxGuardLevel > 0) {
-                                    buidInfo += `\n历史舰长: ${refreshedBind.maxGuardLevelText} (${refreshedBind.maxGuardLevel})`;
+                                    buidInfo += `\n历史舰长: ${(0, helpers_1.getGuardLevelText)(refreshedBind.maxGuardLevel)} (${refreshedBind.maxGuardLevel})`;
                                 }
                                 if (refreshedBind.medalName) {
                                     buidInfo += `\n粉丝牌: ${refreshedBind.medalName} Lv.${refreshedBind.medalLevel}`;
@@ -132,14 +133,14 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
                         if (refreshedBind) {
                             let buidInfo = `您尚未绑定MC账号\n\nB站账号信息：\nB站UID: ${refreshedBind.buidUid}\n用户名: ${refreshedBind.buidUsername}`;
                             if (refreshedBind.guardLevel > 0) {
-                                buidInfo += `\n舰长等级: ${refreshedBind.guardLevelText} (${refreshedBind.guardLevel})`;
+                                buidInfo += `\n舰长等级: ${(0, helpers_1.getGuardLevelText)(refreshedBind.guardLevel)} (${refreshedBind.guardLevel})`;
                                 if (refreshedBind.maxGuardLevel > 0 &&
                                     refreshedBind.maxGuardLevel < refreshedBind.guardLevel) {
-                                    buidInfo += `\n历史最高: ${refreshedBind.maxGuardLevelText} (${refreshedBind.maxGuardLevel})`;
+                                    buidInfo += `\n历史最高: ${(0, helpers_1.getGuardLevelText)(refreshedBind.maxGuardLevel)} (${refreshedBind.maxGuardLevel})`;
                                 }
                             }
                             else if (refreshedBind.maxGuardLevel > 0) {
-                                buidInfo += `\n历史舰长: ${refreshedBind.maxGuardLevelText} (${refreshedBind.maxGuardLevel})`;
+                                buidInfo += `\n历史舰长: ${(0, helpers_1.getGuardLevelText)(refreshedBind.maxGuardLevel)} (${refreshedBind.maxGuardLevel})`;
                             }
                             if (refreshedBind.medalName) {
                                 buidInfo += `\n粉丝牌: ${refreshedBind.medalName} Lv.${refreshedBind.medalLevel}`;
@@ -217,13 +218,13 @@ class McidCommandHandler extends base_handler_1.BaseHandler {
         if (bind.buidUid) {
             buidInfo = `B站账号信息：\nB站UID: ${bind.buidUid}\n用户名: ${bind.buidUsername}`;
             if (bind.guardLevel > 0) {
-                buidInfo += `\n舰长等级: ${bind.guardLevelText} (${bind.guardLevel})`;
+                buidInfo += `\n舰长等级: ${(0, helpers_1.getGuardLevelText)(bind.guardLevel)} (${bind.guardLevel})`;
                 if (bind.maxGuardLevel > 0 && bind.maxGuardLevel < bind.guardLevel) {
-                    buidInfo += `\n历史最高: ${bind.maxGuardLevelText} (${bind.maxGuardLevel})`;
+                    buidInfo += `\n历史最高: ${(0, helpers_1.getGuardLevelText)(bind.maxGuardLevel)} (${bind.maxGuardLevel})`;
                 }
             }
             else if (bind.maxGuardLevel > 0) {
-                buidInfo += `\n历史舰长: ${bind.maxGuardLevelText} (${bind.maxGuardLevel})`;
+                buidInfo += `\n历史舰长: ${(0, helpers_1.getGuardLevelText)(bind.maxGuardLevel)} (${bind.maxGuardLevel})`;
             }
             if (bind.medalName) {
                 buidInfo += `\n粉丝牌: ${bind.medalName} Lv.${bind.medalLevel}`;

package/lib/index.js

@@ -11,6 +11,7 @@ const rate_limiter_1 = require("./utils/rate-limiter");
 const helpers_1 = require("./utils/helpers");
 const error_utils_1 = require("./utils/error-utils");
 const mcidbind_repository_1 = require("./repositories/mcidbind.repository");
+const supabase_client_1 = require("./utils/supabase-client");
 const schedule_mute_repository_1 = require("./repositories/schedule-mute.repository");
 const handlers_1 = require("./handlers");
 const service_container_1 = require("./services/service-container");
@@ -53,6 +54,12 @@ exports.Config = koishi_1.Schema.object({
     forceBindTargetUpUid: koishi_1.Schema.number().description('强制绑定目标UP主UID').default(686127),
     forceBindTargetRoomId: koishi_1.Schema.number().description('强制绑定目标房间号').default(544853),
     forceBindTargetMedalName: koishi_1.Schema.string().description('强制绑定目标粉丝牌名称').default('生态'),
+    supabaseUrl: koishi_1.Schema.string()
+        .description('Supabase项目URL')
+        .default(''),
+    supabaseKey: koishi_1.Schema.string()
+        .description('Supabase API Key (anon/service_role key)')
+        .default(''),
     groupRequestReview: koishi_1.Schema.object({
         enabled: koishi_1.Schema.boolean().description('是否启用入群申请审批功能').default(false),
         targetGroupId: koishi_1.Schema.string()
@@ -60,11 +67,11 @@ exports.Config = koishi_1.Schema.object({
         reviewGroupId: koishi_1.Schema.string()
             .description('管理员审批操作所在的群ID（播报群）'),
         approveAutoBindEmoji: koishi_1.Schema.string()
-            .description('批准并自动绑定的表情ID（/太赞了）')
-            .default('389'),
+            .description('批准并自动绑定的表情ID（/赞）')
+            .default('76'),
         approveInteractiveBindEmoji: koishi_1.Schema.string()
-            .description('批准并交互式绑定的表情ID（/偷感）')
-            .default('427'),
+            .description('批准并交互式绑定的表情ID（/OK）')
+            .default('124'),
         rejectEmoji: koishi_1.Schema.string().description('拒绝申请的表情ID（/NO）').default('123'),
         autoCleanupHours: koishi_1.Schema.number()
             .description('待审批记录自动清理时间（小时）')
@@ -109,7 +116,8 @@ function apply(ctx, config) {
     const logger = new koishi_1.Logger('bind-bot');
     const loggerService = new logger_1.LoggerService(logger, config.debugMode);
     // 创建数据仓储实例
-    const mcidbindRepo = new mcidbind_repository_1.MCIDBINDRepository(ctx, loggerService);
+    const supabaseClient = new supabase_client_1.SupabaseClient({ url: config.supabaseUrl, key: config.supabaseKey });
+    const mcidbindRepo = new mcidbind_repository_1.MCIDBINDRepository(supabaseClient, loggerService);
     const scheduleMuteRepo = new schedule_mute_repository_1.ScheduleMuteRepository(ctx, loggerService);
     // 交互型绑定会话管理
     const bindingSessions = new Map();
@@ -583,299 +591,7 @@ function apply(ctx, config) {
             content.body = 'Internal Server Error';
         }
     });
-    // 在数据库中创建MCIDBIND表
-    ctx.model.extend('mcidbind', {
-        qqId: {
-            type: 'string'
-        },
-        mcUsername: {
-            type: 'string',
-            initial: null
-        },
-        mcUuid: {
-            type: 'string',
-            initial: null
-        },
-        lastModified: {
-            type: 'timestamp',
-            initial: null
-        },
-        isAdmin: {
-            type: 'boolean',
-            initial: false
-        },
-        whitelist: {
-            type: 'json',
-            initial: []
-        },
-        tags: {
-            type: 'json',
-            initial: []
-        },
-        // BUID相关字段
-        buidUid: {
-            type: 'string',
-            initial: ''
-        },
-        buidUsername: {
-            type: 'string',
-            initial: ''
-        },
-        guardLevel: {
-            type: 'integer',
-            initial: 0
-        },
-        guardLevelText: {
-            type: 'string',
-            initial: ''
-        },
-        maxGuardLevel: {
-            type: 'integer',
-            initial: 0
-        },
-        maxGuardLevelText: {
-            type: 'string',
-            initial: ''
-        },
-        medalName: {
-            type: 'string',
-            initial: ''
-        },
-        medalLevel: {
-            type: 'integer',
-            initial: 0
-        },
-        wealthMedalLevel: {
-            type: 'integer',
-            initial: 0
-        },
-        lastActiveTime: {
-            type: 'timestamp',
-            initial: null
-        },
-        reminderCount: {
-            type: 'integer',
-            initial: 0
-        },
-        usernameLastChecked: {
-            type: 'timestamp',
-            initial: null
-        },
-        usernameCheckFailCount: {
-            type: 'integer',
-            initial: 0
-        },
-        // 绑定状态标志字段
-        hasMcBind: {
-            type: 'boolean',
-            initial: false
-        },
-        hasBuidBind: {
-            type: 'boolean',
-            initial: false
-        }
-    }, {
-        // 设置主键为qqId
-        primary: 'qqId',
-        // 添加索引
-        unique: [['mcUsername'], ['buidUid']],
-        // 添加isAdmin索引，提高查询效率
-        indexes: [['isAdmin'], ['buidUid']]
-    });
-    // 检查表结构是否包含旧字段
-    const checkTableStructure = async () => {
-        try {
-            // 尝试获取一条记录来检查字段
-            const records = await mcidbindRepo.findAll({ limit: 1 });
-            // 如果没有记录，不需要迁移
-            if (!records || records.length === 0)
-                return false;
-            // 检查记录中是否包含id或userId字段，或缺少whitelist字段
-            const record = records[0];
-            return 'id' in record || 'userId' in record || !('whitelist' in record);
-        }
-        catch (error) {
-            logger.error(`[初始化] 检查表结构失败: ${error.message}`);
-            return false;
-        }
-    };
-    // 添加缺失字段
-    const addMissingFields = async () => {
-        try {
-            // 获取所有记录
-            const records = await mcidbindRepo.findAll();
-            let updatedCount = 0;
-            // 更新每个缺少字段的记录
-            for (const record of records) {
-                let needUpdate = false;
-                const updateData = {};
-                const qqId = record.qqId; // 提前提取 qqId，避免类型推断问题
-                // 检查并添加whitelist字段
-                if (!record.whitelist) {
-                    updateData.whitelist = [];
-                    needUpdate = true;
-                }
-                // 检查并添加tags字段
-                if (!record.tags) {
-                    updateData.tags = [];
-                    needUpdate = true;
-                }
-                // 检查并添加maxGuardLevel字段
-                if (!('maxGuardLevel' in record)) {
-                    updateData.maxGuardLevel = 0;
-                    needUpdate = true;
-                }
-                // 检查并添加maxGuardLevelText字段
-                if (!('maxGuardLevelText' in record)) {
-                    updateData.maxGuardLevelText = '';
-                    needUpdate = true;
-                }
-                // 检查并添加reminderCount字段
-                if (!('reminderCount' in record)) {
-                    updateData.reminderCount = 0;
-                    needUpdate = true;
-                }
-                // 检查并修复hasMcBind字段（数据迁移 + 数据一致性检查）
-                const currentHasMcBind = record.hasMcBind;
-                const mcUsername = record.mcUsername;
-                const hasValidMc = !!(mcUsername && !mcUsername.startsWith('_temp_'));
-                // 情况1：字段不存在，需要添加
-                if (currentHasMcBind === undefined || currentHasMcBind === null) {
-                    updateData.hasMcBind = hasValidMc;
-                    needUpdate = true;
-                    logger.debug(`[数据迁移] 添加hasMcBind字段 QQ(${qqId}): ${hasValidMc}`);
-                }
-                // 情况2：字段存在但值不正确，需要修复
-                else if (currentHasMcBind !== hasValidMc) {
-                    updateData.hasMcBind = hasValidMc;
-                    needUpdate = true;
-                    logger.info(`[数据修复] 修正hasMcBind QQ(${qqId}): ${currentHasMcBind} -> ${hasValidMc}`);
-                }
-                // 清理临时用户名（无论hasMcBind字段是否存在）
-                if (!hasValidMc && mcUsername && mcUsername.startsWith('_temp_')) {
-                    updateData.mcUsername = null;
-                    updateData.mcUuid = null;
-                    updateData.whitelist = [];
-                    needUpdate = true;
-                    logger.info(`[数据清理] 清理QQ(${qqId})的临时用户名: ${mcUsername}`);
-                }
-                // 检查并修复hasBuidBind字段（数据迁移 + 数据一致性检查）
-                const currentHasBuidBind = record.hasBuidBind;
-                const buidUid = record.buidUid;
-                const hasValidBuid = !!(buidUid && buidUid.length > 0);
-                // 情况1：字段不存在，需要添加
-                if (currentHasBuidBind === undefined || currentHasBuidBind === null) {
-                    updateData.hasBuidBind = hasValidBuid;
-                    needUpdate = true;
-                    logger.debug(`[数据迁移] 添加hasBuidBind字段 QQ(${qqId}): ${hasValidBuid}`);
-                }
-                // 情况2：字段存在但值不正确，需要修复
-                else if (currentHasBuidBind !== hasValidBuid) {
-                    updateData.hasBuidBind = hasValidBuid;
-                    needUpdate = true;
-                    logger.info(`[数据修复] 修正hasBuidBind QQ(${qqId}): ${currentHasBuidBind} -> ${hasValidBuid}`);
-                }
-                // 如果需要更新，执行更新操作
-                if (needUpdate) {
-                    await mcidbindRepo.update(qqId, updateData);
-                    updatedCount++;
-                }
-            }
-            if (updatedCount > 0) {
-                logger.info(`[初始化] 成功为${updatedCount}条记录添加缺失字段`);
-            }
-            else {
-                logger.info('[初始化] 所有记录都包含必要字段，无需更新');
-            }
-            return true;
-        }
-        catch (error) {
-            logger.error(`[初始化] 添加缺失字段失败: ${error.message}`);
-            return false;
-        }
-    };
-    // 在插件启动时执行数据迁移（放在函数定义之后）
-    ctx.on('ready', async () => {
-        logger.info('[初始化] 开始数据迁移和一致性检查...');
-        await addMissingFields();
-    });
-    // 重建MCIDBIND表
-    const rebuildMcidBindTable = async () => {
-        try {
-            // 备份现有数据
-            const oldRecords = await mcidbindRepo.findAll();
-            logger.info(`[初始化] 成功备份${oldRecords.length}条记录`);
-            // 创建数据备份（用于恢复）
-            const backupData = JSON.parse(JSON.stringify(oldRecords));
-            try {
-                // 提取有效数据
-                const validRecords = oldRecords
-                    .map(record => {
-                    // 确保qqId存在
-                    if (!record.qqId) {
-                        // 如果没有qqId但有userId，尝试从userId提取
-                        if ('userId' in record && record.userId) {
-                            record.qqId = normalizeQQId(String(record.userId));
-                        }
-                        else {
-                            // 既没有qqId也没有userId，跳过此记录
-                            return null;
-                        }
-                    }
-                    return {
-                        qqId: record.qqId,
-                        mcUsername: record.mcUsername || '',
-                        mcUuid: record.mcUuid || '',
-                        lastModified: record.lastModified || new Date(),
-                        isAdmin: record.isAdmin || false,
-                        whitelist: record.whitelist || [],
-                        tags: record.tags || []
-                    };
-                })
-                    .filter(record => record !== null);
-                // 删除现有表
-                await mcidbindRepo.deleteAll();
-                logger.info('[初始化] 成功删除旧表数据');
-                // 重新创建记录
-                let successCount = 0;
-                let errorCount = 0;
-                for (const record of validRecords) {
-                    try {
-                        await mcidbindRepo.create(record);
-                        successCount++;
-                    }
-                    catch (e) {
-                        errorCount++;
-                        logger.warn(`[初始化] 重建记录失败 (QQ=${record.qqId}): ${e.message}`);
-                    }
-                }
-                logger.info(`[初始化] 成功重建了${successCount}条记录，失败${errorCount}条`);
-                return true;
-            }
-            catch (migrationError) {
-                // 迁移过程出错，尝试恢复
-                logger.error(`[初始化] 表重建过程失败，尝试恢复数据: ${migrationError.message}`);
-                try {
-                    // 清空表以避免重复数据
-                    await mcidbindRepo.deleteAll();
-                    // 恢复原始数据
-                    for (const record of backupData) {
-                        await mcidbindRepo.create(record);
-                    }
-                    logger.info(`[初始化] 成功恢复${backupData.length}条原始记录`);
-                }
-                catch (recoveryError) {
-                    logger.error(`[初始化] 数据恢复失败，可能导致数据丢失: ${recoveryError.message}`);
-                    throw new Error('数据迁移失败且无法恢复');
-                }
-                throw migrationError;
-            }
-        }
-        catch (error) {
-            logger.error(`[初始化] 重建表失败: ${error.message}`);
-            throw error;
-        }
-    };
+    // mcidbind 表已迁移至 Supabase，无需在 Koishi 中注册模型
     // 处理用户ID，去除平台前缀，只保留QQ号
     const normalizeQQId = (userId) => {
         // 处理空值情况

package/lib/repositories/mcidbind.repository.d.ts

@@ -1,117 +1,35 @@
-import { Context } from 'koishi';
 import { LoggerService } from '../utils/logger';
+import { SupabaseClient } from '../utils/supabase-client';
 import type { MCIDBIND } from '../types';
 /**
  * MCIDBIND 数据仓储类
- * 封装所有 MCIDBIND 表的数据库操作
+ * 通过 Supabase REST API 操作 user 表
  */
 export declare class MCIDBINDRepository {
-    private ctx;
+    private supabase;
     private logger;
-    constructor(ctx: Context, logger: LoggerService);
-    /**
-     * 根据 QQ 号查询绑定信息
-     * @param qqId QQ号（已规范化）
-     * @returns 绑定信息或 null
-     */
+    constructor(supabase: SupabaseClient, logger: LoggerService);
     findByQQId(qqId: string): Promise<MCIDBIND | null>;
-    /**
-     * 根据 MC 用户名查询绑定信息（精确匹配）
-     * @param mcUsername MC用户名
-     * @returns 绑定信息或 null
-     */
     findByMCUsername(mcUsername: string): Promise<MCIDBIND | null>;
-    /**
-     * 根据 MC 用户名查询绑定信息（不区分大小写）
-     * @param mcUsername MC用户名
-     * @returns 绑定信息或 null
-     */
     findByUsernameIgnoreCase(mcUsername: string): Promise<MCIDBIND | null>;
-    /**
-     * 根据 MC UUID 查询绑定信息
-     * @param mcUuid MC UUID（可带或不带连字符）
-     * @returns 绑定信息或 null
-     */
     findByUuid(mcUuid: string): Promise<MCIDBIND | null>;
-    /**
-     * 根据 B站 UID 查询绑定信息
-     * @param buidUid B站UID
-     * @returns 绑定信息或 null
-     */
     findByBuidUid(buidUid: string): Promise<MCIDBIND | null>;
-    /**
-     * 获取所有绑定记录
-     * @param options 查询选项
-     * @returns 绑定记录列表
-     */
     findAll(options?: {
         limit?: number;
     }): Promise<MCIDBIND[]>;
-    /**
-     * 根据标签查询绑定记录
-     * @param tag 标签名称
-     * @returns 包含该标签的绑定记录列表
-     */
     findByTag(tag: string): Promise<MCIDBIND[]>;
-    /**
-     * 创建新的绑定记录
-     * @param data 绑定数据
-     * @returns 创建的记录
-     */
     create(data: Partial<MCIDBIND> & {
         qqId: string;
     }): Promise<MCIDBIND>;
-    /**
-     * 更新绑定记录（部分字段）
-     * @param qqId QQ号
-     * @param data 要更新的字段
-     */
     update(qqId: string, data: Partial<MCIDBIND>): Promise<void>;
-    /**
-     * 删除绑定记录
-     * @param qqId QQ号
-     * @returns 删除的记录数
-     */
     delete(qqId: string): Promise<number>;
-    /**
-     * 删除所有绑定记录
-     * @returns 删除的记录数
-     */
     deleteAll(): Promise<number>;
-    /**
-     * 批量创建绑定记录
-     * @param records 绑定记录列表
-     */
     batchCreate(records: Array<Partial<MCIDBIND> & {
         qqId: string;
     }>): Promise<void>;
-    /**
-     * 为用户添加标签
-     * @param qqId QQ号
-     * @param tag 标签名称
-     */
     addTag(qqId: string, tag: string): Promise<void>;
-    /**
-     * 为用户移除标签
-     * @param qqId QQ号
-     * @param tag 标签名称
-     */
     removeTag(qqId: string, tag: string): Promise<void>;
-    /**
-     * 为用户添加白名单服务器
-     * @param qqId QQ号
-     * @param serverId 服务器ID
-     */
     addWhitelist(qqId: string, serverId: string): Promise<void>;
-    /**
-     * 为用户移除白名单服务器
-     * @param qqId QQ号
-     * @param serverId 服务器ID
-     */
     removeWhitelist(qqId: string, serverId: string): Promise<void>;
-    /**
-     * 获取所有管理员
-     * @returns 管理员列表
-     */
     findAllAdmins(): Promise<MCIDBIND[]>;
 }