Bladeren bron

Unified Image suffix: .mirai

Him188 5 jaren geleden
bovenliggende
commit
437f9db575

+ 1 - 1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/FriendImpl.kt

@@ -91,7 +91,7 @@ internal class FriendImpl(
                     fileId = 0,
                     fileMd5 = image.md5,
                     fileSize = image.inputSize.toInt(),
-                    fileName = image.md5.toUHexString("") + ".gif",
+                    fileName = image.md5.toUHexString("") + "." + ExternalImage.defaultFormatName,
                     imgOriginal = 1
                 )
             ).sendAndExpect<LongConn.OffPicUp.Response>()

+ 5 - 4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt

@@ -67,12 +67,15 @@ class ExternalImage private constructor(
     }
 
     companion object {
+        const val defaultFormatName = "mirai"
+
+
         fun generateUUID(md5: ByteArray): String {
             return "${md5[0, 3]}-${md5[4, 5]}-${md5[6, 7]}-${md5[8, 9]}-${md5[10, 15]}"
         }
 
         fun generateImageId(md5: ByteArray): String {
-            return """{${generateUUID(md5)}}.gif"""
+            return """{${generateUUID(md5)}}.$defaultFormatName"""
         }
     }
 
@@ -90,9 +93,7 @@ class ExternalImage private constructor(
 
     override fun toString(): String = "[ExternalImage(${generateUUID(md5)})]"
 
-    fun calculateImageResourceId(): String {
-        return "{${generateUUID(md5)}}.gif"
-    }
+    fun calculateImageResourceId(): String = generateImageId(md5)
 }
 
 /**