fix way how multipart messages are sending

0.19.0

CHANGELOG.md

@@ -1,5 +1,43 @@
 # TelegramBotAPI changelog
 
+## 0.20.0 MPP Migration
+
+* Time library change: `joda-time` -> `com.soywiz.korlibs.klock:klock`
+* `Currencied` now using as `currency` value with type `String`
+    * For `Java` there is `Currencied#javaCurrency` extension function, which will give an old currency work way
+* `User` now have no field `userLocale`
+    * For `Java` there is `User#javaLocale` extension function, which will give an old locale work way
+
+## 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:
@@ -20,6 +58,18 @@
 * `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:

build.gradle

@@ -1,6 +1,3 @@
-project.version = "0.18.0"
-project.group = "com.github.insanusmokrassar"
-
 buildscript {
     repositories {
         mavenLocal()
@@ -15,9 +12,13 @@ buildscript {
     }
 }
 
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+}
+
+project.version = "0.19.0-kmpp-migration"
+project.group = "com.github.insanusmokrassar"
 
 apply from: "publish.gradle"
 
@@ -28,21 +29,49 @@ repositories {
     maven { url "https://kotlin.bintray.com/kotlinx" }
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
-    api "joda-time:joda-time:$joda_time_version"
+kotlin {
+    jvm()
+//    js()
 
-    api "io.ktor:ktor-client:$ktor_version"
-    api "io.ktor:ktor-client-cio:$ktor_version"
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version"
+                api "com.soywiz.korlibs.klock:klock:$klock_version"
 
-    api "io.ktor:ktor-server:$ktor_version"
-    api "io.ktor:ktor-server-host-common:$ktor_version"
-}
+                api "io.ktor:ktor-client-core:$ktor_version"
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
 
-compileKotlin {
-    kotlinOptions {
-        freeCompilerArgs = [ disableImplicitReflectionSerializerAnnotation ]
+        jvmMain {
+            dependencies {
+                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
+
+                api "io.ktor:ktor-client:$ktor_version"
+                api "io.ktor:ktor-server:$ktor_version"
+
+                api "io.ktor:ktor-server-host-common:$ktor_version"
+                api "io.ktor:ktor-client-cio:$ktor_version"
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+
+//        jsMain {
+//            dependencies {
+//                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_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
+klock_version=1.8.0
+ktor_version=1.2.6
 
 gradle_bintray_plugin_version=1.8.4
 
 project_public_name=Telegram Bot API
 project_public_description=Library for Object-Oriented and type-safe work with Telegram Bot API
-
-disableImplicitReflectionSerializerAnnotation=-Xexperimental=kotlinx.serialization.ImplicitReflectionSerializer

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

maven.publish.gradle

@@ -1,56 +1,52 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar) {
-    from javadoc
+task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
 
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
+        if (it.name.contains('kotlinMultiplatform')) {
+            artifactId = "${project.name}"
+        } else {
+            artifactId = "${project.name}-$name"
+        }
+    }
+}
+
 publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            groupId "${project.group}"
-            artifactId "${project.name}"
-            version "${project.version}"
+    publications.all {
+        artifact javadocsJar
 
-            artifact sourcesJar
-            artifact javadocJar
-            
-            pom.withXml {
-                asNode().children().last() + {
-                    resolveStrategy = Closure.DELEGATE_FIRST
-                    name "${project_public_name}"
-                    description "${project_public_description}"
-                    url "https://insanusmokrassar.github.io/${project.name}"
+        pom.withXml {
+            asNode().children().last() + {
+                resolveStrategy = Closure.DELEGATE_FIRST
 
-                    scm {
-                        connection "scm:git:git://github.com/insanusmokrassar/${project.name}.git"
-                        developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/${project.name}.git[push=]ssh:git@github.com:insanusmokrassar/${project.name}.git"
-                        url "https://github.com/insanusmokrassar/${project.name}"
+                description "Library for Object-Oriented and type-safe work with Telegram Bot API"
+                name "Telegram Bot API"
+                url "https://insanusmokrassar.github.io/TelegramBotAPI"
 
-                    }
+                scm {
+                    developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                    url "https://github.com/insanusmokrassar/TelegramBotAPI.git"
+                }
 
-                    developers {
+                developers {
                         developer {
                             id "InsanusMokrassar"
-                            name "Ovsyannikov Alexey"
+                            name "Ovsiannikov Aleksei"
                             email "ovsyannikov.alexey95@gmail.com"
                         }
-                    }
+                }
 
-                    licenses {
+                licenses {
                         license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE'
-                            distribution 'repo'
+                            name "Apache Software License 2.0"
+                            url "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
                         }
-                    }
                 }
             }
         }
@@ -59,5 +55,5 @@ publishing {
 
 signing {
     useGpgCmd()
-    sign publishing.publications.maven
+    sign(publishing.publications)
 }

mpp_publish_template.json

@@ -0,0 +1 @@
+{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

publish.gradle

@@ -1,33 +1,27 @@
 apply plugin: 'com.jfrog.bintray'
 
-ext {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
-}
+apply from: "maven.publish.gradle"
 
 bintray {
     user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    publications = ["maven"]
-    filesSpec {
-        into "$projectBintrayDir"
-        from("build/libs") {
-            include "**/*.asc"
-        }
-        from("build/publications/maven") {
-            rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1"
-        }
-    }
     pkg {
-        repo = 'StandardRepository'
+        repo = "StandardRepository"
         name = "${project.name}"
-        vcsUrl = "https://github.com/InsanusMokrassar/${project.name}"
-        licenses = ['Apache-2.0']
+        vcsUrl = "https://github.com/InsanusMokrassar/TelegramBotAPI"
+        licenses = ["Apache-2.0"]
         version {
             name = "${project.version}"
             released = new Date()
-            vcsTag = name
+            vcsTag = "${project.version}"
         }
     }
 }
 
-apply from: "maven.publish.gradle"
+bintrayUpload.doFirst {
+    publications = publishing.publications.collect {
+        it.name
+    }
+}
+
+bintrayUpload.dependsOn publishToMavenLocal

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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/BaseRequestsExecutor.kt

@@ -0,0 +1,7 @@
+package com.github.insanusmokrassar.TelegramBotAPI.bot
+
+import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
+
+abstract class BaseRequestsExecutor(
+    protected val telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper
+) : RequestsExecutor

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

@@ -7,14 +7,12 @@ import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.newRequestExcep
 import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.EmptyLimiter
 import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.RequestLimiter
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.extractResult
 import com.github.insanusmokrassar.TelegramBotAPI.types.Response
 import com.github.insanusmokrassar.TelegramBotAPI.types.RetryAfterError
 import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.call.HttpClientCall
-import io.ktor.client.engine.HttpClientEngine
-import io.ktor.util.cio.toByteArray
+import io.ktor.client.call.receive
 import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 
@@ -26,28 +24,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()
@@ -72,13 +48,11 @@ class KtorRequestsExecutor(
             if (call == null) {
                 throw IllegalArgumentException("Can't execute request: $request")
             }
-            val content = call.response.use {
-                it.content.toByteArray().toString(Charsets.UTF_8)
-            }
+            val content = call.response.receive<String>()
             val responseObject = jsonFormatter.parse(Response.serializer(), content)
 
             (responseObject.result ?.let {
-                jsonFormatter.fromJson(request.resultDeserializer(), it)
+                jsonFormatter.fromJson(request.resultDeserializer, it)
             } ?: responseObject.parameters ?.let {
                 val error = it.error
                 if (error is RetryAfterError) {

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/AbstractRequestCallFactory.kt

@@ -5,10 +5,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import io.ktor.client.HttpClient
 import io.ktor.client.call.HttpClientCall
 import io.ktor.client.call.call
-import io.ktor.client.request.accept
-import io.ktor.client.request.url
-import io.ktor.http.ContentType
-import io.ktor.http.HttpMethod
+import io.ktor.client.request.*
+import io.ktor.http.*
 
 abstract class AbstractRequestCallFactory : KtorCallFactory {
     private val methodsCache: MutableMap<String, String> = mutableMapOf()

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

@@ -21,14 +21,15 @@ class MultipartRequestCallFactory : AbstractRequestCallFactory() {
                 val params = castedRequest.paramsJson.mapWithCommonValues()
                 for ((key, value) in castedRequest.mediaMap + params) {
                     when (value) {
-                        is MultipartFile -> append(
+                        is MultipartFile -> appendInput(
                             key,
-                            value.file.asInput().readBytes(),
                             Headers.build {
                                 append(HttpHeaders.ContentType, value.mimeType)
                                 append(HttpHeaders.ContentDisposition, "filename=${value.fileId}")
                             }
-                        )
+                        ) {
+                            value.file.asInput()
+                        }
                         is FileId -> append(key, value.fileId)
                         else -> append(key, value.toString())
                     }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt

@@ -1,10 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import kotlinx.io.core.Closeable
 
 interface RequestsExecutor : Closeable {
-    @Throws(RequestException::class)
+    /**
+     * @throws com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
+     */
     suspend fun <T : Any> execute(request: Request<T>): T
 }

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

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.Response
-import java.io.IOException
+import kotlinx.io.errors.IOException
 
 fun newRequestException(
     response: Response,
@@ -20,7 +20,7 @@ sealed class RequestException constructor(
     message: String? = null,
     cause: Throwable? = null
 ) : IOException(
-    message,
+    message ?: "Something went wrong",
     cause
 )
 
@@ -32,9 +32,3 @@ class UnauthorizedException(response: Response, plainAnswer: String, message: St
 
 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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/CommonLimiter.kt

@@ -1,9 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters
 
+import com.soywiz.klock.DateTime
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 
-private fun now(): Long = System.currentTimeMillis()
+private fun now(): Long = DateTime.nowUnixLong()
 
 class CommonLimiter(
     private val lockCount: Int = 10,

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/settings/limiters/PowLimiter.kt

@@ -4,8 +4,8 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import java.util.concurrent.Executors
 import kotlin.coroutines.*
+import kotlin.math.pow
 
 private sealed class RequestEvent
 private class AddRequest(
@@ -21,9 +21,7 @@ data class PowLimiter(
     private val powK: Double = 0.0016
 ) : RequestLimiter {
     @Transient
-    private val scope = CoroutineScope(
-        Executors.newFixedThreadPool(3).asCoroutineDispatcher()
-    )
+    private val scope = CoroutineScope(Dispatchers.Default)
     @Transient
     private val eventsChannel = Channel<RequestEvent>(Channel.UNLIMITED)
     @Transient
@@ -35,7 +33,7 @@ data class PowLimiter(
             for (event in eventsChannel) {
                 when (event) {
                     is AddRequest -> {
-                        val awaitTime = ((Math.pow(requestsInWork, powValue) * powK) * 1000L).toLong()
+                        val awaitTime = (((requestsInWork.pow(powValue) * powK) * 1000L).toLong())
                         requestsInWork++
 
                         event.continuation.resume(

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

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

@@ -24,5 +24,8 @@ data class ForwardMessage(
 
     override fun method(): String = "forwardMessage"
 
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<User> = User.serializer()
+    override val resultDeserializer: DeserializationStrategy<User>
+        get() = User.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

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

@@ -5,10 +5,13 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateSerializerWithoutDeserialization
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.internal.ArrayListSerializer
 
+private val updatesListSerializer = ArrayListSerializer(
+    UpdateSerializerWithoutDeserialization
+)
+
 @Serializable
 data class GetUpdates(
     val offset: UpdateIdentifier? = null,// set `last update id + 1` to receive next part of updates
@@ -18,7 +21,9 @@ data class GetUpdates(
 ): SimpleRequest<List<Update>> {
     override fun method(): String = "getUpdates"
 
-    override fun resultDeserializer(): KSerializer<List<Update>> = ArrayListSerializer(
-        UpdateSerializerWithoutDeserialization
-    )
+    override val resultDeserializer: DeserializationStrategy<List<Update>>
+        get() = updatesListSerializer
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Poll> = Poll.serializer()
+    override val resultDeserializer: DeserializationStrategy<Poll>
+        get() = Poll.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/InputFile.kt

@@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts
 import com.github.insanusmokrassar.TelegramBotAPI.utils.StorageFile
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
-import java.io.File
 
 @Serializable(InputFileSerializer::class)
 sealed class InputFile {
@@ -40,7 +39,3 @@ data class MultipartFile (
 ) : InputFile() {
     override val fileId: String = file.generateCustomName()
 }
-
-fun File.toInputFile(): InputFile = MultipartFile(
-    StorageFile(this)
-)

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

@@ -0,0 +1,8 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts
+
+import kotlinx.serialization.*
+
+interface Request<T: Any> {
+    fun method(): String
+    val resultDeserializer: DeserializationStrategy<T>
+}

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

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

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun CallbackQuery.createAnswer(

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }
 
 fun InlineQuery.createAnswer(

src/commonMain/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/commonMain/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/commonMain/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 resultDeserializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: KSerializer<Boolean>
+        get() = BooleanSerializer
 
     val preCheckoutQueryId: PreCheckoutQueryId
     val isOk: Boolean

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
 
     val shippingQueryId: ShippingQueryIdentifier
     val isOk: Boolean

src/commonMain/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 resultDeserializer(): KSerializer<String> = StringSerializer
+    override val resultDeserializer: DeserializationStrategy<String>
+        get() = StringSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<ExtendedChat> = ExtendedChatSerializer
+    override val resultDeserializer: DeserializationStrategy<ExtendedChat>
+        get() = ExtendedChatSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

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

@@ -9,13 +9,18 @@ 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<ChatMember>> {
     override fun method(): String = "getChatAdministrators"
-    override fun resultDeserializer(): KSerializer<List<ChatMember>> = ArrayListSerializer(
-        ChatMemberSerializerWithoutDeserialization
-    )
+    override val resultDeserializer: DeserializationStrategy<List<ChatMember>>
+        get() = chatMembersListSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Int> = IntSerializer
+    override val resultDeserializer: DeserializationStrategy<Int>
+        get() = IntSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

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

@@ -14,5 +14,8 @@ data class GetChatMember(
     override val userId: UserId
 ) : ChatMemberRequest<ChatMember> {
     override fun method(): String = "getChatMember"
-    override fun resultDeserializer(): DeserializationStrategy<ChatMember> = ChatMemberDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<ChatMember>
+        get() = ChatMemberDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

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

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

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): 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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt

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

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -21,5 +21,8 @@ data class EditChatMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -18,5 +18,8 @@ data class StopChatMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage, EditReplyMessage {
     override fun method(): String = "stopMessageLiveLocation"
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt

@@ -21,5 +21,8 @@ data class EditChatMessageReplyMarkup(
 ) : EditChatMessage, EditReplyMessage {
 
     override fun method(): String = editMessageReplyMarkupMethod
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/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 resultDeserializer(): KSerializer<Boolean> = BooleanSerializer
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = BooleanSerializer
 }

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

@@ -26,5 +26,8 @@ data class EditChatMessageCaption(
 ) : EditChatMessage, EditTextChatMessage, EditReplyMessage {
 
     override fun method(): String = editMessageCaptionMethod
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditChatMessageMedia.kt

@@ -30,5 +30,8 @@ data class EditChatMessageMedia(
     }
 
     override fun method(): String = editMessageMediaMethod
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditChatMessageText.kt

@@ -28,5 +28,8 @@ data class EditChatMessageText(
 ) : EditChatMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
 
     override fun method(): String = editMessageTextMethod
-    override fun resultDeserializer(): DeserializationStrategy<Message> = TelegramBotAPIMessageDeserializationStrategy
+    override val resultDeserializer: DeserializationStrategy<Message>
+        get() = TelegramBotAPIMessageDeserializationStrategy
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
 }

src/commonMain/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/commonMain/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/commonMain/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/commonMain/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/commonMain/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/commonMain/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 resultDeserializer(): KSerializer<List<GameHighScore>> = GameHighScoresSerializer
+    override val resultDeserializer: DeserializationStrategy<List<GameHighScore>>
+        get() = GameHighScoresSerializer
 }
 
 object GameHighScoresSerializer : KSerializer<List<GameHighScore>> by ArrayListSerializer(GameHighScore.serializer())

src/commonMain/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 resultDeserializer(): KSerializer<Boolean> = Boolean.serializer()
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
 }