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

package/lib/commands.js

@@ -105,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');
@@ -168,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

@@ -66,7 +66,6 @@ export interface Config {
     enableMemory: boolean;
     memoryFileName: string;
     memoryInAi: boolean;
-    memoryContent: string;
     groupRules: GroupRule[];
     allowedUserIds: string[];
     allowGroupOwner: boolean;

package/lib/index.js

@@ -55,9 +55,8 @@ 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 数据目录）。'),
+        memoryFileName: koishi_1.Schema.string().default('Memory.md').description('记忆库文件名（保存在 Koishi 数据目录）。请直接使用控制台左侧「探索器 Explorer」打开该文件查看/编辑记忆库内容。'),
         memoryInAi: koishi_1.Schema.boolean().default(true).description('AI 回复/识图时是否参考记忆库内容。'),
-        memoryContent: koishi_1.Schema.string().role('textarea').default('').description('记忆库内容（可直接在此查看/编辑 Memory.md，保存后会自动写回文件）。'),
     }).description('记忆库'),
     koishi_1.Schema.object({
         enableSelfGag: koishi_1.Schema.boolean().default(true).description('启用口球娱乐：普通成员对自己使用 mute/gag 时随机 1~60 分钟禁言。'),

package/lib/service.d.ts

@@ -122,7 +122,6 @@ export declare class QQGroupManagerService extends Service {
     private searchMemory;
     private decoratePromptWithMemory;
     private handleMemoryCommand;
-    private _syncMemoryConfig;
     private isImageSendableUrl;
     describeImageMessage(session?: Session): {
         hasCqImage: boolean;

package/lib/service.js

@@ -36,26 +36,6 @@ class QQGroupManagerService extends koishi_1.Service {
         this._logger = ctx.logger('nestim-qq-group-manager');
         ctx.on('message', (session) => this.handleGroupModeration(session));
         ctx.on('guild-member-request', (session) => this.handleGuildMemberRequest(session));
-        // 让配置里的 memoryContent 编辑框与 Memory.md 双向同步
-        this._syncMemoryConfig().catch((error) => this._logger.warn(`[memory] sync failed: ${String(error)}`));
-    }
-    async _syncMemoryConfig() {
-        try {
-            const fileContent = await this.readMemoryFile();
-            const cfgContent = typeof this.config.memoryContent === 'string' ? this.config.memoryContent : '';
-            if (cfgContent && cfgContent !== fileContent) {
-                // 用户在配置编辑框里改过内容 → 写回文件
-                await this.writeMemoryFile(cfgContent);
-                this._logger.info('[memory] 配置内容已写回 Memory.md');
-            }
-            else if (!cfgContent) {
-                // 首次：把文件内容填充到编辑框，便于查看/编辑
-                this.config.memoryContent = fileContent;
-            }
-        }
-        catch (error) {
-            this._logger.warn(`[memory] sync failed: ${String(error)}`);
-        }
     }
     isPlatformAllowed(platform) {
         return !!platform && this.config.platformFilter.includes(platform);
@@ -2889,16 +2869,19 @@ 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;
     }
@@ -2941,10 +2924,9 @@ class QQGroupManagerService extends koishi_1.Service {
         catch { /* ignore */ }
         return null;
     }
-    buildJoinRequestPrompt(code, applicant, extra) {
+    buildJoinRequestPrompt(applicant, extra) {
         const lines = [
             '检测到新的入群申请，请管理员审核：',
-            `审核编号：${code}`,
             `QQ号：${applicant.userId}`,
         ];
         if (extra?.nickname)
@@ -2955,12 +2937,9 @@ class QQGroupManagerService extends koishi_1.Service {
             lines.push(`年龄：${extra.age}`);
         if (extra?.level)
             lines.push(`QQ等级：${extra.level}`);
-        if (extra?.avatarUrl)
-            lines.push(`头像：${extra.avatarUrl}`);
         lines.push(`验证信息：${applicant.comment || '(无)'}`);
-        lines.push(`同意：${this.config.command} 审核 ${code} 同意 [理由]`);
-        lines.push(`拒绝：${this.config.command} 审核 ${code} 拒绝 [理由]`);
-        lines.push(`快捷回复：同意入群 ${code} / 拒绝入群 ${code}`);
+        lines.push(`同意：${this.config.command} 同意 [理由]`);
+        lines.push(`拒绝：${this.config.command} 拒绝 [理由]`);
         return lines.join('\n');
     }
     async handleGuildMemberRequest(session) {
@@ -3008,28 +2987,44 @@ class QQGroupManagerService extends koishi_1.Service {
                 avatarUrl: `https://q1.qlogo.cn/g?b=qq&nk=${encodeURIComponent(session.userId)}&s=640`,
             };
         }
-        const prompt = this.buildJoinRequestPrompt(code, item, extra);
+        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);
@@ -3039,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.4",
+  "version": "0.1.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [