fix: 回复的时候冒出一个 QQ 号

main/src/services/ForwardService.ts

@@ -705,10 +705,11 @@ export default class ForwardService {
 
       // 处理回复
       let source: Quotable;
-      if (message.replyToMsgId) {
+      if (message.replyToMsgId || message.replyTo) {
         markdownCompatible = false;
         try {
-          const quote = await db.message.findFirst({
+          console.log(message.replyTo)
+          const quote = message.replyToMsgId && await db.message.findFirst({
             where: {
               tgChatId: Number(pair.tg.id),
               tgMsgId: message.replyToMsgId,
@@ -717,7 +718,7 @@ export default class ForwardService {
           });
           if (quote) {
             source = {
-              message: quote.brief || ' ',
+              message: message.replyTo?.quoteText || quote.brief || ' ',
               seq: quote.seq,
               rand: Number(quote.rand),
               user_id: Number(quote.qqSenderId),
@@ -726,7 +727,7 @@ export default class ForwardService {
           }
           else {
             source = {
-              message: '回复消息找不到',
+              message: message.replyTo?.quoteText || '回复消息找不到',
               seq: 1,
               time: Math.floor(new Date().getTime() / 1000),
               rand: 1,

patches/@icqqjs__icqq@1.2.0.patch

@@ -38,7 +38,7 @@ index ee137c44c92b947dcc7d851bb04f319c9a070f68..4bb7d5d082156f76974269e220051539
  }
  exports.getUserProfile = getUserProfile;
 diff --git a/lib/message/converter.js b/lib/message/converter.js
-index 27a659a3290fadd990a1a980918515a6ded4978f..d6156587a02b1ed441ac8d2a3e2104e6343306b2 100644
+index 27a659a3290fadd990a1a980918515a6ded4978f..e1bbe1470f302c30e7adea92f433a6e3929064e3 100644
 --- a/lib/message/converter.js
 +++ b/lib/message/converter.js
 @@ -111,7 +111,7 @@ class Converter {
@@ -58,3 +58,14 @@ index 27a659a3290fadd990a1a980918515a6ded4978f..d6156587a02b1ed441ac8d2a3e2104e6
          if (dummy)
              return this._text(display);
          const buf = Buffer.allocUnsafe(6);
+@@ -535,10 +534,6 @@ class Converter {
+     quote(source) {
+         const elems = new Converter(source.message || "", this.ext).elems;
+         const tmp = this.brief;
+-        if (!this.ext?.dm) {
+-            this.at({ type: "at", qq: source.user_id });
+-            this.elems.unshift(this.elems.pop());
+-        }
+         this.elems.unshift({
+             45: {
+                 1: [source.seq],

pnpm-lock.yaml

@@ -6,7 +6,7 @@ settings:
 
 patchedDependencies:
   '@icqqjs/icqq@1.2.0':
-    hash: wkoe3yspe5fefr6roinm5qebhu
+    hash: b62fm7z6sx5w22w3vrzouur4ai
     path: patches/@icqqjs__icqq@1.2.0.patch
 
 importers:
@@ -27,7 +27,7 @@ importers:
         version: 7.0.3
       '@icqqjs/icqq':
         specifier: 1.2.0
-        version: 1.2.0(patch_hash=wkoe3yspe5fefr6roinm5qebhu)
+        version: 1.2.0(patch_hash=b62fm7z6sx5w22w3vrzouur4ai)
       '@prisma/client':
         specifier: 5.13.0
         version: 5.13.0(prisma@5.13.0)
@@ -102,7 +102,7 @@ importers:
         version: 0.2.2
       telegram:
         specifier: https://github.com/clansty/gramjs/releases/download/2.19.10%2Brevert_media/telegram-2.19.10.tgz
-        version: '@github.com/clansty/gramjs/releases/download/2.19.10%252525252525252Brevert_media/telegram-2.19.10.tgz'
+        version: '@github.com/clansty/gramjs/releases/download/2.19.10%25252525252525252Brevert_media/telegram-2.19.10.tgz'
       tmp-promise:
         specifier: ^3.0.3
         version: 3.0.3
@@ -805,7 +805,7 @@ packages:
       glob: 10.3.12
     dev: false
 
-  /@icqqjs/icqq@1.2.0(patch_hash=wkoe3yspe5fefr6roinm5qebhu):
+  /@icqqjs/icqq@1.2.0(patch_hash=b62fm7z6sx5w22w3vrzouur4ai):
     resolution: {integrity: sha512-/BypCM8jlQC2OtoyVuf6aYuMBNJ122zez5gt4MOTsEetCrouxX1zVE2yGv6bbAOkzFA4JuMnwrIJL+pr2hP2ag==, tarball: https://npm.pkg.github.com/download/@icqqjs/icqq/1.2.0/a2f26dae19b894a37865e730fc639e251f169d17}
     engines: {node: '>= v14'}
     dependencies:
@@ -5747,7 +5747,7 @@ packages:
       - utf-8-validate
     dev: false
 
-  '@github.com/clansty/gramjs/releases/download/2.19.10%252525252525252Brevert_media/telegram-2.19.10.tgz':
+  '@github.com/clansty/gramjs/releases/download/2.19.10%25252525252525252Brevert_media/telegram-2.19.10.tgz':
     resolution: {tarball: https://github.com/clansty/gramjs/releases/download/2.19.10%2Brevert_media/telegram-2.19.10.tgz}
     name: telegram
     version: 2.19.10