@alemonjs/discord 2.1.20 → 2.1.21

package/lib/format.js

@@ -26,7 +26,7 @@ const markdownToDiscordText = (items, hideUnsupported) => {
                 return Number(hideUnsupported) >= 2 ? v.url : `[${v.text}](${v.url})`;
             }
             case 'MD.image':
-                return `![image](${item.value})`;
+                return `[image](${item.value})`;
             case 'MD.list':
                 return (item.value
                     .map(li => {

package/lib/sdk/api.js

@@ -44,18 +44,14 @@ class DCAPI {
     }
     async channelsMessagesForm(channel_id, param = {}, img) {
         const formData = new FormData();
-        for (const key in param) {
-            if (param[key]) {
-                formData.append(key, param[key]);
-            }
-        }
         if (img) {
             const from = await createPicFrom(img);
             if (from) {
                 const { picData, name } = from;
-                formData.append('file', picData, name);
+                formData.append('files[0]', picData, name);
             }
         }
+        formData.append('payload_json', JSON.stringify(param ?? {}));
         return this.request({
             method: 'post',
             url: `channels/${channel_id}/messages`,

package/lib/send.js

@@ -175,6 +175,18 @@ const sendchannel = async (client, param, val) => {
             components.push(createSelectData(sel));
         }
         const embedData = embeds.length > 0 ? embeds.map(createEmbedData) : undefined;
+        const hasComponents = components.length > 0;
+        const hasEmbeds = !!embedData;
+        const payload = {};
+        if (finalContent) {
+            payload.content = finalContent;
+        }
+        if (hasComponents) {
+            payload.components = components;
+        }
+        if (hasEmbeds) {
+            payload.embeds = embedData;
+        }
         if (images.length > 0) {
             let bufferData = null;
             for (const img of images) {
@@ -183,25 +195,18 @@ const sendchannel = async (client, param, val) => {
                     break;
                 }
             }
-            const payload = { content: finalContent };
-            if (components.length > 0) {
-                payload.components = components;
-            }
-            if (embedData) {
-                payload.embeds = embedData;
+            if (bufferData && hasEmbeds) {
+                payload.attachments = [{ id: 0, filename: 'image.png' }];
+                const firstEmbed = payload.embeds[0];
+                if (firstEmbed && !firstEmbed.image) {
+                    firstEmbed.image = { url: 'attachment://image.png' };
+                }
             }
-            const res = await client.channelsMessagesForm(channelId, payload, bufferData);
+            const res = await client.channelsMessagesForm(channelId, payload, bufferData ?? undefined);
             return [createResult(ResultCode.Ok, '完成', res)];
         }
-        if (components.length > 0 || embedData || finalContent) {
-            const payload = { content: finalContent };
-            if (components.length > 0) {
-                payload.components = components;
-            }
-            if (embedData) {
-                payload.embeds = embedData;
-            }
-            const res = components.length > 0 || embedData ? await client.channelsMessages(channelId, payload) : await client.channelsMessagesForm(channelId, payload);
+        if (hasComponents || hasEmbeds || finalContent) {
+            const res = await client.channelsMessages(channelId, payload);
             return [createResult(ResultCode.Ok, '完成', res)];
         }
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/discord",
-  "version": "2.1.20",
+  "version": "2.1.21",
   "description": "discord platform connection",
   "author": "lemonade",
   "license": "MIT",