From dc83b8d77a46ff2ee69f74103dc04773d441bd6f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 1 Feb 2021 21:09:11 +0600 Subject: [PATCH] fix of #275 and several other internal problems --- CHANGELOG.md | 3 +++ .../edit/LiveLocation/EditChatMessageLiveLocation.kt | 3 ++- .../edit/LiveLocation/EditInlineMessageLiveLocation.kt | 2 +- .../edit/LiveLocation/StopChatMessageLiveLocation.kt | 3 ++- .../edit/LiveLocation/StopInlineMessageLiveLocation.kt | 2 +- .../tgbotapi/requests/edit/text/EditInlineMessageText.kt | 5 ++--- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 845a19b0ca..acd2a8d895 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.32.2 +* `Core`: + * Fix of [#275](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/275) + ## 0.32.1 * `Core`: diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt index ba93fd4206..d736ddb2f0 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt @@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.utils.throwRangeError import kotlinx.serialization.* private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass>() +const val editMessageLiveLocationMethod = "editMessageLiveLocation" @Serializable data class EditChatMessageLiveLocation( @@ -30,7 +31,7 @@ data class EditChatMessageLiveLocation( @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null ) : EditChatMessage, EditReplyMessage, EditLocationMessage { - override fun method(): String = "editMessageLiveLocation" + override fun method(): String = editMessageLiveLocationMethod override val resultDeserializer: DeserializationStrategy> get() = commonResultDeserializer override val requestSerializer: SerializationStrategy<*> diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt index f12c2d522d..b430bbfd64 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt @@ -23,7 +23,7 @@ data class EditInlineMessageLiveLocation( @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null ) : EditInlineMessage, EditReplyMessage, EditLocationMessage { - override fun method(): String = "editMessageLiveLocation" + override fun method(): String = editMessageLiveLocationMethod override val requestSerializer: SerializationStrategy<*> get() = serializer() diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt index 128a95390b..bccc7f0b66 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt @@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.types.message.content.LocationContent import kotlinx.serialization.* private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass>() +const val stopMessageLiveLocationMethod = "stopMessageLiveLocation" @Serializable data class StopChatMessageLiveLocation( @@ -20,7 +21,7 @@ data class StopChatMessageLiveLocation( @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null ) : EditChatMessage, EditReplyMessage { - override fun method(): String = "stopMessageLiveLocation" + override fun method(): String = stopMessageLiveLocationMethod override val resultDeserializer: DeserializationStrategy> get() = commonResultDeserializer override val requestSerializer: SerializationStrategy<*> diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt index dbfdcdd319..4873b63769 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt @@ -13,7 +13,7 @@ data class StopInlineMessageLiveLocation( @SerialName(replyMarkupField) override val replyMarkup: InlineKeyboardMarkup? = null ) : EditInlineMessage, EditReplyMessage { - override fun method(): String = "stopMessageLiveLocation" + override fun method(): String = stopMessageLiveLocationMethod override val requestSerializer: SerializationStrategy<*> get() = serializer() } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt index 2e0be3eafe..61c89f500d 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt @@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.requests.edit.text import dev.inmo.tgbotapi.CommonAbstracts.* import dev.inmo.tgbotapi.requests.edit.abstracts.* -import dev.inmo.tgbotapi.requests.edit.media.editMessageMediaMethod import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.MessageEntity.* import dev.inmo.tgbotapi.types.ParseMode.ParseMode @@ -55,10 +54,10 @@ data class EditInlineMessageText internal constructor( override val replyMarkup: InlineKeyboardMarkup? = null ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage { override val entities: List? by lazy { - rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources() + rawEntities ?.asTextParts(text) ?.justTextSources() } - override fun method(): String = editMessageMediaMethod + override fun method(): String = editMessageTextMethod override val requestSerializer: SerializationStrategy<*> get() = serializer() }