@alemonjs/discord 2.1.0-alpha.2 → 2.1.0-alpha.20

package/lib/send.js

@@ -13,120 +13,196 @@ const createButtonsData = (rows) => {
             components: val.map(button => {
                 const value = button.value;
                 let text = '';
-                if (typeof button.options?.data === 'object') {
-                    text = button.options?.data.click;
-                }
-                else {
-                    text = button.options.data;
-                }
+                text = button.options?.data;
                 return {
                     type: 2,
                     custom_id: text,
                     style: 1,
-                    label: typeof value == 'object' ? value.title : value
+                    label: value
                 };
             })
         };
     });
 };
-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 => {
-        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 '';
+const sendchannel = async (client, param, val) => {
+    try {
+        if (!val || val.length <= 0) {
+            return [];
         }
-        else if (item.type == 'Text') {
-            if (item.options?.style == 'block') {
-                return `\`${item.value}\``;
+        const channel_id = param?.channel_id ?? '';
+        const images = val.filter(item => item.type === 'Image' || item.type === 'ImageURL' || item.type === 'ImageFile');
+        const buttons = val.filter(item => item.type === 'BT.group');
+        const mds = val.filter(item => item.type === 'Markdown');
+        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.options?.style == 'italic') {
-                return `*${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.options?.style == 'bold') {
-                return `**${item.value}**`;
+            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;
             }
-            else if (item.options?.style == 'strikethrough') {
-                return `~~${item.value}~~`;
+        })
+            .join('');
+        if (images.length > 0) {
+            let bufferData = null;
+            for (let i = 0; i < images.length; i++) {
+                if (bufferData) {
+                    break;
+                }
+                const item = images[i];
+                if (item.type === 'Image') {
+                    if (Buffer.isBuffer(item.value)) {
+                        bufferData = item.value;
+                    }
+                    else if (typeof item.value === 'string') {
+                        if (item.value.startsWith('http://') || item.value.startsWith('https://')) {
+                            bufferData = await ImageURLToBuffer(item.value);
+                        }
+                        else if (item.value.startsWith('base64://')) {
+                            bufferData = Buffer.from(item.value.slice(9), 'base64');
+                        }
+                        else if (item.value.startsWith('file://')) {
+                            bufferData = readFileSync(item.value.slice(7));
+                        }
+                        else {
+                            bufferData = Buffer.from(item.value, 'base64');
+                        }
+                    }
+                }
+                else if (item.type === 'ImageURL') {
+                    const res = await ImageURLToBuffer(item.value);
+                    bufferData = res;
+                }
+                else if (item.type === 'ImageFile') {
+                    bufferData = readFileSync(item.value);
+                }
             }
-            return item.value;
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: content
+            }, bufferData);
+            return [createResult(ResultCode.Ok, '完成', res)];
         }
-    })
-        .join('');
-    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, { content: text });
-            }
-            else if (item.type == 'ImageURL') {
-                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, { content: text });
-            }
-        }));
-    }
-    if (buttons && buttons.length > 0) {
-        return Promise.all(buttons.map(async (item) => {
-            const rows = item.value;
-            // 构造成按钮
-            const data = createButtonsData(rows);
+        let contentMd = '';
+        if (mds && mds.length > 0) {
+            mds.forEach(item => {
+                if (item.type === 'Markdown') {
+                    const md = item.value;
+                    md.forEach(line => {
+                        if (line.type === 'MD.text') {
+                            contentMd += line.value;
+                        }
+                        else if (line.type === 'MD.blockquote') {
+                            contentMd += `> ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.bold') {
+                            contentMd += `**${line.value}**`;
+                        }
+                        else if (line.type === 'MD.italic') {
+                            contentMd += `*${line.value}*`;
+                        }
+                        else if (line.type === 'MD.divider') {
+                            contentMd += '---\n';
+                        }
+                        else if (line.type === 'MD.image') {
+                            contentMd += `![${line.value}](${line.value})`;
+                        }
+                        else if (line.type === 'MD.italicStar') {
+                            contentMd += `*${line.value}*`;
+                        }
+                        else if (line.type === 'MD.link') {
+                            contentMd += `[${line.value}](${line.value})`;
+                        }
+                        else if (line.type === 'MD.list') {
+                            const listStr = line.value.map(listItem => {
+                                if (typeof listItem.value === 'object') {
+                                    return `\n${listItem.value.index}. ${listItem.value.text}`;
+                                }
+                                return `\n- ${listItem.value}`;
+                            });
+                            contentMd += `${listStr}\n`;
+                        }
+                        else if (line.type === 'MD.newline') {
+                            contentMd += '\n';
+                        }
+                        else if (line.type === 'MD.strikethrough') {
+                            contentMd += `~~${line.value}~~`;
+                        }
+                        else if (line.type === 'MD.subtitle') {
+                            contentMd += `## ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.title') {
+                            contentMd += `# ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.code') {
+                            const language = line?.options?.language || '';
+                            contentMd += `\`\`\`${language}\n${line.value}\n\`\`\`\n`;
+                        }
+                        else {
+                            const value = line['value'] || '';
+                            contentMd += String(value);
+                        }
+                    });
+                }
+            });
+        }
+        if (buttons && buttons.length > 0) {
+            let components = null;
+            buttons.forEach(item => {
+                if (components) {
+                    return;
+                }
+                const rows = item.value;
+                components = createButtonsData(rows);
+            });
             const res = await client.channelsMessages(channel_id, {
-                content: content,
-                components: data
+                content: contentMd || content,
+                components: components
             });
-            return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                id: res.id
+            return [createResult(ResultCode.Ok, '完成', res)];
+        }
+        if (content) {
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: contentMd || content
             });
-        })).catch(err => [
-            createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
-        ]);
+            return [createResult(ResultCode.Ok, '完成', res)];
+        }
+        return [];
     }
-    if (content) {
-        return Promise.all([content].map(item => client.channelsMessages(channel_id, {
-            content: item
-        })));
+    catch (err) {
+        return [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);
+    if (!val || val.length <= 0) {
+        return [];
+    }
+    const channelId = param?.channel_id ?? (await client.userMeChannels(param.author_id))?.id;
+    return sendchannel(client, { channel_id: channelId }, val);
 };
 
 export { sendchannel, senduser };

package/package.json

@@ -1,26 +1,34 @@
 {
   "name": "@alemonjs/discord",
-  "version": "2.1.0-alpha.2",
-  "description": "阿柠檬discord平台连接",
+  "version": "2.1.0-alpha.20",
+  "description": "discord platform connection",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib",
   "scripts": {
-    "build": "node bundle.js"
+    "build": "lvy build"
   },
   "exports": {
     ".": {
       "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "require": "./lib/index.js"
     },
     "./package": "./package.json",
     "./desktop": "./lib/desktop.js"
   },
+  "dependencies": {
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7"
+  },
   "devDependencies": {
     "@types/qrcode": "^1.5.5"
   },
+  "peerDependencies": {
+    "alemonjs": "^2.1.0-alpha.15"
+  },
   "alemonjs": {
     "desktop": {
       "platform": [
@@ -29,18 +37,18 @@
         }
       ],
       "logo": "antd.DiscordOutlined",
-      "commond": [
+      "command": [
         {
           "name": "打开discord",
           "icon": "antd.DiscordOutlined",
-          "commond": "open.discord"
+          "command": "open.discord"
         }
       ],
       "sidebars": [
         {
           "name": "dc",
           "icon": "antd.DiscordOutlined",
-          "commond": "open.discord"
+          "command": "open.discord"
         }
       ]
     }
@@ -57,4 +65,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}

package/lib/env.js

@@ -1 +0,0 @@
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';

package/lib/sdk/config.js

@@ -1,10 +0,0 @@
-import { BaseConfig } from './core/config.js';
-import { AvailableIntentsEventsEnum } from './types.js';
-
-const config = new BaseConfig({
-    token: '',
-    intent: AvailableIntentsEventsEnum,
-    shard: [0, 1]
-});
-
-export { config };

package/lib/sdk/core/config.js

@@ -1,46 +0,0 @@
-/**
- * 基础配置结构
- */
-class BaseConfig {
-    #data = null;
-    constructor(val) {
-        this.#data = val;
-    }
-    /**
-     * 设置配置
-     * @param key
-     * @param val
-     */
-    set(key, val) {
-        if (val !== undefined)
-            this.#data[key] = val;
-        return this;
-    }
-    /**
-     *
-     * @param key
-     * @returns
-     */
-    has(key) {
-        if (Object.prototype.hasOwnProperty.call(this.#data, key)) ;
-        return false;
-    }
-    /**
-     * 读取配置
-     * @param key
-     * @returns
-     */
-    all() {
-        return this.#data;
-    }
-    /**
-     * 读取配置
-     * @param key
-     * @returns
-     */
-    get(key) {
-        return this.#data[key];
-    }
-}
-
-export { BaseConfig };