github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-21 07:56:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix message rendering error with not-head QuoteReply; fix #1451

Browse Source
This commit is contained in:
Karlatemp 2021-07-31 19:17:48 +08:00
parent 4a2b8ac92c
commit f95482989d
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mirai-core/src/commonMain/kotlin/message/messageToElems.kt
View File

@ -40,13 +40,6 @@ internal fun MessageChain.toRichTextElems(
val forGroup = messageTarget is Group
val elements = ArrayList<ImMsgBody.Elem>(this.size)
if (this.anyIsInstance<QuoteReply>()) {
when (val source = this[QuoteReply]!!.source) {
is MessageSourceInternal -> elements.add(ImMsgBody.Elem(srcMsg = source.toJceData()))
else -> error("unsupported MessageSource implementation: ${source::class.simpleName}. Don't implement your own MessageSource.")
}
}
var longTextResId: String? = null
fun transformOneMessage(currentMessage: Message) {
@ -189,19 +182,7 @@ internal fun MessageChain.toRichTextElems(
ImMsgBody.Elem(face = currentMessage.toJceData())
}
)
is QuoteReply -> {
if (forGroup) {
when (val source = currentMessage.source) {
is OnlineMessageSource.Incoming.FromGroup -> {
val sender0 = source.sender
if (sender0 !is AnonymousMember)
transformOneMessage(At(sender0))
// transformOneMessage(PlainText(" "))
// removed by https://github.com/mamoe/mirai/issues/524
// 发送 QuoteReply 消息时无可避免的产生多余空格 #524
}
}
}
is QuoteReply -> { // transformed
}
is Dice -> transformOneMessage(MarketFaceImpl(currentMessage.toJceStruct()))
is MarketFace -> {
@ -255,6 +236,26 @@ internal fun MessageChain.toRichTextElems(
}
}
}
if (this.anyIsInstance<QuoteReply>()) {
when (val source = this[QuoteReply]!!.source) {
is MessageSourceInternal -> {
elements.add(ImMsgBody.Elem(srcMsg = source.toJceData()))
if (forGroup) {
if (source is OnlineMessageSource.Incoming.FromGroup) {
val sender0 = source.sender
if (sender0 !is AnonymousMember)
transformOneMessage(At(sender0))
// transformOneMessage(PlainText(" "))
// removed by https://github.com/mamoe/mirai/issues/524
// 发送 QuoteReply 消息时无可避免的产生多余空格 #524
}
}
}
else -> error("unsupported MessageSource implementation: ${source::class.simpleName}. Don't implement your own MessageSource.")
}
}
this.forEach(::transformOneMessage)
if (withGeneralFlags) {