From 1f5f0e269cc44d4080f6f8da7a3d2cf0ec6610f0 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Thu, 28 Jan 2021 21:06:54 +0800 Subject: [PATCH 1/2] Fix MessageSource.ensureSequenceIdAvailable() fix #930 --- .../kotlin/message/incomingSourceImpl.kt | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt index 5ca0011d2..d3f1c6486 100644 --- a/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt @@ -49,25 +49,15 @@ internal interface MessageSourceInternal { } @Suppress("RedundantSuspendModifier", "unused") -internal suspend inline fun MessageSource.ensureSequenceIdAvailable() { - // obsolete but keep for future - return - /* - if (this is MessageSourceToGroupImpl) { - this.ensureSequenceIdAvailable() - }*/ +internal suspend fun MessageSource.ensureSequenceIdAvailable() { + if (this is OnlineMessageSourceToGroupImpl) { + ensureSequenceIdAvailable() + } } @Suppress("RedundantSuspendModifier", "unused") internal suspend inline fun Message.ensureSequenceIdAvailable() { - // no suspend. - - // obsolete but keep for future - return - /* - if (this is MessageSourceToGroupImpl) { - this.ensureSequenceIdAvailable() - }*/ + (this as? MessageChain)?.sourceOrNull?.ensureSequenceIdAvailable() } @Serializable(OnlineMessageSourceFromFriendImpl.Serializer::class) From b3e62552a4884a8b4c38a0f535b9bc57aa13fc13 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Thu, 28 Jan 2021 21:07:38 +0800 Subject: [PATCH 2/2] 2.2.0-dev-7 --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1337eedd4..21c724835 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,7 +12,7 @@ import org.gradle.api.attributes.Attribute object Versions { - const val project = "2.2.0-dev-6" + const val project = "2.2.0-dev-7" const val core = project const val console = project