koishi-plugin-checkgal 1.6.3 → 1.6.5

package/lib/commands.js

@@ -13,23 +13,51 @@ function apply(ctx, config, deps) {
         await session.send('正在查询，请稍候...');
         const results = await touchgal.searchGame(keyword, config);
         if (!results.length) {
-            return `未找到关于“${keyword}”的任何游戏。`;
+            return `未找到关于"${keyword}"的任何游戏。`;
         }
         // 缓存结果
         results.forEach(game => gameCache.set(game.id, game));
-        for (const game of results) {
-            const imageBuffer = await touchgal.downloadAndConvertImage(game.banner);
-            const imageElement = imageBuffer
-                ? koishi_1.h.image(imageBuffer, 'image/jpeg')
-                : (0, koishi_1.h)('text', { content: '封面图加载失败' });
-            const content = [
-                imageElement,
-                `ID: ${game.id}`,
-                `名称: ${game.name}`,
-                `平台: ${game.platform.join(', ')}`,
-                `语言: ${game.language.join(', ')}`,
-            ].join('\n');
-            await session.send(content);
+        // 判断是否使用合并转发
+        if (config.isForward && (session.platform === 'onebot' || session.platform === 'red')) {
+            // 使用合并转发
+            const messageElements = [];
+            for (const game of results) {
+                const imageBuffer = await touchgal.downloadAndConvertImage(game.banner);
+                const imageElement = imageBuffer
+                    ? koishi_1.h.image(imageBuffer, 'image/jpeg')
+                    : (0, koishi_1.h)('text', { content: '封面图加载失败' });
+                const content = [
+                    imageElement,
+                    `ID: ${game.id}`,
+                    `名称: ${game.name}`,
+                    `平台: ${game.platform.join(', ')}`,
+                    `语言: ${game.language.join(', ')}`,
+                ].join('\n');
+                // 包装成 message 元素
+                messageElements.push((0, koishi_1.h)('message', {
+                    userId: session.userId,
+                    nickname: session.author?.nickname || session.username,
+                }, koishi_1.h.parse(content)));
+            }
+            // 使用 figure 元素发送合并转发
+            await session.send((0, koishi_1.h)('figure', { children: messageElements }));
+        }
+        else {
+            // 普通发送方式
+            for (const game of results) {
+                const imageBuffer = await touchgal.downloadAndConvertImage(game.banner);
+                const imageElement = imageBuffer
+                    ? koishi_1.h.image(imageBuffer, 'image/jpeg')
+                    : (0, koishi_1.h)('text', { content: '封面图加载失败' });
+                const content = [
+                    imageElement,
+                    `ID: ${game.id}`,
+                    `名称: ${game.name}`,
+                    `平台: ${game.platform.join(', ')}`,
+                    `语言: ${game.language.join(', ')}`,
+                ].join('\n');
+                await session.send(content);
+            }
         }
     });
     ctx.command('下载gal <id:number>', '获取Galgame下载地址')
@@ -49,7 +77,7 @@ function apply(ctx, config, deps) {
                 gameCache.set(id, gameInfo);
             }
             else {
-                await session.send(`无法获取游戏“${id}”的详细信息，但仍会尝试获取下载链接...`);
+                await session.send(`无法获取游戏"${id}"的详细信息，但仍会尝试获取下载链接...`);
             }
         }
         const downloads = await touchgal.getDownloads(id);
@@ -58,24 +86,70 @@ function apply(ctx, config, deps) {
         }
         const gameTitle = gameInfo ? `游戏: ${gameInfo.name} (ID: ${id})` : `游戏ID: ${id}`;
         const imageBuffer = gameInfo ? await touchgal.downloadAndConvertImage(gameInfo.banner) : null;
-        // 对于单条消息，直接发送 Buffer 是最高效的
-        if (imageBuffer) {
-            await session.send(koishi_1.h.image(imageBuffer, 'image/jpeg'));
+        // 判断是否使用合并转发
+        if (config.isForward && (session.platform === 'onebot' || session.platform === 'red')) {
+            // 使用合并转发
+            const messageElements = [];
+            // 第一条消息：游戏标题和封面
+            if (imageBuffer) {
+                const headerContent = [
+                    koishi_1.h.image(imageBuffer, 'image/jpeg'),
+                    gameTitle,
+                    `共找到 ${downloads.length} 个下载资源`,
+                ].join('\n');
+                messageElements.push((0, koishi_1.h)('message', {
+                    userId: session.userId,
+                    nickname: session.author?.nickname || session.username,
+                }, koishi_1.h.parse(headerContent)));
+            }
+            else {
+                const headerContent = [
+                    gameTitle,
+                    `共找到 ${downloads.length} 个下载资源`,
+                ].join('\n');
+                messageElements.push((0, koishi_1.h)('message', {
+                    userId: session.userId,
+                    nickname: session.author?.nickname || session.username,
+                }, koishi_1.h.parse(headerContent)));
+            }
+            // 后续消息：每个下载资源一条消息
+            for (const res of downloads) {
+                const resContent = [
+                    `名称: ${res.name}`,
+                    `平台: ${res.platform.join(', ')} | 大小: ${res.size}`,
+                    `下载地址: ${res.content}`,
+                    `提取码: ${res.code || '无'}`,
+                    `解压码: ${res.password || '无'}`,
+                    `备注: ${res.note || '无'}`,
+                ].join('\n');
+                messageElements.push((0, koishi_1.h)('message', {
+                    userId: session.userId,
+                    nickname: session.author?.nickname || session.username,
+                }, resContent));
+            }
+            // 使用 figure 元素发送合并转发
+            await session.send((0, koishi_1.h)('figure', { children: messageElements }));
+        }
+        else {
+            // 普通发送方式
+            if (imageBuffer) {
+                await session.send(koishi_1.h.image(imageBuffer, 'image/jpeg'));
+            }
+            const header = [
+                gameTitle,
+                `共找到 ${downloads.length} 个下载资源：`,
+            ].filter(Boolean).join('\n');
+            const downloadDetails = downloads.map(res => {
+                return [
+                    `› 名称: ${res.name}`,
+                    `  平台: ${res.platform.join(', ')} | 大小: ${res.size}`,
+                    `  下载地址: ${res.content}`,
+                    `  提取码: ${res.code || '无'}`,
+                    `  解压码: ${res.password || '无'}`,
+                    `  备注: ${res.note || '无'}`,
+                ].join('\n');
+            }).join('\n\n');
+            return `${header}\n\n${downloadDetails}`;
         }
-        const header = [
-            gameTitle,
-            `共找到 ${downloads.length} 个下载资源：`,
-        ].filter(Boolean).join('\n');
-        const downloadDetails = downloads.map(res => {
-            return [
-                `› 名称: ${res.name}`,
-                `  平台: ${res.platform.join(', ')} | 大小: ${res.size}`,
-                `  下载地址: ${res.content}`,
-                `  提取码: ${res.code || '无'}`,
-                `  解压码: ${res.password || '无'}`,
-                `  备注: ${res.note || '无'}`,
-            ].join('\n');
-        }).join('\n\n');
-        return `${header}\n\n${downloadDetails}`;
     });
 }

package/lib/config.d.ts

@@ -2,5 +2,6 @@ import { Schema } from 'koishi';
 export interface Config {
     searchLimit: number;
     enableNsfw: boolean;
+    isForward: boolean;
 }
 export declare const Config: Schema<Config>;

package/lib/config.js

@@ -5,4 +5,5 @@ const koishi_1 = require("koishi");
 exports.Config = koishi_1.Schema.object({
     searchLimit: koishi_1.Schema.number().default(15).min(1).max(50).description('单次搜索返回的最大结果数量。'),
     enableNsfw: koishi_1.Schema.boolean().default(false).description('是否允许搜索 NSFW 内容。'),
+    isForward: koishi_1.Schema.boolean().default(false).description('是否开启合并转发 `仅支持 onebot/red 适配器` 其他平台开启无效').experimental(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-checkgal",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "scripts": {
     "build": "tsc"
   },
@@ -31,7 +31,7 @@
   ],
   "peerDependencies": {
     "koishi": "^4.18.9",
-    "koishi-plugin-ffmpeg": ""
+    "koishi-plugin-ffmpeg": "^1.1.0"
   },
   "koishi": {
     "description": {
@@ -44,7 +44,8 @@
     }
   },
   "devDependencies": {
+    "koishi-plugin-ffmpeg": "^1.1.0",
     "typescript": "^5.4.0",
     "@types/node": "^18.0.0"
   }
-}
+}