@alemonjs/qq-bot 2.1.0-alpha.26 → 2.1.0-alpha.28

package/lib/sends.js

@@ -2,11 +2,14 @@ import { readFileSync } from 'fs';
 import { createResult, ResultCode } from 'alemonjs';
 import axios from 'axios';
 
-const createButtonsData = (rows) => {
-    let id = 0;
+const MAX_BUTTON_ROWS = 5;
+const MAX_BUTTONS_PER_ROW = 5;
+const createButtonsData = (rows, startId = 0) => {
+    let id = startId;
+    const clippedRows = rows.slice(0, MAX_BUTTON_ROWS);
     return {
-        rows: rows.map(row => ({
-            buttons: row.value.map(button => {
+        rows: clippedRows.map(row => ({
+            buttons: row.value.slice(0, MAX_BUTTONS_PER_ROW).map(button => {
                 const value = button.value;
                 const options = button.options;
                 id++;
@@ -29,7 +32,8 @@ const createButtonsData = (rows) => {
                     }
                 };
             })
-        }))
+        })),
+        nextId: id
     };
 };
 const createArkCardData = (value) => ({
@@ -196,15 +200,36 @@ const buildMdAndButtonsParams = (val) => {
             }
         }
         else if (item.type === 'BT.group' && typeof item?.value !== 'string') {
-            params['keyboard'] = { content: createButtonsData(item.value) };
+            if (params['keyboard']?.content?.rows) {
+                const existingRows = params['keyboard'].content.rows;
+                const currentId = params['keyboard'].content.nextId ?? existingRows.length;
+                const remaining = MAX_BUTTON_ROWS - existingRows.length;
+                if (remaining > 0) {
+                    const { rows: newRows, nextId } = createButtonsData(item.value.slice(0, remaining), currentId);
+                    existingRows.push(...newRows);
+                    params['keyboard'].content.nextId = nextId;
+                }
+            }
+            else {
+                const result = createButtonsData(item.value);
+                params['keyboard'] = { content: result };
+            }
         }
         else if (item.type === 'Markdown' && typeof item?.value !== 'string') {
             const content = createMarkdownText(item.value);
             if (content) {
-                params['markdown'] = { content };
+                if (params['markdown']?.content) {
+                    params['markdown'].content += content;
+                }
+                else {
+                    params['markdown'] = { content };
+                }
             }
         }
     }
+    if (params['keyboard']?.content?.nextId !== undefined) {
+        delete params['keyboard'].content.nextId;
+    }
     return params;
 };
 const buildArkParams = (val) => {
@@ -266,6 +291,9 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
     const images = filterImages(val);
     if (images.length > 0) {
         const url = await resolveRichMediaUrl(images, uploadMedia);
+        if (!url) {
+            return [createResult(ResultCode.Fail, '图片上传失败', null)];
+        }
         const res = await sendMessage({
             content,
             media: { file_info: url },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.0-alpha.26",
+  "version": "2.1.0-alpha.28",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",