@nestim/koishi-plugin-qq-group-manager 0.1.3 → 0.1.5

package/lib/commands.js

@@ -29,16 +29,6 @@ function registerCommands(ctx, service, config) {
         return result;
     });
     const root = ctx.command(config.command, 'QQ群管理命令入口');
-    root
-        .subcommand('ping', '检查插件是否可用')
-        .action(async ({ session }) => {
-        const auth = await service.authorizeCommand('ping', session);
-        if (!auth.ok)
-            return auth.userMessage ?? '权限不足或上下文不符合要求。';
-        const result = { ok: true, message: 'qq-group-manager 已加载。' };
-        service.logCommandResult('ping', result, session);
-        return styleText(result.message, config);
-    });
     root
         .subcommand('查图', '识图调试：查看本条消息中被识别的图片信息')
         .action(async ({ session }) => {
@@ -66,19 +56,6 @@ function registerCommands(ctx, service, config) {
         }
         return styleText('识图诊断：\n' + lines.join('\n'), config);
     });
-    root
-        .subcommand('plan <groupId:string>', '生成演练动作计划')
-        .option('reason', '-r <reason:string> 计划原因')
-        .action(async ({ session, options }, groupId) => {
-        if (!groupId)
-            return '请提供群号。';
-        const auth = await service.authorizeCommand('plan', session);
-        if (!auth.ok)
-            return auth.userMessage ?? '权限不足或上下文不符合要求。';
-        const result = await service.planDemoAction(groupId, options.reason);
-        service.logCommandResult('plan', result, session, { groupId });
-        return formatAction(result, config);
-    });
     root
         .subcommand('kick <target:string>', '踢出群成员')
         .option('reject', '-r 拒绝再次加群请求')
@@ -128,17 +105,16 @@ function registerCommands(ctx, service, config) {
         return formatAction(result, config, displayTarget);
     });
     root
-        .subcommand('gag [target:string]', '口球（随机 1~60 分钟禁言）')
-        .alias('口球')
-        .alias('口气')
+        .subcommand('gag [target:string]', '自我约束（随机 1~60 分钟禁言）')
+        .alias('自我约束')
         .option('reason', '-r <reason:string> 操作原因')
         .action(async ({ session, options }, target) => {
         if (!config.enableSelfGag)
-            return '口球娱乐功能未启用。';
+            return '自我约束功能未启用。';
         if (!session?.userId)
             return '无法识别当前账号。';
         if (config.allowedUserIds.includes(session.userId))
-            return '喵~ 白名单用户不参与口球。';
+            return '喵~ 白名单用户不参与自我约束。';
         const resolvedTarget = target || session.userId;
         if (await service.shouldSelfGag(session, resolvedTarget)) {
             const result = await service.selfGag(session, 'gag-trigger');
@@ -191,22 +167,4 @@ function registerCommands(ctx, service, config) {
         const displayTarget = await service.formatTargetDisplay(session, result.plan?.targetId, target);
         return formatAction(result, config, displayTarget);
     });
-    root
-        .subcommand('审核 <code:string> <state:string>', '审核入群申请（同意/拒绝）')
-        .option('reason', '-r <reason:string> 审核理由')
-        .action(async ({ session, options }, code, state) => {
-        if (!code || !state)
-            return '请提供审核编号与状态（同意/拒绝）。';
-        const auth = await service.authorizeCommand('review-join-request', session);
-        if (!auth.ok)
-            return auth.userMessage ?? '权限不足或上下文不符合要求。';
-        const normalized = state.trim().toLowerCase();
-        const approve = ['同意', '通过', '放行', '批准', 'approve', 'pass', 'ok', 'yes'].includes(normalized);
-        const reject = ['拒绝', '驳回', 'deny', 'reject', 'no', 'refuse'].includes(normalized);
-        if (!approve && !reject)
-            return '状态仅支持：同意/拒绝。';
-        const result = await service.reviewJoinRequestDecision(session, code, approve, options.reason);
-        service.logCommandResult('review-join-request', result, session, { code, approve, source: 'command' });
-        return formatAction(result, config);
-    });
 }

package/lib/index.d.ts

@@ -94,6 +94,7 @@ export interface GroupRule {
     autoKickEnabled?: boolean;
     autoKickThreshold?: number;
     autoViolationWindowMinutes?: number;
+    enableJoinRequestReview?: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -1,4 +1,4 @@
-"use strict";
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.inject = exports.name = void 0;
 exports.apply = apply;
@@ -42,6 +42,7 @@ exports.Config = koishi_1.Schema.intersect([
             autoKickEnabled: koishi_1.Schema.boolean().description('该群是否启用自动踢人（留空则跟随全局设置）。'),
             autoKickThreshold: koishi_1.Schema.natural().description('该群触发自动踢人的违规次数（留空则跟随全局设置）。'),
             autoViolationWindowMinutes: koishi_1.Schema.natural().description('该群违规计数统计窗口（分钟，留空则跟随全局设置）。'),
+            enableJoinRequestReview: koishi_1.Schema.boolean().description('该群是否启用入群审核（留空则跟随全局设置）。'),
         })).role('table').default([]).description('按群覆盖消息管控策略（未命中群号时使用全局默认）。'),
     }).description('消息管控'),
     koishi_1.Schema.object({
@@ -54,7 +55,7 @@ exports.Config = koishi_1.Schema.intersect([
     }).description('自动管控'),
     koishi_1.Schema.object({
         enableMemory: koishi_1.Schema.boolean().default(true).description('启用记忆库：群内发送 [记忆]+内容 保存到 Memory.md，[记忆查询]/[记忆删除] 管理，AI 回复可引用。'),
-        memoryFileName: koishi_1.Schema.string().default('Memory.md').description('记忆库文件名（保存在 Koishi 数据目录，可通过控制台 Explorer 查看/编辑）。'),
+        memoryFileName: koishi_1.Schema.string().default('Memory.md').description('记忆库文件名（保存在 Koishi 数据目录）。请直接使用控制台左侧「探索器 Explorer」打开该文件查看/编辑记忆库内容。'),
         memoryInAi: koishi_1.Schema.boolean().default(true).description('AI 回复/识图时是否参考记忆库内容。'),
     }).description('记忆库'),
     koishi_1.Schema.object({

package/lib/service.d.ts

@@ -1,4 +1,4 @@
-import { Context, Service, Session } from 'koishi';
+import { Context, Service, Session } from 'koishi';
 import type { Config } from './index';
 import type { ActionResult, AuthorizationResult, MuteParseResult } from './types';
 declare module 'koishi' {
@@ -139,6 +139,8 @@ export declare class QQGroupManagerService extends Service {
     private toGroupId;
     private getOneBotApi;
     private extractTextForFilter;
+    private hasTextContent;
+    private hasImageOrFace;
     private hasCardMessage;
     private hasForwardMessage;
     private normalizeGuildId;
@@ -154,6 +156,9 @@ export declare class QQGroupManagerService extends Service {
     private generateJoinRequestCode;
     private parseJoinRequestReviewText;
     private handleJoinRequestReviewMessage;
+    private resolveJoinReviewEnabled;
+    private fetchStrangerInfo;
+    private buildJoinRequestPrompt;
     private handleGuildMemberRequest;
     reviewJoinRequestDecision(session: Session, code: string, approve: boolean, reason?: string): Promise<ActionResult>;
     formatTargetDisplay(session: Session | undefined, targetId?: string, rawTarget?: string): Promise<string>;

package/lib/service.js

@@ -1,4 +1,4 @@
-"use strict";
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -1012,9 +1012,16 @@ class QQGroupManagerService extends koishi_1.Service {
         const cqList = content.match(cqPattern) ?? [];
         for (const chunk of cqList) {
             const match = chunk.match(/(?:url|src)=([^,\]]+)/i);
-            if (!match)
-                continue;
-            const value = decodeURIComponent(match[1].trim());
+            let value = match ? decodeURIComponent(match[1].trim()) : '';
+            if (!this.isImageSendableUrl(value)) {
+                // 部分适配器把 url 放在 file 字段
+                const fm = chunk.match(/file=([^,\]]+)/i);
+                if (fm) {
+                    const f = decodeURIComponent(fm[1].trim());
+                    if (this.isImageSendableUrl(f))
+                        value = f;
+                }
+            }
             if (!this.isImageSendableUrl(value))
                 continue;
             urls.push(value);
@@ -1738,7 +1745,7 @@ class QQGroupManagerService extends koishi_1.Service {
                 thresholdMode,
                 focusText: (directMention || followupForce || relatedContextFollowup) ? (text || '@bot') : undefined,
                 focusUserId: (directMention || followupForce || relatedContextFollowup) ? session.userId : undefined,
-                focusImages: directMention ? messageImages : [],
+                focusImages: messageImages,
                 focusUserName: (directMention || followupForce || relatedContextFollowup) ? this.getDisplayName(session) : undefined,
                 topicTokens: thresholdMode ? topicTokens : undefined,
                 selectedRecord,
@@ -2598,6 +2605,23 @@ class QQGroupManagerService extends koishi_1.Service {
         const raw = (session.content ?? '').replace(/\[CQ:[^\]]+\]/g, ' ');
         return raw.trim();
     }
+    hasTextContent(session) {
+        const text = this.extractTextForFilter(session);
+        if (text)
+            return true;
+        // 有的适配器把图片/表情放在 elements 里，content 可能没文字；检查是否有文字元素
+        for (const el of session.elements ?? []) {
+            if (el.type === 'text' && String(el.text ?? el.content ?? '').trim())
+                return true;
+        }
+        return false;
+    }
+    hasImageOrFace(session) {
+        const content = session.content ?? '';
+        if (/\[CQ:(image|face|record|video|flash),/i.test(content))
+            return true;
+        return (session.elements ?? []).some((el) => el.type === 'image' || el.type === 'face' || el.type === 'record' || el.type === 'video' || el.type === 'flash');
+    }
     hasCardMessage(session) {
         const content = session.content ?? '';
         if (/\[CQ:(json|xml),/i.test(content))
@@ -2651,6 +2675,10 @@ class QQGroupManagerService extends koishi_1.Service {
         };
     }
     detectViolation(session, policy) {
+        // 防误判：纯图片/表情/贴纸（无实际文字内容）的消息不作为违规处理，避免表情包被当成违禁词
+        if (this.hasImageOrFace(session) && !this.hasTextContent(session)) {
+            return null;
+        }
         if (policy.blockCardMessage && this.hasCardMessage(session)) {
             return { type: 'card', detail: '检测到卡片消息(json/xml)' };
         }
@@ -2841,21 +2869,24 @@ class QQGroupManagerService extends koishi_1.Service {
         return `${Date.now().toString(36).toUpperCase().slice(-6)}`;
     }
     parseJoinRequestReviewText(text) {
-        const source = text.trim();
+        let source = String(text).trim();
         if (!source)
             return null;
-        const approveMatch = source.match(/^(同意|通过|放行|批准|approve)\s*(?:入群|申请)?\s*#?([A-Za-z0-9]{4,12})(?:\s+(.+))?$/i);
+        // 去掉可能的命令前缀（如 [bot]）
+        source = source.replace(/^\[[^\]]+\]\s*/, '').trim();
+        // 支持 同意/拒绝 [编号] [理由]（编号可省略）
+        const approveMatch = source.match(/^(同意|通过|放行|批准|approve|ok|yes)\s*(?:入群|申请)?\s*#?([A-Za-z0-9]{4,12})?\s*([\s\S]*)$/i);
         if (approveMatch) {
-            return { approve: true, code: approveMatch[2].toUpperCase(), reason: (approveMatch[3] || '').trim() };
+            return { approve: true, code: approveMatch[2] ? approveMatch[2].toUpperCase() : '', reason: (approveMatch[3] || '').trim() };
         }
-        const rejectMatch = source.match(/^(拒绝|驳回|拒|deny|reject)\s*(?:入群|申请)?\s*#?([A-Za-z0-9]{4,12})(?:\s+(.+))?$/i);
+        const rejectMatch = source.match(/^(拒绝|驳回|拒|deny|reject|no|refuse)\s*(?:入群|申请)?\s*#?([A-Za-z0-9]{4,12})?\s*([\s\S]*)$/i);
         if (rejectMatch) {
-            return { approve: false, code: rejectMatch[2].toUpperCase(), reason: (rejectMatch[3] || '').trim() };
+            return { approve: false, code: rejectMatch[2] ? rejectMatch[2].toUpperCase() : '', reason: (rejectMatch[3] || '').trim() };
         }
         return null;
     }
     async handleJoinRequestReviewMessage(session) {
-        if (!this.config.enableJoinRequestReview)
+        if (!this.resolveJoinReviewEnabled(session))
             return false;
         if (session.platform !== 'onebot' || !session.guildId)
             return false;
@@ -2870,8 +2901,49 @@ class QQGroupManagerService extends koishi_1.Service {
         await session.send(this.styleText(result.message));
         return true;
     }
+    resolveJoinReviewEnabled(session) {
+        const guildId = this.normalizeGuildId(session?.guildId);
+        const rule = this.config.groupRules?.find((item) => this.normalizeGuildId(item.guildId) === guildId);
+        if (typeof rule?.enableJoinRequestReview === 'boolean')
+            return rule.enableJoinRequestReview;
+        return !!this.config.enableJoinRequestReview;
+    }
+    async fetchStrangerInfo(bot, userId) {
+        if (!bot || !userId)
+            return null;
+        // 兼容不同 OneBot 适配器的方法命名
+        try {
+            if (typeof bot.getStrangerInfo === 'function')
+                return await bot.getStrangerInfo(userId, true);
+        }
+        catch { /* ignore */ }
+        try {
+            if (typeof bot.get_stranger_info === 'function')
+                return await bot.get_stranger_info(userId, true);
+        }
+        catch { /* ignore */ }
+        return null;
+    }
+    buildJoinRequestPrompt(applicant, extra) {
+        const lines = [
+            '检测到新的入群申请，请管理员审核：',
+            `QQ号：${applicant.userId}`,
+        ];
+        if (extra?.nickname)
+            lines.push(`昵称：${extra.nickname}`);
+        if (extra?.sex)
+            lines.push(`性别：${extra.sex}`);
+        if (extra?.age !== undefined && extra.age !== '')
+            lines.push(`年龄：${extra.age}`);
+        if (extra?.level)
+            lines.push(`QQ等级：${extra.level}`);
+        lines.push(`验证信息：${applicant.comment || '(无)'}`);
+        lines.push(`同意：${this.config.command} 同意 [理由]`);
+        lines.push(`拒绝：${this.config.command} 拒绝 [理由]`);
+        return lines.join('\n');
+    }
     async handleGuildMemberRequest(session) {
-        if (!this.config.enableJoinRequestReview)
+        if (!this.resolveJoinReviewEnabled(session))
             return;
         if (!this.isPlatformAllowed(session.platform))
             return;
@@ -2893,36 +2965,66 @@ class QQGroupManagerService extends koishi_1.Service {
         };
         this.pendingJoinRequests.set(code, item);
         this.pendingJoinRequestFlags.set(item.flag, code);
-        const prompt = [
-            '检测到新的入群申请，请管理员审核：',
-            `审核编号：${code}`,
-            `申请账号：${item.userId}`,
-            `验证信息：${item.comment || '(无)'}`,
-            `同意：${this.config.command} 审核 ${code} 同意 [理由]`,
-            `拒绝：${this.config.command} 审核 ${code} 拒绝 [理由]`,
-            `快捷回复：同意入群 ${code} / 拒绝入群 ${code}`,
-        ].join('\n');
+        // 尽力获取申请者信息（昵称/性别/年龄/等级/头像）
+        let extra = {};
+        const bot = this.getOneBotApi(session);
+        const info = await this.fetchStrangerInfo(bot, session.userId);
+        if (info) {
+            const nickname = info.nickname || info.card || info.name || '';
+            let sex = info.sex || info.gender || '';
+            if (sex === 'male')
+                sex = '男';
+            else if (sex === 'female')
+                sex = '女';
+            else if (sex === 'unknown' || sex === '')
+                sex = '未知';
+            const level = (info.level !== undefined && info.level !== null) ? String(info.level) : '';
+            extra = {
+                nickname,
+                sex: sex || '',
+                age: info.age,
+                level,
+                avatarUrl: `https://q1.qlogo.cn/g?b=qq&nk=${encodeURIComponent(session.userId)}&s=640`,
+            };
+        }
+        const prompt = this.buildJoinRequestPrompt(item, extra);
         try {
-            await session.send(this.styleText(prompt));
-            this.logCommandResult('join-request', { ok: true, message: 'join request notice sent' }, session, { code, target: item.userId });
+            if (extra?.avatarUrl) {
+                // 直接把头像图片发到群里，而不是给链接
+                await session.send([koishi_1.h.text(this.styleText(prompt)), koishi_1.h.image(extra.avatarUrl)]);
+            }
+            else {
+                await session.send(this.styleText(prompt));
+            }
+            this.logCommandResult('join-request', { ok: true, message: 'join request notice sent' }, session, { target: item.userId });
         }
         catch (error) {
-            this.logCommandResult('join-request', { ok: false, message: `join request notice failed: ${String(error)}` }, session, { code, target: item.userId });
+            this.logCommandResult('join-request', { ok: false, message: `join request notice failed: ${String(error)}` }, session, { target: item.userId });
         }
     }
     async reviewJoinRequestDecision(session, code, approve, reason) {
         this.cleanupPendingJoinRequests();
-        const key = code.trim().toUpperCase();
-        const item = this.pendingJoinRequests.get(key);
-        if (!item)
-            return { ok: false, message: `未找到审核编号 ${key}，可能已处理或已过期。` };
-        if (session.guildId !== item.guildId)
-            return { ok: false, message: `审核编号 ${key} 不属于当前群。` };
+        let item;
+        const key = (code || '').trim().toUpperCase();
+        if (key) {
+            item = this.pendingJoinRequests.get(key);
+            if (!item)
+                return { ok: false, message: `未找到审核编号 ${key}，可能已处理或已过期。` };
+            if (session.guildId !== item.guildId)
+                return { ok: false, message: `审核编号 ${key} 不属于当前群。` };
+        }
+        else {
+            // 无编号：取当前群最近一条待审核申请
+            const candidates = [...this.pendingJoinRequests.values()].filter((x) => x.guildId === session.guildId);
+            if (!candidates.length)
+                return { ok: false, message: '当前没有待审核的入群申请。' };
+            item = candidates[candidates.length - 1];
+        }
         const plan = {
             action: approve ? 'approve-join-request' : 'reject-join-request',
             groupId: item.guildId,
             targetId: item.userId,
-            reason: `code=${item.code}${reason ? `; ${reason}` : ''}`,
+            reason: `${reason || ''}`,
         };
         if (this.config.dryRun)
             return this.createDryRunResult(plan);
@@ -2932,13 +3034,13 @@ class QQGroupManagerService extends koishi_1.Service {
         }
         try {
             await bot.handleGuildMemberRequest(item.flag, approve, reason || '');
-            this.pendingJoinRequests.delete(key);
+            this.pendingJoinRequests.delete(item.code);
             this.pendingJoinRequestFlags.delete(item.flag);
             return {
                 ok: true,
                 message: approve
-                    ? `已放行入群申请：${item.userId}（编号 ${key}）`
-                    : `已拒绝入群申请：${item.userId}（编号 ${key}）`,
+                    ? `已放行入群申请：${item.userId}`
+                    : `已拒绝入群申请：${item.userId}`,
                 plan,
             };
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nestim/koishi-plugin-qq-group-manager",
   "description": "Koishi QQ群管理插件（OneBot/LLOneBot）：群管命令、权限校验、图片菜单、状态卡片、复读、AI群聊回复、记忆库、识图与自动管控（禁言/踢人）。",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [