From 332fe95adfa18bf444cb7d43296a0cd1fe4c184f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Dec 2022 10:48:38 +0600 Subject: [PATCH 1/5] start 4.2.2 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f28995447..b9101ea2dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 4.2.2 + ## 4.2.1 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 21733ff3fb..d65eeb7079 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ kotlin.incremental=true kotlin.incremental.js=true library_group=dev.inmo -library_version=4.2.1 +library_version=4.2.2 From fe133bbde051d591336191f981a45aadd2e36f43 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Dec 2022 10:49:18 +0600 Subject: [PATCH 2/5] update microutils --- CHANGELOG.md | 3 +++ gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9101ea2dc..017ca9b295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 4.2.2 +* `Versions`: + * `MicroUtils`: `0.16.0` -> `0.16.1` + ## 4.2.1 * `Versions`: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 550cf78e57..0fb2a82c8a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ ktor = "2.2.1" ksp = "1.7.22-1.0.8" kotlin-poet = "1.12.0" -microutils = "0.16.0" +microutils = "0.16.1" github-release-plugin = "2.4.1" dokka = "1.7.20" From b43d9aefb948e5957dc8ca3a12adbe6c97ee2cae Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Dec 2022 10:52:56 +0600 Subject: [PATCH 3/5] fix of #694 --- CHANGELOG.md | 4 +++- .../kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 017ca9b295..4f45202351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,9 @@ ## 4.2.2 * `Versions`: - * `MicroUtils`: `0.16.0` -> `0.16.1` + * `MicroUtils`: `0.16.0` -> `0.16.1` +* `Core`: + * Fix of [#694](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/694): add opportunity to create `ChatId` and `ChatIdWithThreadId` from `IdChatIdentifier` ## 4.2.1 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt index 9b8eedeb5e..625b8eaa4c 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt @@ -54,6 +54,13 @@ value class ChatIdWithThreadId(val chatIdWithThreadId: Pair this + is ChatIdWithThreadId -> ChatId(chatId) +} + +fun IdChatIdentifier.toChatWithThreadId(threadId: MessageThreadId) = IdChatIdentifier(chatId, threadId) + /** * https://core.telegram.org/bots/api#formatting-options */ From 3e199c69445c6ead0e24795613185f3c052f28c2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 18 Dec 2022 10:01:25 +0600 Subject: [PATCH 4/5] 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 0fb2a82c8a..98d24fa96a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ ktor = "2.2.1" ksp = "1.7.22-1.0.8" kotlin-poet = "1.12.0" -microutils = "0.16.1" +microutils = "0.16.2" github-release-plugin = "2.4.1" dokka = "1.7.20" From e56199ac9fe4edecae6f02a9f3b12e3bf04b3de3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 18 Dec 2022 10:01:46 +0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f45202351..ab7dcd3b05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 4.2.2 * `Versions`: - * `MicroUtils`: `0.16.0` -> `0.16.1` + * `MicroUtils`: `0.16.0` -> `0.16.2` * `Core`: * Fix of [#694](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/694): add opportunity to create `ChatId` and `ChatIdWithThreadId` from `IdChatIdentifier`