Commit 437f9db5 authored by Him188's avatar Him188

Unified Image suffix: .mirai

parent 5ad5c17a
......@@ -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>()
......
......@@ -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)
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment