From 5176e7233c097e55809641982ac30e05ab495fed Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Wed, 22 Jan 2025 05:00:31 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/client/NapCatClient/convert.ts | 2 +-
 main/src/helpers/forwardHelper.ts       | 3 ---
 main/src/services/ForwardService.ts     | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/main/src/client/NapCatClient/convert.ts b/main/src/client/NapCatClient/convert.ts
index 8a6fe48..b62da41 100644
--- a/main/src/client/NapCatClient/convert.ts
+++ b/main/src/client/NapCatClient/convert.ts
@@ -67,7 +67,7 @@ export const messageElemToNapCatSendable = async (elem: SendableElem): Promise<{
             file: elem.file,
             summary: ('brief' in elem && elem.brief) || env.IMAGE_SUMMARY || (`[Q2TG ${elem.type}]`),
             name: elem.type,
-            sub_type: ('asface' in elem && elem.asface) ? 1 : 0,
+            sub_type: ('asface' in elem && elem.asface) ? 7 : 0,
           },
         } as any,
         tempFiles,
diff --git a/main/src/helpers/forwardHelper.ts b/main/src/helpers/forwardHelper.ts
index 2fe70b5..5922b10 100644
--- a/main/src/helpers/forwardHelper.ts
+++ b/main/src/helpers/forwardHelper.ts
@@ -210,9 +210,6 @@ export default {
     else {
       res = '未知';
     }
-    if (res.length > 25) {
-      res = res.slice(0, 25) + '…';
-    }
     return res;
   },
 
diff --git a/main/src/services/ForwardService.ts b/main/src/services/ForwardService.ts
index c2c27f0..bd8b347 100644
--- a/main/src/services/ForwardService.ts
+++ b/main/src/services/ForwardService.ts
@@ -721,7 +721,7 @@ export default class ForwardService {
       if (senderId === pair.tgId && !message.sender) {
         userDisplayName = helper.getUserDisplayName(message.chat);
       }
-      let messageHeader = userDisplayName +
+      let messageHeader = (userDisplayName.length > 25 ? userDisplayName.substring(0, 25) + '…' : userDisplayName) +
         (message.forward ? ' 转发自 ' +
           // 要是隐私设置了，应该会有这个，然后下面两个都获取不到
           (message.fwdFrom?.fromName ||