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

Fix image extension "null" received from some official clients

Browse Source
This commit is contained in:
Him188 2021-01-29 11:38:43 +08:00
parent f18aecbbc1
commit df3cc8457d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,12 @@ internal class OnlineGroupImageImpl(
override val imageId: String = generateImageId( override val imageId: String = generateImageId(
delegate.picMd5, delegate.picMd5,
delegate.filePath.substringAfterLast('.') delegate.filePath.substringAfterLast('.').toLowerCase().let { ext ->
if (ext == "null") {
// official clients might send `null`
getImageType(delegate.imageType)
} else ext
}
).takeIf { ).takeIf {
IMAGE_ID_REGEX.matches(it) IMAGE_ID_REGEX.matches(it)
} ?: generateImageId(delegate.picMd5) } ?: generateImageId(delegate.picMd5)