@alemonjs/discord 2.1.0-alpha.6 → 2.1.0-alpha.8

package/README.md

@@ -18,12 +18,16 @@ yarn add @alemonjs/discord
 discord:
   # 令牌
   token: ''
-  # 主人
-  master_key: null
   # 前缀（非必填）
   intent: null
   # 活动 非必填）
   shard: null
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```
 
 ```sh

package/lib/config.js

@@ -1,4 +1,4 @@
-import { getConfigValue } from 'alemonjs';
+import { getConfigValue, useUserHashKey } from 'alemonjs';
 
 // 平台
 const platform = 'discord';
@@ -7,5 +7,16 @@ const getDiscordConfigValue = () => {
     const config = value[platform] || {};
     return config;
 };
+const getMaster = (UserId) => {
+    const config = getDiscordConfigValue();
+    const master_key = config.master_key || [];
+    const master_id = config.master_id || [];
+    const UserKey = useUserHashKey({
+        Platform: platform,
+        UserId: UserId
+    });
+    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    return [is, UserKey];
+};
 
-export { getDiscordConfigValue, platform };
+export { getDiscordConfigValue, getMaster, platform };

package/lib/index.js

@@ -1,8 +1,8 @@
 import './env.js';
-import { cbpPlatform, useUserHashKey, createResult, ResultCode } from 'alemonjs';
+import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { sendchannel, senduser } from './send.js';
 import { DCClient } from './sdk/wss.js';
-import { getDiscordConfigValue, platform } from './config.js';
+import { getDiscordConfigValue, getMaster, platform } from './config.js';
 export { DCAPI as API } from './sdk/api.js';
 
 // main
@@ -47,13 +47,7 @@ var index = () => {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        const value = getDiscordConfigValue();
-        const master_key = value?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        const [isMaster, UserKey] = getMaster(UserId);
         const UserAvatar = createUserAvatar(UserId, event.author.avatar);
         if (event.type == 0 && event.member) {
             const e = {
@@ -63,6 +57,7 @@ var index = () => {
                 // guild
                 GuildId: event.guild_id,
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -87,9 +82,6 @@ var index = () => {
                 name: 'private.message.create',
                 // 事件类型
                 Platform: platform,
-                // guild
-                // GuildId: event.guild_id,
-                // ChannelId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -111,19 +103,12 @@ var index = () => {
         else ;
     });
     client.on('INTERACTION_CREATE', event => {
-        console.log('event', event);
         const isPrivate = typeof event['user'] === 'object' ? true : false;
         const user = isPrivate ? event['user'] : event['member'].user;
         const UserId = user.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
         const UserAvatar = createUserAvatar(UserId, user.avatar);
         const UserName = user.username;
-        const value = getDiscordConfigValue();
-        const master_key = value?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        const [isMaster, UserKey] = getMaster(UserId);
         const MessageText = event.data.custom_id;
         if (isPrivate) {
             // 处理消息
@@ -160,6 +145,7 @@ var index = () => {
                 // guild
                 GuildId: event['guild_id'],
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -236,16 +222,11 @@ var index = () => {
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
                     const avatar = event.author.avatar;
-                    const value = getDiscordConfigValue();
-                    const master_key = value?.master_key ?? [];
                     const UserAvatar = createUserAvatar(UserId, avatar);
-                    const UserKey = useUserHashKey({
-                        Platform: platform,
-                        UserId: UserId
-                    });
+                    const [isMaster, UserKey] = getMaster(UserId);
                     return {
                         UserId: item.id,
-                        IsMaster: master_key.includes(UserId),
+                        IsMaster: isMaster,
                         IsBot: item.bot,
                         UserAvatar,
                         UserKey
@@ -280,8 +261,7 @@ var index = () => {
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
     });
-    // 处理 api 调用
-    cbp?.onapis(async (data, consume) => {
+    cbp.onapis(async (data, consume) => {
         const key = data.payload?.key;
         if (client[key]) {
             // 如果 client 上有对应的 key，直接调用。

package/lib/send.js

@@ -95,7 +95,7 @@ const sendchannel = async (client, param, val) => {
                 }
             }
             const res = await client.channelsMessagesForm(channel_id, {
-                content: content,
+                content: content
             }, bufferData);
             return [createResult(ResultCode.Ok, '完成', {})];
         }

package/package.json

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