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

[core] Fix ForwardMessage rendering on iOS; fix #1575

Browse Source
This commit is contained in:
Karlatemp 2022-12-15 00:21:47 +08:00
parent 3abef93fd8
commit d9f3fe616c
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/commonMain/kotlin/message/data/MultiMsgUploader.kt
View File

@ -11,10 +11,8 @@ package net.mamoe.mirai.internal.message.data
import net.mamoe.mirai.contact.Contact
import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.internal.contact.groupCode
import net.mamoe.mirai.internal.contact.impl
import net.mamoe.mirai.internal.contact.uin
import net.mamoe.mirai.internal.contact.userIdOrNull
import net.mamoe.mirai.internal.message.protocol.MessageProtocolFacade
import net.mamoe.mirai.internal.message.source.MessageSourceInternal
import net.mamoe.mirai.internal.network.QQAndroidClient
@ -248,15 +246,14 @@ internal open class MultiMsgUploader(
}
}
}
val isToGroup = contact is Group
// Step6: Convert
pendingMessages.forEach { pm ->
val msg0 = MsgComm.Msg(
msgHead = MsgComm.MsgHead(
fromUin = pm.msg.senderId,
fromNick = pm.msg.senderName,
toUin = if (isLong) {
contact.userIdOrNull ?: 0
} else 0,
msgSeq = pm.seq,
msgTime = pm.msg.time,
msgUid = 0x01000000000000000L or pm.uid.toLongUnsigned(),
@ -264,11 +261,16 @@ internal open class MultiMsgUploader(
status = 0,
msgId = 1,
),
msgType = 82, // troop,
groupInfo = MsgComm.GroupInfo(
groupCode = if (contact is Group) contact.groupCode else 0L,
msgType = if (isToGroup) {
82 // troop
} else {
9 // c2c
},
c2cCmd = if (isToGroup) 0 else 11,
groupInfo = if (isToGroup) MsgComm.GroupInfo(
groupCode = contact.id,
groupCard = pm.msg.senderName, // Cinnamon
),
) else null,
isSrcMsg = false,
), msgBody = ImMsgBody.MsgBody(
richText = ImMsgBody.RichText(