From a17ae07e5065c767e9ca68797266ecde19d93629 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 14 Feb 2020 12:06:43 +0600 Subject: [PATCH] InputMedia#media fix (version 0.23.2) --- CHANGELOG.md | 4 ++++ build.gradle | 2 +- .../types/InputMedia/InputMediaAnimation.kt | 11 ++++------- .../types/InputMedia/InputMediaAudio.kt | 11 ++++------- .../types/InputMedia/InputMediaDocument.kt | 11 ++++------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2788ea1675..f1021ac54f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,10 @@ * `toInputFile` extensions now will return more exact types * Now it is possible to send broadcast channels size for `FlowsUpdatesFilter` +### 0.23.2 + +* Fixes in `InputMedia` - `media` field was not included to serialization + ## 0.22.0 * **`KtorCallFactory` must return `HttpStatement` instead of `HttpClientCall`** diff --git a/build.gradle b/build.gradle index 6ce5ce96d9..858e3bdb2f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" } -project.version = "0.23.1" +project.version = "0.23.2" project.group = "com.github.insanusmokrassar" apply from: "publish.gradle" diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt index 1fb4cfdbbf..068672984f 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt @@ -22,11 +22,8 @@ data class InputMediaAnimation( override val type: String = "animation" @SerialName(mediaField) - val media: String - get() = file.let { - when (it) { - is FileId -> it.fileId - is MultipartFile -> it.fileId.toInputMediaFileAttachmentName() - } - } + val media: String = when (file) { + is FileId -> file.fileId + is MultipartFile -> file.fileId.toInputMediaFileAttachmentName() + } } diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt index c63592243c..ad40fdf3ce 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt @@ -23,11 +23,8 @@ data class InputMediaAudio( override val type: String = "audio" @SerialName(mediaField) - val media: String - get() = file.let { - when (it) { - is FileId -> it.fileId - is MultipartFile -> it.fileId.toInputMediaFileAttachmentName() - } - } + val media: String = when (file) { + is FileId -> file.fileId + is MultipartFile -> file.fileId.toInputMediaFileAttachmentName() + } } diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt index 38cd9ac283..2baf97971b 100644 --- a/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt @@ -19,11 +19,8 @@ data class InputMediaDocument( override val type: String = "document" @SerialName(mediaField) - val media: String - get() = file.let { - when (it) { - is FileId -> it.fileId - is MultipartFile -> it.fileId.toInputMediaFileAttachmentName() - } - } + val media: String = when (file) { + is FileId -> file.fileId + is MultipartFile -> file.fileId.toInputMediaFileAttachmentName() + } }