@alemonjs/bubble 2.1.0-alpha.4 → 2.1.0-alpha.6

package/lib/send.js

@@ -14,7 +14,7 @@ const sendToRoom = async (client, param, val) => {
         const threadId = String(param?.thread_id ?? '');
         const messageId = param?.message_id ? String(param?.message_id) : undefined;
         const images = val.filter(item => item.type === 'Image' || item.type === 'ImageURL' || item.type === 'ImageFile');
-        const mds = val.filter(item => item.type === 'Markdown');
+        const mdAndButtons = val.filter(item => item.type === 'Markdown' || item.type === 'BT.group');
         const content = val
             .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
             .map(item => {
@@ -72,12 +72,12 @@ const sendToRoom = async (client, param, val) => {
             const uploadRes = await client.uploadFile(bufferData, undefined, { channelId, threadId, messageId: messageId });
             const fileAttachment = uploadRes?.data?.file;
             if (!fileAttachment) {
-                throw new Error('文件上传失败：未返回文件信息');
+                return [createResult(ResultCode.Ok, '文件上传失败：未返回文件信息', uploadRes)];
             }
             if (channelId) {
                 const res = await client.sendMessage(channelId, {
                     content: content,
-                    type: 'text',
+                    type: 'image',
                     attachments: [fileAttachment]
                 });
                 return [createResult(ResultCode.Ok, '完成', res)];
@@ -85,7 +85,7 @@ const sendToRoom = async (client, param, val) => {
             if (threadId) {
                 const res = await client.sendDm(threadId, {
                     content: content,
-                    type: 'text',
+                    type: 'image',
                     attachments: [fileAttachment]
                 });
                 return [createResult(ResultCode.Ok, '完成', res)];
@@ -93,8 +93,8 @@ const sendToRoom = async (client, param, val) => {
             return [createResult(ResultCode.Ok, '完成', null)];
         }
         let contentMd = '';
-        if (mds && mds.length > 0) {
-            mds.forEach(item => {
+        if (mdAndButtons && mdAndButtons.length > 0) {
+            mdAndButtons.forEach(item => {
                 if (item.type === 'Markdown') {
                     const md = item.value;
                     md.forEach(line => {
@@ -141,15 +141,31 @@ const sendToRoom = async (client, param, val) => {
                         }
                     });
                 }
+                else if (item.type === 'BT.group' && item.value.length > 0) {
+                    contentMd += `<box>${item.value?.map(row => {
+                        const val = row.value;
+                        if (val.length === 0) {
+                            return '';
+                        }
+                        return `<flex>${val.map(button => {
+                            const value = button.value;
+                            const options = button.options;
+                            const autoEnter = options?.autoEnter ?? false;
+                            const label = typeof value === 'object' ? value.title : value;
+                            const command = options?.data || label;
+                            return `<btn command="${command}" enter="${String(autoEnter)}" >${label}</btn>`;
+                        }).join('')}</flex>`;
+                    }).join('')}</box>`;
+                }
             });
         }
         if ((content && content.length > 0) || (contentMd && contentMd.length > 0)) {
             if (channelId) {
-                const res = await client.sendMessage(channelId, { content: content ?? contentMd, type: 'text' });
+                const res = await client.sendMessage(channelId, { content: content !== '' ? content : contentMd, type: 'text' });
                 return [createResult(ResultCode.Ok, '完成', res)];
             }
             if (threadId) {
-                const res = await client.sendDm(threadId, { content: content ?? contentMd, type: 'text' });
+                const res = await client.sendDm(threadId, { content: content !== '' ? content : contentMd, type: 'text' });
                 return [createResult(ResultCode.Ok, '完成', res)];
             }
             return [createResult(ResultCode.Ok, '完成', null)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/bubble",
-  "version": "2.1.0-alpha.4",
+  "version": "2.1.0-alpha.6",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",
@@ -65,4 +65,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}