koishi-plugin-maibot 1.9.7 → 1.9.9

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -1565,13 +1565,28 @@ function apply(ctx, config) {
         const wl = checkWhitelist(sess, config);
         if (!wl.allowed)
             return;
-        const hit = await (0, priority_cooldown_1.checkCommandCooldown)(ctx, sess, priorityCooldownCfg, cmdName, getCooldownPrimaryUserId, async (s) => getSessionBindingKeys(ctx, s));
+        // 获取当前用户绑定的 maiUid（用于共享冷却）
+        let sessionMaiUid;
+        try {
+            const binding = await getBindingBySession(ctx, sess);
+            if (binding?.maiUid)
+                sessionMaiUid = binding.maiUid;
+        }
+        catch { /* 忽略 */ }
+        // 超过2个绑定时拦截有冷却的命令
+        if (sessionMaiUid) {
+            const sameUidBindings = await ctx.database.get('maibot_bindings', { maiUid: sessionMaiUid });
+            if (sameUidBindings.length > 2) {
+                return `❌ 您的游戏账号已被 ${sameUidBindings.length} 个用户绑定，请先解绑多余账号后再使用此功能。\n（使用 /mai解绑 解绑当前账号）`;
+            }
+        }
+        const hit = await (0, priority_cooldown_1.checkCommandCooldown)(ctx, sess, priorityCooldownCfg, cmdName, getCooldownPrimaryUserId, async (s) => getSessionBindingKeys(ctx, s), sessionMaiUid);
         if (hit)
             return hit;
         const uid = await getCooldownPrimaryUserId(sess);
         if (!uid)
             return;
-        await (0, priority_cooldown_1.recordCommandCooldown)(ctx, uid, cmdName, priorityCooldownCfg);
+        await (0, priority_cooldown_1.recordCommandCooldown)(ctx, uid, cmdName, priorityCooldownCfg, sessionMaiUid);
     });
     /**
      * 获取上传任务的统计信息（平均处理时长和今日成功率）
@@ -2036,6 +2051,29 @@ function apply(ctx, config) {
         const legacy = await getBindRelatedLegacyUserIdsForTarget(ctx, platform, extracted);
         for (const id of legacy)
             keys.add(id);
+        // 通过 bind 插件反查 aid，补上 koishi:<aid>（实际记录冷却用的统一键）
+        const db = ctx.database;
+        if (db && typeof db.get === 'function') {
+            try {
+                const pidCandidates = platform
+                    ? [`${platform}:${extracted}`, extracted]
+                    : [extracted];
+                let aid;
+                for (const pid of pidCandidates) {
+                    const rows = await db.get('binding', { pid });
+                    if (rows?.length) {
+                        aid = rows[0]?.aid;
+                        break;
+                    }
+                }
+                if (aid !== undefined && aid !== null) {
+                    keys.add(`koishi:${String(aid)}`);
+                }
+            }
+            catch {
+                // binding 表不存在或结构不一致时忽略
+            }
+        }
         for (const id of [...keys]) {
             const rows = await ctx.database.get('maibot_bindings', { userId: id });
             for (const b of rows)
@@ -2735,6 +2773,14 @@ function apply(ctx, config) {
             const maiUid = String(previewResult.UserID);
             const userName = previewResult.UserName;
             const rating = previewResult.Rating ? String(previewResult.Rating) : undefined;
+            // 检查同一游戏账号是否已被其他 Bot 用户绑定
+            const sameUidBindings = await ctx.database.get('maibot_bindings', { maiUid });
+            const otherBindings = sameUidBindings.filter(b => b.userId !== userId);
+            if (otherBindings.length > 0) {
+                const earliest = otherBindings.sort((a, b) => new Date(a.bindTime).getTime() - new Date(b.bindTime).getTime())[0];
+                await session.send(`⚠️ 此游戏账号已被其他用户绑定（最早绑定时间: ${new Date(earliest.bindTime).toLocaleString('zh-CN')}）。\n` +
+                    `持有 SGID 即证明账号所有权，继续绑定后进入冷却期。`);
+            }
             // 存储到数据库
             await ctx.database.create('maibot_bindings', {
                 userId,
@@ -6665,7 +6711,7 @@ function apply(ctx, config) {
         const n = await (0, priority_cooldown_1.adminRemovePersonalPriorityRows)(ctx, candidates);
         return `✅ 已清除 ${n} 条个人优先记录。\n匹配键：${candidates.join('、')}`;
     });
-    ctx.command('mai管理员设置个人优先 <targetUserId:text> <spec:text>', '设置个人优先：永久 / 时长 / clear')
+    ctx.command('mai管理员设置个人优先 [targetUserId:text] [spec:text]', '设置个人优先：永久 / 时长 / clear（无参数走交互式）')
         .userFields(['authority'])
         .action(async ({ session }, targetUserId, spec) => {
         if (!session)
@@ -6673,8 +6719,24 @@ function apply(ctx, config) {
         if ((session.user?.authority ?? 0) < authLevelForCardAdmin) {
             return `❌ 权限不足，需要 auth 等级 ${authLevelForCardAdmin} 以上`;
         }
-        if (!targetUserId?.trim() || !spec?.trim()) {
-            return '❌ 用法：/mai管理员设置个人优先 <@或ID> <永久|7d|clear>';
+        const promptMs = Math.max(90000, rebindTimeout);
+        // 交互式：未提供目标用户
+        if (!targetUserId?.trim()) {
+            await session.send(`【设置个人优先】请在 ${Math.floor(promptMs / 1000)} 秒内发送目标用户（@用户 或数字ID）\n${INTERACTIVE_CANCEL_HINT}`);
+            const r1 = await waitForUserReply(session, ctx, promptMs);
+            const replyText = r1?.content?.trim() || '';
+            if (!replyText || isInteractiveCancel(replyText))
+                return '操作已取消';
+            targetUserId = replyText;
+        }
+        // 交互式：未提供时长
+        if (!spec?.trim()) {
+            await session.send(`请发送时长规格（永久 / 7d / 30d / clear 等）\n${INTERACTIVE_CANCEL_HINT}`);
+            const r2 = await waitForUserReply(session, ctx, promptMs);
+            const replyText = r2?.content?.trim() || '';
+            if (!replyText || isInteractiveCancel(replyText))
+                return '操作已取消';
+            spec = replyText;
         }
         const sp = (0, priority_cooldown_1.parsePriorityAdminSpec)(spec);
         if (sp === null) {
@@ -6687,11 +6749,11 @@ function apply(ctx, config) {
         const r = await (0, priority_cooldown_1.adminSetPersonalPriorityForUserIds)(ctx, candidates, sp);
         return r.message;
     });
-    ctx.command('mai管理员设置群组优先 <spec:text>', '直接设置群组优先（-g 指定群，默认当前群）')
+    ctx.command('mai管理员设置群组优先 [spec:text]', '直接设置群组优先（-g 指定群；无参数走交互式）')
         .userFields(['authority'])
         .usage(' 示例：/mai管理员设置群组优先 clear -g qq:5911013814031454\n' +
         '或：/mai管理员设置群组优先 -g qq:5911013814031454 永久\n' +
-        '（仅数字群号时请写 qq:群号；在群内执行可省略 -g）')
+        '无参数：发指令后按提示输入群标识与时长（仅数字群号请写 qq:群号；在群内执行可省略群标识）')
         .option('guild', '-g <guildKey:string> 群标识，如 qq:群号')
         .action(async ({ session, options }, spec) => {
         if (!session)
@@ -6699,15 +6761,43 @@ function apply(ctx, config) {
         if ((session.user?.authority ?? 0) < authLevelForCardAdmin) {
             return `❌ 权限不足，需要 auth 等级 ${authLevelForCardAdmin} 以上`;
         }
+        const promptMs = Math.max(90000, rebindTimeout);
         const { spec: specOnly, guild: guildOpt } = splitGroupPrioritySpecAndGuild(spec, options?.guild);
-        if (!specOnly) {
-            return '❌ 用法：/mai管理员设置群组优先 <永久|7d|clear> [-g 群标识]';
+        let specFinal = specOnly;
+        let guildFinal = guildOpt;
+        // 无任何参数 → 全交互式
+        if (!specFinal) {
+            // 群标识
+            if (!guildFinal) {
+                const fromSessionGuild = (0, priority_cooldown_1.canonicalGuildPriorityKey)(session);
+                await session.send(`【设置群组优先】请在 ${Math.floor(promptMs / 1000)} 秒内发送群标识（如 qq:123456）${fromSessionGuild ? `\n直接发送 0 则使用当前群 ${fromSessionGuild}` : ''}\n${INTERACTIVE_CANCEL_HINT}`);
+                const r1 = await waitForUserReply(session, ctx, promptMs);
+                const replyText = r1?.content?.trim() || '';
+                if (isInteractiveCancel(replyText))
+                    return '操作已取消';
+                if (replyText === '0' && fromSessionGuild) {
+                    guildFinal = fromSessionGuild;
+                }
+                else if (replyText) {
+                    guildFinal = replyText;
+                }
+                else {
+                    return '操作已取消';
+                }
+            }
+            // 时长
+            await session.send(`请发送时长规格（永久 / 7d / 30d / clear 等）\n${INTERACTIVE_CANCEL_HINT}`);
+            const r2 = await waitForUserReply(session, ctx, promptMs);
+            const replyText = r2?.content?.trim() || '';
+            if (!replyText || isInteractiveCancel(replyText))
+                return '操作已取消';
+            specFinal = replyText;
         }
-        const sp = (0, priority_cooldown_1.parsePriorityAdminSpec)(specOnly);
+        const sp = (0, priority_cooldown_1.parsePriorityAdminSpec)(specFinal);
         if (sp === null) {
             return '❌ 无效的 spec，示例：永久、7d、clear';
         }
-        let gk = (guildOpt.trim() || (0, priority_cooldown_1.canonicalGuildPriorityKey)(session) || '').trim();
+        let gk = (guildFinal.trim() || (0, priority_cooldown_1.canonicalGuildPriorityKey)(session) || '').trim();
         gk = normalizeGuildKeyForPriority(gk, session);
         if (!gk) {
             return '❌ 请使用 -g 指定群标识（platform:guildId），或在群聊内执行。';