From c332413e5aecf104bd5c32c2fcbcf7012caa586b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Feb 2023 09:21:57 +0600 Subject: [PATCH 1/8] start 5.0.2 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f249287e8..52cb4d1fab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 5.0.2 + ## 5.0.1 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 6b365d17b3..d5f1dc3067 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=5.0.1 +library_version=5.0.2 From f083e94c05043186da573ea6b7620265c2c0c6d4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Feb 2023 09:24:16 +0600 Subject: [PATCH 2/8] fix in BehaviourContext.onEditedContentMessage --- CHANGELOG.md | 7 +++++-- .../triggers_handling/EditedContentTriggers.kt | 17 +---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52cb4d1fab..43f3d00c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,14 @@ ## 5.0.2 +* `BehaviourBuilder`: + * Fixes in `BehaviourContext.onEditedContentMessage` - now it will trigger callback on channel post edits too + ## 5.0.1 * `Versions`: - * `MicroUtils`: `0.16.4` -> `0.16.6` - * `Ktor`: `2.2.1` -> `2.2.2` + * `MicroUtils`: `0.16.4` -> `0.16.6` + * `Ktor`: `2.2.1` -> `2.2.2` * `Core`: * Fixes in `SendMediaGroup` request * Fixes in `SetChatAdministratorCustomTitle` request (thanks to [@madhead](https://github.com/madhead)) diff --git a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt index 0b6337d018..3141a57439 100644 --- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt +++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt @@ -1,18 +1,3 @@ - - -/** - * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call - * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example, - * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage]. - * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own. - * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times] - * to combinate several filters - * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously - * in one "stream". Output of [markerFactory] will be used as a key for "stream" - * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that - * data - */@file:Suppress("unused", "UNCHECKED_CAST") - package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling import dev.inmo.tgbotapi.extensions.behaviour_builder.* @@ -35,7 +20,7 @@ internal suspend inline fun noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver> ) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) { when (it) { - is BaseEditMessageUpdate -> (it.editMessageUpdateOrNull() ?.data ?.withContent()) + is BaseEditMessageUpdate -> (it.data.withContent()) else -> null } ?.let(::listOfNotNull) } From a8c4879769b3e5bf422b3d15fe2555538eb0568b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 2 Feb 2023 09:25:21 +0600 Subject: [PATCH 3/8] update dependencies --- CHANGELOG.md | 3 +++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43f3d00c36..0f7b361ad8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 5.0.2 +* `Versions`: + * `MicroUtils`: `0.16.6` -> `0.16.8` + * `Ktor`: `2.2.2` -> `2.2.3` * `BehaviourBuilder`: * Fixes in `BehaviourContext.onEditedContentMessage` - now it will trigger callback on channel post edits too diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 085f20bd54..56d27ad0d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,12 +8,12 @@ javax-activation = "1.1.1" korlibs = "3.4.0" uuid = "0.6.0" -ktor = "2.2.2" +ktor = "2.2.3" ksp = "1.7.22-1.0.8" kotlin-poet = "1.12.0" -microutils = "0.16.6" +microutils = "0.16.8-branch_0.16.8-build346" github-release-plugin = "2.4.1" dokka = "1.7.20" From 49851ee3d7edaea9ed4e467c345e311c76aa3887 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Feb 2023 16:22:33 +0600 Subject: [PATCH 4/8] update micro_utils version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56d27ad0d5..caca9c0f70 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ ktor = "2.2.3" ksp = "1.7.22-1.0.8" kotlin-poet = "1.12.0" -microutils = "0.16.8-branch_0.16.8-build346" +microutils = "0.16.8" github-release-plugin = "2.4.1" dokka = "1.7.20" From 37b5af235a5218089e0f1bd9a34b2b2a341928ac Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:55:46 +0600 Subject: [PATCH 5/8] start 5.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d5f1dc3067..5290e27fd1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=5.0.2 +library_version=5.1.0 From db74b55c418ebf7bf54283a531840a49fea2d882 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:56:06 +0600 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f7b361ad8..422c41c83b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 5.1.0 + ## 5.0.2 * `Versions`: From b59d94d0a934f9fdf2093c461598e9d9cc8a7381 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:56:47 +0600 Subject: [PATCH 7/8] Update libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index caca9c0f70..faa81a5246 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "1.7.22" +kotlin = "1.8.10" kotlin-serialization = "1.4.1" kotlin-coroutines = "1.6.4" From 3c48dcb2a6854ef351116f797e36bb2152a7ca11 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Feb 2023 18:26:29 +0600 Subject: [PATCH 8/8] downgrade kotlin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index faa81a5246..caca9c0f70 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "1.8.10" +kotlin = "1.7.22" kotlin-serialization = "1.4.1" kotlin-coroutines = "1.6.4"