fix: 使用 richHeader 之后无法 /q 来自 QQ 的消息

只对新的消息有效

prisma/schema.prisma

@@ -76,6 +76,7 @@ model Message {
   tgMessageText  String?
   nick           String? // /抱 的时候会用到
   tgSenderId     BigInt?  @db.BigInt
+  richHeaderUsed Boolean  @default(false)
 
   @@index([qqRoomId, qqSenderId, seq, rand, pktnum, time, instanceId])
   @@index([tgChatId, tgMsgId, instanceId])

src/controllers/ForwardController.ts

@@ -61,12 +61,8 @@ export default class ForwardController {
       });
       if (existed) return;
       // 开始转发过程
-      let tgMessages: Api.Message | Api.Message[] = await this.forwardService.forwardFromQq(event, pair);
+      let { tgMessage, richHeaderUsed } = await this.forwardService.forwardFromQq(event, pair);
-      if (!tgMessages) return;
+      if (!tgMessage) return;
-      if (!Array.isArray(tgMessages)) {
-        tgMessages = [tgMessages];
-      }
-      for (const tgMessage of tgMessages) {
       // 更新数据库
       await db.message.create({
         data: {
@@ -84,6 +80,7 @@ export default class ForwardController {
           tgFileId: forwardHelper.getMessageDocumentId(tgMessage),
           nick: event.nickname,
           tgSenderId: BigInt(this.tgBot.me.id.toString()),
+          richHeaderUsed,
         },
       });
       await this.forwardService.addToZinc(pair.dbId, tgMessage.id, {
@@ -91,7 +88,6 @@ export default class ForwardController {
         nick: event.nickname,
       });
     }
-    }
     catch (e) {
       this.log.error('处理 QQ 消息时遇到问题', e);
     }

src/controllers/QuotLyController.ts

@@ -163,7 +163,7 @@ export default class {
         title: message.nick,
         photo: { url: getAvatarUrl(message.qqSenderId) },
       };
-      if (message.qqRoomId > 0) {
+      if (message.qqRoomId > 0 || message.richHeaderUsed) {
         quoteMessage.text = message.tgMessageText;
       }
       else if (message.tgMessageText.includes('\n')) {

src/services/ForwardService.ts

@@ -430,7 +430,7 @@ export default class ForwardService {
       }
 
       tempFiles.forEach(it => it.cleanup());
-      return tgMessage;
+      return { tgMessage, richHeaderUsed };
     }
     catch (e) {
       this.log.error('从 QQ 到 TG 的消息转发失败', e);
@@ -439,7 +439,7 @@ export default class ForwardService {
       }
       catch {
       }
-      return null;
+      return {};
     }
   }