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

Merge remote-tracking branch 'mirai/dev' into dev

Browse Source
This commit is contained in:
Him188 2021-01-29 10:23:42 +08:00
commit 559d6a7039
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -12,7 +12,7 @@
import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.Attribute
object Versions { object Versions {
const val project = "2.2.0-dev-6" const val project = "2.2.0-dev-7"
const val core = project const val core = project
const val console = project const val console = project

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

@ -49,25 +49,15 @@ internal interface MessageSourceInternal {
} }
@Suppress("RedundantSuspendModifier", "unused") @Suppress("RedundantSuspendModifier", "unused")
internal suspend inline fun MessageSource.ensureSequenceIdAvailable() { internal suspend fun MessageSource.ensureSequenceIdAvailable() {
// obsolete but keep for future if (this is OnlineMessageSourceToGroupImpl) {
return ensureSequenceIdAvailable()
/* }
if (this is MessageSourceToGroupImpl) {
this.ensureSequenceIdAvailable()
}*/
} }
@Suppress("RedundantSuspendModifier", "unused") @Suppress("RedundantSuspendModifier", "unused")
internal suspend inline fun Message.ensureSequenceIdAvailable() { internal suspend inline fun Message.ensureSequenceIdAvailable() {
// no suspend. (this as? MessageChain)?.sourceOrNull?.ensureSequenceIdAvailable()
// obsolete but keep for future
return
/*
if (this is MessageSourceToGroupImpl) {
this.ensureSequenceIdAvailable()
}*/
} }
@Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class) @Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class)