npm - @alemonjs/qq-bot - Versions diffs - 2.1.0-alpha.7 → 2.1.0-alpha.9 - Mend

@alemonjs/qq-bot 2.1.0-alpha.7 → 2.1.0-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/index.html CHANGED Viewed

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>AlemonJS</title>
     <script type="module" crossorigin src="/assets/index.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index.css" />
+    <link rel="stylesheet" crossorigin href="/assets/index.css">
   </head>
   <body>

package/lib/register.js CHANGED Viewed

@@ -238,6 +238,17 @@ const register = (client) => {
         cbp.send(e);
     });
     client.on('INTERACTION_CREATE', async (event) => {
+        try {
+            if (event.scene === 'group' || event.scene === 'c2c') {
+                await client.interactionResponse('group', event.id);
+            }
+            else if (event.scene === 'guild') {
+                await client.interactionResponse('guild', event.id);
+            }
+        }
+        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);
@@ -261,12 +272,12 @@ const register = (client) => {
                 IsMaster: isMaster,
                 IsBot: false,
                 // 格式化数据
-                MessageId: event.id,
+                MessageId: `INTERACTION_CREATE:${event.id}`,
                 MessageText: MessageText,
                 OpenId: event.group_member_openid,
-                tag: 'GROUP_AT_MESSAGE_CREATE',
+                tag: 'INTERACTION_CREATE_GROUP',
                 CreateAt: Date.now(),
-                value: event,
+                value: event
             };
             cbp.send(e);
         }
@@ -284,9 +295,6 @@ const register = (client) => {
             const e = {
                 name: 'private.interaction.create',
                 Platform: platform,
-                // guild
-                // GuildId: event.group_openid,
-                // ChannelId: event.group_openid,
                 // 用户Id
                 UserId: event.user_openid,
                 UserKey,
@@ -298,11 +306,51 @@ const register = (client) => {
                 MessageText: MessageText,
                 OpenId: event.user_openid,
                 CreateAt: Date.now(),
-                tag: 'C2C_MESSAGE_CREATE',
+                tag: 'INTERACTION_CREATE_C2C',
+                value: event
+            };
+            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 MessageText = event.data.resolved.button_data?.trim() || '';
+            // 处理消息
+            const e = {
+                name: 'interaction.create',
+                Platform: platform,
+                // guild
+                GuildId: event.guild_id,
+                ChannelId: event.channel_id,
+                // 用户Id
+                UserId: event.data.resolved.user_id,
+                UserKey,
+                UserAvatar: UserAvatar,
+                IsMaster: isMaster,
+                IsBot: false,
+                // 格式化数据
+                MessageId: event.data.resolved.message_id,
+                MessageText: MessageText,
+                OpenId: event.guild_id,
+                CreateAt: Date.now(),
+                tag: 'INTERACTION_CREATE_GUILD',
                 value: event
             };
             cbp.send(e);
         }
+        else {
+            logger.warn({
+                code: ResultCode.Fail,
+                message: '暂未更新支持此类型的交互事件',
+                data: event
+            });
+        }
     });
     client.on('ERROR', console.error);
     const api = {
@@ -352,6 +400,16 @@ const register = (client) => {
                 if (tag == 'MESSAGE_CREATE') {
                     return await MESSAGE_CREATE(client, event, val);
                 }
+                // 交互
+                if (tag == 'INTERACTION_CREATE_GROUP') {
+                    return await GROUP_AT_MESSAGE_CREATE(client, event, val);
+                }
+                if (tag == 'INTERACTION_CREATE_C2C') {
+                    return await C2C_MESSAGE_CREATE(client, event, val);
+                }
+                if (tag == 'INTERACTION_CREATE_GUILD') {
+                    return await AT_MESSAGE_CREATE(client, event, val);
+                }
                 return Promise.all([]);
             },
             mention: async (event) => {
@@ -397,15 +455,16 @@ const register = (client) => {
         }
     });
     // 处理 api 调用
-    cbp?.onapis && cbp.onapis(async (data, consume) => {
-        const key = data.payload?.key;
-        if (client[key]) {
-            // 如果 client 上有对应的 key，直接调用。
-            const params = data.payload.params;
-            const res = await client[key](...params);
-            consume([createResult(ResultCode.Ok, '请求完成', res)]);
-        }
-    });
+    cbp?.onapis &&
+        cbp.onapis(async (data, consume) => {
+            const key = data.payload?.key;
+            if (client[key]) {
+                // 如果 client 上有对应的 key，直接调用。
+                const params = data.payload.params;
+                const res = await client[key](...params);
+                consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            }
+        });
 };
 export { getQQBotConfig, platform, register };

package/lib/sdk/api.d.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import * as axios from 'axios';
 import { AxiosRequestConfig } from 'axios';
 import { ApiRequestData, FileType } from './typing.js';
-import FormData from 'form-data';
 declare class QQBotAPI {
     /**
@@ -140,45 +139,44 @@ declare class QQBotAPI {
      * @returns
      */
     grouMessageDelte(group_openid: string, message_id: string): Promise<any>;
-    /**
-     * 创建form
-     * @param image
-     * @param msg_id
-     * @param content
-     * @param name
-     * @returns
-     */
-    createFrom(image: Buffer, msg_id: string, content: any, Name?: string): Promise<false | FormData>;
     /**
      * ************
      * 消息-图片接口
      * ***********
      */
     /**
-     * 发送buffer图片
-     * @param id 私信传频道id,公信传子频道id
-     * @param message {消息编号,图片,内容}
-     * @param isGroup 是否是群聊
+     *
+     * @param channel_id
+     * @param message
+     * @param image
      * @returns
      */
-    postImage(channel_id: string, message: {
-        msg_id: string;
-        image: Buffer;
+    channelsMessages(channel_id: string, message: {
         content?: string;
-        name?: string;
-    }): Promise<any>;
+        embed?: any;
+        ark?: any;
+        message_reference?: any;
+        image?: string;
+        msg_id?: string;
+        event_id?: string;
+        markdown?: any;
+    }, image?: Buffer): Promise<any>;
     /**
-     * 私聊发送buffer图片
+     * 私聊发送
      * @param id 私信传频道id,公信传子频道id
      * @param message {消息编号,图片,内容}
      * @returns
      */
-    postDirectImage(guild_id: string, message: {
-        msg_id: string;
-        image: Buffer;
+    dmsMessages(guild_id: string, message: {
         content?: string;
-        name?: string;
-    }): Promise<any>;
+        embed?: any;
+        ark?: any;
+        message_reference?: any;
+        image?: string;
+        msg_id?: string;
+        event_id?: string;
+        markdown?: any;
+    }, image?: Buffer): Promise<any>;
     /**
      * ********
      * 用户api
@@ -320,24 +318,7 @@ declare class QQBotAPI {
      * @param message_id
      * @returns
      */
-    channelsMessages(channel_id: string, message_id: string): Promise<any>;
-    /**
-     * 发送消息
-     * @param channel_id
-     * @param message_id
-     * @param data
-     * @returns
-     */
-    channelsMessagesPost(channel_id: string, data: {
-        content?: string;
-        embed?: any;
-        ark?: any;
-        message_reference?: any;
-        image?: string;
-        msg_id?: string;
-        event_id?: string;
-        markdown?: any;
-    }): Promise<any>;
+    channelsMessagesById(channel_id: string, message_id: string): Promise<any>;
     /**
      * 撤回消息
      * @param channel_id
@@ -455,21 +436,6 @@ declare class QQBotAPI {
      * @returns
      */
     usersMeDms(): Promise<any>;
-    /**
-     * 发送私信
-     * @param guild_id
-     * @returns
-     */
-    dmsMessage(guild_id: string, data: {
-        content?: string;
-        embed?: any;
-        ark?: any;
-        message_reference?: any;
-        image?: string;
-        msg_id?: string;
-        event_id?: string;
-        markdown?: any;
-    }): Promise<any>;
     /**
      * 撤回私信
      * @param guild_id
@@ -776,6 +742,13 @@ declare class QQBotAPI {
      * @returns
      */
     guildApiPermission(guild_id: string): Promise<any>;
+    /**
+     * 交互事件回应
+     * @param interaction_id
+     * @param code
+     * @returns
+     */
+    interactionResponse(mode: 'group' | 'guild', interaction_id: string, code?: number): Promise<any>;
 }
 export { QQBotAPI };

package/lib/sdk/api.js CHANGED Viewed

@@ -90,13 +90,18 @@ class QQBotAPI {
      *   0 文本  1 图文 2 md 3 ark 4 embed
      */
     async usersOpenMessages(openid, data) {
+        const db = {
+            ...(data.event_id
+                ? { event_id: data.event_id }
+                : {
+                    msg_seq: this.getMessageSeq(data.msg_id || '')
+                }),
+            ...data
+        };
         return this.groupService({
             url: `/v2/users/${openid}/messages`,
             method: 'post',
-            data: {
-                msg_seq: this.getMessageSeq(data.msg_id || ''),
-                ...data
-            }
+            data: db
         }).then(res => res?.data);
     }
     /**
@@ -123,13 +128,18 @@ class QQBotAPI {
      * @returns
      */
     async groupOpenMessages(group_openid, data) {
+        const db = {
+            ...(data.event_id
+                ? { event_id: data.event_id }
+                : {
+                    msg_seq: this.getMessageSeq(data.msg_id || '')
+                }),
+            ...data
+        };
         return this.groupService({
             url: `/v2/groups/${group_openid}/messages`,
             method: 'post',
-            data: {
-                msg_seq: this.getMessageSeq(data.msg_id || ''),
-                ...data
-            }
+            data: db
         }).then(res => res?.data);
     }
     /**
@@ -220,41 +230,33 @@ class QQBotAPI {
             method: 'delete'
         }).then(res => res?.data);
     }
-    /**
-     * 创建form
-     * @param image
-     * @param msg_id
-     * @param content
-     * @param name
-     * @returns
-     */
-    async createFrom(image, msg_id, content, Name = 'image.jpg') {
-        const from = await createPicFrom(image, Name);
-        if (!from)
-            return false;
-        const { picData, name } = from;
-        const formdata = new FormData();
-        formdata.append('msg_id', msg_id);
-        if (typeof content === 'string')
-            formdata.append('content', content);
-        formdata.append('file_image', picData, name);
-        return formdata;
-    }
     /**
      * ************
      * 消息-图片接口
      * ***********
      */
     /**
-     * 发送buffer图片
-     * @param id 私信传频道id,公信传子频道id
-     * @param message {消息编号,图片,内容}
-     * @param isGroup 是否是群聊
+     *
+     * @param channel_id
+     * @param message
+     * @param image
      * @returns
      */
-    async postImage(channel_id, message) {
-        const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
-        const dary = formdata != false ? formdata.getBoundary() : '';
+    async channelsMessages(channel_id, message, image) {
+        const formdata = new FormData();
+        for (const key in message) {
+            if (message[key] !== undefined) {
+                formdata.append(key, message[key]);
+            }
+        }
+        if (image) {
+            const from = await createPicFrom(image);
+            if (from) {
+                const { picData, name } = from;
+                formdata.append('file_image', picData, name);
+            }
+        }
+        const dary = formdata.getBoundary();
         return this.guildServer({
             method: 'post',
             url: `/channels/${channel_id}/messages`,
@@ -265,14 +267,26 @@ class QQBotAPI {
         }).then(res => res?.data);
     }
     /**
-     * 私聊发送buffer图片
+     * 私聊发送
      * @param id 私信传频道id,公信传子频道id
      * @param message {消息编号,图片,内容}
      * @returns
      */
-    async postDirectImage(guild_id, message) {
-        const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
-        const dary = formdata != false ? formdata.getBoundary() : '';
+    async dmsMessages(guild_id, message, image) {
+        const formdata = new FormData();
+        for (const key in message) {
+            if (message[key] !== undefined) {
+                formdata.append(key, message[key]);
+            }
+        }
+        if (image) {
+            const from = await createPicFrom(image);
+            if (from) {
+                const { picData, name } = from;
+                formdata.append('file_image', picData, name);
+            }
+        }
+        const dary = formdata.getBoundary();
         return this.guildServer({
             method: 'post',
             url: `/dms/${guild_id}/messages`,
@@ -462,26 +476,12 @@ class QQBotAPI {
      * @param message_id
      * @returns
      */
-    async channelsMessages(channel_id, message_id) {
+    async channelsMessagesById(channel_id, message_id) {
         return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/messages/${message_id}`
         }).then(res => res?.data);
     }
-    /**
-     * 发送消息
-     * @param channel_id
-     * @param message_id
-     * @param data
-     * @returns
-     */
-    async channelsMessagesPost(channel_id, data) {
-        return this.guildServer({
-            method: 'POST',
-            url: `/channels/${channel_id}/messages`,
-            data
-        }).then(res => res?.data);
-    }
     /**
      * 撤回消息
      * @param channel_id
@@ -662,18 +662,6 @@ class QQBotAPI {
             url: `/users/@me/dms`
         }).then(res => res?.data);
     }
-    /**
-     * 发送私信
-     * @param guild_id
-     * @returns
-     */
-    async dmsMessage(guild_id, data) {
-        return this.guildServer({
-            method: 'POST',
-            url: `/dms/${guild_id}/messages`,
-            data
-        }).then(res => res?.data);
-    }
     /**
      * 撤回私信
      * @param guild_id
@@ -1069,6 +1057,32 @@ class QQBotAPI {
             url: `/guilds/${guild_id}/api_permission`
         }).then(res => res?.data);
     }
+    /**
+     * 交互事件回应
+     * @param interaction_id
+     * @param code
+     * @returns
+     */
+    async interactionResponse(mode, interaction_id, code) {
+        if (mode === 'group') {
+            return this.groupService({
+                method: 'PUT',
+                url: `/interactions/${interaction_id}`,
+                data: {
+                    code: code || 0
+                }
+            }).then(res => res?.data);
+        }
+        else {
+            return this.guildServer({
+                method: 'PUT',
+                url: `/interactions/${interaction_id}`,
+                data: {
+                    code: code || 0
+                }
+            }).then(res => res?.data);
+        }
+    }
 }
 export { API_URL, API_URL_SANDBOX, BOTS_API_RUL, QQBotAPI };