fix sendPrivateMessage result

satorijs · Jul 10, 2024 · f69e005 · f69e005
1 parent 7c4e396
commit f69e005
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/adapters/qq/src/internal/group.ts b/adapters/qq/src/internal/group.ts
@@ -11,7 +11,14 @@ declare module './internal' {
       message: string
       data: any
     }>
-    sendPrivateMessage(openid: string, data: QQ.Message.Request): Promise<any>
+    sendPrivateMessage(openid: string, data: QQ.Message.Request): Promise<{
+      id: string
+      timestamp: string
+    } & {
+      code: number
+      message: string
+      data: any
+    }>
     sendFilePrivate(openid: string, data: QQ.Message.File.Request): Promise<any>
     sendFileGuild(group_openid: string, data: QQ.Message.File.Request): Promise<any>
     acknowledgeInteraction(interaction_id: string, data: {

diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts
@@ -245,27 +245,24 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
     session.type = 'send'
     const send = async () => {
       try {
-        if (this.session.isDirect) {
-          const { sendResult: { msg_id } } = await this.bot.internal.sendPrivateMessage(this.session.channelId, data)
-          session.messageId = msg_id
-        } else {
-          const resp = await this.bot.internal.sendMessage(this.session.channelId, data)
-          if (resp.id) {
-            session.messageId = resp.id
-            session.timestamp = new Date(resp.timestamp).valueOf()
-            session.channelId = this.session.channelId
-            session.guildId = this.session.guildId
+        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) {
+          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) {
+          try {
+            const auditData: QQ.MessageAudited = await this.audit(resp.data.message_audit.audit_id)
+            session.messageId = auditData.message_id
             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) {
-            try {
-              const auditData: QQ.MessageAudited = await this.audit(resp.data.message_audit.audit_id)
-              session.messageId = auditData.message_id
-              session.app.emit(session, 'send', session)
-              this.results.push(session.event.message)
-            } catch (e) {
-              this.bot.logger.error(e)
-            }
+          } catch (e) {
+            this.bot.logger.error(e)
           }
         }
       } catch (e) {