github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-20 22:37:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct format name of GroupImage

Browse Source
This commit is contained in:
Karlatemp 2020-12-13 11:39:54 +08:00
parent 0897d0cd7e
commit 0a5d3097f7
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-core-api/src/commonMain/kotlin/utils/ExternalImage.kt
View File

@ -73,8 +73,9 @@ public class ExternalImage internal constructor(
} }
@MiraiExperimentalApi @MiraiExperimentalApi
public fun generateImageId(md5: ByteArray): String { @JvmOverloads
return """{${generateUUID(md5)}}.$defaultFormatName""" public fun generateImageId(md5: ByteArray, format: String = defaultFormatName): String {
return """{${generateUUID(md5)}}.$format"""
} }
} }
@ -87,7 +88,7 @@ public class ExternalImage internal constructor(
return "ExternalImage(${generateUUID(md5)})" return "ExternalImage(${generateUUID(md5)})"
} }
internal fun calculateImageResourceId(): String = """{${generateUUID(md5)}}.$formatName""" internal fun calculateImageResourceId(): String = generateImageId(md5, formatName)
private fun String.detectFormatName(): String = when { private fun String.detectFormatName(): String = when {
startsWith("FFD8") -> "jpg" startsWith("FFD8") -> "jpg"

5
mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
View File

@ -32,7 +32,10 @@ internal class OnlineGroupImageImpl(
internal val delegate: ImMsgBody.CustomFace internal val delegate: ImMsgBody.CustomFace
) : @Suppress("DEPRECATION") ) : @Suppress("DEPRECATION")
OnlineGroupImage() { OnlineGroupImage() {
override val imageId: String = delegate.filePath.takeIf { override val imageId: String = ExternalImage.generateImageId(
delegate.md5,
delegate.filePath.substringAfterLast('.')
).takeIf {
GROUP_IMAGE_ID_REGEX.matches(it) GROUP_IMAGE_ID_REGEX.matches(it)
} ?: ExternalImage.generateImageId(delegate.md5) } ?: ExternalImage.generateImageId(delegate.md5)