From 723868a4f06dbdb70f0d64201c9f0a699f284d7e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 15 Apr 2019 17:06:33 +0800 Subject: [PATCH 1/3] hotfix start --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1e809a788..0e253bdfe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,8 @@ of `]` in links titles * All default `startGettingOfUpdates` (in fact - method `start` of `UpdatesPoller`) are suspend and will try to delete webhook +### 0.12.7 Hotfix version + ## 0.11.0 * Kotlin `1.3.11` -> `1.3.21` diff --git a/build.gradle b/build.gradle index aef9c31704..f33328bda1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -project.version = "0.12.6" +project.version = "0.12.7" project.group = "com.github.insanusmokrassar" buildscript { From 1f8c27c75613fe1f24e5ae0652feca496852039d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 15 Apr 2019 19:30:09 +0800 Subject: [PATCH 2/3] hotfix for inputmedias --- .../requests/send/media/SendMediaGroup.kt | 1 - .../types/InputMedia/InputMediaAnimation.kt | 4 +--- .../types/InputMedia/InputMediaAudio.kt | 2 +- .../types/InputMedia/InputMediaDocument.kt | 4 +--- .../types/InputMedia/InputMediaPhoto.kt | 18 +++++++----------- .../types/InputMedia/InputMediaVideo.kt | 19 +++++++------------ 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt index 014df6fa83..921afb4f8c 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt @@ -58,7 +58,6 @@ private val serializer = ArrayListSerializer(RawMessage.serializer()) data class SendMediaGroupData internal constructor( @SerialName(chatIdField) override val chatId: ChatIdentifier, - @Transient val media: List = emptyList(), @SerialName(disableNotificationField) override val disableNotification: Boolean = false, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt index 8e713c19d7..cf0612a4fb 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAnimation.kt @@ -8,15 +8,13 @@ import kotlinx.serialization.* @Serializable data class InputMediaAnimation( - @Transient - override val file: InputFile = throw IllegalStateException("Must be created with file"), + override val file: InputFile, override val caption: String? = null, @SerialName(parseModeField) override val parseMode: ParseMode? = null, override val width: Int? = null, override val height: Int? = null, override val duration: Long? = null, - @Transient override val thumb: InputFile? = null ) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, CaptionedInputMedia { override val type: String = "animation" diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt index 53506cbb69..e19b26e832 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaAudio.kt @@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable @Serializable data class InputMediaAudio( - override val file: InputFile = throw IllegalStateException("Must be created with file"), + override val file: InputFile, override val caption: String? = null, @SerialName(parseModeField) override val parseMode: ParseMode? = null, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt index 1a63556760..629d3fea16 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaDocument.kt @@ -8,12 +8,10 @@ import kotlinx.serialization.* @Serializable data class InputMediaDocument( - @Transient - override val file: InputFile = throw IllegalStateException("Must be created with file"), + override val file: InputFile, override val caption: String? = null, @SerialName(parseModeField) override val parseMode: ParseMode? = null, - @Transient override val thumb: InputFile? = null ) : InputMedia, ThumbedInputMedia, CaptionedInputMedia { override val type: String = "document" diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt index 23b123cfb8..1b49e61a4c 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt @@ -9,8 +9,7 @@ import kotlinx.serialization.* @Serializable data class InputMediaPhoto( - @Transient - override val file: InputFile = throw IllegalStateException("Must be created with file"), + override val file: InputFile, override val caption: String? = null, @SerialName(parseModeField) override val parseMode: ParseMode? = null @@ -19,17 +18,14 @@ data class InputMediaPhoto( override fun serialize(format: StringFormat): String = format.stringify(serializer(), this) + @SerialName(mediaField) + val media: String = when (file) { + is FileId -> file.fileId + is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(file.fileId) + } + @Transient override val arguments: Map = Mapper.mapNullable(serializer(), this) - - @SerialName(mediaField) - val media: String - get() = file.let { - when (it) { - is FileId -> it.fileId - is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId) - } - } } fun PhotoSize.toInputMediaPhoto( diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt index 3cc1371231..718864d90a 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt @@ -8,30 +8,25 @@ import kotlinx.serialization.* @Serializable data class InputMediaVideo( - @Transient - override val file: InputFile = throw IllegalStateException("Must be created with file"), + override val file: InputFile, override val caption: String? = null, @SerialName(parseModeField) override val parseMode: ParseMode? = null, override val width: Int? = null, override val height: Int? = null, override val duration: Long? = null, - @Transient override val thumb: InputFile? = null ) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, CaptionedInputMedia, MediaGroupMemberInputMedia { override val type: String = "video" override fun serialize(format: StringFormat): String = format.stringify(serializer(), this) + @SerialName(mediaField) + val media: String = when (file) { + is FileId -> file.fileId + is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(file.fileId) + } + @Transient override val arguments: Map = Mapper.mapNullable(serializer(), this) - - @SerialName(mediaField) - val media: String - get() = file.let { - when (it) { - is FileId -> it.fileId - is MultipartFile -> inputMediaFileAttachmentNameTemplate.format(it.fileId) - } - } } From 6106b2293e9bb81b17bc3263273fa653ab14f827 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 15 Apr 2019 19:31:54 +0800 Subject: [PATCH 3/3] fill changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e253bdfe5..886233b3b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,8 @@ will try to delete webhook ### 0.12.7 Hotfix version +* Now temporary all requests of input media will contains `file` field + ## 0.11.0 * Kotlin `1.3.11` -> `1.3.21`