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] Fix group roaming message fetching

Browse Source
This commit is contained in:
Karlatemp 2023-02-19 12:57:16 +08:00
parent 8c5a22a14e
commit 07164cc79b
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,12 @@ package net.mamoe.mirai.internal.contact.roaming
import kotlinx.coroutines.flow.*
import net.mamoe.mirai.contact.roaming.RoamingMessageFilter
import net.mamoe.mirai.internal.contact.CommonGroupImpl
import net.mamoe.mirai.internal.message.getMessageSourceKindFromC2cCmdOrNull
import net.mamoe.mirai.internal.message.toMessageChainOnline
import net.mamoe.mirai.internal.network.protocol.data.proto.MsgComm
import net.mamoe.mirai.internal.network.protocol.packet.chat.TroopManagement
import net.mamoe.mirai.internal.network.protocol.packet.chat.receive.MessageSvcPbGetGroupMsg
import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSourceKind
internal class RoamingMessagesImplGroup(
override val contact: CommonGroupImpl
@ -56,12 +56,11 @@ internal class RoamingMessagesImplGroup(
emitAll(
resp.msgElem.asSequence()
.filter { getMessageSourceKindFromC2cCmdOrNull(it.msgHead.c2cCmd) != null } // ignore unsupported messages
.filter { it.time in timeStart..timeEnd }
.sortedByDescending { it.time } // Ensure caller receiver newer messages first
.sortedByDescending { it.msgHead.msgSeq } // Ensure caller receiver newer messages first
.filter { filter.apply(it) } // Call filter after sort
.asFlow()
.map { it.toMessageChainOnline(bot) }
.map { listOf(it).toMessageChainOnline(bot, contact.id, MessageSourceKind.GROUP) }
)
currentSeq = resp.msgElem.minBy { it.time }.msgHead.msgSeq