From b4251e5145ab50cdf7411666ea5ed96eac90897a Mon Sep 17 00:00:00 2001 From: idranme <96647698+idranme@users.noreply.github.com> Date: Wed, 31 Jul 2024 03:01:23 +0000 Subject: [PATCH] fix(qq): audit --- adapters/qq/src/internal/group.ts | 12 ++++-------- adapters/qq/src/message.ts | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/adapters/qq/src/internal/group.ts b/adapters/qq/src/internal/group.ts index 99b5184e..1ff3a181 100644 --- a/adapters/qq/src/internal/group.ts +++ b/adapters/qq/src/internal/group.ts @@ -6,18 +6,14 @@ declare module './internal' { sendMessage(channel_id: string, data: QQ.Message.Request): Promise<{ id: string timestamp: string - } & { - code: number - message: string - data: any + audit_id?: string + audit_tips?: string }> sendPrivateMessage(openid: string, data: QQ.Message.Request): Promise<{ id: string timestamp: string - } & { - code: number - message: string - data: any + audit_id?: string + audit_tips?: string }> sendFilePrivate(openid: string, data: QQ.Message.File.Request): Promise sendFileGuild(group_openid: string, data: QQ.Message.File.Request): Promise diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts index 81d626d9..321895a4 100644 --- a/adapters/qq/src/message.ts +++ b/adapters/qq/src/message.ts @@ -248,16 +248,16 @@ export class QQMessageEncoder extends MessageEncode const resp = this.session.isDirect ? await this.bot.internal.sendPrivateMessage(this.session.channelId, data) : await this.bot.internal.sendMessage(this.session.channelId, data) - if (resp.id) { + if (resp.id && !resp.audit_id) { session.messageId = resp.id session.timestamp = new Date(resp.timestamp).valueOf() session.channelId = this.session.channelId session.guildId = this.session.guildId session.app.emit(session, 'send', session) this.results.push(session.event.message) - } else if (resp.code === 304023 && this.bot.config.intents & QQ.Intents.MESSAGE_AUDIT) { + } else if (resp.audit_id && this.bot.config.intents & QQ.Intents.MESSAGE_AUDIT) { try { - const auditData: QQ.MessageAudited = await this.audit(resp.data.message_audit.audit_id) + const auditData: QQ.MessageAudited = await this.audit(resp.audit_id) session.messageId = auditData.message_id session.app.emit(session, 'send', session) this.results.push(session.event.message)