From 737acfa41becf08a7cc0b7b6f7b02c130c3c0489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E6=B1=A0?= <whitechi73@outlook.com>
Date: Thu, 29 Feb 2024 10:42:36 +0800
Subject: [PATCH] `Shamrock`: Rollback
 `52ec43abf80d6595d1fe3b490ebe1bfc23bf0ab8` commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 白池 <whitechi73@outlook.com>
---
 .../qqinterface/servlet/msg/converter/ElemConverter.kt      | 4 ++--
 .../fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/ElemConverter.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/ElemConverter.kt
index d0299e2..789b91c 100644
--- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/ElemConverter.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/ElemConverter.kt
@@ -119,7 +119,7 @@ internal object ElemConverter {
                 chatType = chatType,
                 size = customFace.size!!.toLong(),
                 sha = "",
-                fileId = customFace.fileUuid,
+                fileId = "",
                 storeId = 0,
             )
         )
@@ -162,7 +162,7 @@ internal object ElemConverter {
                 chatType = chatType,
                 size = notOnlineImage.fileLen!!.toLong(),
                 sha = "",
-                fileId = notOnlineImage.fileUuid,
+                fileId = "",
                 storeId = 0,
             )
         )
diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt
index cfb60c4..f37a6cc 100644
--- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt
@@ -160,7 +160,7 @@ internal object RichProtoSvc: BaseSvc() {
         width: UInt = 0u,
         height: UInt = 0u
     ): String {
-        val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download")
+        val isNtServer = originalUrl.startsWith("/download")
         val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC
         if (originalUrl.isNotEmpty()) {
             if (isNtServer && !originalUrl.contains("rkey=")) {
@@ -196,7 +196,7 @@ internal object RichProtoSvc: BaseSvc() {
         height: UInt = 0u,
         storeId: Int = 0
     ): String {
-        val isNtServer = storeId == 1 || !fileId.startsWith("/") || originalUrl.startsWith("/download")
+        val isNtServer = storeId == 1 || originalUrl.startsWith("/download")
         val domain = if (isNtServer) MULTIMEDIA_DOMAIN else C2C_PIC
         if (originalUrl.isNotEmpty()) {
             if (fileId.isNotEmpty()) getNtPicRKey(
@@ -238,7 +238,7 @@ internal object RichProtoSvc: BaseSvc() {
         width: UInt = 0u,
         height: UInt = 0u
     ): String {
-        val isNtServer = !fileId.startsWith("/") || originalUrl.startsWith("/download")
+        val isNtServer = originalUrl.startsWith("/download")
         val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC
         if (originalUrl.isNotEmpty()) {
             if (isNtServer && !originalUrl.contains("rkey=")) {