diff --git a/example/index.js b/example/index.js index e71854d..1dff1af 100644 --- a/example/index.js +++ b/example/index.js @@ -1,9 +1,10 @@ // 以下仅为用法示意,详情请参照文档:https://bot.q.qq.com/wiki/develop/nodesdk/ -const { createOpenAPI, createWebsocket } = require('qq-guild-bot'); +const { createOpenAPI, createWebsocket, AvailableIntentsEventsEnum } = require('qq-guild-bot'); const testConfigWs = { appID: '', token: '', + intents: [], }; const client = createOpenAPI(testConfigWs); @@ -13,43 +14,46 @@ ws.on('READY', (wsdata) => { console.log('[READY] 事件接收 :', wsdata); }); -ws.on('ERROR', (data) => { +ws.on(AvailableIntentsEventsEnum.ERROR, (data) => { console.log('[ERROR] 事件接收 :', data); }); -ws.on('GUILDS', (data) => { +ws.on(AvailableIntentsEventsEnum.GUILDS, (data) => { console.log('[GUILDS] 事件接收 :', data); }); -ws.on('GUILD_MEMBERS', (data) => { +ws.on(AvailableIntentsEventsEnum.GUILD_MEMBERS, (data) => { console.log('[GUILD_MEMBERS] 事件接收 :', data); }); -ws.on('GUILD_MESSAGES', (data) => { +ws.on(AvailableIntentsEventsEnum.GUILD_MESSAGES, (data) => { console.log('[GUILD_MESSAGES] 事件接收 :', data); }); -ws.on('GUILD_MESSAGE_REACTIONS', (data) => { +ws.on(AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS, (data) => { console.log('[GUILD_MESSAGE_REACTIONS] 事件接收 :', data); }); -ws.on('DIRECT_MESSAGE', (data) => { +ws.on(AvailableIntentsEventsEnum.DIRECT_MESSAGE, (data) => { console.log('[DIRECT_MESSAGE] 事件接收 :', data); }); -ws.on('INTERACTION', (data) => { +ws.on(AvailableIntentsEventsEnum.INTERACTION, (data) => { console.log('[INTERACTION] 事件接收 :', data); }); -ws.on('MESSAGE_AUDIT', (data) => { +ws.on(AvailableIntentsEventsEnum.MESSAGE_AUDIT, (data) => { console.log('[MESSAGE_AUDIT] 事件接收 :', data); }); -ws.on('FORUMS_EVENT', (data) => { +ws.on(AvailableIntentsEventsEnum.FORUMS_EVENT, (data) => { console.log('[FORUMS_EVENT] 事件接收 :', data); }); -ws.on('AUDIO_ACTION', (data) => { +ws.on(AvailableIntentsEventsEnum.AUDIO_ACTION, (data) => { console.log('[AUDIO_ACTION] 事件接收 :', data); }); -ws.on('PUBLIC_GUILD_MESSAGES', async (eventData) => { +ws.on(AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES, async (eventData) => { console.log('[PUBLIC_GUILD_MESSAGES] 事件接收 :', eventData); - const {data} = await client.messageApi.postMessage('', { + const { data } = await client.messageApi.postMessage('', { content: 'test' }) console.log(data); }); +ws.on(AvailableIntentsEventsEnum.GROUP, (data) => { + console.log('[GROUP] 事件接收 :', data); +}); // client.guildApi.guild('').then((data) => { // console.log(data); diff --git a/package-lock.json b/package-lock.json index d4e68ee..7ca2dde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "qq-guild-bot", - "version": "2.9.4", + "version": "2.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5b8b6c9..dadd1bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "qq-guild-bot", - "version": "2.9.4", + "version": "2.10.0", "description": "QQ频道机器人NodeSDK", "publishConfig": { "registry": "https://registry.npmjs.org/" diff --git a/src/types/websocket-types.ts b/src/types/websocket-types.ts index 9b88470..a19a327 100644 --- a/src/types/websocket-types.ts +++ b/src/types/websocket-types.ts @@ -83,6 +83,7 @@ export enum AvailableIntentsEventsEnum { PUBLIC_GUILD_MESSAGES = 'PUBLIC_GUILD_MESSAGES', MESSAGE_AUDIT = 'MESSAGE_AUDIT', INTERACTION = 'INTERACTION', + GROUP = 'GROUP', } // OpenAPI传过来的事件类型 @@ -138,6 +139,13 @@ export const WsEventType: { [key: string]: AvailableIntentsEventsEnum } = { // ======= PUBLIC_GUILD_MESSAGES ====== AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES, // 机器人被@时触发 PUBLIC_MESSAGE_DELETE: AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES, // 当频道的消息被删除时 + + // ======= GROUP ====== + GROUP_ADD_ROBOT: AvailableIntentsEventsEnum.GROUP, + GROUP_DEL_ROBOT: AvailableIntentsEventsEnum.GROUP, + GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP, + GROUP_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP, + GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP, }; export const WSCodes = { @@ -233,6 +241,7 @@ export const IntentEvents: IntentEventsMapType = { GUILD_MESSAGES: 1 << 9, GUILD_MESSAGE_REACTIONS: 1 << 10, DIRECT_MESSAGE: 1 << 12, + GROUP: 1 << 25, INTERACTION: 1 << 26, MESSAGE_AUDIT: 1 << 27, FORUMS_EVENT: 1 << 28,