From 16195ca52bda4546766c68d540c185b3d4f469fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Wed, 20 Nov 2024 12:21:45 +0800
Subject: [PATCH] fix: old version handle

---
 src/core/apis/file.ts | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts
index 97f8c304b..6a3ee5500 100644
--- a/src/core/apis/file.ts
+++ b/src/core/apis/file.ts
@@ -412,15 +412,17 @@ export class NTQQFileApi {
         }
 
         const url: string = element.originImageUrl ?? '';
+
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
-
-        if (url) {
-            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+        const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+        const imageAppid = parsedUrl.searchParams.get('appid');
+        const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+        const imageFileId = parsedUrl.searchParams.get('fileid');
+        if (url && isNTV2 && imageFileId) {
             const rkeyData = await this.getRkeyData();
-            return this.getImageUrlFromParsedUrl(parsedUrl, rkeyData);
+            return this.getImageUrlFromParsedUrl(imageFileId, imageAppid, rkeyData);
         }
-
         return this.getImageUrlFromMd5(fileMd5, md5HexStr);
     }
 
@@ -462,19 +464,12 @@ export class NTQQFileApi {
         return rkeyData;
     }
 
-    private getImageUrlFromParsedUrl(parsedUrl: URL, rkeyData: any): string {
-        const imageAppid = parsedUrl.searchParams.get('appid');
-        const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
-        const imageFileId = parsedUrl.searchParams.get('fileid');
-        if (isNTV2 && rkeyData.online_rkey) {
-            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-            return IMAGE_HTTP_HOST_NT + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
-        } else if (isNTV2 && imageFileId) {
-            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-            return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
+    private getImageUrlFromParsedUrl(imageFileId: string, appid: string, rkeyData: any): string {
+        const rkey = appid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+        if (rkeyData.online_rkey) {
+            return IMAGE_HTTP_HOST_NT + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
         }
-
-        return '';
+        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
     }
 
     private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {