@alemonjs/discord 2.1.14 → 2.1.16

package/lib/index.js

@@ -88,7 +88,7 @@ const main = () => {
                 .addOpen({ OpenId: UserId })
                 .add({ tag: 'interaction.create' }).value);
         }
-        void client.interactionsCallback(event.id, event.token, '正在处理您的请求...');
+        void client.interactionsCallbackEphemeral(event.id, event.token, '正在处理您的请求...');
     });
     client.on('MESSAGE_UPDATE', event => {
         if (!event.author) {

package/lib/sdk/api.d.ts

@@ -144,10 +144,15 @@ export declare class DCAPI {
     gateway(): Promise<{
         url: string;
     }>;
-    interactionsCallback(id: string, token: string, content: string): Promise<any>;
+    interactionsCallback(id: string, token: string, data: {
+        type: number;
+        data: any;
+    }): Promise<any>;
+    interactionsCallbackEphemeral(id: string, token: string, content: string): Promise<any>;
     interactionsCallbackMessage(id: string, token: string, messageData: any): Promise<any>;
     interactionsCallbackForm(id: string, token: string, formData: any): Promise<any>;
     interactionsDeferred(id: string, token: string): Promise<any>;
+    interactionsCallbackModal(id: string, token: string, modalData: any): Promise<any>;
     interactionsFollowup(application_id: string, token: string, messageData: any): Promise<any>;
     interactionsFollowupForm(application_id: string, token: string, formData: any): Promise<any>;
     getGlobalApplicationCommands(application_id: string, params?: {

package/lib/sdk/api.js

@@ -826,14 +826,21 @@ class DCAPI {
             url: '/gateway'
         });
     }
-    interactionsCallback(id, token, content) {
+    interactionsCallback(id, token, data) {
+        return this.request({
+            method: 'POST',
+            url: `/interactions/${id}/${token}/callback`,
+            data
+        });
+    }
+    interactionsCallbackEphemeral(id, token, content) {
         return this.request({
             method: 'POST',
             url: `/interactions/${id}/${token}/callback`,
             data: {
                 type: 4,
                 data: {
-                    content: content,
+                    content,
                     flags: 64
                 }
             }
@@ -868,6 +875,16 @@ class DCAPI {
             }
         });
     }
+    interactionsCallbackModal(id, token, modalData) {
+        return this.request({
+            method: 'POST',
+            url: `/interactions/${id}/${token}/callback`,
+            data: {
+                type: 9,
+                data: modalData
+            }
+        });
+    }
     interactionsFollowup(application_id, token, messageData) {
         return this.request({
             method: 'POST',

package/lib/send.js

@@ -16,6 +16,44 @@ const createButtonsData = (rows) => rows.map(row => ({
         label: button.value
     }))
 }));
+const createSelectData = (select) => {
+    const meta = select.options ?? {};
+    const kind = meta.kind ?? 'string';
+    const typeMap = { string: 3, user: 5, role: 6, mentionable: 7, channel: 8 };
+    const base = {
+        type: typeMap[kind] ?? 3,
+        custom_id: meta.customId ?? '',
+        placeholder: meta.placeholder,
+        min_values: meta.minValues,
+        max_values: meta.maxValues,
+        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
+        }));
+    }
+    return { type: 1, components: [base] };
+};
+const createEmbedData = (embed) => {
+    const v = embed.value ?? {};
+    return {
+        title: v.title,
+        description: v.description,
+        url: v.url,
+        color: v.color,
+        timestamp: v.timestamp ? new Date(v.timestamp).toISOString() : undefined,
+        image: v.image ? { url: v.image } : undefined,
+        thumbnail: v.thumbnail ? { url: v.thumbnail } : undefined,
+        author: v.author ? { name: v.author.name, url: v.author.url, icon_url: v.author.iconUrl } : undefined,
+        footer: v.footer ? { text: v.footer.text, icon_url: v.footer.iconUrl } : undefined,
+        fields: v.fields
+    };
+};
 const resolveImageBuffer = async (item) => {
     if (item.type === 'Image') {
         if (Buffer.isBuffer(item.value)) {
@@ -75,6 +113,8 @@ const sendchannel = async (client, param, val) => {
         const hide = getDiscordConfig().hideUnsupported;
         const images = [];
         const buttons = [];
+        const selects = [];
+        const embeds = [];
         const textParts = [];
         const mdParts = [];
         const fallbackParts = [];
@@ -89,6 +129,15 @@ const sendchannel = async (client, param, val) => {
                 case 'ButtonGroup':
                     buttons.push(item);
                     break;
+                case 'Select':
+                    selects.push(item);
+                    break;
+                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;
@@ -112,10 +161,20 @@ const sendchannel = async (client, param, val) => {
             .filter(Boolean)
             .join('\n')
             .replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
-        if (hide && !finalContent && images.length <= 0 && buttons.length <= 0) {
+        if (hide && !finalContent && images.length <= 0 && buttons.length <= 0 && selects.length <= 0 && embeds.length <= 0) {
             logger.info('[discord] hideUnsupported: 消息内容转换后为空，跳过发送');
             return [];
         }
+        const components = [];
+        for (const btn of buttons) {
+            if (typeof btn.value !== 'string') {
+                components.push(...createButtonsData(btn.value));
+            }
+        }
+        for (const sel of selects) {
+            components.push(createSelectData(sel));
+        }
+        const embedData = embeds.length > 0 ? embeds.map(createEmbedData) : undefined;
         if (images.length > 0) {
             let bufferData = null;
             for (const img of images) {
@@ -124,22 +183,25 @@ const sendchannel = async (client, param, val) => {
                     break;
                 }
             }
-            const res = await client.channelsMessagesForm(channelId, { content: finalContent }, bufferData);
-            return [createResult(ResultCode.Ok, '完成', res)];
-        }
-        if (buttons.length > 0) {
-            let components = null;
-            for (const item of buttons) {
-                if (typeof item.value !== 'string') {
-                    components = createButtonsData(item.value);
-                    break;
-                }
+            const payload = { content: finalContent };
+            if (components.length > 0) {
+                payload.components = components;
+            }
+            if (embedData) {
+                payload.embeds = embedData;
             }
-            const res = await client.channelsMessages(channelId, { content: finalContent, components });
+            const res = await client.channelsMessagesForm(channelId, payload, bufferData);
             return [createResult(ResultCode.Ok, '完成', res)];
         }
-        if (finalContent) {
-            const res = await client.channelsMessagesForm(channelId, { content: finalContent });
+        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);
             return [createResult(ResultCode.Ok, '完成', res)];
         }
         return [];

package/package.json

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