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-03-18 23:18:09 +08:00
parent 275d9f8f6e
commit 8d9c820a92
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ internal class RoamingMessagesImplGroup(
filter: RoamingMessageFilter?
): Flow<MessageChain> {
var currentSeq: Int = getLastMsgSeq() ?: return emptyFlow()
var lastOfferedSeq = -1
return flow {
while (true) {
@ -52,10 +53,14 @@ internal class RoamingMessagesImplGroup(
val maxTime = messageTimeSequence.max()
if (maxTime < timeStart) break // we have fetched all messages
// we have fetched all messages
// note: maxTime = 0 means all fetched messages were recalled
if (maxTime < timeStart && maxTime != 0) break
emitAll(
resp.msgElem.asSequence()
.filter { lastOfferedSeq == -1 || it.msgHead.msgSeq < lastOfferedSeq }
.filter { it.time in timeStart..timeEnd }
.sortedByDescending { it.msgHead.msgSeq } // Ensure caller receiver newer messages first
.filter { filter.apply(it) } // Call filter after sort
@ -63,7 +68,8 @@ internal class RoamingMessagesImplGroup(
.map { listOf(it).toMessageChainOnline(bot, contact.id, MessageSourceKind.GROUP) }
)
currentSeq = resp.msgElem.minBy { it.time }.msgHead.msgSeq
currentSeq = resp.msgElem.first().msgHead.msgSeq
lastOfferedSeq = currentSeq
}
}
}