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

Fix forward display (#1148)

Browse Source
This commit is contained in:
Karlatemp 2021-04-03 22:12:14 +08:00 committed by GitHub
parent f4c1b0af12
commit 6e914f6941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -711,10 +711,9 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
it.messageChain.ensureSequenceIdAvailable()
}
val sequenceId = client.atomicNextMessageSequenceId()
val data = message.calculateValidationData(
sequenceId = sequenceId,
client = client,
random = Random.nextInt().absoluteValue,
sendMessageHandler,
isLong,

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

@ -14,6 +14,7 @@ package net.mamoe.mirai.internal.network.protocol.packet.chat
import kotlinx.io.core.ByteReadPacket
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.contact.SendMessageHandler
import net.mamoe.mirai.internal.message.MessageSourceInternal
import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.message.toRichTextElems
import net.mamoe.mirai.internal.network.Packet
@ -31,6 +32,7 @@ import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
import net.mamoe.mirai.internal.utils.io.serialization.toByteArray
import net.mamoe.mirai.internal.utils.io.serialization.writeProtoBuf
import net.mamoe.mirai.message.data.ForwardMessage
import net.mamoe.mirai.message.data.MessageSource
import net.mamoe.mirai.message.data.toMessageChain
import net.mamoe.mirai.utils.gzip
import net.mamoe.mirai.utils.md5
@ -46,17 +48,31 @@ internal class MessageValidationData(
}
internal fun Collection<ForwardMessage.INode>.calculateValidationData(
sequenceId: Int,
client: QQAndroidClient,
random: Int,
handler: SendMessageHandler<*>,
isLong: Boolean,
): MessageValidationData {
val offeredSourceIds = mutableSetOf<Int>()
fun calculateMsgSeq(node: ForwardMessage.INode): Int {
node.messageChain[MessageSource]?.let { source ->
source as MessageSourceInternal
val sid = source.sequenceIds.first()
// Duplicate message added
if (offeredSourceIds.add(sid)) {
return sid
}
}
return client.atomicNextMessageSequenceId()
}
val msgList = map { chain ->
MsgComm.Msg(
msgHead = MsgComm.MsgHead(
fromUin = chain.senderId,
toUin = if (isLong) { handler.targetUserUin ?: 0 } else 0,
msgSeq = sequenceId,
msgSeq = calculateMsgSeq(chain),
msgTime = chain.time,
msgUid = 0x01000000000000000L or random.toLongUnsigned(),
mutiltransHead = MsgComm.MutilTransHead(