@alemonjs/discord 0.2.10 → 2.1.0-alpha.0

package/lib/sdk/message.d.ts

@@ -1,101 +1,101 @@
-import { CHANNEL_TOPIC_UPDATE_TYPE } from './message/CHANNEL_TOPIC_UPDATE.js';
-import { CHANNEL_UPDATE_TYPE } from './message/CHANNEL_UPDATE.js';
-import { GUILD_MEMBER_ADD_TYPE } from './message/GUILD_MEMBER_ADD.js';
-import { GUILD_MEMBER_REMOVE_TYPE } from './message/GUILD_MEMBER_REMOVE.js';
-import { GUILD_MEMBER_UPDATE_TYPE } from './message/GUILD_MEMBER_UPDATE.js';
-import { INTERACTION_CREATE_TYPE } from './message/INTERACTION_CREATE.js';
-import { MESSAGE_CREATE_TYPE } from './message/MESSAGE_CREATE.js';
-import { MESSAGE_DELETE_TYPE } from './message/MESSAGE_DELETE.js';
-import { MESSAGE_REACTION_ADD_TYPE } from './message/MESSAGE_REACTION_ADD.js';
-import { MESSAGE_UPDATE_TYPE } from './message/MESSAGE_UPDATE.js';
-import { PRESENCE_UPDATE_TYPE } from './message/PRESENCE_UPDATE.js';
-import { READY_TYPE } from './message/READY.js';
-import { TYPING_START_TYPE } from './message/TYPING_START.js';
-import { VOICE_CHANNEL_STATUS_UPDATE_TYPE } from './message/VOICE_CHANNEL_STATUS_UPDATE.js';
-import { VOICE_STATE_UPDATE_TYPE } from './message/VOICE_STATE_UPDATE.js';
+import { CHANNEL_TOPIC_UPDATE_TYPE } from './message/CHANNEL_TOPIC_UPDATE.js'
+import { CHANNEL_UPDATE_TYPE } from './message/CHANNEL_UPDATE.js'
+import { GUILD_MEMBER_ADD_TYPE } from './message/GUILD_MEMBER_ADD.js'
+import { GUILD_MEMBER_REMOVE_TYPE } from './message/GUILD_MEMBER_REMOVE.js'
+import { GUILD_MEMBER_UPDATE_TYPE } from './message/GUILD_MEMBER_UPDATE.js'
+import { INTERACTION_CREATE_TYPE } from './message/INTERACTION_CREATE.js'
+import { MESSAGE_CREATE_TYPE } from './message/MESSAGE_CREATE.js'
+import { MESSAGE_DELETE_TYPE } from './message/MESSAGE_DELETE.js'
+import { MESSAGE_REACTION_ADD_TYPE } from './message/MESSAGE_REACTION_ADD.js'
+import { MESSAGE_UPDATE_TYPE } from './message/MESSAGE_UPDATE.js'
+import { PRESENCE_UPDATE_TYPE } from './message/PRESENCE_UPDATE.js'
+import { READY_TYPE } from './message/READY.js'
+import { TYPING_START_TYPE } from './message/TYPING_START.js'
+import { VOICE_CHANNEL_STATUS_UPDATE_TYPE } from './message/VOICE_CHANNEL_STATUS_UPDATE.js'
+import { VOICE_STATE_UPDATE_TYPE } from './message/VOICE_STATE_UPDATE.js'
 
 /**
  * Discord 事件映射表
  */
 type DCEventMap = {
-    GUILD_CREATE: any;
-    GUILD_UPDATE: any;
-    GUILD_DELETE: any;
-    GUILD_ROLE_CREATE: any;
-    GUILD_ROLE_UPDATE: any;
-    GUILD_ROLE_DELETE: any;
-    CHANNEL_CREATE: any;
-    CHANNEL_UPDATE: CHANNEL_UPDATE_TYPE;
-    CHANNEL_DELETE: any;
-    CHANNEL_PINS_UPDATE: any;
-    CHANNEL_TOPIC_UPDATE: CHANNEL_TOPIC_UPDATE_TYPE;
-    THREAD_CREATE: any;
-    THREAD_UPDATE: any;
-    THREAD_DELETE: any;
-    THREAD_LIST_SYNC: any;
-    THREAD_MEMBER_UPDATE: any;
-    THREAD_MEMBERS_UPDATE: any;
-    STAGE_INSTANCE_CREATE: any;
-    STAGE_INSTANCE_UPDATE: any;
-    STAGE_INSTANCE_DELETE: any;
-    GUILD_MEMBER_ADD: GUILD_MEMBER_ADD_TYPE;
-    GUILD_MEMBER_UPDATE: GUILD_MEMBER_UPDATE_TYPE;
-    GUILD_MEMBER_REMOVE: GUILD_MEMBER_REMOVE_TYPE;
-    GUILD_AUDIT_LOG_ENTRY_CREATE: any;
-    GUILD_BAN_ADD: any;
-    GUILD_BAN_REMOVE: any;
-    GUILD_EMOJIS_UPDATE: any;
-    GUILD_STICKERS_UPDATE: any;
-    GUILD_SOUNDBOARD_SOUND_CREATE: any;
-    GUILD_SOUNDBOARD_SOUND_UPDATE: any;
-    GUILD_SOUNDBOARD_SOUND_DELETE: any;
-    GUILD_SOUNDBOARD_SOUNDS_UPDATE: any;
-    GUILD_INTEGRATIONS_UPDATE: any;
-    INTEGRATION_CREATE: any;
-    INTEGRATION_UPDATE: any;
-    INTEGRATION_DELETE: any;
-    WEBHOOKS_UPDATE: any;
-    INVITE_CREATE: any;
-    INVITE_DELETE: any;
-    VOICE_STATE_UPDATE: VOICE_STATE_UPDATE_TYPE;
-    VOICE_CHANNEL_STATUS_UPDATE: VOICE_CHANNEL_STATUS_UPDATE_TYPE;
-    VOICE_CHANNEL_EFFECT_SEND: any;
-    PRESENCE_UPDATE: PRESENCE_UPDATE_TYPE;
-    MESSAGE_CREATE: MESSAGE_CREATE_TYPE;
-    MESSAGE_UPDATE: MESSAGE_UPDATE_TYPE;
-    MESSAGE_DELETE: MESSAGE_DELETE_TYPE;
-    MESSAGE_DELETE_BULK: any;
-    MESSAGE_REACTION_ADD: MESSAGE_REACTION_ADD_TYPE;
-    MESSAGE_REACTION_REMOVE: any;
-    MESSAGE_REACTION_REMOVE_ALL: any;
-    MESSAGE_REACTION_REMOVE_EMOJI: any;
-    TYPING_START: TYPING_START_TYPE;
-    DIRECT_MESSAGE_CREATE: any;
-    DIRECT_MESSAGE_UPDATE: any;
-    DIRECT_MESSAGE_DELETE: any;
-    DIRECT_MESSAGE_PINS_UPDATE: any;
-    DIRECT_MESSAGE_REACTION_ADD: any;
-    DIRECT_MESSAGE_REACTION_REMOVE: any;
-    DIRECT_MESSAGE_REACTION_REMOVE_ALL: any;
-    DIRECT_MESSAGE_REACTION_REMOVE_EMOJI: any;
-    DIRECT_MESSAGE_TYPING_START: any;
-    GUILD_SCHEDULED_EVENT_CREATE: any;
-    GUILD_SCHEDULED_EVENT_UPDATE: any;
-    GUILD_SCHEDULED_EVENT_DELETE: any;
-    GUILD_SCHEDULED_EVENT_USER_ADD: any;
-    GUILD_SCHEDULED_EVENT_USER_REMOVE: any;
-    AUTO_MODERATION_RULE_CREATE: any;
-    AUTO_MODERATION_RULE_UPDATE: any;
-    AUTO_MODERATION_RULE_DELETE: any;
-    AUTO_MODERATION_ACTION_EXECUTION: any;
-    MESSAGE_POLL_VOTE_ADD: any;
-    MESSAGE_POLL_VOTE_REMOVE: any;
-    DIRECT_MESSAGE_POLL_VOTE_ADD: any;
-    DIRECT_MESSAGE_POLL_VOTE_REMOVE: any;
-    READY: READY_TYPE;
-    ERROR: any;
-    INTERACTION_CREATE: INTERACTION_CREATE_TYPE;
-    RESUMED: any;
-};
+  GUILD_CREATE: any
+  GUILD_UPDATE: any
+  GUILD_DELETE: any
+  GUILD_ROLE_CREATE: any
+  GUILD_ROLE_UPDATE: any
+  GUILD_ROLE_DELETE: any
+  CHANNEL_CREATE: any
+  CHANNEL_UPDATE: CHANNEL_UPDATE_TYPE
+  CHANNEL_DELETE: any
+  CHANNEL_PINS_UPDATE: any
+  CHANNEL_TOPIC_UPDATE: CHANNEL_TOPIC_UPDATE_TYPE
+  THREAD_CREATE: any
+  THREAD_UPDATE: any
+  THREAD_DELETE: any
+  THREAD_LIST_SYNC: any
+  THREAD_MEMBER_UPDATE: any
+  THREAD_MEMBERS_UPDATE: any
+  STAGE_INSTANCE_CREATE: any
+  STAGE_INSTANCE_UPDATE: any
+  STAGE_INSTANCE_DELETE: any
+  GUILD_MEMBER_ADD: GUILD_MEMBER_ADD_TYPE
+  GUILD_MEMBER_UPDATE: GUILD_MEMBER_UPDATE_TYPE
+  GUILD_MEMBER_REMOVE: GUILD_MEMBER_REMOVE_TYPE
+  GUILD_AUDIT_LOG_ENTRY_CREATE: any
+  GUILD_BAN_ADD: any
+  GUILD_BAN_REMOVE: any
+  GUILD_EMOJIS_UPDATE: any
+  GUILD_STICKERS_UPDATE: any
+  GUILD_SOUNDBOARD_SOUND_CREATE: any
+  GUILD_SOUNDBOARD_SOUND_UPDATE: any
+  GUILD_SOUNDBOARD_SOUND_DELETE: any
+  GUILD_SOUNDBOARD_SOUNDS_UPDATE: any
+  GUILD_INTEGRATIONS_UPDATE: any
+  INTEGRATION_CREATE: any
+  INTEGRATION_UPDATE: any
+  INTEGRATION_DELETE: any
+  WEBHOOKS_UPDATE: any
+  INVITE_CREATE: any
+  INVITE_DELETE: any
+  VOICE_STATE_UPDATE: VOICE_STATE_UPDATE_TYPE
+  VOICE_CHANNEL_STATUS_UPDATE: VOICE_CHANNEL_STATUS_UPDATE_TYPE
+  VOICE_CHANNEL_EFFECT_SEND: any
+  PRESENCE_UPDATE: PRESENCE_UPDATE_TYPE
+  MESSAGE_CREATE: MESSAGE_CREATE_TYPE
+  MESSAGE_UPDATE: MESSAGE_UPDATE_TYPE
+  MESSAGE_DELETE: MESSAGE_DELETE_TYPE
+  MESSAGE_DELETE_BULK: any
+  MESSAGE_REACTION_ADD: MESSAGE_REACTION_ADD_TYPE
+  MESSAGE_REACTION_REMOVE: any
+  MESSAGE_REACTION_REMOVE_ALL: any
+  MESSAGE_REACTION_REMOVE_EMOJI: any
+  TYPING_START: TYPING_START_TYPE
+  DIRECT_MESSAGE_CREATE: any
+  DIRECT_MESSAGE_UPDATE: any
+  DIRECT_MESSAGE_DELETE: any
+  DIRECT_MESSAGE_PINS_UPDATE: any
+  DIRECT_MESSAGE_REACTION_ADD: any
+  DIRECT_MESSAGE_REACTION_REMOVE: any
+  DIRECT_MESSAGE_REACTION_REMOVE_ALL: any
+  DIRECT_MESSAGE_REACTION_REMOVE_EMOJI: any
+  DIRECT_MESSAGE_TYPING_START: any
+  GUILD_SCHEDULED_EVENT_CREATE: any
+  GUILD_SCHEDULED_EVENT_UPDATE: any
+  GUILD_SCHEDULED_EVENT_DELETE: any
+  GUILD_SCHEDULED_EVENT_USER_ADD: any
+  GUILD_SCHEDULED_EVENT_USER_REMOVE: any
+  AUTO_MODERATION_RULE_CREATE: any
+  AUTO_MODERATION_RULE_UPDATE: any
+  AUTO_MODERATION_RULE_DELETE: any
+  AUTO_MODERATION_ACTION_EXECUTION: any
+  MESSAGE_POLL_VOTE_ADD: any
+  MESSAGE_POLL_VOTE_REMOVE: any
+  DIRECT_MESSAGE_POLL_VOTE_ADD: any
+  DIRECT_MESSAGE_POLL_VOTE_REMOVE: any
+  READY: READY_TYPE
+  ERROR: any
+  INTERACTION_CREATE: INTERACTION_CREATE_TYPE
+  RESUMED: any
+}
 
-export type { DCEventMap };
+export type { DCEventMap }

package/lib/sdk/types.d.ts

@@ -1,5 +1,5 @@
-declare const AvailableIntentsEventsEnum: string[];
-type DCIntentsEnum = (typeof AvailableIntentsEventsEnum)[number];
+declare const AvailableIntentsEventsEnum: string[]
+type DCIntentsEnum = (typeof AvailableIntentsEventsEnum)[number]
 
-export { AvailableIntentsEventsEnum };
-export type { DCIntentsEnum };
+export { AvailableIntentsEventsEnum }
+export type { DCIntentsEnum }

package/lib/sdk/wss.d.ts

@@ -1,27 +1,27 @@
-import { DCAPI } from './api.js';
-import { DISOCRDOptions } from './wss.types.js';
-import { DCEventMap } from './message.js';
+import { DCAPI } from './api.js'
+import { DISOCRDOptions } from './wss.types.js'
+import { DCEventMap } from './message.js'
 
 declare class DCClient extends DCAPI {
-    #private;
-    /**
-     * 设置配置
-     * @param opstion
-     */
-    constructor(opstion: DISOCRDOptions);
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on<T extends keyof DCEventMap>(key: T, val: (event: DCEventMap[T]) => any): this;
-    /**
-     * 创建ws监听
-     * @param conversation
-     * @param shard
-     * @returns
-     */
-    connect(gatewayURL?: string): Promise<void>;
+  #private
+  /**
+   * 设置配置
+   * @param opstion
+   */
+  constructor(opstion: DISOCRDOptions)
+  /**
+   * 注册事件处理程序
+   * @param key 事件名称
+   * @param val 事件处理函数
+   */
+  on<T extends keyof DCEventMap>(key: T, val: (event: DCEventMap[T]) => any): this
+  /**
+   * 创建ws监听
+   * @param conversation
+   * @param shard
+   * @returns
+   */
+  connect(gatewayURL?: string): Promise<void>
 }
 
-export { DCClient };
+export { DCClient }

package/lib/sdk/wss.types.d.ts

@@ -1,4 +1,4 @@
-import { DCIntentsEnum } from './types.js';
+import { DCIntentsEnum } from './types.js'
 
 /**
  * ****
@@ -6,25 +6,25 @@ import { DCIntentsEnum } from './types.js';
  * ***
  */
 interface DISOCRDOptions {
-    /**
-     * 网关地址
-     */
-    gatewayURL?: string;
-    /**
-     * 钥匙
-     */
-    token: string;
-    /**
-     * 订阅(有默认值)
-     * ******
-     */
-    intent?: DCIntentsEnum[];
-    /**
-     * 分片(有默认值)
-     * ******
-     * [0, 1]
-     */
-    shard?: number[];
+  /**
+   * 网关地址
+   */
+  gatewayURL?: string
+  /**
+   * 钥匙
+   */
+  token: string
+  /**
+   * 订阅(有默认值)
+   * ******
+   */
+  intent?: DCIntentsEnum[]
+  /**
+   * 分片(有默认值)
+   * ******
+   * [0, 1]
+   */
+  shard?: number[]
 }
 
-export type { DISOCRDOptions };
+export type { DISOCRDOptions }

package/lib/send.js

@@ -24,12 +24,6 @@ const createButtonsData = (rows) => {
                     custom_id: text,
                     style: 1,
                     label: typeof value == 'object' ? value.title : value
-                    // action: {
-                    //     // 0 link 1 callback , 2 command
-                    //     type: typeof options.data === 'object' ? 1 : options?.isLink ? 0 : 2,
-                    //     data: options?.data ?? '',
-                    //     enter: options?.autoEnter ?? false
-                    // }
                 };
             })
         };
@@ -39,6 +33,11 @@ const sendchannel = (client, param, val) => {
     if (val.length < 0)
         return Promise.all([]);
     const channel_id = param?.channel_id ?? '';
+    // images
+    const images = val.filter(item => item.type == 'Image' || item.type == 'ImageURL' || item.type == 'ImageFile');
+    // buttons
+    const buttons = val.filter(item => item.type == 'BT.group');
+    // text
     const content = val
         .filter(item => item.type == 'Mention' || item.type == 'Text' || item.type == 'Link')
         .map(item => {
@@ -77,35 +76,36 @@ const sendchannel = (client, param, val) => {
         }
     })
         .join('');
-    if (content) {
-        return Promise.all([content].map(item => client.channelsMessages(channel_id, {
-            content: item
-        })));
-    }
-    const images = val.filter(item => item.type == 'Image' || item.type == 'ImageURL' || item.type == 'ImageFile');
     if (images.length > 0) {
+        let isText = false;
         return Promise.all(images.map(async (item) => {
+            // content
+            let text = null;
+            if (!isText) {
+                text = content;
+            }
+            isText = true;
             if (item.type == 'Image') {
-                return client.channelsMessagesImage(channel_id, item.value);
+                return client.channelsMessagesImage(channel_id, item.value, { content: text });
             }
             else if (item.type == 'ImageURL') {
-                return client.channelsMessagesImage(channel_id, ImageURLToBuffer(item.value));
+                return client.channelsMessagesImage(channel_id, await ImageURLToBuffer(item.value), {
+                    content: text
+                });
             }
             else if (item.type == 'ImageFile') {
                 const data = readFileSync(item.value);
-                return client.channelsMessagesImage(channel_id, data);
+                return client.channelsMessagesImage(channel_id, data, { content: text });
             }
         }));
     }
-    // buttons
-    const buttons = val.filter(item => item.type == 'BT.group');
     if (buttons && buttons.length > 0) {
         return Promise.all(buttons.map(async (item) => {
             const rows = item.value;
             // 构造成按钮
             const data = createButtonsData(rows);
             const res = await client.channelsMessages(channel_id, {
-                content: '',
+                content: content,
                 components: data
             });
             return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
@@ -115,90 +115,18 @@ const sendchannel = (client, param, val) => {
             createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
         ]);
     }
-    return Promise.all([]);
-};
-const senduser = async (client, param, val) => {
-    if (val.length < 0)
-        return Promise.all([]);
-    const channel_id = param?.channel_id ?? (await client.userMeChannels(param.author_id))?.id;
-    const content = val
-        .filter(item => item.type == 'Mention' || item.type == 'Text' || item.type == 'Link')
-        .map(item => {
-        if (item.type == 'Link') {
-            return `[${item.value}](${item?.options?.link ?? item.value})`;
-        }
-        else if (item.type == 'Mention') {
-            if (item.value == 'everyone' ||
-                item.value == 'all' ||
-                item.value == '' ||
-                typeof item.value != 'string') {
-                return `<@everyone>`;
-            }
-            if (item.options?.belong == 'user') {
-                return `<@${item.value}>`;
-            }
-            else if (item.options?.belong == 'channel') {
-                return `<#${item.value}>`;
-            }
-            return '';
-        }
-        else if (item.type == 'Text') {
-            if (item.options?.style == 'block') {
-                return `\`${item.value}\``;
-            }
-            else if (item.options?.style == 'italic') {
-                return `*${item.value}*`;
-            }
-            else if (item.options?.style == 'bold') {
-                return `**${item.value}**`;
-            }
-            else if (item.options?.style == 'strikethrough') {
-                return `~~${item.value}~~`;
-            }
-            return item.value;
-        }
-    })
-        .join('');
     if (content) {
         return Promise.all([content].map(item => client.channelsMessages(channel_id, {
             content: item
         })));
     }
-    const images = val.filter(item => item.type == 'Image' || item.type == 'ImageURL' || item.type == 'ImageFile');
-    if (images && images.length > 0) {
-        return Promise.all(images.map(async (item) => {
-            if (item.type == 'Image') {
-                return client.channelsMessagesImage(channel_id, item.value);
-            }
-            else if (item.type == 'ImageURL') {
-                return client.channelsMessagesImage(channel_id, ImageURLToBuffer(item.value));
-            }
-            else if (item.type == 'ImageFile') {
-                const data = readFileSync(item.value);
-                return client.channelsMessagesImage(channel_id, data);
-            }
-        }));
-    }
-    // buttons
-    const buttons = val.filter(item => item.type == 'BT.group');
-    if (buttons && buttons.length > 0) {
-        return Promise.all(buttons.map(async (item) => {
-            const rows = item.value;
-            // 构造成按钮
-            const data = createButtonsData(rows);
-            // console.log("data", data)
-            const res = await client.channelsMessages(channel_id, {
-                content: '',
-                components: data
-            });
-            return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                id: res.id
-            });
-        })).catch(err => [
-            createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
-        ]);
-    }
     return Promise.all([]);
 };
+const senduser = async (client, param, val) => {
+    if (val.length < 0)
+        return Promise.all([]);
+    const channel_id = param?.channel_id ?? (await client.userMeChannels(param.author_id))?.id;
+    return sendchannel(client, { channel_id }, val);
+};
 
 export { sendchannel, senduser };

package/package.json

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