From 3ff7fa7db1069b5bde257ddfb25b9adb706f8e95 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 1 Feb 2021 13:14:42 +0800
Subject: [PATCH] Decode service message as LongMessageInternal or
ForwardMessageInternal if possible
---
.../src/commonMain/kotlin/message/conversions.kt | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/mirai-core/src/commonMain/kotlin/message/conversions.kt b/mirai-core/src/commonMain/kotlin/message/conversions.kt
index c3a8d10e4..b957d2a09 100644
--- a/mirai-core/src/commonMain/kotlin/message/conversions.kt
+++ b/mirai-core/src/commonMain/kotlin/message/conversions.kt
@@ -558,11 +558,9 @@ internal fun List<ImMsgBody.Elem>.joinToMessageChain(
val resId = this.firstIsInstanceOrNull<ImMsgBody.GeneralFlags>()?.longTextResid
if (resId != null) {
- // TODO: 2020/4/29 解析长消息
- list.add(SimpleServiceMessage(35, content)) // resId
+ list.add(LongMessageInternal(content, resId))
} else {
- // TODO: 2020/4/29 解析合并转发
- list.add(SimpleServiceMessage(35, content))
+ list.add(ForwardMessageInternal(content))
}
}
@@ -655,7 +653,10 @@ internal fun contextualBugReportException(
e: Throwable? = null,
additional: String = ""
): IllegalStateException {
- return IllegalStateException("在 $context 时遇到了意料之中的问题. 请完整复制此日志提交给 mirai: https://github.com/mamoe/mirai/issues/new $additional 调试信息: $forDebug", e)
+ return IllegalStateException(
+ "在 $context 时遇到了意料之中的问题. 请完整复制此日志提交给 mirai: https://github.com/mamoe/mirai/issues/new $additional 调试信息: $forDebug",
+ e
+ )
}
@OptIn(ExperimentalContracts::class)