@alemonjs/qq-bot 2.1.0-alpha.10 → 2.1.0-alpha.12

package/README.md

@@ -46,6 +46,13 @@ qq-bot:
   # ws: 'ws://[your ip]:17157/websocket'
   # 3) 自定义模式 (用于连接类官网连接方式的指定服务端)
   # gatewayURL: 'ws://[your ip]:8080'
+  # 其他
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```
 
 ```conf

package/lib/config.js

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

package/lib/hook.d.ts

@@ -1,11 +1,15 @@
 import { EventKeys, Events } from 'alemonjs';
 import { GROUP_AT_MESSAGE_CREATE_TYPE } from './message/group/GROUP_AT_MESSAGE_CREATE.js';
 import { QQBotAPI } from './sdk/api.js';
+import { AT_MESSAGE_CREATE_TYPE } from './message/AT_MESSAGE_CREATE.js';
+import { INTERACTION_CREATE_TYPE } from './message/INTERACTION_CREATE.js';
+import { DIRECT_MESSAGE_CREATE_TYPE } from './message/DIRECT_MESSAGE_CREATE.js';
+import { C2C_MESSAGE_CREATE_TYPE } from './message/group/C2C_MESSAGE_CREATE.js';
 
 type MAP = {
-    'message.create': GROUP_AT_MESSAGE_CREATE_TYPE;
-    'private.message.create': undefined;
-    'interaction.create': undefined;
+    'message.create': GROUP_AT_MESSAGE_CREATE_TYPE | AT_MESSAGE_CREATE_TYPE;
+    'private.message.create': DIRECT_MESSAGE_CREATE_TYPE | C2C_MESSAGE_CREATE_TYPE;
+    'interaction.create': INTERACTION_CREATE_TYPE;
     'private.interaction.create': undefined;
     'message.update': undefined;
     'message.delete': undefined;

package/lib/message/AT_MESSAGE_CREATE.d.ts

@@ -0,0 +1,37 @@
+type AT_MESSAGE_CREATE_TYPE = {
+    attachments?: {
+        id: string;
+        url: string;
+        content_type: string;
+        filename: string;
+        size: number;
+        height: number;
+        width: number;
+    }[];
+    author: {
+        avatar: string;
+        bot: boolean;
+        id: string;
+        username: string;
+    };
+    channel_id: string;
+    content: string;
+    guild_id: string;
+    id: string;
+    member: {
+        joined_at: string;
+        nick: string;
+        roles: string[];
+    };
+    mentions: {
+        avatar: string;
+        bot: boolean;
+        id: string;
+        username: string;
+    }[];
+    seq: number;
+    seq_in_channel: string;
+    timestamp: string;
+};
+
+export type { AT_MESSAGE_CREATE_TYPE };

package/lib/message/DIRECT_MESSAGE_CREATE.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 私信
+ * @param event
+ * @returns
+ */
+type DIRECT_MESSAGE_CREATE_TYPE = {
+    attachments?: {
+        content_type: string;
+        filename: string;
+        height: number;
+        id: string;
+        size: number;
+        url: string;
+        width: number;
+    }[];
+    author: {
+        avatar: string;
+        bot: boolean;
+        id: string;
+        username: string;
+    };
+    channel_id: string;
+    content: string;
+    direct_message: boolean;
+    guild_id: string;
+    id: string;
+    member: {
+        joined_at: string;
+    };
+    seq: number;
+    seq_in_channel: string;
+    src_guild_id: string;
+    timestamp: string;
+};
+
+export type { DIRECT_MESSAGE_CREATE_TYPE };

package/lib/message/INTERACTION_CREATE.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 交互消息事件 | 按钮消息
+ * @param event
+ * @returns
+ */
+type INTERACTION_CREATE_TYPE = {
+    application_id: string;
+    chat_type: 1;
+    data: {
+        resolved: {
+            button_data: string;
+            button_id: number;
+        };
+        type: number;
+    };
+    group_member_openid: string;
+    group_openid: string;
+    id: string;
+    scene: 'group';
+    timestamp: string;
+    type: number;
+    version: number;
+} | {
+    application_id: string;
+    chat_type: 2;
+    data: {
+        resolved: {
+            button_data: string;
+            button_id: number;
+        };
+        type: number;
+    };
+    id: string;
+    scene: 'c2c';
+    timestamp: string;
+    type: number;
+    user_openid: string;
+    version: number;
+} | {
+    application_id: string;
+    chat_type: 0;
+    data: {
+        resolved: {
+            message_id: string;
+            button_data: string;
+            button_id: number;
+            user_id: string;
+        };
+        type: number;
+    };
+    id: string;
+    scene: 'guild';
+    timestamp: string;
+    type: number;
+    guild_id: string;
+    channel_id: string;
+    version: number;
+};
+
+export type { INTERACTION_CREATE_TYPE };

package/lib/message/group/C2C_MESSAGE_CREATE.d.ts

@@ -0,0 +1,11 @@
+type C2C_MESSAGE_CREATE_TYPE = {
+    author: {
+        id: string;
+        user_openid: string;
+    };
+    content: string;
+    id: string;
+    timestamp: string;
+};
+
+export type { C2C_MESSAGE_CREATE_TYPE };

package/lib/register.js

@@ -1,6 +1,6 @@
-import { cbpPlatform, useUserHashKey, ResultCode, createResult } from 'alemonjs';
+import { cbpPlatform, ResultCode, createResult } from 'alemonjs';
 import { GROUP_AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, AT_MESSAGE_CREATE, MESSAGE_CREATE } from './sends.js';
-import { getQQBotConfig, platform } from './config.js';
+import { getQQBotConfig, getMaster, platform } from './config.js';
 
 const register = (client) => {
     const config = getQQBotConfig();
@@ -22,14 +22,9 @@ const register = (client) => {
     };
     // 监听消息
     client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const UserAvatar = createUserAvatarURL(event.author.id);
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatarURL(event.author.id);
         // 定义消
         const e = {
             name: 'message.create',
@@ -55,14 +50,9 @@ const register = (client) => {
         cbp.send(e);
     });
     client.on('C2C_MESSAGE_CREATE', async (event) => {
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
-        const UserAvatar = createUserAvatarURL(event.author.id);
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatarURL(event.author.id);
         // 定义消
         const e = {
             name: 'private.message.create',
@@ -92,15 +82,10 @@ const register = (client) => {
         // 屏蔽其他机器人的消息
         if (event?.author?.bot)
             return;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
         let msg = event?.content ?? '';
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'private.message.create',
@@ -129,15 +114,10 @@ const register = (client) => {
         // 屏蔽其他机器人的消息
         if (event?.author?.bot)
             return;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author.id);
         let msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'message.create',
@@ -195,15 +175,10 @@ const register = (client) => {
         // 撤回消息
         if (new RegExp(/DELETE$/).test(event.eventType))
             return;
-        const master_key = config?.master_key ?? [];
         const UserId = event.author.id;
-        const isMaster = master_key.includes(UserId);
         const msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'message.create',
@@ -241,16 +216,10 @@ const register = (client) => {
         // } catch (err) {
         //   createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
         // }
-        // 如何区分私聊/群聊
         if (event.scene === 'group') {
-            const master_key = config?.master_key ?? [];
-            const isMaster = master_key.includes(event.group_member_openid);
             const UserAvatar = createUserAvatarURL(event.group_member_openid);
             const UserId = event.group_member_openid;
-            const UserKey = useUserHashKey({
-                Platform: platform,
-                UserId: UserId
-            });
+            const [isMaster, UserKey] = getMaster(UserId);
             const MessageText = event.data.resolved.button_data?.trim() || '';
             const e = {
                 name: 'interaction.create',
@@ -276,14 +245,9 @@ const register = (client) => {
             cbp.send(e);
         }
         else if (event.scene === 'c2c') {
-            const master_key = config?.master_key ?? [];
-            const isMaster = master_key.includes(event.user_openid);
             const UserAvatar = createUserAvatarURL(event.user_openid);
             const UserId = event.user_openid;
-            const UserKey = useUserHashKey({
-                Platform: platform,
-                UserId: UserId
-            });
+            const [isMaster, UserKey] = getMaster(UserId);
             const MessageText = event.data.resolved.button_data?.trim() || '';
             // 处理消息
             const e = {
@@ -306,14 +270,9 @@ const register = (client) => {
             cbp.send(e);
         }
         else if (event.scene === 'guild') {
-            const master_key = config?.master_key ?? [];
-            const isMaster = master_key.includes(event.data.resolved.user_id);
             const UserAvatar = createUserAvatarURL(event.data.resolved.user_id);
             const UserId = event.data.resolved.user_id;
-            const UserKey = useUserHashKey({
-                Platform: platform,
-                UserId: UserId
-            });
+            const [isMaster, UserKey] = getMaster(UserId);
             const MessageText = event.data.resolved.button_data?.trim() || '';
             // 处理消息
             const e = {

package/package.json

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