From cf9dba0ecc0208d279cb55006e2f9f1c80e61cf2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:55:46 +0600 Subject: [PATCH 1/6] start 5.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6b365d17b3..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.1 +library_version=5.1.0 From 32613bacc69ebf56cdba4d6a3729729f1b449d7c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:56:06 +0600 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f249287e8..454365a007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # TelegramBotAPI changelog +## 5.1.0 + ## 5.0.1 * `Versions`: From f29996aac88507f1f24483a47a3ce5263bd3fd24 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 4 Feb 2023 00:56:47 +0600 Subject: [PATCH 3/6] Update libs.versions.toml --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 085f20bd54..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" @@ -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" github-release-plugin = "2.4.1" dokka = "1.7.20" From 5667ae8095fec428641569f7d94a14f972fee781 Mon Sep 17 00:00:00 2001 From: madhead Date: Fri, 3 Feb 2023 20:55:48 +0100 Subject: [PATCH 4/6] Added the field `user_chat_id` to the class `ChatJoinRequest`. --- CHANGELOG.md | 4 ++++ .../src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt | 1 + .../kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt | 2 ++ 3 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 454365a007..396f60d8d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 5.1.0 +* `Core`: + * [Bot API 6.5](https://core.telegram.org/bots/api#february-3-2023) support + * Added the field `user_chat_id` to the class `ChatJoinRequest`. + ## 5.0.1 * `Versions`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt index 8a3d8b8d85..b993b32d8b 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt @@ -375,6 +375,7 @@ const val latitudeField = "latitude" const val longitudeField = "longitude" const val headingField = "heading" const val fromField = "from" +const val userChatIdField = "user_chat_id" const val userField = "user" const val dateField = "date" const val chatField = "chat" diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt index 738e95adc6..cad68fefe7 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt @@ -15,6 +15,8 @@ data class ChatJoinRequest( val chat: PublicChat, @SerialName(fromField) override val from: User, + @SerialName(userChatIdField) + val userChatId: Identifier, @SerialName(dateField) val date: TelegramDate, @SerialName(inviteLinkField) From bdcba202c9dddffebaa3427fe4ddd57f4979e3f2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Feb 2023 18:32:46 +0600 Subject: [PATCH 5/6] Update ChatJoinRequest.kt --- .../kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt index cad68fefe7..90a00b33f7 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatJoinRequest.kt @@ -16,7 +16,7 @@ data class ChatJoinRequest( @SerialName(fromField) override val from: User, @SerialName(userChatIdField) - val userChatId: Identifier, + val userChatId: UserId, @SerialName(dateField) val date: TelegramDate, @SerialName(inviteLinkField) From a39a276299d9170f67d0ac335a8e1f59cfa10499 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Feb 2023 18:34:05 +0600 Subject: [PATCH 6/6] 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 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"