@alemonjs/discord 2.1.20 → 2.1.22

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/index.js

@@ -5,6 +5,18 @@ import { getMaster, platform } from './config.js';
 export { DCAPI as API } from './sdk/api.js';
 export { useClient, useValue } from './hook.js';
 
+const SELECT_DUP_PREFIX = '__alemon_dup__:';
+const decodeDuplicateSelectValue = (value) => {
+    if (typeof value !== 'string' || !value.startsWith(SELECT_DUP_PREFIX)) {
+        return value;
+    }
+    const content = value.slice(SELECT_DUP_PREFIX.length);
+    const separatorIndex = content.indexOf(':');
+    if (separatorIndex < 0) {
+        return value;
+    }
+    return content.slice(separatorIndex + 1);
+};
 const main = () => {
     const port = process.env?.port || 17117;
     const url = `ws://127.0.0.1:${port}`;
@@ -60,6 +72,10 @@ const main = () => {
         else ;
     });
     client.on('INTERACTION_CREATE', event => {
+        const selectedValues = Array.isArray(event?.data?.values) ? event.data.values.map(item => decodeDuplicateSelectValue(item)) : [];
+        if (selectedValues.length > 0) {
+            event.data.values = selectedValues.filter((item) => typeof item === 'string');
+        }
         const isPrivate = typeof event['user'] === 'object' ? true : false;
         const user = isPrivate ? event['user'] : event['member'].user;
         const UserId = user.id;
@@ -68,7 +84,8 @@ const main = () => {
         const [isMaster, UserKey] = getMaster(UserId);
         const isCustom = !!event.data?.custom_id;
         const isName = !!event.data?.name;
-        const command = isCustom ? event.data.custom_id : (isName ? `/${event.data.name}` : '');
+        const selectedCommand = typeof selectedValues[0] === 'string' ? selectedValues[0] : '';
+        const command = selectedCommand || (isCustom ? event.data.custom_id : isName ? `/${event.data.name}` : '');
         const notAutoConfirmation = isCustom ? /^notAutoConfirmation:/.test(command) : false;
         const currentMessageText = notAutoConfirmation ? command.replace(/^notAutoConfirmation:/, '') : command;
         if (isPrivate) {

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/sdk/message/INTERACTION_CREATE.d.ts

@@ -82,6 +82,7 @@ interface Data {
     component_type?: number;
     type?: number;
     name?: string;
+    values?: string[];
 }
 type Public = {
     version: number;

package/lib/send.js

@@ -3,19 +3,23 @@ import { readFileSync } from 'fs';
 import { dataEnumToDiscordText, markdownRawToDiscordText, markdownToDiscordText } from './format.js';
 import { getDiscordConfig } from './config.js';
 
+const SELECT_DUP_PREFIX = '__alemon_dup__:';
+const encodeDuplicateSelectValue = (value, index) => `${SELECT_DUP_PREFIX}${index}:${value}`;
 const fetchImageBuffer = async (url) => {
     const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
     return Buffer.from(arrayBuffer);
 };
-const createButtonsData = (rows) => rows.map(row => ({
-    type: 1,
-    components: row.value.map(button => ({
-        type: 2,
-        custom_id: button.options?.notAutoConfirmation ? `notAutoConfirmation:${button.options.data}` : button.options?.data ?? '',
-        style: 1,
-        label: button.value
-    }))
-}));
+const createButtonsData = (rows) => {
+    return rows.map(row => ({
+        type: 1,
+        components: row.value.map(button => ({
+            type: 2,
+            custom_id: button.options?.notAutoConfirmation ? `notAutoConfirmation:${button.options.data}` : (button.options?.data ?? ''),
+            style: 1,
+            label: button.value
+        }))
+    }));
+};
 const createSelectData = (select) => {
     const meta = select.options ?? {};
     const kind = meta.kind ?? 'string';
@@ -29,13 +33,19 @@ const createSelectData = (select) => {
         disabled: meta.disabled
     };
     if (kind === 'string') {
-        base.options = (select.value ?? []).map(opt => ({
-            label: opt.label,
-            value: opt.value,
-            description: opt.description,
-            default: opt.default,
-            emoji: opt.emoji ? { name: opt.emoji } : undefined
-        }));
+        const seenValues = new Map();
+        base.options = (select.value ?? []).map(opt => {
+            const rawValue = String(opt.value ?? '');
+            const nextIndex = seenValues.get(rawValue) ?? 0;
+            seenValues.set(rawValue, nextIndex + 1);
+            return {
+                label: opt.label,
+                value: nextIndex > 0 ? encodeDuplicateSelectValue(rawValue, nextIndex) : rawValue,
+                description: opt.description,
+                default: opt.default,
+                emoji: opt.emoji ? { name: opt.emoji } : undefined
+            };
+        });
     }
     return { type: 1, components: [base] };
 };
@@ -135,9 +145,6 @@ const sendchannel = async (client, param, val) => {
                 case 'Embed':
                     embeds.push(item);
                     break;
-                case 'Modal':
-                    logger.warn('[discord] Modal 必须通过 interaction callback 发送，channelsMessages 流程已跳过');
-                    break;
                 case 'Markdown':
                     mdParts.push(markdownToDiscordText(item.value, hide));
                     break;
@@ -175,6 +182,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 +202,20 @@ 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) {
+                payload.attachments = [{ id: 0, filename: 'image.png' }];
+                if (hasEmbeds) {
+                    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.22",
   "description": "discord platform connection",
   "author": "lemonade",
   "license": "MIT",