From df3cc8457d96df412e85124b9a166fbeb3418467 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 29 Jan 2021 11:38:43 +0800
Subject: [PATCH] Fix image extension "null" received from some official
 clients

---
 mirai-core/src/commonMain/kotlin/message/imagesImpl.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt b/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
index 49409cee5..d385e1f41 100644
--- a/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
+++ b/mirai-core/src/commonMain/kotlin/message/imagesImpl.kt
@@ -36,7 +36,12 @@ internal class OnlineGroupImageImpl(
 
     override val imageId: String = generateImageId(
         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 {
         IMAGE_ID_REGEX.matches(it)
     } ?: generateImageId(delegate.picMd5)