fix(qq): fix msg_seq with active mesage

satorijs · Nov 25, 2023 · db2285f · db2285f
1 parent 1d830da
commit db2285f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/adapters/dingtalk/package.json b/adapters/dingtalk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-dingtalk",
   "description": "DingTalk (钉钉) Adapter for Satorijs",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

diff --git a/adapters/qq/package.json b/adapters/qq/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-qq",
   "description": "QQ Adapter for Satorijs",
-  "version": "4.1.10",
+  "version": "4.1.12",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts
@@ -151,23 +151,24 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
   private content: string = ''
   private useMarkdown = false
   private rows: QQ.Button[][] = []
-  private attachedFile: QQ.SendFileResponse;
+  private attachedFile: QQ.SendFileResponse
+
   // 先图后文
   async flush() {
     if (!this.content.trim() && !this.rows.flat().length && !this.attachedFile) return
     this.trimButtons()
-    this.options.session['seq'] ||= 0
-    let msg_id = this.options?.session?.messageId, msg_seq: number = ++this.options.session['seq']
-    if (this.options?.session && (Date.now() - this.options?.session?.timestamp) > MSG_TIMEOUT) {
-      msg_id = null
-      msg_seq = null
+    let msg_id: string, msg_seq: number
+    if (this.options?.session?.messageId && Date.now() - this.options.session.timestamp < MSG_TIMEOUT) {
+      this.options.session['seq'] ||= 0
+      msg_id = this.options.session.messageId
+      msg_seq = ++this.options.session['seq']
     }
     const data: QQ.SendMessageParams = {
       content: this.content,
       msg_type: QQ.MessageType.TEXT,
       timestamp: Math.floor(Date.now() / 1000),
       msg_id,
-      msg_seq
+      msg_seq,
     }
     if (this.attachedFile) {
       if (!data.content.length) data.content = ' '