@alemonjs/discord 0.1.0 → 0.2.0

package/README.md

@@ -17,7 +17,7 @@ discord:
   # 令牌
   token: ''
   # 主人
-  master_id: null
+  master_key: null
   # 前缀（非必填）
   intent: null
   # 活动 非必填）

package/lib/index.d.ts

@@ -1,7 +1,8 @@
+import * as alemonjs from 'alemonjs';
 import { DCClient } from './sdk/platform/discord/sdk/wss.js';
 
 type Client = typeof DCClient.prototype;
 declare const client: Client;
-declare const _default: () => typeof global.alemonjs;
+declare const _default: () => alemonjs.ClientAPI;
 
 export { type Client, client, _default as default };

package/lib/index.js

@@ -1,4 +1,4 @@
-import { defineBot, getConfig, Text, At, OnProcessor, useParse } from 'alemonjs';
+import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import 'fs';
 import 'axios';
 import 'path';
@@ -11,14 +11,15 @@ import { DCClient } from './sdk/platform/discord/sdk/wss.js';
 
 const client = global.client;
 var index = defineBot(() => {
-    const cfg = getConfig();
-    const config = cfg.value?.discord;
+    const value = getConfigValue();
+    const config = value?.discord;
     if (!config)
         return;
     // 创建客户端
     const client = new DCClient({
         token: config.token
     });
+    const Platform = 'discord';
     // 连接
     client.connect();
     // 监听消息
@@ -26,17 +27,14 @@ var index = defineBot(() => {
         // 消除bot消息
         if (event.author?.bot)
             return;
-        const master_id = config?.master_id ?? [];
-        const isMaster = master_id.includes(event.author.id);
+        const master_key = config?.master_key ?? [];
+        const isMaster = master_key.includes(event.author.id);
         // 艾特消息处理
         const at_users = [];
         // 获取艾特用户
         for (const item of event.mentions) {
             at_users.push({
-                id: item.id,
-                name: item.username,
-                avatar: client.userAvatar(item.id, item.avatar),
-                bot: item.bot
+                id: item.id
             });
         }
         // 清除 @ 相关的消息
@@ -44,43 +42,55 @@ var index = defineBot(() => {
         for await (const item of at_users) {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
+        const UserId = event.author.id;
+        const UserKey = useUserHashKey({
+            Platform: Platform,
+            UserId: UserId
+        });
+        let url = null;
+        const UserAvatar = {
+            toBuffer: async () => {
+                if (!url) {
+                    url = client.userAvatar(UserId, event.author.avatar);
+                }
+                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                return Buffer.from(arrayBuffer);
+            },
+            toBase64: async () => {
+                if (!url) {
+                    url = client.userAvatar(UserId, event.author.avatar);
+                }
+                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                return Buffer.from(arrayBuffer).toString('base64');
+            },
+            toURL: async () => {
+                if (!url) {
+                    url = client.userAvatar(UserId, event.author.avatar);
+                }
+                return url;
+            }
+        };
         // 定义消
         const e = {
             // 事件类型
-            Platform: 'discord',
-            // 频道
+            Platform: Platform,
+            // guild
             GuildId: event.guild_id,
-            // 子频道
             ChannelId: event.channel_id,
-            // 是否是主人
-            IsMaster: isMaster,
-            // 用户ID
-            UserId: event.author.id,
-            // 用户名
+            // user
+            UserId: UserId,
+            UserKey,
             UserName: event.author.username,
-            GuildIdName: '',
-            GuildIdAvatar: '',
-            ChannelName: '',
-            // 用户头像
-            UserAvatar: client.userAvatar(event.author.id, event.author.avatar),
-            // 格式化数据
-            MsgId: event.id,
-            // 用户消息
-            MessageBody: [
-                Text(msg),
-                ...at_users.map(item => At(item.id, 'user', {
-                    name: item.name,
-                    avatar: item.avatar,
-                    bot: item.bot
-                }))
-            ],
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            // message
+            MessageId: event.id,
             MessageText: msg,
-            // 用户openId
-            OpenID: '',
-            // 创建时间
+            OpenId: '',
             CreateAt: Date.now(),
+            // other
             tag: 'MESSAGE_CREATE',
-            //
             value: null
         };
         // 当访问的时候获取
@@ -93,9 +103,7 @@ var index = defineBot(() => {
         OnProcessor(e, 'message.create');
     });
     // 发送错误时
-    client.on('ERROR', msg => {
-        console.error(msg);
-    });
+    client.on('ERROR', console.error);
     global.client = client;
     return {
         api: {
@@ -103,21 +111,99 @@ var index = defineBot(() => {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = useParse({
-                        MessageBody: val
-                    }, 'Text');
+                    const content = val
+                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                        .map(item => {
+                        if (item.type == 'Link') {
+                            return `[${item.options?.title ?? item.value}](${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(event.ChannelId, {
                             content: item
                         })));
                     }
-                    const images = useParse({
-                        MessageBody: val
-                    }, 'Image');
+                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
                     if (images) {
                         return Promise.all(images.map(item => client.channelsMessagesImage(event.ChannelId, item)));
                     }
                     return Promise.all([]);
+                },
+                mention: async (e) => {
+                    const event = e.value;
+                    const MessageMention = event.mentions.map(item => {
+                        let url = null;
+                        const Platform = 'discord';
+                        const UserId = item.id;
+                        const avatar = event.author.avatar;
+                        const value = getConfigValue();
+                        const config = value?.discord;
+                        const master_key = config?.master_key ?? [];
+                        const UserAvatar = {
+                            toBuffer: async () => {
+                                if (!url) {
+                                    url = client.userAvatar(UserId, avatar);
+                                }
+                                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                                return Buffer.from(arrayBuffer);
+                            },
+                            toBase64: async () => {
+                                if (!url) {
+                                    url = client.userAvatar(UserId, avatar);
+                                }
+                                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                                return Buffer.from(arrayBuffer).toString('base64');
+                            },
+                            toURL: async () => {
+                                if (!url) {
+                                    url = client.userAvatar(UserId, avatar);
+                                }
+                                return url;
+                            }
+                        };
+                        return {
+                            UserId: item.id,
+                            IsMaster: master_key.includes(UserId),
+                            IsBot: item.bot,
+                            UserAvatar,
+                            UserKey: useUserHashKey({
+                                Platform: Platform,
+                                UserId: UserId
+                            })
+                        };
+                    });
+                    return MessageMention;
                 }
             }
         }

package/lib/sdk/platform/discord/sdk/api.d.ts

@@ -116,7 +116,7 @@ declare class DCAPI {
     userMessage(user_id: string): Promise<any>;
     /**
      * 获取当前用户频道
-     * @param params :{获取该频道 ID 之前的频道,获取该频道ID后的频道,返回的最大频道数量 (1-200),在响应中包括大概的成员和存在计数 }
+     * @param params :{获取该频道 Id 之前的频道,获取该频道Id后的频道,返回的最大频道数量 (1-200),在响应中包括大概的成员和存在计数 }
      * @returns
      */
     usersMeGuilds(params: {

package/lib/sdk/platform/discord/sdk/api.js

@@ -205,7 +205,7 @@ class DCAPI {
     }
     /**
      * 获取当前用户频道
-     * @param params :{获取该频道 ID 之前的频道,获取该频道ID后的频道,返回的最大频道数量 (1-200),在响应中包括大概的成员和存在计数 }
+     * @param params :{获取该频道 Id 之前的频道,获取该频道Id后的频道,返回的最大频道数量 (1-200),在响应中包括大概的成员和存在计数 }
      * @returns
      */
     async usersMeGuilds(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/discord",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "discord-bot",
   "author": "lemonade",
   "license": "MIT",