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

Fix display of ForwardMessage

Browse Source
This commit is contained in:
Karlatemp 2021-02-01 10:47:31 +08:00
parent 8bef20bf9d
commit 8e784c383e
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt
View File

@ -65,6 +65,13 @@ internal abstract class SendMessageHandler<C : Contact> {
groupCard = senderName // Cinnamon groupCard = senderName // Cinnamon
) else null ) else null
// For ForwardMessage display
val ForwardMessage.INode.groupInfo: MsgComm.GroupInfo
get() = MsgComm.GroupInfo(
groupCode = if (isToGroup) targetGroupCode!! else 0,
groupCard = senderName
)
val isToGroup: Boolean get() = contact is Group val isToGroup: Boolean get() = contact is Group
suspend fun MessageChain.convertToLongMessageIfNeeded( suspend fun MessageChain.convertToLongMessageIfNeeded(

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/MultiMsg.kt
View File

@ -62,7 +62,7 @@ internal fun Collection<ForwardMessage.INode>.calculateValidationData(
msgId = 1 msgId = 1
), ),
msgType = 82, // troop msgType = 82, // troop
groupInfo = handler.groupInfo, groupInfo = handler.run { chain.groupInfo },
isSrcMsg = false isSrcMsg = false
), ),
msgBody = ImMsgBody.MsgBody( msgBody = ImMsgBody.MsgBody(