From c071ac5773fb320e0e52649b54dc561b4d83e1f7 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 23 Mar 2021 23:57:20 +0800
Subject: [PATCH 1/2] Update docs of Nudge, clearification
---
.../src/commonMain/kotlin/message/action/Nudge.kt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt b/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
index 10a3fd627..869010e32 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
+++ b/mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
@@ -36,7 +36,7 @@ public sealed class Nudge {
public abstract val target: UserOrBot
/**
- * 发送戳一戳该成员的消息到 [receiver].
+ * 发送戳一戳消息到 [receiver].
*
* 需要 [使用协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE].
*
@@ -55,7 +55,7 @@ public sealed class Nudge {
public companion object {
/**
- * 发送戳一戳该成员的消息.
+ * 发送戳一戳消息.
*
* 需要 [使用协议][BotConfiguration.protocol] [MiraiProtocol.ANDROID_PHONE].
*
@@ -109,4 +109,4 @@ public data class FriendNudge(
*/
public data class StrangerNudge(
public override val target: Stranger
-) : UserNudge()
\ No newline at end of file
+) : UserNudge()
From a5e85f443e450a13b24c955823ab783fd36aa602 Mon Sep 17 00:00:00 2001
From: Karlatemp <karlatemp@vip.qq.com>
Date: Wed, 24 Mar 2021 23:59:38 +0800
Subject: [PATCH 2/2] Try fix forward message display (#1052)
fix https://github.com/mamoe/mirai/issues/1052#issuecomment-805600071
---
mirai-core/src/commonMain/kotlin/QQAndroidBot.kt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
index 7c701ac06..74b3a3630 100644
--- a/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
+++ b/mirai-core/src/commonMain/kotlin/QQAndroidBot.kt
@@ -208,7 +208,7 @@ internal fun RichMessage.Key.longMessage(brief: String, resId: String, timeSecon
</item>
<source name="聊天记录" icon="" action="" appid="-1"/>
</msg>
- """.trimIndent()
+ """.trimIndent().trim()
return LongMessageInternal(template, resId)
}
@@ -220,7 +220,7 @@ internal fun RichMessage.Key.forwardMessage(
forwardMessage: ForwardMessage,
): ForwardMessageInternal = with(forwardMessage) {
val template = """
- <?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
+ <?xml version="1.0" encoding="utf-8"?>
<msg serviceID="35" templateID="1" action="viewMultiMsg" brief="${brief.take(30)}"
m_resid="$resId" m_fileName="$timeSeconds"
tSum="3" sourceMsgId="0" url="" flag="3" adverSign="0" multiMsgFlag="0">
@@ -245,6 +245,6 @@ internal fun RichMessage.Key.forwardMessage(
</item>
<source name="${source.take(50)}" icon="" action="" appid="-1"/>
</msg>
- """.trimIndent().replace("\n", " ")
+ """.trimIndent().replace("\n", " ").trim()
return ForwardMessageInternal(template, resId)
}
\ No newline at end of file