@alemonjs/onebot 2.1.0-alpha.1 → 2.1.0-alpha.2

package/README.md

@@ -9,4 +9,10 @@ onebot:
   reverse_enable: false # 启用后正向连接配置失效，地址：ws://127.0.0.1:17158
   reverse_port: 17158 # 返向连接服务端口，启用反向连接后生效
   master_key: null
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```

package/lib/config.js

@@ -1,9 +1,20 @@
-import { getConfigValue } from 'alemonjs';
+import { getConfigValue, useUserHashKey } from 'alemonjs';
 
 const platform = 'onebot';
 const getOneBotConfig = () => {
     const value = getConfigValue() || {};
     return value[platform] || {};
 };
+const getMaster = (UserId) => {
+    const config = getOneBotConfig();
+    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 { getOneBotConfig, platform };
+export { getMaster, getOneBotConfig, platform };

package/lib/index.js

@@ -1,8 +1,8 @@
-import { cbpPlatform, useUserHashKey, createResult, ResultCode } from 'alemonjs';
+import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { getBufferByURL } from 'alemonjs/utils';
 import { OneBotClient } from './sdk/wss.js';
 import { readFileSync } from 'fs';
-import { getOneBotConfig, platform } from './config.js';
+import { getOneBotConfig, getMaster, platform } from './config.js';
 export { OneBotAPI as API } from './sdk/api.js';
 
 const MyBot = {
@@ -40,14 +40,10 @@ var index = () => {
         }
     });
     client.on('MESSAGES', event => {
-        const uis = config?.master_id ?? [];
         const msg = getMessageText(event.message);
         const UserId = String(event.user_id);
         const UserAvatar = createUserAvatar(UserId);
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         const groupId = String(event.group_id);
         // 定义消
         const e = {
@@ -55,7 +51,7 @@ var index = () => {
             Platform: platform,
             GuildId: groupId,
             ChannelId: groupId,
-            IsMaster: uis.includes(UserId),
+            IsMaster: isMaster,
             SpaceId: groupId,
             IsBot: false,
             UserId: UserId,
@@ -72,19 +68,15 @@ var index = () => {
         cbp.send(e);
     });
     client.on('DIRECT_MESSAGE', event => {
-        const uis = config?.master_id ?? [];
         const msg = getMessageText(event.message);
         const UserId = String(event.user_id);
         const UserAvatar = createUserAvatar(UserId);
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'private.message.create',
             Platform: platform,
-            IsMaster: uis.includes(String(event.user_id)),
+            IsMaster: isMaster,
             IsBot: false,
             UserId: UserId,
             UserName: event.sender.nickname,
@@ -103,7 +95,7 @@ var index = () => {
     client.on('ERROR', event => {
         logger.error(event);
     });
-    const sendGroup = async (event, val) => {
+    const sendGroup = async (ChannelId, val) => {
         if (val.length < 0)
             return [];
         const content = val
@@ -113,7 +105,7 @@ var index = () => {
         try {
             if (content) {
                 const res = await client.sendGroupMessage({
-                    group_id: event.ChannelId,
+                    group_id: ChannelId,
                     message: [
                         {
                             type: 'text',
@@ -142,7 +134,7 @@ var index = () => {
                         data = Buffer.from(item.value, 'base64');
                     }
                     client.sendGroupMessage({
-                        group_id: event.ChannelId,
+                        group_id: ChannelId,
                         message: [
                             {
                                 type: 'image',
@@ -165,11 +157,11 @@ var index = () => {
     };
     /**
      *
-     * @param event
+     * @param UserId
      * @param val
      * @returns
      */
-    const sendPrivate = async (event, val) => {
+    const sendPrivate = async (UserId, val) => {
         if (val.length < 0)
             return Promise.all([]);
         const content = val
@@ -179,7 +171,7 @@ var index = () => {
         try {
             if (content) {
                 const res = await client.sendPrivateMessage({
-                    user_id: event.UserId,
+                    user_id: UserId,
                     message: [
                         {
                             type: 'text',
@@ -208,7 +200,7 @@ var index = () => {
                         data = Buffer.from(item.value, 'base64');
                     }
                     client.sendPrivateMessage({
-                        user_id: event.UserId,
+                        user_id: UserId,
                         message: [
                             {
                                 type: 'image',
@@ -232,11 +224,11 @@ var index = () => {
     const api = {
         active: {
             send: {
-                channel: (event, val) => {
-                    return sendGroup(event, val);
+                channel: async (SpaceId, val) => {
+                    return sendGroup(Number(SpaceId), val);
                 },
-                user: (event, val) => {
-                    return sendPrivate(event, val);
+                user: async (OpenId, val) => {
+                    return sendPrivate(Number(OpenId), val);
                 }
             }
         },
@@ -245,38 +237,38 @@ var index = () => {
                 if (val.length < 0)
                     return Promise.all([]);
                 if (event['name'] == 'private.message.create') {
-                    return sendPrivate(event, val);
+                    const UserId = Number(event.UserId);
+                    return sendPrivate(UserId, val);
                 }
                 else if (event['name'] == 'message.create') {
-                    return sendGroup(event, val);
+                    const GroupId = Number(event.ChannelId);
+                    return sendGroup(GroupId, val);
                 }
                 return Promise.all([]);
             },
             mention: async (event) => {
-                const uis = config?.master_id ?? [];
                 const e = event.value;
-                if (event['name'] == 'message.create' || event['name'] == 'private.message.create') {
+                const names = ['message.create', 'private.message.create'];
+                if (names.includes(event.name)) {
                     const Metions = [];
                     for (const item of e.message) {
                         if (item.type == 'at') {
                             let isBot = false;
-                            const uid = String(item.data.qq);
-                            if (uid == 'all') {
+                            const UserId = String(item.data.qq);
+                            if (UserId == 'all') {
                                 continue;
                             }
-                            if (uid == MyBot.id) {
+                            if (UserId == MyBot.id) {
                                 isBot = true;
                             }
-                            const avatar = createUserAvatar(uid);
+                            const [isMaster, UserKey] = getMaster(UserId);
+                            const avatar = createUserAvatar(UserId);
                             Metions.push({
-                                UserId: uid,
-                                UserKey: useUserHashKey({
-                                    Platform: platform,
-                                    UserId: uid
-                                }),
+                                UserId: UserId,
+                                IsMaster: isMaster,
+                                UserKey: UserKey,
                                 UserName: item.data?.nickname,
                                 UserAvatar: avatar,
-                                IsMaster: uis.includes(uid),
                                 IsBot: isBot
                             });
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.2",
   "description": "onebot v11",
   "author": "lemonade",
   "license": "MIT",