ChatSerializers formatter extracting

0.18.1

CHANGELOG.md

@@ -1,6 +1,68 @@
 # TelegramBotAPI changelog
 
-## 0.17.0
+## 0.19.0 ImplicitReflection removing
+
+* Total rework of serialization for requests. Now all `SimpleRequest` children have:
+    * `requestSerializer` - field, which must provide serializer of current type
+    * `resultDeserializer` - field, which must provide opportunity to deserializer result. Previously it was a function
+* Removed deprecations:
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.WebhookPrivateKeyConfig`
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesFilter`
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.createSimpleUpdateFilter`
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.createMarkdownText`
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownCaption`
+    * `com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownText`
+    * `com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.KtorUpdatesPoller`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.CaptionedMediaContent`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.message.CommonForwardedMessage`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.CaptionedInputMedia`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.games.Game#text`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.games.Game#textEntities`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFileKt.makeFileUrl`
+    * `com.github.insanusmokrassar.TelegramBotAPI.types.files.PathedFileKt.downloadingFilesBaseUrl`
+    * `com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.Data`
+    * `com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByInlineMessageId`
+    * `com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByMessageId`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.RequestException`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.ReplyMessageNotFound`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor#baseUrl`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor#constructor(token, hostUrl)`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor#constructor(token, client, hostUrl, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)`
+    * `com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor#constructor(token, engine, hostUrl)`
+
+## 0.18.0 Raws cleaning
+
+* Made internal and not available outside of library:
+    * `RawMessage`
+    * `RawUpdate`
+    * `RawChatMember`
+    * `RawMessageEntity`
+    * `RawInlineQuery`
+    * `RawCallbackQuery`
+    * `RawChosenInlineResult`
+
+* All `RawMessage` usages was replaced with `Message` interface (with some of other raw classes was made the same things)
+    * `TelegramBotAPIMessageDeserializationStrategy` was created. It was used for deserialization of Telegram Bot API
+    incoming messages
+    * `TelegramBotAPIMessageDeserializeOnlySerializer` was created. It **MUST NOT** be used to serialize messages
+* Update of description
+* Make `Game` object a little bit more standartizated
+* `Game` now is not serializable and have no additional trash, related to serialization
+* `TelegramFile` was removed
+
+### 0.18.1 Libraries update
+
+* Update libraries:
+    * `kotlin`: 1.3.41 -> 1.3.61
+    * `kotlin coroutines`: 1.2.2 -> 1.3.2
+    * `kotlin serialization`: 0.11.1 -> 0.14.0
+    * `joda time`: 2.10.3 -> 2.10.5
+    * `ktor`: 1.2.3 -> 1.2.6
+* `BotAction` now will be deserialized in a little bit other way
+    * `BotActionSerializer` now is internal
+* Most part of serializers now are objects (instead of classes as was previously)
+
+## 0.17.0 July 29, 2019 API Update
 
 Libraries updates:
 

README.md

@@ -5,16 +5,16 @@
 
 ## What is it?
 
-It is one more project which wish to be useful and full Telegram Bots API bridge for Kotlin. Most part of some specific
-solves or unuseful moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api).
+Library for Object-Oriented and type-safe work with Telegram Bot API. Most part of some specific solves or unuseful
+moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api).
 
 ## Compatibility
 
-This version compatible with [31st of May 2019 update of TelegramBotAPI](https://core.telegram.org/bots/api#may-31-2019).
-There is one exception of implemented functionality. It is Telegram Passport API, which was presented in
+This version compatible with [29th of July 2019 update of TelegramBotAPI](https://core.telegram.org/bots/api#july-29-2019).
+There is Telegram Passport API exception of implemented functionality, which was presented in
 [August 2018 update of TelegramBotAPI](https://core.telegram.org/bots/api#august-27-2018) update. It will be implemented
-as soon as possible. All included and supported API can be found on
-[wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Included-API).
+as soon as possible. All APIs that are not included are presented
+[wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Not-included-API).
 
 ## How to implement library?
 

build.gradle

@@ -1,4 +1,4 @@
-project.version = "0.17.0"
+project.version = "0.19.0"
 project.group = "com.github.insanusmokrassar"
 
 buildscript {
@@ -39,10 +39,6 @@ dependencies {
 
     api "io.ktor:ktor-server:$ktor_version"
     api "io.ktor:ktor-server-host-common:$ktor_version"
-}
 
-compileKotlin {
-    kotlinOptions {
-        freeCompilerArgs = [ disableImplicitReflectionSerializerAnnotation ]
-    }
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }

gradle.properties

@@ -1,13 +1,11 @@
 kotlin.code.style=official
-kotlin_version=1.3.41
-kotlin_coroutines_version=1.2.2
-kotlin_serialisation_runtime_version=0.11.1
-joda_time_version=2.10.3
-ktor_version=1.2.3
+kotlin_version=1.3.61
+kotlin_coroutines_version=1.3.2
+kotlin_serialisation_runtime_version=0.14.0
+joda_time_version=2.10.5
+ktor_version=1.2.6
 
 gradle_bintray_plugin_version=1.8.4
 
 project_public_name=Telegram Bot API
-project_public_description=It is one more project which wish to be useful and full Telegram Bots API bridge for Kotlin
-
-disableImplicitReflectionSerializerAnnotation=-Xexperimental=kotlinx.serialization.ImplicitReflectionSerializer
+project_public_description=Library for Object-Oriented and type-safe work with Telegram Bot API

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 21 12:05:40 HKT 2019
+#Fri Nov 29 12:11:00 HKT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip

settings.gradle

@@ -1,18 +1 @@
-/*
- * This settings file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/3.4.1/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
 rootProject.name = 'TelegramBotAPI'

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ByInlineMessageId.kt

@@ -1,7 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
-
-@Deprecated(
-    "Deprecated for the reason of creating of more obvious type interface",
-    ReplaceWith("InlineMessageAction", "com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction")
-)
-typealias ByInlineMessageId = InlineMessageAction

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ByMessageId.kt

@@ -1,8 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
-
-@Deprecated(
-    "Deprecated for the reason of creating of more obvious type interface",
-    ReplaceWith("MessageAction", "com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction")
-
-)
-typealias ByMessageId = MessageAction

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/BaseRequestsExecutor.kt

@@ -4,14 +4,4 @@ import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
 
 abstract class BaseRequestsExecutor(
     protected val telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper
-) : RequestsExecutor {
-    @Deprecated("Deprecated due to new TelegramAPIUrlKeeper API", ReplaceWith("telegramAPIUrlsKeeper.commonAPIUrl"))
-    protected val baseUrl: String
-        get() = telegramAPIUrlsKeeper.commonAPIUrl
-
-    @Deprecated("Deprecated due to new TelegramAPIUrlKeeper API")
-    constructor(
-        token: String,
-        hostUrl: String = "https://api.telegram.org"
-    ) : this (TelegramAPIUrlsKeeper(token, hostUrl))
-}
+) : RequestsExecutor

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt

@@ -25,28 +25,6 @@ class KtorRequestsExecutor(
     private val requestsLimiter: RequestLimiter = EmptyLimiter,
     private val jsonFormatter: Json = Json.nonstrict
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
-
-    @Deprecated("Deprecated due to new TelegramAPIUrlKeeper API")
-    constructor(
-        token: String,
-        client: HttpClient = HttpClient(),
-        hostUrl: String = "https://api.telegram.org",
-        callsFactories: List<KtorCallFactory> = emptyList(),
-        excludeDefaultFactories: Boolean = false,
-        requestsLimiter: RequestLimiter = EmptyLimiter,
-        jsonFormatter: Json = Json.nonstrict
-    ) : this(TelegramAPIUrlsKeeper(token, hostUrl), client, callsFactories, excludeDefaultFactories, requestsLimiter, jsonFormatter)
-
-    @Deprecated("Deprecated due to new TelegramAPIUrlKeeper API")
-    constructor(
-        token: String,
-        engine: HttpClientEngine? = null,
-        hostUrl: String = "https://api.telegram.org"
-    ) : this(
-        TelegramAPIUrlsKeeper(token, hostUrl),
-        engine ?.let { HttpClient(engine) } ?: HttpClient()
-    )
-
     private val callsFactories: List<KtorCallFactory> = callsFactories.run {
         if (!excludeDefaultFactories) {
             asSequence().plus(SimpleRequestCallFactory()).plus(MultipartRequestCallFactory()).toList()
@@ -74,11 +52,11 @@ class KtorRequestsExecutor(
             val content = call.response.use {
                 it.content.toByteArray().toString(Charsets.UTF_8)
             }
-            val responseObject = jsonFormatter.parse(
-                Response.serializer(request.resultSerializer()),
-                content
-            )
-            responseObject.result ?: responseObject.parameters ?.let {
+            val responseObject = jsonFormatter.parse(Response.serializer(), content)
+
+            (responseObject.result ?.let {
+                jsonFormatter.fromJson(request.resultDeserializer, it)
+            } ?: responseObject.parameters ?.let {
                 val error = it.error
                 if (error is RetryAfterError) {
                     delay(error.leftToRetry)
@@ -92,7 +70,7 @@ class KtorRequestsExecutor(
                     content,
                     "Can't get result object from $content"
                 )
-            }
+            })
         }
     }
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt

@@ -3,9 +3,11 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapWithCommonValues
 import io.ktor.client.HttpClient
-import io.ktor.client.request.forms.*
+import io.ktor.client.request.forms.MultiPartFormDataContent
+import io.ktor.client.request.forms.formData
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
+import kotlinx.io.core.readBytes
 
 class MultipartRequestCallFactory : AbstractRequestCallFactory() {
 
@@ -21,9 +23,7 @@ class MultipartRequestCallFactory : AbstractRequestCallFactory() {
                     when (value) {
                         is MultipartFile -> append(
                             key,
-                            InputProvider {
-                                value.file.asInput()
-                            },
+                            value.file.asInput().readBytes(),
                             Headers.build {
                                 append(HttpHeaders.ContentType, value.mimeType)
                                 append(HttpHeaders.ContentDisposition, "filename=${value.fileId}")

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt

@@ -12,12 +12,11 @@ class SimpleRequestCallFactory : AbstractRequestCallFactory() {
         baseUrl: String,
         request: Request<T>
     ): Any? = (request as? SimpleRequest<T>) ?.let { _ ->
-        val content = request.toJsonWithoutNulls(SimpleRequestSerializer).toString()
+        val content = request.json().toString()
 
         TextContent(
             content,
             ContentType.Application.Json
         )
     }
-
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestException.kt

@@ -1,12 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.bot
-
-import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
-
-@Deprecated(
-    "Replaced to another package",
-    ReplaceWith(
-        "RequestException",
-        "com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException"
-    )
-)
-typealias RequestException = RequestException

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/RequestException.kt

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.Response
 import java.io.IOException
 
 fun newRequestException(
-    response: Response<*>,
+    response: Response,
     plainAnswer: String,
     message: String? = null,
     cause: Throwable? = null
@@ -15,7 +15,7 @@ fun newRequestException(
 }
 
 sealed class RequestException constructor(
-    val response: Response<*>,
+    val response: Response,
     val plainAnswer: String,
     message: String? = null,
     cause: Throwable? = null
@@ -24,17 +24,11 @@ sealed class RequestException constructor(
     cause
 )
 
-class CommonRequestException(response: Response<*>, plainAnswer: String, message: String?, cause: Throwable?) :
+class CommonRequestException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
 
-class UnauthorizedException(response: Response<*>, plainAnswer: String, message: String?, cause: Throwable?) :
+class UnauthorizedException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
 
-class ReplyMessageNotFoundException(response: Response<*>, plainAnswer: String, message: String?, cause: Throwable?) :
+class ReplyMessageNotFoundException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
-
-@Deprecated(
-    "Replaced by ReplyMessageNotFoundException",
-    ReplaceWith("ReplyMessageNotFoundException", "com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.ReplyMessageNotFoundException")
-)
-typealias ReplyMessageNotFound = ReplyMessageNotFoundException

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/DeleteMessage.kt

@@ -15,5 +15,8 @@ data class DeleteMessage(
 ) : SimpleRequest<Boolean>, MessageAction {
     override fun method(): String = "deleteMessage"
 
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/ForwardMessage.kt

@@ -3,7 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -16,12 +17,15 @@ data class ForwardMessage(
     override val messageId: MessageIdentifier,
     @SerialName(disableNotificationField)
     val disableNotification: Boolean = false
-): SimpleRequest<RawMessage>, MessageAction {
+): SimpleRequest<Message>, MessageAction {
     @Transient
     override val chatId: ChatIdentifier
         get() = fromChatId
 
     override fun method(): String = "forwardMessage"
 
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetMe.kt

@@ -2,11 +2,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.User
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 class GetMe : SimpleRequest<User> {
     override fun method(): String = "getMe"
-    override fun resultSerializer(): KSerializer<User> = User.serializer()
+    override val resultDeserializer: DeserializationStrategy<User>
+        get() = User.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/GetUpdates.kt

@@ -3,31 +3,14 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.RawUpdate
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateSerializerWithoutDeserialization
+import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
 
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_MESSAGE", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_MESSAGE"))
-const val UPDATE_MESSAGE = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_MESSAGE
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_EDITED_MESSAGE", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_EDITED_MESSAGE"))
-const val UPDATE_EDITED_MESSAGE = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_EDITED_MESSAGE
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_CHANNEL_POST", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CHANNEL_POST"))
-const val UPDATE_CHANNEL_POST = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CHANNEL_POST
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_EDITED_CHANNEL_POST", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_EDITED_CHANNEL_POST"))
-const val UPDATE_EDITED_CHANNEL_POST = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_EDITED_CHANNEL_POST
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_CHOSEN_INLINE_RESULT", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CHOSEN_INLINE_RESULT"))
-const val UPDATE_CHOSEN_INLINE_RESULT = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CHOSEN_INLINE_RESULT
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_INLINE_QUERY", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_INLINE_QUERY"))
-const val UPDATE_INLINE_QUERY = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_INLINE_QUERY
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_CALLBACK_QUERY", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CALLBACK_QUERY"))
-const val UPDATE_CALLBACK_QUERY = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_CALLBACK_QUERY
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_SHIPPING_QUERY", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_SHIPPING_QUERY"))
-const val UPDATE_SHIPPING_QUERY = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_SHIPPING_QUERY
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_PRE_CHECKOUT_QUERY", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_PRE_CHECKOUT_QUERY"))
-const val UPDATE_PRE_CHECKOUT_QUERY = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_PRE_CHECKOUT_QUERY
-@Deprecated("Replaced to other package", ReplaceWith("UPDATE_POLL", "com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_POLL"))
-const val UPDATE_POLL = com.github.insanusmokrassar.TelegramBotAPI.types.UPDATE_POLL
+private val updatesListSerializer = ArrayListSerializer(
+    UpdateSerializerWithoutDeserialization
+)
 
 @Serializable
 data class GetUpdates(
@@ -35,8 +18,12 @@ data class GetUpdates(
     val limit: Int? = null,
     val timeout: Int? = null,
     val allowed_updates: List<String>? = ALL_UPDATES_LIST
-): SimpleRequest<List<RawUpdate>> {
+): SimpleRequest<List<Update>> {
     override fun method(): String = "getUpdates"
 
-    override fun resultSerializer(): KSerializer<List<RawUpdate>> = ArrayListSerializer(RawUpdate.serializer())
+    override val resultDeserializer: DeserializationStrategy<List<Update>>
+        get() = updatesListSerializer
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/StopPoll.kt

@@ -18,5 +18,8 @@ data class StopPoll(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : MessageAction, SimpleRequest<Poll>, ReplyMarkup {
     override fun method(): String = "stopPoll"
-    override fun resultSerializer(): KSerializer<Poll> = Poll.serializer()
+    override val resultDeserializer: DeserializationStrategy<Poll>
+        get() = Poll.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/Request.kt

@@ -1,21 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.types.Response
-import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
-import kotlinx.serialization.json.JsonObject
 
-@Serializable(RequestSerializer::class)
 interface Request<T: Any> {
     fun method(): String
-    fun resultSerializer(): KSerializer<T>
-    fun json(): JsonObject = toJsonWithoutNulls(RequestSerializer)
+    val resultDeserializer: DeserializationStrategy<T>
 }
-object RequestSerializer : KSerializer<Request<*>> by ContextSerializer(Request::class)
-
-fun <T : Any> StringFormat.extractResult(
-    from: String,
-    dataSerializer: KSerializer<T>
-): Response<T> {
-    return parse(Response.serializer(dataSerializer), from)
-}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt

@@ -1,8 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts
 
-import kotlinx.serialization.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.json.JsonObject
 
-@Serializable(SimpleRequestSerializer::class)
-interface SimpleRequest<T: Any> : Request<T>
+interface SimpleRequest<T: Any> : Request<T> {
+    val requestSerializer: SerializationStrategy<*>
+}
 
-object SimpleRequestSerializer : KSerializer<SimpleRequest<*>> by ContextSerializer(SimpleRequest::class)
+@Suppress("UNCHECKED_CAST")
+inline fun <T: Any, K: SimpleRequest<T>> K.json(): JsonObject = toJsonWithoutNulls(requestSerializer as SerializationStrategy<K>)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerCallbackQuery.kt

@@ -20,7 +20,10 @@ data class AnswerCallbackQuery(
     val cachedTimeSeconds: Int? = null
 ) : SimpleRequest<Boolean> {
     override fun method(): String = "answerCallbackQuery"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun CallbackQuery.createAnswer(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt

@@ -28,7 +28,10 @@ data class AnswerInlineQuery(
     val switchPmParameter: String? = null
 ): SimpleRequest<Boolean> {
     override fun method(): String = "answerInlineQuery"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun InlineQuery.createAnswer(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerPreCheckoutQuery.kt

@@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abstracts.AnswerPreCheckoutQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class AnswerPreCheckoutQueryOk(
@@ -13,6 +12,8 @@ data class AnswerPreCheckoutQueryOk(
 ) : AnswerPreCheckoutQuery {
     @SerialName(okField)
     override val isOk: Boolean = true
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 
@@ -25,6 +26,8 @@ data class AnswerPreCheckoutQueryError(
 ) : AnswerPreCheckoutQuery {
     @SerialName(okField)
     override val isOk: Boolean = false
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun PreCheckoutQuery.createAnswerOk(): AnswerPreCheckoutQueryOk = AnswerPreCheckoutQueryOk(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/AnswerShippingQuery.kt

@@ -17,6 +17,8 @@ data class AnswerShippingQueryOk(
 ) : AnswerShippingQuery {
     @SerialName(okField)
     override val isOk: Boolean = true
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 object ShippingOptionsSerializer : KSerializer<List<ShippingOption>> by ArrayListSerializer(
@@ -32,6 +34,8 @@ data class AnswerShippingQueryError(
 ) : AnswerShippingQuery {
     @SerialName(okField)
     override val isOk: Boolean = false
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun ShippingQuery.createAnswerOk(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerPreCheckoutQuery.kt

@@ -3,11 +3,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abs
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.PreCheckoutQueryId
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.internal.BooleanSerializer
 import kotlinx.serialization.serializer
 
 interface AnswerPreCheckoutQuery : SimpleRequest<Boolean> {
     override fun method(): String = "answerPreCheckoutQuery"
-    override fun resultSerializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: KSerializer<Boolean>
+        get() = BooleanSerializer
 
     val preCheckoutQueryId: PreCheckoutQueryId
     val isOk: Boolean

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/payments/abstracts/AnswerShippingQuery.kt

@@ -2,12 +2,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.abs
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ShippingQueryIdentifier
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.serializer
+import kotlinx.serialization.*
+import kotlinx.serialization.internal.BooleanSerializer
 
 interface AnswerShippingQuery : SimpleRequest<Boolean> {
     override fun method(): String = "answerShippingQuery"
-    override fun resultSerializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
 
     val shippingQueryId: ShippingQueryIdentifier
     val isOk: Boolean

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt

@@ -13,5 +13,8 @@ data class ExportChatInviteLink(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<String> {
     override fun method(): String = "exportChatInviteLink"
-    override fun resultSerializer(): KSerializer<String> = StringSerializer
+    override val resultDeserializer: DeserializationStrategy<String>
+        get() = StringSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt

@@ -13,5 +13,8 @@ data class LeaveChat(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "leaveChat"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt

@@ -14,5 +14,8 @@ data class GetChat(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<ExtendedChat> {
     override fun method(): String = "getChat"
-    override fun resultSerializer(): KSerializer<ExtendedChat> = ExtendedChatSerializer
+    override val resultDeserializer: DeserializationStrategy<ExtendedChat>
+        get() = ExtendedChatSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt

@@ -3,16 +3,24 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.RawChatMember
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMemberSerializerWithoutDeserialization
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
 
+private val chatMembersListSerializer = ArrayListSerializer(
+    ChatMemberSerializerWithoutDeserialization
+)
+
 @Serializable
 data class GetChatAdministrators(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier
-): ChatRequest, SimpleRequest<List<RawChatMember>> {
+): ChatRequest, SimpleRequest<List<ChatMember>> {
     override fun method(): String = "getChatAdministrators"
-    override fun resultSerializer(): KSerializer<List<RawChatMember>> = ArrayListSerializer(RawChatMember.serializer())
+    override val resultDeserializer: DeserializationStrategy<List<ChatMember>>
+        get() = chatMembersListSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt

@@ -13,5 +13,8 @@ data class GetChatMembersCount(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Int> {
     override fun method(): String = "getChatMembersCount"
-    override fun resultSerializer(): KSerializer<Int> = IntSerializer
+    override val resultDeserializer: DeserializationStrategy<Int>
+        get() = IntSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/GetChatMember.kt

@@ -2,7 +2,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.RawChatMember
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMember
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.abstracts.ChatMemberDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -11,7 +12,10 @@ data class GetChatMember(
     override val chatId: ChatIdentifier,
     @SerialName(userIdField)
     override val userId: UserId
-) : ChatMemberRequest<RawChatMember> {
+) : ChatMemberRequest<ChatMember> {
     override fun method(): String = "getChatMember"
-    override fun resultSerializer(): KSerializer<RawChatMember> = RawChatMember.serializer()
+    override val resultDeserializer: DeserializationStrategy<ChatMember>
+        get() = ChatMemberDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt

@@ -16,5 +16,8 @@ data class KickChatMember(
     override val untilDate: TelegramDate? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "kickChatMember"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt

@@ -32,5 +32,8 @@ data class PromoteChatMember(
     private val canPromoteMembers: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "promoteChatMember"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt

@@ -19,5 +19,8 @@ data class RestrictChatMember(
     val permissions: ChatPermissions
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "restrictChatMember"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/UnbanChatMember.kt

@@ -13,5 +13,8 @@ data class UnbanChatMember(
     override val userId: UserId
 ) : ChatMemberRequest<Boolean> {
     override fun method(): String = "unbanChatMember"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt

@@ -13,5 +13,8 @@ data class DeleteChatPhoto(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "deleteChatPhoto"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt

@@ -16,5 +16,8 @@ data class PinChatMessage (
     override val disableNotification: Boolean = false
 ): ChatRequest, SimpleRequest<Boolean>, MessageAction, DisableNotification {
     override fun method(): String = "pinChatMessage"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt

@@ -20,5 +20,8 @@ data class SetChatDescription (
     }
 
     override fun method(): String = "setChatDescription"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPermissions.kt

@@ -15,5 +15,8 @@ data class SetChatPermissions (
     val permissions: ChatPermissions
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "setChatPermissions"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt

@@ -16,7 +16,8 @@ data class SetChatPhoto (
     val photo: MultipartFile = throw IllegalArgumentException("Unfortunately, this type of objects can't be parsed automatically")
 ): ChatRequest, MultipartRequest<Boolean> {
     override fun method(): String = "setChatPhoto"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
     override val mediaMap: Map<String, MultipartFile> = mapOf(photoField to photo)
     override val paramsJson: JsonObject = toJson(serializer())
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt

@@ -20,5 +20,8 @@ data class SetChatTitle (
     }
 
     override fun method(): String = "setChatTitle"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt

@@ -13,5 +13,8 @@ data class UnpinChatMessage(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "unpinChatMessage"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt

@@ -13,5 +13,8 @@ data class DeleteChatStickerSet(
     override val chatId: ChatIdentifier
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "deleteChatStickerSet"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt

@@ -14,5 +14,8 @@ data class SetChatStickerSet(
     val stickerSetName: StickerSetName
 ): ChatRequest, SimpleRequest<Boolean> {
     override fun method(): String = "setChatStickerSet"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/common/CommonMultipartFileRequest.kt

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import kotlinx.serialization.json.JsonObject
 
 data class CommonMultipartFileRequest<T: Any>(
-    val data: Request<T>,
+    val data: SimpleRequest<T>,
     override val mediaMap: Map<String, MultipartFile>
 ) : MultipartRequest<T>, Request<T> by data {
     override val paramsJson: JsonObject = data.json()

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -3,7 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -20,5 +21,8 @@ data class EditChatMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt

@@ -1,10 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditInlineMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class EditInlineMessageLiveLocation(
@@ -18,4 +18,6 @@ data class EditInlineMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditCh
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -17,5 +18,8 @@ data class StopChatMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage, EditReplyMessage {
     override fun method(): String = "stopMessageLiveLocation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt

@@ -4,8 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditIn
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class StopInlineMessageLiveLocation(
@@ -15,4 +14,6 @@ data class StopInlineMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
     override fun method(): String = "stopMessageLiveLocation"
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditCh
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 const val editMessageReplyMarkupMethod = "editMessageReplyMarkup"
@@ -20,5 +21,8 @@ data class EditChatMessageReplyMarkup(
 ) : EditChatMessage, EditReplyMessage {
 
     override fun method(): String = editMessageReplyMarkupMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup
 
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditInlineMessage
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class EditInlineMessageReplyMarkup(
@@ -15,4 +15,6 @@ data class EditInlineMessageReplyMarkup(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
     override fun method(): String = editMessageReplyMarkupMethod
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditChatMessage.kt

@@ -2,6 +2,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-interface EditChatMessage : SimpleRequest<RawMessage>, MessageAction
+interface EditChatMessage : SimpleRequest<Message>, MessageAction

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt

@@ -2,10 +2,11 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
-import kotlinx.serialization.KSerializer
+import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
 interface EditInlineMessage : SimpleRequest<Boolean> {
     val inlineMessageId: InlineMessageIdentifier
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditChatMessageCaption.kt

@@ -5,7 +5,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 const val editMessageCaptionMethod = "editMessageCaption"
@@ -25,5 +26,8 @@ data class EditChatMessageCaption(
 ) : EditChatMessage, EditTextChatMessage, EditReplyMessage {
 
     override fun method(): String = editMessageCaptionMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt

@@ -5,8 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class EditInlineMessageCaption(
@@ -20,4 +19,6 @@ data class EditInlineMessageCaption(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage {
     override fun method(): String = editMessageCaptionMethod
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt

@@ -5,7 +5,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 const val editMessageMediaMethod = "editMessageMedia"
@@ -29,5 +30,8 @@ data class EditChatMessageMedia(
     }
 
     override fun method(): String = editMessageMediaMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class EditInlineMessageMedia(
@@ -23,6 +23,8 @@ data class EditInlineMessageMedia(
             throw IllegalArgumentException("For editing of media messages you MUST use file id (according to documentation)")
         }
     }
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 
     override fun method(): String = editMessageMediaMethod
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt

@@ -5,7 +5,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 const val editMessageTextMethod = "editMessageText"
@@ -27,5 +28,8 @@ data class EditChatMessageText(
 ) : EditChatMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
 
     override fun method(): String = editMessageTextMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
 
+import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.editMessageMediaMethod
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class EditInlineMessageText(
@@ -23,4 +23,6 @@ data class EditInlineMessageText(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
     override fun method(): String = editMessageMediaMethod
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt

@@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class GetGameHighScoresByChat (
@@ -14,4 +13,7 @@ data class GetGameHighScoresByChat (
     override val chatId: ChatId,
     @SerialName(messageIdField)
     override val messageId: MessageIdentifier
-) : GetGameHighScores, MessageAction
+) : GetGameHighScores, MessageAction {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt

@@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class GetGameHighScoresByInlineMessageId (
@@ -12,4 +11,7 @@ data class GetGameHighScoresByInlineMessageId (
     override val userId: UserId,
     @SerialName(inlineMessageIdField)
     override val inlineMessageId: InlineMessageIdentifier
-) : GetGameHighScores, InlineMessageAction
+) : GetGameHighScores, InlineMessageAction {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt

@@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.MessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class SetGameScoreByChatId (
@@ -20,4 +19,7 @@ data class SetGameScoreByChatId (
     override val force: Boolean = false,
     @SerialName(disableEditMessageField)
     override val disableEditMessage: Boolean = false
-) : SetGameScore, MessageAction
+) : SetGameScore, MessageAction {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt

@@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.InlineMessageAction
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 data class SetGameScoreByInlineMessageId (
@@ -18,4 +17,7 @@ data class SetGameScoreByInlineMessageId (
     override val force: Boolean = false,
     @SerialName(disableEditMessageField)
     override val disableEditMessage: Boolean = false
-) : SetGameScore, InlineMessageAction
+) : SetGameScore, InlineMessageAction {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/GetGameHighScores.kt

@@ -3,6 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
 import com.github.insanusmokrassar.TelegramBotAPI.types.games.GameHighScore
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.internal.ArrayListSerializer
 
@@ -10,7 +11,8 @@ interface GetGameHighScores : SimpleRequest<List<GameHighScore>> {
     val userId: UserId
 
     override fun method(): String = "getGameHighScores"
-    override fun resultSerializer(): KSerializer<List<GameHighScore>> = GameHighScoresSerializer
+    override val resultDeserializer: DeserializationStrategy<List<GameHighScore>>
+        get() = GameHighScoresSerializer
 }
 
 object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ArrayListSerializer(GameHighScore.serializer())

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/abstracts/SetGameScore.kt

@@ -2,8 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.serializer
+import kotlinx.serialization.*
 
 interface SetGameScore : SimpleRequest<Boolean> {
     val userId: UserId
@@ -12,5 +11,6 @@ interface SetGameScore : SimpleRequest<Boolean> {
     val disableEditMessage: Boolean
 
     override fun method(): String = "setGameScore"
-    override fun resultSerializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetFile.kt

@@ -12,5 +12,8 @@ data class GetFile(
     val fileId: FileId
 ): SimpleRequest<PathedFile> {
     override fun method(): String = "getFile"
-    override fun resultSerializer(): KSerializer<PathedFile> = PathedFile.serializer()
+    override val resultDeserializer: DeserializationStrategy<PathedFile>
+        get() = PathedFile.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetStickerSet.kt

@@ -11,5 +11,8 @@ data class GetStickerSet(
     val name: String
 ): SimpleRequest<StickerSet> {
     override fun method(): String = "getStickerSet"
-    override fun resultSerializer(): KSerializer<StickerSet> = StickerSet.serializer()
+    override val resultDeserializer: DeserializationStrategy<StickerSet>
+        get() = StickerSet.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/get/GetUserProfilePhotos.kt

@@ -23,5 +23,8 @@ data class GetUserProfilePhotos(
     }
 
     override fun method(): String = "getUserProfilePhotos"
-    override fun resultSerializer(): KSerializer<UserProfilePhotos> = UserProfilePhotos.serializer()
+    override val resultDeserializer: DeserializationStrategy<UserProfilePhotos>
+        get() = UserProfilePhotos.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendAction.kt

@@ -17,5 +17,8 @@ data class SendAction(
     val action: BotAction
 ): SendChatMessageRequest<Boolean> {
     override fun method(): String = "sendChatAction"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendContact.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -23,8 +24,8 @@ data class SendContact(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>
+) : SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>
 {
     constructor(
         chatId: ChatIdentifier,
@@ -43,7 +44,10 @@ data class SendContact(
     )
 
     override fun method(): String = "sendContact"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun Contact.toRequest(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendLocation.kt

@@ -3,7 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 // TODO:: Add location tracker for tracking location
@@ -23,11 +24,14 @@ data class SendLocation(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    PositionedSendMessageRequest<RawMessage>
+) : SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    PositionedSendMessageRequest<Message>
 {
 
     override fun method(): String = "sendLocation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt

@@ -6,7 +6,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -25,9 +26,9 @@ data class SendMessage(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
+) : SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
     DisableWebPagePreview
 {
     init {
@@ -37,5 +38,8 @@ data class SendMessage(
     }
 
     override fun method(): String = "sendMessage"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendPoll.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -21,8 +22,8 @@ data class SendPoll(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage> {
+) : SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message> {
 
     init {
         if (question.length !in pollQuestionTextLength) {
@@ -39,5 +40,8 @@ data class SendPoll(
     }
 
     override fun method(): String = "sendPoll"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendVenue.kt

@@ -3,7 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -26,10 +27,10 @@ data class SendVenue(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
-    PositionedSendMessageRequest<RawMessage>,
-    TitledSendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>
+) : SendMessageRequest<Message>,
+    PositionedSendMessageRequest<Message>,
+    TitledSendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>
 {
     constructor(
         chatId: ChatIdentifier,
@@ -50,7 +51,10 @@ data class SendVenue(
     )
 
     override fun method(): String = "sendVenue"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun Venue.toRequest(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMar
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 @Serializable
@@ -19,8 +20,11 @@ data class SendGame (
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>,
+) : SendMessageRequest<Message>,
     ReplyMarkup {
     override fun method(): String = "sendGame"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAnimation.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -23,7 +24,7 @@ fun SendAnimation(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val animationAsFileId = (animation as? FileId) ?.fileId
     val animationAsFile = animation as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -77,13 +78,13 @@ data class SendAnimationData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>,
-    SizedSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>,
+    DuratedSendMessageRequest<Message>,
+    SizedSendMessageRequest<Message>
 {
     init {
         text ?.let {
@@ -94,7 +95,10 @@ data class SendAnimationData internal constructor(
     }
 
     override fun method(): String = "sendAnimation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendAnimationFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt

@@ -8,7 +8,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -24,7 +25,7 @@ fun SendAudio(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val audioAsFileId = (audio as? FileId) ?.fileId
     val audioAsFile = audio as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -78,13 +79,13 @@ data class SendAudioData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>,
-    TitledSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>,
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>,
+    TitledSendMessageRequest<Message>,
+    DuratedSendMessageRequest<Message>,
     Performerable
 {
     init {
@@ -96,7 +97,10 @@ data class SendAudioData internal constructor(
     }
 
     override fun method(): String = "sendAudio"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendAudioFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendDocument.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -20,7 +21,7 @@ fun SendDocument(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val documentAsFileId = (document as? FileId) ?.fileId
     val documentAsFile = document as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -65,11 +66,11 @@ data class SendDocumentData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>
 {
     init {
         text ?.let {
@@ -80,7 +81,10 @@ data class SendDocumentData internal constructor(
     }
 
     override fun method(): String = "sendDocument"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendDocumentFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendMediaGroup.kt

@@ -6,7 +6,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMe
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
 import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
@@ -19,7 +20,7 @@ fun SendMediaGroup(
     media: List<MediaGroupMemberInputMedia>,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null
-): Request<List<RawMessage>> {
+): Request<List<Message>> {
     if (media.size !in membersCountInMediaGroup) {
         throw IllegalArgumentException("Count of members for media group must be in $membersCountInMediaGroup range")
     }
@@ -52,7 +53,7 @@ fun SendMediaGroup(
     }
 }
 
-private val serializer = ArrayListSerializer(RawMessage.serializer())
+private val messagesListSerializer = ArrayListSerializer(TelegramBotAPIMessageDeserializeOnlySerializer)
 
 @Serializable
 data class SendMediaGroupData internal constructor(
@@ -63,9 +64,7 @@ data class SendMediaGroupData internal constructor(
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null
-) : DataRequest<List<RawMessage>>,
-    SendMessageRequest<List<RawMessage>>
-{
+) : DataRequest<List<Message>>, SendMessageRequest<List<Message>> {
     @SerialName(mediaField)
     private val convertedMedia: String
         get() = jsonArray {
@@ -76,7 +75,10 @@ data class SendMediaGroupData internal constructor(
 
 
     override fun method(): String = "sendMediaGroup"
-    override fun resultSerializer(): KSerializer<List<RawMessage>> = serializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+    override val resultDeserializer: DeserializationStrategy<List<Message>>
+        get() = messagesListSerializer
 }
 
 data class SendMediaGroupFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendPhoto.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import kotlinx.serialization.*
 
 fun SendPhoto(
@@ -18,7 +19,7 @@ fun SendPhoto(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val data = SendPhotoData(
         chatId,
         (photo as? FileId) ?.fileId,
@@ -52,10 +53,10 @@ data class SendPhotoData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>
 {
     init {
         text ?.let {
@@ -66,7 +67,10 @@ data class SendPhotoData internal constructor(
     }
 
     override fun method(): String = "sendPhoto"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendPhotoFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendSticker.kt

@@ -5,7 +5,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.Replyi
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls
 import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonObject
@@ -16,7 +17,7 @@ fun SendSticker(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> = SendStickerByFileId(
+): Request<Message> = SendStickerByFileId(
     chatId,
     sticker as? FileId,
     disableNotification,
@@ -41,16 +42,19 @@ data class SendStickerByFileId internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendMessageRequest<RawMessage>, ReplyingMarkupSendMessageRequest<RawMessage> {
+) : SendMessageRequest<Message>, ReplyingMarkupSendMessageRequest<Message> {
     override fun method(): String = "sendSticker"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendStickerByFile internal constructor(
     @Transient
     private val sendStickerByFileId: SendStickerByFileId,
     val sticker: MultipartFile
-) : MultipartRequest<RawMessage>, Request<RawMessage> by sendStickerByFileId {
+) : MultipartRequest<Message>, Request<Message> by sendStickerByFileId {
     override val mediaMap: Map<String, MultipartFile> = mapOf(stickerField to sticker)
     override val paramsJson: JsonObject = sendStickerByFileId.toJsonWithoutNulls(SendStickerByFileId.serializer())
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideo.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -24,7 +25,7 @@ fun SendVideo(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val videoAsFileId = (video as? FileId) ?.fileId
     val videoAsFile = video as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -81,13 +82,13 @@ data class SendVideoData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>,
-    SizedSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>,
+    DuratedSendMessageRequest<Message>,
+    SizedSendMessageRequest<Message>
 {
     init {
         text ?.let {
@@ -98,7 +99,10 @@ data class SendVideoData internal constructor(
     }
 
     override fun method(): String = "sendVideo"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendVideoFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVideoNote.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -22,7 +23,7 @@ fun SendVideoNote(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val videoNoteAsFileId = (videoNote as? FileId) ?.fileId
     val videoNoteAsFile = videoNote as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -73,15 +74,14 @@ data class SendVideoNoteData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>,
-    SizedSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>,
+    DuratedSendMessageRequest<Message>,
+    SizedSendMessageRequest<Message>
 {
-    @Transient
     override val height: Int?
         get() = width
 
@@ -94,7 +94,10 @@ data class SendVideoNoteData internal constructor(
     }
 
     override fun method(): String = "sendVideoNote"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendVideoNoteFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt

@@ -7,7 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.utils.mapOfNotNull
 import kotlinx.serialization.*
 
@@ -21,7 +22,7 @@ fun SendVoice(
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-): Request<RawMessage> {
+): Request<Message> {
     val voiceAsFileId = (voice as? FileId) ?.fileId
     val voiceAsFile = voice as? MultipartFile
     val thumbAsFileId = (thumb as? FileId) ?.fileId
@@ -69,12 +70,12 @@ data class SendVoiceData internal constructor(
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : DataRequest<RawMessage>,
-    SendMessageRequest<RawMessage>,
-    ReplyingMarkupSendMessageRequest<RawMessage>,
-    TextableSendMessageRequest<RawMessage>,
-    ThumbedSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>
+) : DataRequest<Message>,
+    SendMessageRequest<Message>,
+    ReplyingMarkupSendMessageRequest<Message>,
+    TextableSendMessageRequest<Message>,
+    ThumbedSendMessageRequest<Message>,
+    DuratedSendMessageRequest<Message>
 {
     init {
         text ?.let {
@@ -85,7 +86,10 @@ data class SendVoiceData internal constructor(
     }
 
     override fun method(): String = "sendVoice"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 data class SendVoiceFiles internal constructor(

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/Data.kt

@@ -1,10 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base
-
-@Deprecated(
-    "Renamed to DataRequest",
-    ReplaceWith(
-        "DataRequest",
-        "com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.DataRequest"
-    )
-)
-typealias Data<T> = DataRequest<T>

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/DataRequest.kt

@@ -3,7 +3,4 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import kotlinx.serialization.*
 
-@Serializable(DataRequestSerializer::class)
 interface DataRequest<T: Any> : SimpleRequest<T>
-
-object DataRequestSerializer : KSerializer<DataRequest<*>> by ContextSerializer(DataRequest::class)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/base/MultipartRequestImpl.kt

@@ -1,8 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartRequest
-import kotlinx.serialization.KSerializer
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
+import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonObject
 
 /**
@@ -13,7 +12,8 @@ class MultipartRequestImpl<D: DataRequest<R>, F: Files, R: Any>(
     val files: F
 ) : MultipartRequest<R> {
     override fun method(): String = data.method()
-    override fun resultSerializer(): KSerializer<R> = data.resultSerializer()
+    override val resultDeserializer: DeserializationStrategy<R>
+        get() = data.resultDeserializer
     override val paramsJson: JsonObject = data.json()
     override val mediaMap: Map<String, MultipartFile> = files
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt

@@ -4,7 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategy
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPrice
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.LabeledPricesSerializer
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.abstracts.*
@@ -62,9 +63,12 @@ data class SendInvoice(
     DisableNotification,
     ReplyMessageId,
     ReplyMarkup,
-    SendMessageRequest<RawMessage> {
+    SendMessageRequest<Message> {
     override fun method(): String = "sendInvoice"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 
     @SerialName(photoUrlField)
     var photoUrl: String? = null

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/AddStickerToSet.kt

@@ -5,8 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipar
 import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 fun AddStickerToSet(
     userId: UserId,
@@ -44,5 +43,8 @@ data class AddStickerToSet internal constructor(
         }
     }
 
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
     override fun method(): String = "addStickerToSet"
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/CreateNewStickerSet.kt

@@ -5,8 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.common.CommonMultipar
 import com.github.insanusmokrassar.TelegramBotAPI.requests.stickers.abstracts.StickerSetAction
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.stickers.MaskPosition
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 fun CreateNewStickerSet(
     userId: UserId,
@@ -47,5 +46,8 @@ data class CreateNewStickerSet internal constructor(
         }
     }
 
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
     override fun method(): String = "createNewStickerSet"
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/DeleteStickerFromSet.kt

@@ -12,5 +12,8 @@ data class DeleteStickerFromSet(
     val sticker: FileId
 ) : SimpleRequest<Boolean> {
     override fun method(): String = "deleteStickerFromSet"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/SetStickerPositionInSet.kt

@@ -21,5 +21,8 @@ data class SetStickerPositionInSet(
     }
 
     override fun method(): String = "setStickerPositionInSet"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/UploadStickerFile.kt

@@ -24,5 +24,6 @@ data class UploadStickerFile(
     override val mediaMap: Map<String, MultipartFile> = mapOf(pngStickerField to sticker)
     @Transient
     override val paramsJson: JsonObject = toJsonWithoutNulls(serializer())
-    override fun resultSerializer(): KSerializer<File> = File.serializer()
+    override val resultDeserializer: DeserializationStrategy<File>
+        get() = File.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/stickers/abstracts/StickerSetAction.kt

@@ -12,5 +12,6 @@ interface StickerSetAction : SimpleRequest<Boolean> {
     val emojis: String // must be more than one
     val maskPosition: MaskPosition?
 
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: KSerializer<Boolean>
+        get() = BooleanSerializer
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/DeleteWebhook.kt

@@ -1,13 +1,15 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.webhook
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer
 
 @Serializable
 class DeleteWebhook : SimpleRequest<Boolean> {
     override fun method(): String = "deleteWebhook"
 
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/GetWebhookInfo.kt

@@ -2,12 +2,14 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.webhook
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.WebhookInfo
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 
 @Serializable
 class GetWebhookInfo : SimpleRequest<WebhookInfo> {
     override fun method(): String = "getWebhookInfo"
 
-    override fun resultSerializer(): KSerializer<WebhookInfo> = WebhookInfo.serializer()
+    override val resultDeserializer: DeserializationStrategy<WebhookInfo>
+        get() = WebhookInfo.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/webhook/SetWebhook.kt

@@ -51,7 +51,10 @@ data class SetWebhook internal constructor(
     val allowedUpdates: List<String>? = null
 ) : DataRequest<Boolean> {
     override fun method(): String = "setWebhook"
-    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 
     init {
         maxAllowedConnections ?.let {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/CallbackQuery/RawCallbackQuery.kt

@@ -1,16 +1,18 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
 import kotlinx.serialization.*
 
 @Serializable
-data class RawCallbackQuery(
+internal data class RawCallbackQuery(
     @SerialName(idField)
     val id: CallbackQueryIdentifier,
     @SerialName(fromField)
     val from: User,
-    val message: RawMessage? = null,
+    @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
+    val message: Message? = null,
     @SerialName(inlineMessageIdField)
     val inlineMessageId: InlineMessageIdentifier? = null,
     @SerialName("chat_instance")
@@ -19,11 +21,10 @@ data class RawCallbackQuery(
     @SerialName("game_short_name")
     val gameShortName: String? = null
 ) {
-    @Transient
     val asCallbackQuery: CallbackQuery by lazy {
         when {
-            message != null && data != null -> MessageDataCallbackQuery(id, from, chatInstance, message.asMessage, data)
-            message != null && gameShortName != null -> MessageGameShortNameCallbackQuery(id, from, chatInstance, message.asMessage, gameShortName)
+            message != null && data != null -> MessageDataCallbackQuery(id, from, chatInstance, message, data)
+            message != null && gameShortName != null -> MessageGameShortNameCallbackQuery(id, from, chatInstance, message, gameShortName)
             inlineMessageId != null && data != null -> InlineMessageIdDataCallbackQuery(id, from, chatInstance, inlineMessageId, data)
             inlineMessageId != null && gameShortName != null -> InlineMessageIdGameShortNameCallbackQuery(id, from, chatInstance, inlineMessageId, gameShortName)
             else -> throw IllegalStateException("Strange answer from server, can't create callback query")