koishi-plugin-checkgal 1.6.1 → 1.6.4

package/lib/api.d.ts

@@ -1,11 +1,6 @@
 import { Context } from 'koishi';
 import { GameInfo, DownloadResource } from './types';
 import { Config } from './config';
-declare module 'koishi' {
-    interface Context {
-        canvas: any;
-    }
-}
 export declare class TouchGalAPI {
     private http;
     private logger;

package/lib/api.js

@@ -66,14 +66,12 @@ class TouchGalAPI {
             const response = await this.http.get(url, {
                 responseType: 'arraybuffer',
             });
-            if (!(response instanceof ArrayBuffer))
-                return null;
             const imageBuffer = Buffer.from(response);
-            const image = await this.ctx.canvas.loadImage(imageBuffer);
-            const canvas = this.ctx.canvas.createCanvas(image.width, image.height);
-            const ctx = canvas.getContext('2d');
-            ctx.drawImage(image, 0, 0);
-            const jpegBuffer = canvas.toBuffer('image/jpeg');
+            // 使用 ffmpeg 将图片转换为 jpeg
+            const jpegBuffer = await this.ctx.ffmpeg.builder()
+                .input(imageBuffer)
+                .outputOption('-f', 'mjpeg')
+                .run('buffer');
             return jpegBuffer;
         }
         catch (error) {

package/lib/commands.js

@@ -13,10 +13,12 @@ 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));
+        // 构建合并转发消息
+        const forwardMessages = [];
         for (const game of results) {
             const imageBuffer = await touchgal.downloadAndConvertImage(game.banner);
             const imageElement = imageBuffer
@@ -29,8 +31,10 @@ function apply(ctx, config, deps) {
                 `平台: ${game.platform.join(', ')}`,
                 `语言: ${game.language.join(', ')}`,
             ].join('\n');
-            await session.send(content);
+            forwardMessages.push((0, koishi_1.h)('message', {}, content));
         }
+        // 发送合并转发消息
+        await session.send((0, koishi_1.h)('message', { forward: true }, forwardMessages));
     });
     ctx.command('下载gal <id:number>', '获取Galgame下载地址')
         .action(async ({ session }, id) => {
@@ -49,7 +53,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 +62,37 @@ function apply(ctx, config, deps) {
         }
         const gameTitle = gameInfo ? `游戏: ${gameInfo.name} (ID: ${id})` : `游戏ID: ${id}`;
         const imageBuffer = gameInfo ? await touchgal.downloadAndConvertImage(gameInfo.banner) : null;
-        // 对于单条消息，直接发送 Buffer 是最高效的
+        // 构建合并转发消息
+        const forwardMessages = [];
+        // 第一条消息：游戏标题和封面
         if (imageBuffer) {
-            await session.send(koishi_1.h.image(imageBuffer, 'image/jpeg'));
+            const headerContent = [
+                koishi_1.h.image(imageBuffer, 'image/jpeg'),
+                gameTitle,
+                `共找到 ${downloads.length} 个下载资源`,
+            ].join('\n');
+            forwardMessages.push((0, koishi_1.h)('message', {}, headerContent));
+        }
+        else {
+            const headerContent = [
+                gameTitle,
+                `共找到 ${downloads.length} 个下载资源`,
+            ].join('\n');
+            forwardMessages.push((0, koishi_1.h)('message', {}, headerContent));
         }
-        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 || '无'}`,
+        // 后续消息：每个下载资源一条消息
+        for (const res of downloads) {
+            const resContent = [
+                `名称: ${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}`;
+            forwardMessages.push((0, koishi_1.h)('message', {}, resContent));
+        }
+        // 发送合并转发消息
+        await session.send((0, koishi_1.h)('message', { forward: true }, forwardMessages));
     });
 }

package/lib/index.js

@@ -8,7 +8,7 @@ const api_1 = require("./api");
 const cache_1 = require("./cache");
 const commands_1 = require("./commands");
 exports.name = 'checkgal';
-exports.inject = ['canvas'];
+exports.inject = ['ffmpeg'];
 function apply(ctx, config) {
     // 初始化服务
     const api = new api_1.TouchGalAPI(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-checkgal",
-  "version": "1.6.1",
+  "version": "1.6.4",
   "scripts": {
     "build": "tsc"
   },
@@ -30,7 +30,8 @@
     "galgame"
   ],
   "peerDependencies": {
-    "koishi": "^4.18.9"
+    "koishi": "^4.18.9",
+    "koishi-plugin-ffmpeg": "^1.1.0"
   },
   "koishi": {
     "description": {
@@ -38,12 +39,13 @@
     },
     "service": {
       "required": [
-        "canvas"
+        "ffmpeg"
       ]
     }
   },
   "devDependencies": {
+    "koishi-plugin-ffmpeg": "^1.1.0",
     "typescript": "^5.4.0",
     "@types/node": "^18.0.0"
   }
-}
+}