Shamrock: Rollback 52ec43abf80d6595d1fe3b490ebe1bfc23bf0ab8 commit

Signed-off-by: 白池 <[email protected]>
whitechi73 · Feb 29, 2024 · 737acfa · 737acfa
1 parent 3619cba
commit 737acfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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=")) {