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

[core] Try to fix rand id fetching

Browse Source
This commit is contained in:
Karlatemp 2023-02-18 23:44:48 +08:00
parent 00486e7900
commit 8c5a22a14e
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core/src/commonMain/kotlin/contact/roaming/AbstractRoamingMessages.kt
View File

@ -13,6 +13,7 @@ import net.mamoe.mirai.contact.Contact
import net.mamoe.mirai.contact.roaming.RoamingMessage
import net.mamoe.mirai.contact.roaming.RoamingMessages
import net.mamoe.mirai.internal.contact.AbstractContact
import net.mamoe.mirai.internal.message.source.decodeRandom
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgComm
import net.mamoe.mirai.utils.mapToIntArray
import net.mamoe.mirai.utils.toLongUnsigned
@ -31,7 +32,7 @@ internal abstract class AbstractRoamingMessages : RoamingMessages {
override val time: Long get() = message.msgHead.msgTime.toLongUnsigned()
override val ids: IntArray by lazy { messages.mapToIntArray { it.msgHead.msgSeq } }
override val internalIds: IntArray by lazy {
messages.mapToIntArray { it.msgBody.richText.attr?.random ?: 0 } // other client 消息的这个是0
messages.mapToIntArray { it.decodeRandom() }
}
}
}

19
mirai-core/src/commonMain/kotlin/message/source/incomingSourceImpl.kt
View File

@ -56,9 +56,7 @@ internal class OnlineMessageSourceFromFriendImpl(
override val isRecalledOrPlanned: Boolean get() = _isRecalledOrPlanned.value
override fun setRecalled(): Boolean = _isRecalledOrPlanned.compareAndSet(expect = false, update = true)
override val ids: IntArray get() = sequenceIds // msg.msgBody.richText.attr!!.random
override val internalIds: IntArray = msg.mapToIntArray {
it.msgBody.richText.attr?.random ?: 0
} // other client 消息的这个是0
override val internalIds: IntArray = msg.mapToIntArray { it.decodeRandom() }
override val time: Int = msg.first().msgHead.msgTime
override var originalMessageLazy = lazy {
msg.toMessageChainNoSource(bot, 0, MessageSourceKind.FRIEND)
@ -95,9 +93,7 @@ internal class OnlineMessageSourceFromStrangerImpl(
override fun setRecalled(): Boolean = _isRecalledOrPlanned.compareAndSet(expect = false, update = true)
override val ids: IntArray get() = sequenceIds // msg.msgBody.richText.attr!!.random
override val internalIds: IntArray = msg.mapToIntArray {
it.msgBody.richText.attr?.random ?: 0
} // other client 消息的这个是0
override val internalIds: IntArray = msg.mapToIntArray { it.decodeRandom() }
override val time: Int = msg.first().msgHead.msgTime
override var originalMessageLazy = lazy {
msg.toMessageChainNoSource(bot, 0, MessageSourceKind.STRANGER)
@ -159,6 +155,13 @@ private fun List<MsgComm.Msg>.toJceDataPrivate(ids: IntArray): ImMsgBody.SourceM
}
}
internal fun MsgComm.Msg.decodeRandom(): Int {
msgBody.richText.attr?.random?.let { return it }
// msg uin = 0x100000000000000 or rand.toLongUnsigned()
return msgHead.msgUid.toInt()
}
@Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@Serializable(OnlineMessageSourceFromTempImpl.Serializer::class)
internal class OnlineMessageSourceFromTempImpl(
@ -168,7 +171,7 @@ internal class OnlineMessageSourceFromTempImpl(
object Serializer : KSerializer<MessageSource> by MessageSourceSerializerImpl("OnlineMessageSourceFromTemp")
override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
override val internalIds: IntArray = msg.mapToIntArray { it.msgBody.richText.attr!!.random }
override val internalIds: IntArray = msg.mapToIntArray { it.decodeRandom() }
private val _isRecalledOrPlanned = atomic(false)
@ -217,7 +220,7 @@ internal class OnlineMessageSourceFromGroupImpl(
override val isRecalledOrPlanned: Boolean get() = _isRecalledOrPlanned.value
override fun setRecalled(): Boolean = _isRecalledOrPlanned.compareAndSet(expect = false, update = true)
override val sequenceIds: IntArray = msg.mapToIntArray { it.msgHead.msgSeq }
override val internalIds: IntArray = msg.mapToIntArray { it.msgBody.richText.attr!!.random }
override val internalIds: IntArray = msg.mapToIntArray { it.decodeRandom() }
override val ids: IntArray get() = sequenceIds
override val time: Int = msg.first().msgHead.msgTime
override var originalMessageLazy = lazy {