@alemonjs/qq-bot 2.1.17 → 2.1.19

package/lib/hook.d.ts

@@ -1,5 +1,6 @@
 import { EventKeys, Events } from 'alemonjs';
 import { GROUP_AT_MESSAGE_CREATE_TYPE } from './message/group/GROUP_AT_MESSAGE_CREATE';
+import { GROUP_MESSAGE_CREATE_TYPE } from './message/group/GROUP_MESSAGE_CREATE';
 import { QQBotAPI as API } from './sdk/api';
 import { AT_MESSAGE_CREATE_TYPE } from './message/AT_MESSAGE_CREATE';
 import { INTERACTION_CREATE_TYPE } from './message/INTERACTION_CREATE';
@@ -28,8 +29,10 @@ import { GROUP_MSG_RECEIVE_TYPE } from './message/group/GROUP_MSG_RECEIVE';
 import { GROUP_MSG_REJECT_TYPE } from './message/group/GROUP_MSG_REJECT';
 import { C2C_MSG_RECEIVE_TYPE } from './message/group/C2C_MSG_RECEIVE';
 import { C2C_MSG_REJECT_TYPE } from './message/group/C2C_MSG_REJECT';
+import { MESSAGE_AUDIT_PASS_TYPE } from './message/group/MESSAGE_AUDIT_PASS';
+import { MESSAGE_AUDIT_REJECT_TYPE } from './message/group/MESSAGE_AUDIT_REJECT';
 type MAP = {
-    'message.create': GROUP_AT_MESSAGE_CREATE_TYPE | AT_MESSAGE_CREATE_TYPE | MESSAGE_CREATE_TYPE;
+    'message.create': GROUP_AT_MESSAGE_CREATE_TYPE | GROUP_MESSAGE_CREATE_TYPE | AT_MESSAGE_CREATE_TYPE | MESSAGE_CREATE_TYPE;
     'private.message.create': DIRECT_MESSAGE_CREATE_TYPE | C2C_MESSAGE_CREATE_TYPE;
     'interaction.create': INTERACTION_CREATE_TYPE;
     'private.interaction.create': INTERACTION_CREATE_TYPE;
@@ -49,7 +52,7 @@ type MAP = {
     'member.ban': undefined;
     'member.unban': undefined;
     'member.update': GUILD_MEMBER_UPDATE_TYPE;
-    'notice.create': GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE;
+    'notice.create': GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE | MESSAGE_AUDIT_PASS_TYPE | MESSAGE_AUDIT_REJECT_TYPE;
     'private.message.update': undefined;
     'private.message.delete': DIRECT_MESSAGE_DELETE_TYPE;
     'private.friend.add': FRIEND_ADD_TYPE;

package/lib/hook.js

@@ -16,6 +16,9 @@ const useMode = (event) => {
     if (tag === 'GROUP_AT_MESSAGE_CREATE') {
         currentMode = 'group';
     }
+    if (tag === 'GROUP_MESSAGE_CREATE') {
+        currentMode = 'group';
+    }
     if (tag === 'C2C_MESSAGE_CREATE') {
         currentMode = 'c2c';
     }

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

@@ -1,12 +1,27 @@
 export interface GROUP_AT_MESSAGE_CREATE_TYPE {
     author: {
+        bot?: boolean;
         id: string;
         member_openid: string;
+        union_openid: string;
         username: string;
     };
     content: string;
     group_openid: string;
     group_id: string;
     id: string;
+    mentions?: {
+        bot?: boolean;
+        id: string;
+        is_you?: boolean;
+        member_openid?: string;
+        scope?: string;
+        username: string;
+    }[];
     timestamp: string;
+    message_scene: {
+        ext: string[];
+        source: string;
+    };
+    message_type: number;
 }

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

@@ -0,0 +1,27 @@
+export interface GROUP_MESSAGE_CREATE_TYPE {
+    author: {
+        bot?: boolean;
+        id: string;
+        member_openid: string;
+        union_openid: string;
+        username: string;
+    };
+    content: string;
+    group_openid: string;
+    group_id: string;
+    id: string;
+    mentions?: {
+        bot?: boolean;
+        id: string;
+        is_you?: boolean;
+        member_openid?: string;
+        scope?: string;
+        username: string;
+    }[];
+    timestamp: string;
+    message_scene: {
+        ext: string[];
+        source: string;
+    };
+    message_type: number;
+}

package/lib/message/group/GROUP_MESSAGE_CREATE.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,7 @@
+export type MESSAGE_AUDIT_PASS_TYPE = {
+    audit_id: string;
+    audit_time: string;
+    create_time?: string;
+    group_openid?: string;
+    message_id?: string;
+};

package/lib/message/group/MESSAGE_AUDIT_PASS.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,7 @@
+export type MESSAGE_AUDIT_REJECT_TYPE = {
+    audit_id: string;
+    audit_time: string;
+    create_time?: string;
+    group_openid?: string;
+    message_id?: string;
+};

package/lib/message/group/MESSAGE_AUDIT_REJECT.js

@@ -0,0 +1 @@
+

package/lib/register.js

@@ -11,6 +11,34 @@ const register = (client) => {
     const createUserAvatarURL = (authorId) => {
         return `https://q.qlogo.cn/qqapp/${config.app_id}/${authorId}/640`;
     };
+    const getGroupMessageMeta = (event) => {
+        const author = event?.author;
+        const UserId = author?.id ?? '';
+        const memberOpenId = author?.member_openid ?? '';
+        const groupId = event?.group_id ?? event?.group_openid ?? '';
+        const messageId = event?.id ?? '';
+        const [isMaster, UserKey] = UserId ? getMaster(UserId) : [false, ''];
+        return {
+            UserId,
+            UserKey,
+            isMaster,
+            UserName: author?.username ?? '',
+            UserAvatar: UserId ? createUserAvatarURL(UserId) : '',
+            groupId,
+            messageId,
+            openId: memberOpenId ? `C2C:${memberOpenId}` : ''
+        };
+    };
+    const getGroupAuditMeta = (event) => {
+        const groupId = event?.group_openid ?? '';
+        const messageId = event?.message_id ?? event?.audit_id ?? '';
+        const auditTime = event?.audit_time ?? '';
+        return {
+            groupId,
+            messageId,
+            auditTime
+        };
+    };
     client.on('GROUP_ADD_ROBOT', event => {
         cbp.send(FormatEvent.create('guild.join')
             .addPlatform({ Platform: platform, value: event, BotId: botId })
@@ -41,25 +69,50 @@ const register = (client) => {
             .addMessage({ MessageId: '' })
             .add({ tag: 'GROUP_DEL_ROBOT' }).value);
     });
+    client.on('GROUP_MESSAGE_CREATE', event => {
+        if (event?.author?.bot) {
+            return;
+        }
+        const msg = getMessageContent(event);
+        const meta = getGroupMessageMeta(event);
+        cbp.send(FormatEvent.create('message.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: meta.groupId, SpaceId: `GROUP:${meta.groupId}` })
+            .addChannel({ ChannelId: meta.groupId })
+            .addUser({
+            UserId: meta.UserId,
+            UserKey: meta.UserKey,
+            UserAvatar: meta.UserAvatar,
+            UserName: meta.UserName,
+            IsMaster: meta.isMaster,
+            IsBot: false
+        })
+            .addMessage({ MessageId: meta.messageId })
+            .addText({ MessageText: msg?.trim() })
+            .addOpen({ OpenId: meta.openId })
+            .add({ tag: 'GROUP_MESSAGE_CREATE' }).value);
+    });
     client.on('GROUP_AT_MESSAGE_CREATE', event => {
-        const UserId = event.author.id;
-        const [isMaster, UserKey] = getMaster(UserId);
-        const UserAvatar = createUserAvatarURL(event.author.id);
+        if (event?.author?.bot) {
+            return;
+        }
+        const msg = getMessageContent(event);
+        const meta = getGroupMessageMeta(event);
         cbp.send(FormatEvent.create('message.create')
             .addPlatform({ Platform: platform, value: event, BotId: botId })
-            .addGuild({ GuildId: event.group_id, SpaceId: `GROUP:${event.group_id}` })
-            .addChannel({ ChannelId: event.group_id })
+            .addGuild({ GuildId: meta.groupId, SpaceId: `GROUP:${meta.groupId}` })
+            .addChannel({ ChannelId: meta.groupId })
             .addUser({
-            UserId: event.author.id,
-            UserKey,
-            UserAvatar: UserAvatar,
-            UserName: event?.author?.username,
-            IsMaster: isMaster,
+            UserId: meta.UserId,
+            UserKey: meta.UserKey,
+            UserAvatar: meta.UserAvatar,
+            UserName: meta.UserName,
+            IsMaster: meta.isMaster,
             IsBot: false
         })
-            .addMessage({ MessageId: event.id })
-            .addText({ MessageText: event.content?.trim() })
-            .addOpen({ OpenId: `C2C:${event.author.member_openid}` })
+            .addMessage({ MessageId: meta.messageId })
+            .addText({ MessageText: msg?.trim() })
+            .addOpen({ OpenId: meta.openId })
             .add({ tag: 'GROUP_AT_MESSAGE_CREATE' }).value);
     });
     client.on('C2C_MESSAGE_CREATE', event => {
@@ -395,6 +448,28 @@ const register = (client) => {
             .addMessage({ MessageId: `group_msg_reject_${event.group_openid}_${event.timestamp}` })
             .add({ tag: 'GROUP_MSG_REJECT' }).value);
     });
+    client.on('MESSAGE_AUDIT_PASS', event => {
+        const meta = getGroupAuditMeta(event);
+        cbp.send(FormatEvent.create('notice.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: meta.groupId, SpaceId: `GROUP:${meta.groupId}` })
+            .addChannel({ ChannelId: meta.groupId })
+            .addUser({ UserId: '', UserKey: '', IsMaster: false, IsBot: false })
+            .addMessage({ MessageId: meta.messageId })
+            .addText({ MessageText: meta.auditTime })
+            .add({ tag: 'MESSAGE_AUDIT_PASS' }).value);
+    });
+    client.on('MESSAGE_AUDIT_REJECT', event => {
+        const meta = getGroupAuditMeta(event);
+        cbp.send(FormatEvent.create('notice.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: meta.groupId, SpaceId: `GROUP:${meta.groupId}` })
+            .addChannel({ ChannelId: meta.groupId })
+            .addUser({ UserId: '', UserKey: '', IsMaster: false, IsBot: false })
+            .addMessage({ MessageId: meta.messageId })
+            .addText({ MessageText: meta.auditTime })
+            .add({ tag: 'MESSAGE_AUDIT_REJECT' }).value);
+    });
     client.on('C2C_MSG_RECEIVE', event => {
         cbp.send(FormatEvent.create('private.notice.create')
             .addPlatform({ Platform: platform, value: event, BotId: botId })
@@ -460,6 +535,9 @@ const register = (client) => {
                 if (tag === 'GROUP_AT_MESSAGE_CREATE') {
                     return await GROUP_AT_MESSAGE_CREATE(client, event, val);
                 }
+                if (tag === 'GROUP_MESSAGE_CREATE') {
+                    return await GROUP_AT_MESSAGE_CREATE(client, event, val);
+                }
                 if (tag === 'C2C_MESSAGE_CREATE') {
                     return await C2C_MESSAGE_CREATE(client, event, val);
                 }
@@ -485,13 +563,9 @@ const register = (client) => {
             },
             mention: event => {
                 const value = event.value || {};
-                const tag = event._tag;
                 const Metions = [];
-                if (tag === 'GROUP_AT_MESSAGE_CREATE' || tag === 'C2C_MESSAGE_CREATE') {
-                    return new Promise(resolve => resolve(Metions));
-                }
                 if (value.mentions) {
-                    const mentions = event.value['mentions'];
+                    const mentions = (event.value['mentions'] || []);
                     const MessageMention = mentions.map(item => {
                         const UserId = item.id;
                         const [isMaster, UserKey] = getMaster(UserId);
@@ -499,7 +573,7 @@ const register = (client) => {
                             UserId: item.id,
                             IsMaster: isMaster,
                             UserName: item.username,
-                            IsBot: item.bot,
+                            IsBot: item.bot ?? false,
                             UserKey: UserKey
                         };
                     });

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

@@ -3,9 +3,12 @@ import { C2C_MSG_REJECT_TYPE } from '../message/group/C2C_MSG_REJECT';
 import { C2C_MSG_RECEIVE_TYPE } from '../message/group/C2C_MSG_RECEIVE';
 import { GROUP_ADD_ROBOT_TYPE } from '../message/group/GROUP_ADD_ROBOT';
 import { GROUP_AT_MESSAGE_CREATE_TYPE } from '../message/group/GROUP_AT_MESSAGE_CREATE';
+import { GROUP_MESSAGE_CREATE_TYPE } from '../message/group/GROUP_MESSAGE_CREATE';
 import { GROUP_DEL_ROBOT_TYPE } from '../message/group/GROUP_DEL_ROBOT';
 import { GROUP_MSG_RECEIVE_TYPE } from '../message/group/GROUP_MSG_RECEIVE';
 import { GROUP_MSG_REJECT_TYPE } from '../message/group/GROUP_MSG_REJECT';
+import { MESSAGE_AUDIT_PASS_TYPE } from '../message/group/MESSAGE_AUDIT_PASS';
+import { MESSAGE_AUDIT_REJECT_TYPE } from '../message/group/MESSAGE_AUDIT_REJECT';
 import { FRIEND_ADD_TYPE } from '../message/group/FRIEND_ADD';
 import { FRIEND_DEL_TYPE } from '../message/group/FRIEND_DEL';
 import { ERROR_TYPE } from '../message/ERROR';
@@ -15,9 +18,12 @@ export type QQBotGroupEventMap = {
     C2C_MSG_RECEIVE: C2C_MSG_RECEIVE_TYPE;
     GROUP_ADD_ROBOT: GROUP_ADD_ROBOT_TYPE;
     GROUP_AT_MESSAGE_CREATE: GROUP_AT_MESSAGE_CREATE_TYPE;
+    GROUP_MESSAGE_CREATE: GROUP_MESSAGE_CREATE_TYPE;
     GROUP_DEL_ROBOT: GROUP_DEL_ROBOT_TYPE;
     GROUP_MSG_RECEIVE: GROUP_MSG_RECEIVE_TYPE;
     GROUP_MSG_REJECT: GROUP_MSG_REJECT_TYPE;
+    MESSAGE_AUDIT_PASS: MESSAGE_AUDIT_PASS_TYPE;
+    MESSAGE_AUDIT_REJECT: MESSAGE_AUDIT_REJECT_TYPE;
     FRIEND_ADD: FRIEND_ADD_TYPE;
     FRIEND_DEL: FRIEND_DEL_TYPE;
     ERROR: ERROR_TYPE;

package/lib/sends.js

@@ -17,6 +17,7 @@ const createButtonsData = (rows, startId = 0) => {
                 id++;
                 const typing = options?.type ?? 'command';
                 const typeMap = { command: 2, link: 0, call: 1 };
+                const rowData = options?.rawData ?? {};
                 return {
                     id: String(id),
                     render_data: {
@@ -27,14 +28,15 @@ const createButtonsData = (rows, startId = 0) => {
                     action: {
                         type: typeMap[typing],
                         permission: {
-                            type: typeof options.permission?.type === 'undefined' ? 2 : options.permission.type,
-                            specify_user_ids: options.permission.userIds,
-                            specify_role_ids: options.permission.roleIds
+                            type: typeof options.permission?.type === 'undefined' ? 2 : options?.permission?.type,
+                            specify_user_ids: options?.permission?.userIds,
+                            specify_role_ids: options?.permission?.roleIds
                         },
                         unsupport_tips: options?.toolTip ?? '',
                         data: options?.data ?? '',
                         at_bot_show_channel_list: false,
-                        enter: options?.autoEnter ?? false
+                        enter: options?.autoEnter ?? false,
+                        ...rowData
                     }
                 };
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",