From 37ac7d8cbebf90e64c148d2d8d4d2aaf8fcb09d5 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 2 Nov 2019 01:29:04 +0800 Subject: [PATCH] Fix adjustImageId --- .../net.mamoe.mirai/message/internal/MessageDataInternal.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt index e9b4f1600..cbc2d302a 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt @@ -69,7 +69,8 @@ private operator fun String.get(range: IntRange) = this.substring(range) // 需要调整 {724D9512-2B54-EEAC-1E21-4AAAC37259DF}.gif private fun String.adjustImageId() = - "{${this[0..7]}-${this[8..11]}-${this[12..15]}-${this[16..19]}-${this[20..31]}}.${this.substringAfterLast(".")}" + if (this.first() == '{') this + else "{${this[0..7]}-${this[8..11]}-${this[12..15]}-${this[16..19]}-${this[20..31]}}.${this.substringAfterLast(".")}" internal fun ByteReadPacket.readMessage(): Message? { val messageType = this.readByte().toInt()