koishi-plugin-blacklist-online 0.1.1 → 0.1.3

package/lib/core.d.ts

@@ -5,7 +5,7 @@ export declare function isUserAdmin(session: Session, config: PluginConfig, user
 export declare function syncBlacklist(ctx: Context, config: PluginConfig): Promise<void>;
 export declare function queueRequest(ctx: Context, type: 'ADD' | 'REMOVE' | 'CANCEL', payload: any): Promise<any>;
 export declare function processOfflineQueue(ctx: Context, config: PluginConfig): Promise<void>;
-export declare function checkAndHandleUser(ctx: Context, config: PluginConfig, session: Session, userId: string): Promise<boolean>;
+export declare function checkAndHandleUser(ctx: Context, config: PluginConfig, session: Session, user_id: string): Promise<boolean>;
 export declare function parseUserId(input: string): string;
 export declare function scanGuild(ctx: Context, config: PluginConfig, bot: any, // 传入具体的 bot 实例
 guildId: string): Promise<{

package/lib/core.js

@@ -57,10 +57,15 @@ async function syncBlacklist(ctx, config) {
         if (strategy === 'full_replace') {
             logger.info(`📥 全量同步 -> ${newRevision} (条数: ${data.length})`);
             await ctx.database.remove('blacklist_users', {});
-            // 分批写入防报错
-            const batchSize = 100;
-            for (let i = 0; i < data.length; i += batchSize) {
-                await ctx.database.upsert('blacklist_users', data.slice(i, i + batchSize));
+            if (data.length > 0) {
+                // 修复：使用 upsert 明确告知数据库如果主键冲突则更新
+                // 注意：Koishi 的 upsert 在处理大量数据时，建议分批以保证稳定性
+                const batchSize = 50;
+                for (let i = 0; i < data.length; i += batchSize) {
+                    const batch = data.slice(i, i + batchSize);
+                    // 这里的字段名必须与后端返回的 snake_case 保持完全一致
+                    await ctx.database.upsert('blacklist_users', batch);
+                }
             }
         }
         else if (strategy === 'incremental') {
@@ -68,7 +73,7 @@ async function syncBlacklist(ctx, config) {
             if (data.upserts?.length)
                 await ctx.database.upsert('blacklist_users', data.upserts);
             if (data.deletes?.length)
-                await ctx.database.remove('blacklist_users', { userId: data.deletes });
+                await ctx.database.remove('blacklist_users', { user_id: data.deletes });
         }
         await ctx.database.upsert('blacklist_meta', [{ key: 'sync_revision', value: newRevision }]);
         logger.info('✅ 同步完成');
@@ -146,7 +151,7 @@ async function processOfflineQueue(ctx, config) {
     }
 }
 // --- 5. 用户检查核心 ---
-async function checkAndHandleUser(ctx, config, session, userId) {
+async function checkAndHandleUser(ctx, config, session, user_id) {
     if (!session.guildId)
         return false;
     const guildSettings = await ctx.database.get('blacklist_guild_settings', { guildId: session.guildId });
@@ -155,25 +160,25 @@ async function checkAndHandleUser(ctx, config, session, userId) {
         return false;
     // 1. 本地白名单 (最高优先级)
     const protectedSet = new Set(config.protectedUsers || []);
-    if (protectedSet.has(userId))
+    if (protectedSet.has(user_id))
         return false;
     // 2. 查库
-    const entries = await ctx.database.get('blacklist_users', { userId, disabled: false });
+    const entries = await ctx.database.get('blacklist_users', { user_id, disabled: false });
     if (entries.length === 0)
         return false;
     const entry = entries[0];
     const reason = entry.reason || 'QQ号黑名单';
     // 3. 查管理员
-    if (await isUserAdmin(session, config, userId)) {
-        logger.info(`🛡️ 跳过黑名单管理员 ${userId}`);
+    if (await isUserAdmin(session, config, user_id)) {
+        logger.info(`🛡️ 跳过黑名单管理员 ${user_id}`);
         return false;
     }
-    logger.info(`🎯 [群: ${session.guildId}] 发现黑名单用户: ${userId} - 原因: ${reason}`);
+    logger.info(`🎯 [群: ${session.guildId}] 发现黑名单用户: ${user_id} - 原因: ${reason}`);
     // 获取显示名
-    let displayName = userId;
+    let displayName = user_id;
     try {
-        const member = await session.bot.getGuildMember(session.guildId, userId);
-        displayName = member.nick || member.user?.name || userId;
+        const member = await session.bot.getGuildMember(session.guildId, user_id);
+        displayName = member.nick || member.user?.name || user_id;
     }
     catch {
     }
@@ -182,7 +187,7 @@ async function checkAndHandleUser(ctx, config, session, userId) {
         const tpl = mode === 'notify' ? config.adminNotifyMessage : config.kickNotifyMessage;
         const msg = tpl
             .replace('{user}', displayName)
-            .replace('{userId}', userId)
+            .replace('{userId}', user_id)
             .replace('{reason}', reason)
             .replace('{guild}', session.guildId);
         // 引用回复
@@ -193,9 +198,9 @@ async function checkAndHandleUser(ctx, config, session, userId) {
     if (mode === 'kick' || mode === 'both') {
         for (let i = 0; i < config.retryAttempts; i++) {
             try {
-                await session.bot.kickGuildMember(session.guildId, userId);
+                await session.bot.kickGuildMember(session.guildId, user_id);
                 kicked = true;
-                logger.info(`✅ [群: ${session.guildId}] 成功踢出: ${userId}`);
+                logger.info(`✅ [群: ${session.guildId}] 成功踢出: ${user_id}`);
                 break;
             }
             catch (e) {
@@ -211,9 +216,9 @@ async function checkAndHandleUser(ctx, config, session, userId) {
         if (kicked && config.verifyKickResult) {
             await (0, exports.sleep)(2000);
             try {
-                await session.bot.getGuildMember(session.guildId, userId);
+                await session.bot.getGuildMember(session.guildId, user_id);
                 // 如果还能获取到，说明没踢掉
-                logger.warn(`⚠️ [群: ${session.guildId}] 踢出验证失败，用户仍在群内: ${userId}`);
+                logger.warn(`⚠️ [群: ${session.guildId}] 踢出验证失败，用户仍在群内: ${user_id}`);
             }
             catch {
                 // 获取不到说明踢出成功
@@ -240,7 +245,7 @@ guildId) {
         const members = await bot.getGuildMemberList(guildId);
         // 2. 获取本地黑名单缓存
         const blacklist = await ctx.database.get('blacklist_users', { disabled: false });
-        const blacklistSet = new Set(blacklist.map(b => b.userId));
+        const blacklistSet = new Set(blacklist.map(b => b.user_id));
         // 3. 筛选目标 (内存操作，极快)
         const targets = members.data.filter((m) => {
             if (!m.user?.id)

package/lib/index.js

@@ -50,13 +50,13 @@ function apply(ctx, config) {
     const logger = ctx.logger('blacklist-online');
     // 1. 扩展数据库
     ctx.model.extend('blacklist_users', {
-        userId: 'string',
+        user_id: 'string',
         reason: 'string',
         disabled: { type: 'boolean', initial: false },
         operator_id: 'string',
         source_id: 'string',
         updated_at: 'timestamp'
-    }, { primary: 'userId' });
+    }, { primary: 'user_id' });
     ctx.model.extend('blacklist_request_queue', {
         id: 'string', type: 'string', payload: 'json', createdAt: 'timestamp', retryCount: 'unsigned'
     }, { primary: 'id' });
@@ -95,7 +95,7 @@ function apply(ctx, config) {
         if (config.protectedUsers.includes(session.userId))
             return;
         // 查库
-        const entries = await ctx.database.get('blacklist_users', { userId: session.userId, disabled: false });
+        const entries = await ctx.database.get('blacklist_users', { user_id: session.userId, disabled: false });
         if (entries.length > 0) {
             try {
                 await session.bot.handleGuildRequest(session.messageId, false, config.rejectionMessage);

package/lib/types.d.ts

@@ -16,7 +16,7 @@ export interface PluginConfig {
     autoRejectNotifyMessage: string;
 }
 export interface BlacklistEntry {
-    userId: string;
+    user_id: string;
     reason: string;
     operator_id?: string;
     source_id?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-blacklist-online",
   "description": "自用插件",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [