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

Fix image extension. fix #635

Browse Source
This commit is contained in:
Karlatemp 2020-12-01 22:40:19 +08:00
parent 6cfd602570
commit d1bd88c001
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ public class ExternalImage internal constructor(
return "ExternalImage(${generateUUID(md5)})" return "ExternalImage(${generateUUID(md5)})"
} }
internal fun calculateImageResourceId(): String = generateImageId(md5) internal fun calculateImageResourceId(): String = """{${generateUUID(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

@ -26,7 +26,10 @@ internal class OnlineGroupImageImpl(
internal val delegate: ImMsgBody.CustomFace internal val delegate: ImMsgBody.CustomFace
) : @Suppress("DEPRECATION") ) : @Suppress("DEPRECATION")
OnlineGroupImage() { OnlineGroupImage() {
override val imageId: String = ExternalImage.generateImageId(delegate.md5) override val imageId: String = delegate.filePath.takeIf {
GROUP_IMAGE_ID_REGEX.matches(it)
} ?: ExternalImage.generateImageId(delegate.md5)
override val originUrl: String override val originUrl: String
get() = if (delegate.origUrl.isBlank()) { get() = if (delegate.origUrl.isBlank()) {
"http://gchat.qpic.cn/gchatpic_new/0/0-0-${ "http://gchat.qpic.cn/gchatpic_new/0/0-0-${