fixes of warnings

one more update of labeler

.github/labeler.yml

@@ -0,0 +1,7 @@
+api: "TelegramBotAPI-extensions-api/**"
+utils: "TelegramBotAPI-extensions-utils/**"
+core: "TelegramBotAPI/**" # currently not work
+
+code: "**/*.kt"
+gradle: "**/*.gradle"
+markdown: "**/*.md"

.github/workflows/greetings.yml

@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Welcome with your first issue'
+        pr-message: 'Welcome with your first PullRequest'

.github/workflows/label.yml

@@ -0,0 +1,18 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+name: "Pull Request Labeler"
+on:
+  - pull_request
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v2
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

CHANGELOG.md

@@ -1,5 +1,114 @@
 # TelegramBotAPI changelog
 
+## 0.27.0
+
+* `Common`:
+    * Versions updates:
+        * `Kotlin`: `1.3.71` -> `1.3.72`
+        * `Klock`: `1.10.3` -> `1.10.5`
+* `TelegramBotAPI`:
+    * Typealias `LongSeconds` was added for correct explanation of seconds in `Long` primitive type
+    * Several new fields was added:
+        * `explanationField`
+        * `explanationEntitiesField`
+        * `openPeriodField`
+        * `closeDateField`
+    * Extension `List<TextPart>#justTextSources` was added for mapping of `List<TextPart>` to `List<TextSource>`
+    * Field `SendPoll#closeInfo` was added
+        * Range `openPeriodPollSecondsLimit` was added and used in all `SendPoll` requests for checking income data
+    * `SendQuizPoll` now able to use fields `caption` and `parseMode` for `explanation` functionality
+        * `quizPollExplanationLimit` was added for checking `QuizPoll` explanation size
+    * Field `TextLinkTextSource#url` was added
+    * Field `TextMentionTextSource#user` was added
+    * Sealed class `ScheduledCloseInfo` was added
+        * Class `ExactScheduledCloseInfo` was added for cases with `close_date`
+        * Class `ApproximateScheduledCloseInfo` was added for cases with `open_period`
+    * Field `Poll#scheduledCloseInfo` was added
+    * Sealed class `MultipleAnswersPoll` was added
+        * Class `RegularPoll` now extends `MultipleAnswersPoll`
+    * `Dice` class was replaced into new package
+    * Sealed class `DiceAnimationType` was added
+        * Field `Dice#animationType` was added as `emoji` API representation
+        * `SendDice` now receive `animationType` as second parameter
+    * For `List<TextSource>` was added several extensions:
+        * `toMarkdownCaptions`
+        * `toMarkdownTexts`
+        * `toMarkdownV2Captions`
+        * `toMarkdownV2Texts`
+        * `toHtmlCaptions`
+        * `toHtmlTexts`
+* `TelegramBotAPI-extensions-api`:
+    * All `RequestsExecutor#sendDice` extensions now accept `DiceAnimationType?` as second parameter
+    * All `RequestsExecutor#sendRegularPoll` extensions now accept `ScheduledCloseInfo` fourth parameter
+    * All `RequestsExecutor#sendQuizPoll` extensions now accept additional parameters `caption: String` and
+    `parseMode: ParseMode` for `explanation` functionality and `closeInfo: ScheduledCloseInfo?` for autoclose poll
+    functionality
+* `TelegramBotAPI-extensions-utils`:
+    * Several shortcuts for `ScheduledCloseInfo` was added:
+        * `closePollExactAt`
+        * `closePollExactAfter`
+        * `closePollAfter`
+
+### 0.27.3
+
+* `TelegramBotAPI`:
+    * `UpdateDeserializationStrategy` is publicly available now
+    * All `setWebhook` extensions was marked as deprecated, renamed and replaced into `TelegramBotAPI-extensions-utils`
+    * Typealias `ExceptionHandler` was added - it will be used for `handleSafely`
+    * `SetWebhook` factories signatures was changed (backward compatibility was not broken)
+    * `executeUnsafe` now working differently
+        * Now it is possible to pass exceptions handler into `executeUnsafe`
+    * `BasketballDiceAnimationType` was added
+    * `UnknownDiceAnimationType` now is deprecated due to renaming - currently it is typealias for `CustomDiceAnimationType`
+        * `CustomDiceAnimationType` now is `data` class instead of common class
+    * `FlowsUpdatesFilter` will use size 64 by default for internal broadcast channels
+* `TelegramBotAPI-extensions-api`:
+    * Long Polling extensions now are deprecated in this project. It was replaced into `TelegramBotAPI-extensions-utils`
+    * Several `telegramBot` functions was renamed into `telegramBotWithCustomClientConfig`
+    * Add one more `setWebhookInfo` realisation
+* `TelegramBotAPI-extensions-utils`:
+    * Extension `toTelegramUpdate` was added
+    * Long Polling extensions were added
+    * Updates utils were added
+    * New extensions `startListenWebhooks`, `setWebhookInfoAndStartListenWebhooks` and `includeWebhookHandlingInRoute` was added
+    * New extension `CoroutineScope#updateHandlerWithMediaGroupsAdaptation` was added
+    * New extension `flowsUpdatesFilter` was added
+* `TelegramBotAPI-all`:
+    * Project was created
+
+### 0.27.2
+
+* `Common`:
+    * Versions:
+        * Coroutines: `1.3.5` -> `1.3.6`
+        * Klock: `1.10.5` -> `1.11.1`
+* `TelegramBotAPI`:
+    * Expected class `MimeType` was added
+        * Field `MimeTyped#mimeType` now typed by `MimeType` instead of `String`
+    * `MediaGroupMemberInputMedia` children now can be deserialized (but only those ones who are declared inside library)
+* `TelegramBotAPI-extensions-utils`:
+    * Chat events splitters added:
+        * Extension `Flow<ChatEventMessage>#onlyChannelEvents` was added
+        * Extension `Flow<ChatEventMessage>#onlyGroupEvents` was added
+        * Extension `Flow<ChatEventMessage>#onlySupergroupEvents` was added
+
+### 0.27.1
+
+* `TelegramBotAPI`:
+    * Interface `Explained` and subsinterfaces `ExplainedInput` and `ExplainedOutput` was added
+        * Class `QuizPoll` now implement `ExplainedInput`
+        * In `QuizPoll#caption` and `QuizPoll#captionEntities` are deprecated now
+        * Class `SendQuizPoll` now implement `ExplainedOutput`
+        * In `SendQuizPoll#caption` is deprecated now
+    * `explanationLimit` range was added as future replacement of `quizPollExplanationLimit`
+        * `quizPollExplanationLimit` now is deprecated
+    * Extensions `toMarkdownExplanations`, `toMarkdownV2Explanations` and `toHtmlExplanations` was added
+    * Typealias `FullTextSourcesList` was added
+        * All extensions `fullEntitiesList` now return `FullTextSourcesList`
+        * All extensions of `List<TextSource>` now are extensions for `FullTextSourcesList`
+* `TelegramBotAPI-extensions-api`:
+    * `sendQuizPoll` now is using `explanation` parameter instead of `caption`
+
 ## 0.26.0
 
 * `Common`:
@@ -38,6 +147,32 @@
     and size of retrieved updates is equal to 100 (max count of retrieved updates)
     * Extensions `getUpdates` now will receive only not nullable `limit` parameter
 
+### 0.26.4
+
+* `TelegramBotAPI`:
+    * Now any getting of updates will return `UnknownUpdateType` when inside of deserialization will be
+    `SerializationException` or `NotImplemented` error
+    * `CallbackGame` currently is an object
+        * It is possible to use `CallbackGame` for now
+            * `CallbackGameInlineKeyboardButton` now will not accept `callbackGame` as income object
+    * Now it is possible to pass exception handler in webhook
+
+### 0.26.3
+
+* `TelegramBotAPI`:
+    * `CallbackGameInlineKeyboardButton` was added
+    ([Issue-79](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/79),
+    [PR-80](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/80))
+    * `UnknownInlineKeyboardButton` was added. It is unavailable for creating, but you can receive it, for example, in
+    `InlineQueryResult`
+    * `Update` now will be created even if was `SerializationException` inside of creating the update instance - in this
+     case will be created `UnknownUpdateType`
+    * `UnknownUpdateType$rawJson` value now is included (`JsonElement`)
+    * **EXPERIMENTALLY** `BaseEditMessageUpdate#data` now is `CommonMessage<*>`
+    * Suspend inline function `handleSafely` was added
+        * `KtorRequestsExecutor` now use `handleSafely` instead of `try` with `supervisorScope`
+        * `UpdatesPolling` now use `handleSafely` instead of `try` with `supervisorScope`
+
 ### 0.26.2
 
 * `TelegramBotAPI`:

README.md

@@ -1,6 +1,6 @@
 # TelegramBotAPI
 
-| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI)                                                                                                                                                          |
+| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Chat in Telegram](badges/chat.svg)](https://teleg.one/InMoTelegramBotAPI) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI)                                                                                                                                                          |
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | TelegramBotAPI status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI)                                                             |
 | TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-api/images/download.svg)](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-api) |
@@ -15,21 +15,112 @@ the list of this complex currently next projects:
   `RequestsExecutor`), which allows to use the core library in more pleasant way
 * [TelegramBotAPI Util Extensions](TelegramBotAPI-extensions-utils/README.md) - contains extensions for more comfortable
 work with commands, updates and other different things
+* [TelegramBotAPI All](TelegramBotAPI-all/README.md) - concentration of all previously mentioned libraries
 
 Most part of some specific solves or unuseful
 moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api).
 
+## JavaScript notes
+
+In case if you are want to use this library inside of browser, you will need additional settings (thanks for help to [Alexander Nozik](https://research.jetbrains.org/researchers/altavir)):
+
+<details>
+<summary>Gradle build script help</summary>
+
+```groovy
+dependencies {
+    /* ... */
+
+    implementation "com.github.insanusmokrassar:TelegramBotAPI:$tgbot_api_version"
+    implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-api:$tgbot_api_version" // optional
+    implementation "com.github.insanusmokrassar:TelegramBotAPI-extensions-utils:$tgbot_api_version" // optional
+
+    /* Block of dependencies for correct building in browser */
+    implementation(npm("fs"))
+    implementation(npm("bufferutil"))
+    implementation(npm("utf-8-validate"))
+    implementation(npm("abort-controller"))
+    implementation(npm("text-encoding"))
+}
+
+/* ... */
+
+kotlin {
+    target {
+        browser {
+            /* Block for fix of exception in absence of some functionality, https://github.com/ktorio/ktor/issues/1339 */
+            dceTask {
+                dceOptions {
+                    keep("ktor-ktor-io.\$\$importsForInline\$\$.ktor-ktor-io.io.ktor.utils.io")
+                }
+            }
+        }
+    }
+}
+```
+
+</details>
+
 ## Ok, where should I start?
 
-In most cases, the most simple way will be to implement
-[TelegramBotAPI Extensions](TelegramBotAPI-extensions-api/README.md) and
-[TelegramBotAPI Util Extensions](TelegramBotAPI-extensions-utils/README.md) for the reason that they contains more
-simple tools. If you want to dive deeper in the core of library or develop something for it - welcome to
+In most cases, the most simple way will be to implement [TelegramBotAPI All](TelegramBotAPI-all/README.md) - it contains
+all necessary tools for comfort usage of this library. If you want to exclude some libraries, you can implement just
+[TelegramBotAPI API Extensions](TelegramBotAPI-extensions-api/README.md),
+[TelegramBotAPI Util Extensions](TelegramBotAPI-extensions-utils/README.md) or even
 [TelegramBotAPI](TelegramBotAPI/README.md).
 
+If you want to dive deeper in the core of library or develop something for it - welcome to learn more from
+[TelegramBotAPI](TelegramBotAPI/README.md) and our [Telegram Chat](https://teleg.one/InMoTelegramBotAPIChat).
+
 Anyway, all libraries are very typical inside of them. Examples:
 
 * In `TelegramBotAPI` common request look like `requestsExecutor.execute(SomeRequest())`
 * `TelegramBotAPI-extensions-api` typical syntax look like `requestsExecutor.someRequest()` (in most cases it would be
-better to understand to use `bot` name instead of `requestsExecutor`)
+better to use `bot` name instead of `requestsExecutor`)
 * `TelegramBotAPI-extensions-utils` will look like `filter.filterBaseMessageUpdates(chatId).filterExactCommands(Regex("^.*$"))...`
+
+## Build instruction
+
+If you want to build this project or to contribute, there are several recommendations:
+
+### Build
+
+In case if you want to just build project, run next command:
+
+```bash
+./gradlew clean build
+```
+
+On windows:
+
+```
+gradlew.bat clean build
+```
+
+### Publishing for work with your version locally
+
+In case, if you want to work in your other projects using your modification (or some state) of this library,
+you can use next code:
+
+```bash
+./gradlew clean build publishToMavenLocal
+```
+
+On windows:
+
+```
+gradlew.bat clean build publishToMavenLocal
+```
+
+But you must remember, that in this case your local maven repo must be the first one from
+your project retrieving libraries:
+
+```groovy
+repositories {
+    mavenLocal() // that must be the first one
+    jcenter()
+    mavenCentral()
+}
+```
+
+Besides, for your own version you can change variable `library_version` in the file [gradle.properties](./gradle.properties).

TelegramBotAPI-all/README.md

@@ -0,0 +1,16 @@
+# TelegramBotAPI-all
+
+Concentration of all TelegramBotAPI libraries:
+
+* [TelegramBotAPI](../TelegramBotAPI/README.md)
+* [TelegramBotAPI Extensions](../TelegramBotAPI-extensions-api/README.md)
+* [TelegramBotAPI Util Extensions](../TelegramBotAPI-extensions-utils/README.md)
+
+## Implementation
+
+```groovy
+dependencies {
+    // ...
+    implementation "com.github.insanusmokrassar:TelegramBotAPI-all:tgBotAPIVersion"
+}
+```

TelegramBotAPI-all/build.gradle

@@ -0,0 +1,52 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        jcenter()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+}
+
+project.version = "$library_version"
+project.group = "$library_group"
+
+apply from: "publish.gradle"
+
+repositories {
+    mavenLocal()
+    jcenter()
+    mavenCentral()
+    maven { url "https://kotlin.bintray.com/kotlinx" }
+}
+
+kotlin {
+    jvm()
+    js()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+                    api "${project.group}:TelegramBotAPI:$library_version"
+                    api "${project.group}:TelegramBotAPI-extensions-api:$library_version"
+                    api "${project.group}:TelegramBotAPI-extensions-utils:$library_version"
+                } else {
+                    api project(":TelegramBotAPI")
+                    api project(":TelegramBotAPI-extensions-api")
+                    api project(":TelegramBotAPI-extensions-utils")
+                }
+            }
+        }
+    }
+}

TelegramBotAPI-all/maven.publish.gradle

@@ -0,0 +1,57 @@
+apply plugin: 'maven-publish'
+
+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.all {
+        artifact javadocsJar
+
+        pom.withXml {
+            asNode().children().last() + {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
+                description "This project just include all subproject of TelegramBotAPI"
+                name "Telegram Bot API All"
+                url "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-all"
+
+                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 {
+                    
+                        developer {
+                            id "InsanusMokrassar"
+                            name "Ovsiannikov Aleksei"
+                            email "ovsyannikov.alexey95@gmail.com"
+                        }
+                    
+                }
+
+                licenses {
+                    
+                        license {
+                            name "Apache Software License 2.0"
+                            url "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                        }
+                    
+                }
+            }
+        }
+    }
+}

TelegramBotAPI-all/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 All","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-all","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-all/publish.gradle

@@ -0,0 +1,55 @@
+apply plugin: 'com.jfrog.bintray'
+
+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')
+    filesSpec {
+        from "${buildDir}/publications/"
+        eachFile {
+            String directorySubname = it.getFile().parentFile.name
+            if (it.getName() == "module.json") {
+                if (directorySubname == "kotlinMultiplatform") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
+                } else {
+                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                }
+            } else {
+                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
+                } else {
+                    it.exclude()
+                }
+            }
+        }
+        into "${project.group}".replace(".", "/")
+    }
+    pkg {
+        repo = "StandardRepository"
+        name = "${project.name}"
+        vcsUrl = "https://github.com/InsanusMokrassar/TelegramBotAPI"
+        licenses = ["Apache-2.0"]
+        version {
+            name = "${project.version}"
+            released = new Date()
+            vcsTag = "${project.version}"
+            gpg {
+                sign = true
+                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+            }
+        }
+    }
+}
+
+bintrayUpload.doFirst {
+    publications = publishing.publications.collect {
+        if (it.name.contains('kotlinMultiplatform')) {
+            null
+        } else {
+            it.name
+        }
+    } - null
+}
+
+bintrayUpload.dependsOn publishToMavenLocal

TelegramBotAPI-extensions-api/README.md

@@ -55,14 +55,22 @@ compile "com.github.insanusmokrassar:TelegramBotAPI-extensions-api:$telegrambota
 ## Example of usage and comparison with `TelegramBotAPI`
 
 Here presented review table for comparison of api from original [TelegramBotAPI](../TelegramBotAPI/README.md#Requests)
-and extensions-api library:
-
-In all examples supposed that you have created bot with next approximate lines:
+and extensions-api library. First of all, this library allow to create bot instance in a new way:
 
 ```kotlin
-val bot: RequestsExecutor = ...
+val bot = telegramBot("IT IS YOUR TOKEN")
 ```
 
+There are a lot of signature for this. For example, you can create bot with next code:
+
+```kotlin
+val bot = telegramBot("IT IS YOUR TOKEN") {
+    proxy = ProxyBuilder.socks("127.0.0.1", 1080)
+}
+```
+
+In all examples supposed that you have created bot.
+
 | TelegramBotAPI | TelegramBotAPI-extensions-api |
 |----------------|-------------------------------|
 | bot.execute(GetMe) |    bot.getMe()          |
@@ -70,6 +78,10 @@ val bot: RequestsExecutor = ...
 
 ## Updates
 
+**Currently, these paragraphs almost outdated due to the fact that extensions for listening of updates and webhooks were
+replaced into `TelegramBotAPI-extensions-utils`. But, most part of information below is correct with small fixes and
+adding of `TelegramBotAPI-extensions-utils` dependency.**
+
 Usually, it is more comfortable to use filter object to get separated types of updates:
 
 ```kotlin

TelegramBotAPI-extensions-api/build.gradle

@@ -40,7 +40,7 @@ kotlin {
                 if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
                     api "${project.group}:TelegramBotAPI:$library_version"
                 } else {
-                    implementation project(":TelegramBotAPI")
+                    api project(":TelegramBotAPI")
                 }
             }
         }

TelegramBotAPI-extensions-api/maven.publish.gradle

@@ -26,7 +26,7 @@ publishing {
 
                 description "API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference"
                 name "Telegram Bot API Extensions for API"
-                url "https://insanusmokrassar.github.io/TelegramBotAPI"
+                url "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api"
 
                 scm {
                     developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"

TelegramBotAPI-extensions-api/mpp_publish_template.json

@@ -1 +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 Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"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 Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/BotBuilder.kt

@@ -0,0 +1,45 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.ProxyConfig
+
+/**
+ * @param proxy Standard ktor [ProxyConfig]
+ * @param ktorClientEngine Engine like [io.ktor.client.engine.cio.CIO]
+ * @param ktorClientConfig Config block for preconfiguring of bot [HttpClient]
+ */
+data class BotBuilder internal constructor(
+    var proxy: ProxyConfig? = null,
+    var ktorClientEngine: HttpClientEngine? = null,
+    var ktorClientConfig: (HttpClientConfig<*>.() -> Unit) ? = null
+) {
+    internal fun createHttpClient(): HttpClient = ktorClientEngine ?.let { engine ->
+        HttpClient(engine) {
+            ktorClientConfig ?.let { it() }
+            engine {
+                proxy = this@BotBuilder.proxy ?: proxy
+            }
+        }
+    } ?: HttpClient {
+        ktorClientConfig ?.let { it() }
+        engine {
+            proxy = this@BotBuilder.proxy ?: proxy
+        }
+    }
+}
+
+/**
+ * @return Created by [telegramBotWithCustomClientConfig] function [RequestsExecutor]. This executor will be preconfigured using [token] and
+ * [block]
+ */
+fun telegramBot(
+    token: String,
+    block: BotBuilder.() -> Unit
+): RequestsExecutor = telegramBot(
+    TelegramAPIUrlsKeeper(token),
+    BotBuilder().apply(block).createHttpClient()
+)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/BotExtensions.kt

@@ -0,0 +1,76 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.HttpClientEngine
+
+/**
+ * Allows to create bot using bot [urlsKeeper] and already prepared [client]
+ */
+fun telegramBot(
+    urlsKeeper: TelegramAPIUrlsKeeper,
+    client: HttpClient
+): RequestsExecutor = KtorRequestsExecutor(
+    urlsKeeper,
+    client
+)
+
+/**
+ * Allows to create bot using bot [urlsKeeper] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
+ * configure [HttpClient] using [clientConfig]
+ */
+fun telegramBotWithCustomClientConfig(
+    urlsKeeper: TelegramAPIUrlsKeeper,
+    clientEngine: HttpClientEngine,
+    clientConfig: HttpClientConfig<*>.() -> Unit = {}
+): RequestsExecutor = telegramBot(
+    urlsKeeper,
+    HttpClient(clientEngine, clientConfig)
+)
+
+/**
+ * Allows to create bot using bot [urlsKeeper] and optionally configure [HttpClient] using [clientConfig]
+ */
+fun telegramBotWithCustomClientConfig(
+    urlsKeeper: TelegramAPIUrlsKeeper,
+    clientConfig: HttpClientConfig<*>.() -> Unit = {}
+): RequestsExecutor = telegramBot(
+    urlsKeeper,
+    HttpClient(clientConfig)
+)
+
+/**
+ * Allows to create bot using bot [token]
+ */
+fun telegramBot(
+    token: String
+): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token))
+
+/**
+ * Allows to create bot using bot [token] and already prepared [client]
+ */
+fun telegramBot(
+    token: String,
+    client: HttpClient
+): RequestsExecutor = telegramBot(TelegramAPIUrlsKeeper(token), client)
+
+/**
+ * Allows to create bot using bot [token] and configure [HttpClient] using [clientConfig]
+ */
+fun telegramBotWithCustomClientConfig(
+    token: String,
+    clientConfig: HttpClientConfig<*>.() -> Unit
+): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientConfig)
+
+/**
+ * Allows to create bot using bot [token] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
+ * configure [HttpClient] using [clientConfig]
+ */
+fun telegramBot(
+    token: String,
+    clientEngine: HttpClientEngine,
+    clientConfig: HttpClientConfig<*>.() -> Unit = {}
+): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientEngine, clientConfig)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/JsonUtils.kt

@@ -0,0 +1,11 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
+
+import kotlinx.serialization.json.Json
+
+@Suppress("EXPERIMENTAL_API_USAGE")
+internal val nonstrictJsonFormat = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+    serializeSpecialFloatingPointValues = true
+    useArrayPolymorphism = true
+}

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendDice.kt

@@ -6,19 +6,22 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType
 
 suspend fun RequestsExecutor.sendDice(
     chatId: ChatIdentifier,
+    animationType: DiceAnimationType? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
-    SendDice(chatId, disableNotification, replyToMessageId, replyMarkup)
+    SendDice(chatId, animationType, disableNotification, replyToMessageId, replyMarkup)
 )
 
 suspend fun RequestsExecutor.sendDice(
     chat: Chat,
+    animationType: DiceAnimationType? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
-) = sendDice(chat.id, disableNotification, replyToMessageId, replyMarkup)
+) = sendDice(chat.id, animationType, disableNotification, replyToMessageId, replyMarkup)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/polls/SendPoll.kt

@@ -5,10 +5,10 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls.SendQuizPo
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls.SendRegularPoll
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
-import com.github.insanusmokrassar.TelegramBotAPI.types.polls.QuizPoll
-import com.github.insanusmokrassar.TelegramBotAPI.types.polls.RegularPoll
+import com.github.insanusmokrassar.TelegramBotAPI.types.polls.*
 
 suspend fun RequestsExecutor.sendRegularPoll(
     chatId: ChatIdentifier,
@@ -17,12 +17,13 @@ suspend fun RequestsExecutor.sendRegularPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     allowMultipleAnswers: Boolean = false,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
     SendRegularPoll(
-        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, disableNotification, replyToMessageId, replyMarkup
     )
 )
 suspend fun RequestsExecutor.sendRegularPoll(
@@ -33,12 +34,13 @@ suspend fun RequestsExecutor.sendRegularPoll(
     options: List<String> = poll.options.map { it.text },
     isAnonymous: Boolean = poll.isAnonymous,
     allowMultipleAnswers: Boolean = poll.allowMultipleAnswers,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
     SendRegularPoll(
-        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+        chatId, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, disableNotification, replyToMessageId, replyMarkup
     )
 )
 
@@ -49,11 +51,12 @@ suspend fun RequestsExecutor.sendRegularPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     allowMultipleAnswers: Boolean = false,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendRegularPoll(
-    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, disableNotification, replyToMessageId, replyMarkup
 )
 
 suspend fun RequestsExecutor.sendRegularPoll(
@@ -64,11 +67,12 @@ suspend fun RequestsExecutor.sendRegularPoll(
     options: List<String> = poll.options.map { it.text },
     isAnonymous: Boolean = poll.isAnonymous,
     allowMultipleAnswers: Boolean = poll.allowMultipleAnswers,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendRegularPoll(
-    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, disableNotification, replyToMessageId, replyMarkup
+    chat.id, question, options, isAnonymous, isClosed, allowMultipleAnswers, closeInfo, disableNotification, replyToMessageId, replyMarkup
 )
 
 
@@ -79,12 +83,15 @@ suspend fun RequestsExecutor.sendQuizPoll(
     correctOptionId: Int,
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
     SendQuizPoll(
-        chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+        chatId, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, disableNotification, replyToMessageId, replyMarkup
     )
 )
 
@@ -95,11 +102,14 @@ suspend fun RequestsExecutor.sendQuizPoll(
     correctOptionId: Int,
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendQuizPoll(
-    chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+    chat.id, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, disableNotification, replyToMessageId, replyMarkup
 )
 
 suspend fun RequestsExecutor.sendQuizPoll(
@@ -110,12 +120,15 @@ suspend fun RequestsExecutor.sendQuizPoll(
     options: List<String> = quizPoll.options.map { it.text },
     correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
     isAnonymous: Boolean = quizPoll.isAnonymous,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = execute(
     SendQuizPoll(
-        chatId, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+        chatId, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, disableNotification, replyToMessageId, replyMarkup
     )
 )
 
@@ -127,9 +140,12 @@ suspend fun RequestsExecutor.sendQuizPoll(
     options: List<String> = quizPoll.options.map { it.text },
     correctOptionId: Int = quizPoll.correctOptionId ?: error("Correct option ID must be provided by income QuizPoll or by developer"),
     isAnonymous: Boolean = quizPoll.isAnonymous,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    closeInfo: ScheduledCloseInfo? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendQuizPoll(
-    chat.id, question, options, correctOptionId, isAnonymous, isClosed, disableNotification, replyToMessageId, replyMarkup
+    chat.id, question, options, correctOptionId, isAnonymous, isClosed, explanation, parseMode, closeInfo, disableNotification, replyToMessageId, replyMarkup
 )

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt

@@ -10,56 +10,54 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.*
-import com.github.insanusmokrassar.TelegramBotAPI.utils.PreviewFeature
-import io.ktor.client.features.HttpRequestTimeoutException
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 import kotlinx.coroutines.*
 
+@Deprecated("Replaced and renamed in TelegramBotAPI-extensions-utils")
 fun RequestsExecutor.startGettingOfUpdates(
     timeoutSeconds: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
-    exceptionsHandler: (suspend (Exception) -> Unit)? = null,
+    exceptionsHandler: (ExceptionHandler<Unit>)? = null,
     allowedUpdates: List<String>? = null,
     updatesReceiver: UpdateReceiver<Update>
 ): Job = scope.launch {
     var lastUpdateIdentifier: UpdateIdentifier? = null
 
     while (isActive) {
-        try {
-            supervisorScope {
-                val updates = getUpdates(
-                    offset = lastUpdateIdentifier?.plus(1),
-                    timeout = timeoutSeconds,
-                    allowed_updates = allowedUpdates
-                ).let { originalUpdates ->
-                    val converted = originalUpdates.convertWithMediaGroupUpdates()
-                    /**
-                     * Dirty hack for cases when the media group was retrieved not fully:
-                     *
-                     * We are throw out the last media group and will reretrieve it again in the next get updates
-                     * and it will guarantee that it is full
-                     */
-                    if (originalUpdates.size == getUpdatesLimit.last && converted.last() is SentMediaGroupUpdate) {
-                        converted - converted.last()
-                    } else {
-                        converted
-                    }
-                }
-
-                supervisorScope {
-                    for (update in updates) {
-                        updatesReceiver(update)
-
-                        lastUpdateIdentifier = update.lastUpdateIdentifier()
-                    }
+        handleSafely(
+            { e ->
+                exceptionsHandler ?.invoke(e)
+                if (e is RequestException) {
+                    delay(1000L)
+                }
+            }
+        ) {
+            val updates = getUpdates(
+                offset = lastUpdateIdentifier?.plus(1),
+                timeout = timeoutSeconds,
+                allowed_updates = allowedUpdates
+            ).let { originalUpdates ->
+                val converted = originalUpdates.convertWithMediaGroupUpdates()
+                /**
+                 * Dirty hack for cases when the media group was retrieved not fully:
+                 *
+                 * We are throw out the last media group and will reretrieve it again in the next get updates
+                 * and it will guarantee that it is full
+                 */
+                if (originalUpdates.size == getUpdatesLimit.last && converted.last() is SentMediaGroupUpdate) {
+                    converted - converted.last()
+                } else {
+                    converted
+                }
+            }
+
+            handleSafely {
+                for (update in updates) {
+                    updatesReceiver(update)
+
+                    lastUpdateIdentifier = update.lastUpdateIdentifier()
                 }
             }
-        } catch (e: HttpRequestTimeoutException) {
-            exceptionsHandler ?.invoke(e) // it is ok due to mechanism of long polling
-        } catch (e: RequestException) {
-            exceptionsHandler ?.invoke(e) // it is not ok, but in most cases it will mean that there is some limit for requests count
-            delay(1000L)
-        } catch (e: Exception) {
-            exceptionsHandler ?.invoke(e)
         }
     }
 }
@@ -70,7 +68,10 @@ fun RequestsExecutor.startGettingOfUpdates(
  * [kotlinx.coroutines.flow.Flow.collect] on one of [FlowsUpdatesFilter] flows. To avoid it, you can pass
  * [flowUpdatesPreset] lambda - it will be called BEFORE starting updates getting
  */
+@FlowPreview
 @PreviewFeature
+@Suppress("unused")
+@Deprecated("Replaced and renamed in TelegramBotAPI-extensions-utils")
 fun RequestsExecutor.startGettingFlowsUpdates(
     timeoutSeconds: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
@@ -82,6 +83,7 @@ fun RequestsExecutor.startGettingFlowsUpdates(
     startGettingOfUpdates(timeoutSeconds, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
 }
 
+@Deprecated("Replaced and renamed in TelegramBotAPI-extensions-utils")
 fun RequestsExecutor.startGettingOfUpdates(
     updatesFilter: UpdatesFilter,
     timeoutSeconds: Seconds = 30,
@@ -95,6 +97,7 @@ fun RequestsExecutor.startGettingOfUpdates(
     updatesFilter.asUpdateReceiver
 )
 
+@Deprecated("Replaced and renamed in TelegramBotAPI-extensions-utils")
 fun RequestsExecutor.startGettingOfUpdates(
     messageCallback: UpdateReceiver<MessageUpdate>? = null,
     messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
@@ -139,6 +142,8 @@ fun RequestsExecutor.startGettingOfUpdates(
     )
 }
 
+@Suppress("unused")
+@Deprecated("Replaced and renamed in TelegramBotAPI-extensions-utils")
 fun RequestsExecutor.startGettingOfUpdates(
     messageCallback: UpdateReceiver<MessageUpdate>? = null,
     mediaGroupCallback: UpdateReceiver<MediaGroupUpdate>? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/utils/UpdatesHandling.kt

@@ -0,0 +1,49 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.utils
+
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.InternalUtils.convertWithMediaGroupUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver
+import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.accumulateByKey
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.launch
+
+/**
+ * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE
+ * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s.
+ *
+ * @see UpdateReceiver
+ */
+fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
+    output: UpdateReceiver<Update>,
+    mediaGroupsDebounceMillis: Long = 1000L
+): UpdateReceiver<Update> {
+    val updatesChannel = Channel<Update>(Channel.UNLIMITED)
+    val mediaGroupChannel = Channel<Pair<String, BaseMessageUpdate>>(Channel.UNLIMITED)
+    val mediaGroupAccumulatedChannel = mediaGroupChannel.accumulateByKey(
+        mediaGroupsDebounceMillis,
+        scope = this
+    )
+
+    launch {
+        launch {
+            for (update in updatesChannel) {
+                when (val data = update.data) {
+                    is MediaGroupMessage -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
+                    else -> output(update)
+                }
+            }
+        }
+        launch {
+            for ((_, mediaGroup) in mediaGroupAccumulatedChannel) {
+                mediaGroup.convertWithMediaGroupUpdates().forEach {
+                    output(it)
+                }
+            }
+        }
+    }
+
+    return { updatesChannel.send(it) }
+}

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/webhook/SetWebhookInfo.kt

@@ -5,6 +5,22 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.SetWebhook
 
+/**
+ * Use this method to send information about webhook (like [url])
+ */
+suspend fun RequestsExecutor.setWebhookInfo(
+    url: String,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null
+) = execute(
+    SetWebhook(
+        url, maxAllowedConnections, allowedUpdates
+    )
+)
+
+/**
+ * Use this method to send information about webhook (like [url] and [certificate])
+ */
 suspend fun RequestsExecutor.setWebhookInfo(
     url: String,
     certificate: FileId,
@@ -16,6 +32,9 @@ suspend fun RequestsExecutor.setWebhookInfo(
     )
 )
 
+/**
+ * Use this method to send information about webhook (like [url] and [certificate])
+ */
 suspend fun RequestsExecutor.setWebhookInfo(
     url: String,
     certificate: MultipartFile,

TelegramBotAPI-extensions-utils/README.md

@@ -1,5 +1,23 @@
 # TelegramBotAPI Util  Extensions
 
+- [TelegramBotAPI Util  Extensions](#telegrambotapi-util--extensions)
+  * [What is it?](#what-is-it-)
+  * [How to implement library?](#how-to-implement-library-)
+    + [Maven](#maven)
+    + [Gradle](#gradle)
+  * [How to use?](#how-to-use-)
+    + [Updates](#updates)
+      - [Long polling](#long-polling)
+      - [WebHooks (currently JVM-only)](#webhooks--currently-jvm-only-)
+    + [Filters](#filters)
+      - [Sent messages](#sent-messages)
+        * [Common messages](#common-messages)
+        * [Chat actions](#chat-actions)
+    + [Shortcuts](#shortcuts)
+      - [ScheduledCloseInfo](#scheduledcloseinfo)
+
+<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
+
 [![Download](https://api.bintray.com/packages/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-utils/images/download.svg) ](https://bintray.com/insanusmokrassar/StandardRepository/TelegramBotAPI-extensions-utils/_latestVersion)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.insanusmokrassar/TelegramBotAPI-extensions-utils)
 
@@ -60,22 +78,186 @@ val filter = FlowsUpdatesFilter(64)
 Alternative way to use the things below:
 
 ```kotlin
-val filter = bot.startGettingUpdates(
+val filter = bot.startGettingFlowsUpdatesByLongPolling(
     scope = CoroutineScope(Dispatchers.Default)
 ) {
     // place code from examples here with replacing of `filter` by `this`
 }
 ```
 
-### Getting of only text incoming messages
+### Updates
+
+As mentioned in [Telegram Bot API reference](https://core.telegram.org/bots/api#getting-updates), there are two ways for
+updates retrieving:
+
+* Webhooks
+* Long Polling
+
+Both of them you could use in your project using [TelegramBotAPI](../TelegramBotAPI/README.md), but here there are
+several useful extensions for both of them.
+
+Anyway, in both of ways it will be useful to know that it is possible to create `UpdateReceiver` object using function
+`flowsUpdatesFilter`:
 
 ```kotlin
-filter.asContentMessagesFlow().onlyTextContentMessages().onEach {
+val internalChannelsSizes = 128
+flowsUpdatesFilter(internalChannelsSizes/* default is 64 */) {
+    /* ... */
+}
+```
+
+#### Long polling
+
+The most simple way is Long Polling and one of the usages was mentioned above:
+
+```kotlin
+val filter = bot.startGettingFlowsUpdatesByLongPolling(
+    scope = CoroutineScope(Dispatchers.Default)
+) {
+    // place code from examples here with replacing of `filter` by `this`
+}
+```
+
+Extension `startGettingFlowsUpdatesByLongPolling` was used in this example, but there are a lot of variations of
+`startGettingOfUpdatesByLongPolling` and others for getting the same result. Usually, it is supposed that you already
+have created `filter` object (or something like this) and will pass it into extension:
+
+```kotlin
+val filter = FlowsUpdatesFilter(64)
+bot.startGettingOfUpdatesByLongPolling(
+    filter
+)
+```
+
+But also there are extensions which allow to pass lambdas directly:
+
+```kotlin
+bot.startGettingOfUpdatesByLongPolling(
+    {
+        println("Received message update: $it")
+    }
+)
+```
+
+Anyway, it is strictly recommended to pass your `CoroutineScope` object to this method at least for more comfortable
+management of updates.
+
+#### WebHooks (currently JVM-only)
+
+For webhooks there are less number of functions and extensions than for Long Polling (but it is still fully automated):
+
+```kotlin
+startListenWebhooks(
+    8081,
+    CIO // require to implement this engine dependency
+) {
+    // here will be all updates one by one in $it
+}
+```
+
+Besides, there are two additional opportunities:
+
+* Extension `Route#includeWebhookHandlingInRoute`, which allow you to include webhook processing inside your ktor
+application without creating of new one server (as it is happening in `startListenWebhooks`)
+* Extension `RequestsExecutor#setWebhookInfoAndStartListenWebhooks`. It is allow to set up full server (in fact, with
+`startListenWebhooks`), but also send `SetWebhook` request before and check that it was successful
+
+### Filters
+
+There are several filters for flows.
+
+#### Sent messages
+
+All sent messages can be filtered for three types:
+
+| Type | Description | Flow extension |
+|:---- |:----------- |:-------------- |
+| Common messages | Simple messages with text, media, location, etc. | `asContentMessagesFlow` |
+| Chat actions | New chat member, rename of chat, etc. | `asChatEventsFlow` |
+| Unknown events | Any other messages, that contain unsupported data | `asUnknownMessagesFlow` |
+
+##### Common messages
+
+Unfortunately, due to the erasing of generic types, when you are using `asContentMessagesFlow` you will retrieve
+data with type `ContentMessage<*>`. For correct filtering of content type for retrieved objects, was created special
+filters:
+
+| Content type | Result type | Flow extension |
+|:---- |:----------- |:-------------- |
+| Animation | `ContentMessage<AnimationContent>`| `onlyAnimationContentMessages` |
+| Audio | `ContentMessage<AudioContent>` | `onlyAudioContentMessages` |
+| Contact | `ContentMessage<ContactContent>` | `onlyContactContentMessages` |
+| Dice | `ContentMessage<DiceContent>` | `onlyDiceContentMessages` |
+| Document | `ContentMessage<DocumentContent>` | `onlyDocumentContentMessages` |
+| Game | `ContentMessage<GameContent>` | `onlyGameContentMessages` |
+| Invoice | `ContentMessage<InvoiceContent>` | `onlyInvoiceContentMessages` |
+| Location | `ContentMessage<LocationContent>` | `onlyLocationContentMessages` |
+| Photo | `ContentMessage<PhotoContent>` | `onlyPhotoContentMessages` |
+| Poll | `ContentMessage<PollContent>` | `onlyPollContentMessages` |
+| Sticker | `ContentMessage<StickerContent>` | `onlyStickerContentMessages` |
+| Text | `ContentMessage<TextContent>` | `onlyTextContentMessages` |
+| Venue | `ContentMessage<VenueContent>` | `onlyVenueContentMessages` |
+| Video | `ContentMessage<VideoContent>` | `onlyVideoContentMessages` |
+| VideoNote | `ContentMessage<VideoNoteContent>` | `onlyVideoNoteContentMessages` |
+| Voice | `ContentMessage<VoiceContent>` | `onlyVoiceContentMessages` |
+
+For example, if you wish to get only photo messages from private chats of groups, you should call next code:
+
+```kotlin
+filter.messageFlow.asContentMessagesFlow().onlyPhotoContentMessages().onEach {
     println(it.content)
-    println(it.fullEntitiesList())
 }.launchIn(
     CoroutineScope(Dispatchers.Default)
 )
 ```
 
-As a result, each received message which will be just text message will be printed out with full list of its internal entities
+##### Chat actions
+
+Chat actions can be divided for three types of events source:
+
+| Type | Flow extension |
+|:---- |:-------------- |
+| Channel events | `onlyChannelEvents` |
+| Group events | `onlyGroupEvents` |
+| Supergroup events | `onlySupergroupEvents` |
+
+According to this table, if you want to add filtering by supergroup events, you will use code like this:
+
+```kotlin
+filter.messageFlow.asChatEventsFlow().onlySupergroupEvents().onEach {
+    println(it.chatEvent)
+}.launchIn(
+    CoroutineScope(Dispatchers.Default)
+)
+```
+
+### Shortcuts
+
+With shortcuts you are able to use simple factories for several things.
+
+#### ScheduledCloseInfo
+
+In case if you are creating some poll, you able to use next shortcuts.
+
+Next sample will use info with closing at the 10 seconds after now:
+
+```kotlin
+closePollExactAt(DateTime.now() + TimeSpan(10000.0))
+```
+
+In this example we will do the same, but in another way:
+
+```kotlin
+closePollExactAfter(10)
+```
+
+Here we have passed `10` seconds and will get the same result object.
+
+In opposite to previous shortcuts, the next one will create `approximate` closing schedule:
+
+```kotlin
+closePollAfter(10)
+```
+
+The main difference here is that the last one will be closed after 10 seconds since the sending. With first samples
+will be created **exact** time for closing of poll

TelegramBotAPI-extensions-utils/build.gradle

@@ -40,7 +40,7 @@ kotlin {
                 if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
                     api "${project.group}:TelegramBotAPI:$library_version"
                 } else {
-                    implementation project(":TelegramBotAPI")
+                    api project(":TelegramBotAPI")
                 }
             }
         }

TelegramBotAPI-extensions-utils/maven.publish.gradle

@@ -26,7 +26,7 @@ publishing {
 
                 description "Util extensions for more useful work with updates and other things"
                 name "Telegram Bot API Utility Extensions"
-                url "https://insanusmokrassar.github.io/TelegramBotAPI"
+                url "https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils"
 
                 scm {
                     developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/TelegramBotAPI.git[push=]https://github.com/insanusmokrassar/TelegramBotAPI.git"

TelegramBotAPI-extensions-utils/mpp_publish_template.json

@@ -1 +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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/JsonFormat.kt

@@ -0,0 +1,11 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils
+
+import kotlinx.serialization.json.Json
+
+@Suppress("EXPERIMENTAL_API_USAGE")
+internal val nonstrictJsonFormat = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+    serializeSpecialFloatingPointValues = true
+    useArrayPolymorphism = true
+}

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/chat_events/ChatEventsSourcesConversations.kt

@@ -0,0 +1,21 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.chat_events
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.mapNotNull
+import kotlin.reflect.KClass
+
+
+fun <T : ChatEventMessage> Flow<ChatEventMessage>.divideBySource(contentType: KClass<T>) = mapNotNull {
+    if (contentType.isInstance(it)) {
+        @Suppress("UNCHECKED_CAST")
+        it as T
+    } else {
+        null
+    }
+}
+
+fun Flow<ChatEventMessage>.onlyChannelEvents() = divideBySource(ChannelEventMessage::class)
+fun Flow<ChatEventMessage>.onlyGroupEvents() = divideBySource(GroupEventMessage::class)
+fun Flow<ChatEventMessage>.onlySupergroupEvents() = divideBySource(SupergroupEventMessage::class)

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/shortcuts/PollCloseShortcuts.kt

@@ -0,0 +1,35 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.LongSeconds
+import com.github.insanusmokrassar.TelegramBotAPI.types.Seconds
+import com.github.insanusmokrassar.TelegramBotAPI.types.polls.ApproximateScheduledCloseInfo
+import com.github.insanusmokrassar.TelegramBotAPI.types.polls.ExactScheduledCloseInfo
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
+
+fun closePollExactAt(
+    dateTime: DateTime
+) = ExactScheduledCloseInfo(
+    dateTime
+)
+
+fun closePollExactAfter(
+    seconds: LongSeconds
+) = closePollExactAt(
+    DateTime.now() + TimeSpan(seconds.toDouble() * 1000L)
+)
+fun closePollExactAfter(
+    seconds: Seconds
+) = closePollExactAfter(
+    seconds.toLong()
+)
+
+fun closePollAfter(
+    seconds: LongSeconds
+) = ApproximateScheduledCloseInfo(
+    TimeSpan(seconds.toDouble() * 1000L)
+)
+
+fun closePollAfter(
+    seconds: Seconds
+) = closePollAfter(seconds.toLong())

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/CallbackQueryUpdatesConversations.kt

@@ -5,12 +5,21 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.update.CallbackQueryUpda
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 
+/**
+ * @return New [Flow] with [DataCallbackQuery] type, got from [CallbackQueryUpdate.data] field
+ */
 fun Flow<CallbackQueryUpdate>.asDataCallbackQueryFlow() = mapNotNull {
     it.data as? DataCallbackQuery
 }
+/**
+ * @return New [Flow] with [GameShortNameCallbackQuery] type, got from [CallbackQueryUpdate.data] field
+ */
 fun Flow<CallbackQueryUpdate>.asGameShortNameCallbackQueryFlow() = mapNotNull {
     it.data as? GameShortNameCallbackQuery
 }
+/**
+ * @return New [Flow] with [UnknownCallbackQueryType] type, got from [CallbackQueryUpdate.data] field
+ */
 fun Flow<CallbackQueryUpdate>.asUnknownCallbackQueryFlow() = mapNotNull {
     it.data as? UnknownCallbackQueryType
 }

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/CommandsFilters.kt

@@ -8,12 +8,37 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEnti
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate
 import kotlinx.coroutines.flow.*
 
+/**
+ * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of
+ * messages with [fullEntitiesList] and check that incoming message contains ONLY ONE [TextSource] and that is
+ * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming
+ * [commandRegex]
+ *
+ * @return The same message in case if it contains only [BotCommandTextSource] with [Regex.matches]
+ * [BotCommandTextSource.command]
+ *
+ * @see fullEntitiesList
+ * @see asContentMessagesFlow
+ * @see onlyTextContentMessages
+ */
 fun <T : BaseSentMessageUpdate> Flow<T>.filterExactCommands(
     commandRegex: Regex
 ) = asContentMessagesFlow().onlyTextContentMessages().filter { contentMessage ->
     (contentMessage.content.fullEntitiesList().singleOrNull() as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
 }
 
+/**
+ * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of
+ * messages with [fullEntitiesList] and check that incoming message contains [BotCommandTextSource]. Besides, it is
+ * checking that [BotCommandTextSource.command] [Regex.matches] with incoming [commandRegex]
+ *
+ * @return The same message in case if it contains somewhere in text [BotCommandTextSource] with [Regex.matches]
+ * [BotCommandTextSource.command]
+ *
+ * @see fullEntitiesList
+ * @see asContentMessagesFlow
+ * @see onlyTextContentMessages
+ */
 fun <T : BaseSentMessageUpdate> Flow<T>.filterCommandsInsideTextMessages(
     commandRegex: Regex
 ) = asContentMessagesFlow().onlyTextContentMessages().filter { contentMessage ->
@@ -23,10 +48,18 @@ fun <T : BaseSentMessageUpdate> Flow<T>.filterCommandsInsideTextMessages(
 }
 
 /**
- * @return Result [Flow] will emit all [TextSource]s to the collector ONLY IN CASE if first [TextSource] is
- * [BotCommandTextSource] and its [BotCommandTextSource.command] is [Regex.matches] to incoming [commandRegex]. Internal
- * behaviour contains next rules: all incoming text sources will be passed as is, [RegularTextSource] will be divided
- * by " " for several [RegularTextSource] which will contains not empty args without spaces
+ * Convert incoming [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage.content] of
+ * messages with [fullEntitiesList] and check that incoming message contains first [TextSource] as
+ * [BotCommandTextSource]. Besides, it is checking that [BotCommandTextSource.command] [Regex.matches] with incoming
+ * [commandRegex] and for other [TextSource] objects used next rules: all incoming text sources will be passed as is,
+ * [RegularTextSource] will be split by " " for several [RegularTextSource] which will contains not empty args without
+ * spaces.
+ *
+ * @return Converted list with first entity [BotCommandTextSource] and than all others according to rules in description
+ *
+ * @see fullEntitiesList
+ * @see asContentMessagesFlow
+ * @see onlyTextContentMessages
  */
 fun <T : BaseSentMessageUpdate> Flow<T>.filterCommandsWithArgs(
     commandRegex: Regex

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/FlowsUpdatesFactory.kt

@@ -0,0 +1,17 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates
+
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
+
+/**
+ * Non-suspendable function for easy-to-use creating of [FlowsUpdatesFilter] and applying the block to it
+ *
+ * @see flowsUpdatesFilter
+ */
+inline fun flowsUpdatesFilter(
+    internalChannelsSizes: Int = 64,
+    block: FlowsUpdatesFilter.() -> Unit
+): FlowsUpdatesFilter {
+    val filter = FlowsUpdatesFilter(internalChannelsSizes)
+    filter.block()
+    return filter
+}

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/SentMessageUpdatesConversations.kt

@@ -5,14 +5,23 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSen
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 
+/**
+ * Will map incoming [BaseSentMessageUpdate]s to [ContentMessage] from [BaseSentMessageUpdate.data]
+ */
 fun <T : BaseSentMessageUpdate> Flow<T>.asContentMessagesFlow() = mapNotNull {
     it.data as? ContentMessage<*>
 }
 
+/**
+ * Will map incoming [BaseSentMessageUpdate]s to [ChatEventMessage] from [BaseSentMessageUpdate.data]
+ */
 fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = mapNotNull {
     it.data as? ChatEventMessage
 }
 
+/**
+ * Will map incoming [BaseSentMessageUpdate]s to [UnknownMessageType] from [BaseSentMessageUpdate.data]
+ */
 fun <T : BaseSentMessageUpdate> Flow<T>.asUnknownMessagesFlow() = mapNotNull {
     it.data as? UnknownMessageType
 }

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdateDeserialization.kt

@@ -0,0 +1,31 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates
+
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.nonstrictJsonFormat
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateDeserializationStrategy
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
+
+/**
+ * @return Deserialize [source] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update]
+ */
+fun Json.toTelegramUpdate(source: String) = parse(UpdateDeserializationStrategy, source)
+/**
+ * @return Deserialize [source] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update]
+ */
+fun Json.toTelegramUpdate(source: JsonElement) = fromJson(UpdateDeserializationStrategy, source)
+
+/**
+ * @return Deserialize [this] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update]. In fact,
+ * it is must be JSON
+ *
+ * @see Json.toTelegramUpdate
+ */
+fun String.toTelegramUpdate() = nonstrictJsonFormat.toTelegramUpdate(this)
+/**
+ * @return Deserialize [this] as [com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update]
+ *
+ * @see Json.toTelegramUpdate
+ */
+fun JsonElement.toTelegramUpdate() = nonstrictJsonFormat.toTelegramUpdate(this)
+
+

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdatesChatFilters.kt

@@ -2,18 +2,30 @@ package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatId
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.SentMediaGroupUpdate
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 
+/**
+ * [Flow.filter] incoming [BaseMessageUpdate]s by their [ChatId]
+ */
 fun <T : BaseMessageUpdate> Flow<T>.filterBaseMessageUpdates(chatId: ChatId): Flow<T> = filter {
     it.data.chat.id == chatId
 }
+/**
+ * [Flow.filter] incoming [BaseMessageUpdate]s by their [ChatId] using [Chat.id] of [chat]
+ */
 fun <T : BaseMessageUpdate> Flow<T>.filterBaseMessageUpdates(chat: Chat): Flow<T> = filterBaseMessageUpdates(chat.id)
 
 
+/**
+ * [Flow.filter] incoming [SentMediaGroupUpdate]s by their [ChatId]
+ */
 fun <T : SentMediaGroupUpdate> Flow<T>.filterSentMediaGroupUpdates(chatId: ChatId): Flow<T> = filter {
     it.data.first().chat.id == chatId
 }
+/**
+ * [Flow.filter] incoming [SentMediaGroupUpdate]s by their [ChatId] using [Chat.id] of [chat]
+ */
 fun <T : SentMediaGroupUpdate> Flow<T>.filterSentMediaGroupUpdates(chat: Chat): Flow<T> = filterSentMediaGroupUpdates(chat.id)

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/UpdatesUtils.kt

@@ -0,0 +1,93 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.*
+
+/**
+ * @return If [this] is [SentMediaGroupUpdate] - [Update.updateId] of [last] element, or its own [Update.updateId]
+ */
+fun Update.lastUpdateIdentifier(): UpdateIdentifier {
+    return if (this is SentMediaGroupUpdate) {
+        origins.last().updateId
+    } else {
+        updateId
+    }
+}
+
+/**
+ * @return The biggest [UpdateIdentifier] OR null
+ *
+ * @see [Update.lastUpdateIdentifier]
+ */
+fun List<Update>.lastUpdateIdentifier(): UpdateIdentifier? {
+    return maxBy { it.updateId } ?.lastUpdateIdentifier()
+}
+
+/**
+ * Will convert incoming list of updates to list with [MediaGroupUpdate]s
+ */
+fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
+    val resultUpdates = mutableListOf<Update>()
+    val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseSentMessageUpdate>>()
+    for (update in this) {
+        val data = (update.data as? MediaGroupMessage)
+        if (data == null) {
+            resultUpdates.add(update)
+            continue
+        }
+        when (update) {
+            is BaseEditMessageUpdate -> resultUpdates.add(
+                update.toEditMediaGroupUpdate()
+            )
+            is BaseSentMessageUpdate -> {
+                mediaGroups.getOrPut(data.mediaGroupId) {
+                    mutableListOf()
+                }.add(update)
+            }
+            else -> resultUpdates.add(update)
+        }
+    }
+    mediaGroups.values.map {
+        it.toSentMediaGroupUpdate() ?.let { mediaGroupUpdate ->
+            resultUpdates.add(mediaGroupUpdate)
+        }
+    }
+    resultUpdates.sortBy { it.updateId }
+    return resultUpdates
+}
+
+/**
+ * @receiver List of [BaseSentMessageUpdate] where [BaseSentMessageUpdate.data] is [MediaGroupMessage] and all messages
+ * have the same [MediaGroupMessage.mediaGroupId]
+ * @return [MessageMediaGroupUpdate] in case if [first] object of [this] is [MessageUpdate]. When [first] object is
+ * [ChannelPostUpdate] instance - will return [ChannelPostMediaGroupUpdate]. Otherwise will be returned null
+ */
+fun List<BaseSentMessageUpdate>.toSentMediaGroupUpdate(): SentMediaGroupUpdate? = (this as? SentMediaGroupUpdate) ?: let {
+    if (isEmpty()) {
+        return@let null
+    }
+    val resultList = sortedBy { it.updateId }
+    when (first()) {
+        is MessageUpdate -> MessageMediaGroupUpdate(resultList)
+        is ChannelPostUpdate -> ChannelPostMediaGroupUpdate(resultList)
+        else -> null
+    }
+}
+
+/**
+ * @return [EditMessageMediaGroupUpdate] in case if [this] is [EditMessageUpdate]. When [this] object is
+ * [EditChannelPostUpdate] instance - will return [EditChannelPostMediaGroupUpdate]
+ *
+ * @throws IllegalStateException
+ */
+fun BaseEditMessageUpdate.toEditMediaGroupUpdate(): EditMediaGroupUpdate = (this as? EditMediaGroupUpdate) ?: let {
+    when (this) {
+        is EditMessageUpdate -> EditMessageMediaGroupUpdate(this)
+        is EditChannelPostUpdate -> EditChannelPostMediaGroupUpdate(this)
+        else -> error("Unsupported type of ${BaseEditMessageUpdate::class.simpleName}")
+    }
+}

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/retrieving/LongPolling.kt

@@ -0,0 +1,180 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.convertWithMediaGroupUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.lastUpdateIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
+import kotlinx.coroutines.*
+
+fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
+    timeoutSeconds: Seconds = 30,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: (ExceptionHandler<Unit>)? = null,
+    allowedUpdates: List<String>? = null,
+    updatesReceiver: UpdateReceiver<Update>
+): Job = scope.launch {
+    var lastUpdateIdentifier: UpdateIdentifier? = null
+
+    while (isActive) {
+        handleSafely(
+            { e ->
+                exceptionsHandler ?.invoke(e)
+                if (e is RequestException) {
+                    delay(1000L)
+                }
+            }
+        ) {
+            val updates = execute(
+                GetUpdates(
+                    offset = lastUpdateIdentifier?.plus(1),
+                    timeout = timeoutSeconds,
+                    allowed_updates = allowedUpdates
+                )
+            ).let { originalUpdates ->
+                val converted = originalUpdates.convertWithMediaGroupUpdates()
+                /**
+                 * Dirty hack for cases when the media group was retrieved not fully:
+                 *
+                 * We are throw out the last media group and will reretrieve it again in the next get updates
+                 * and it will guarantee that it is full
+                 */
+                if (originalUpdates.size == getUpdatesLimit.last && converted.last() is SentMediaGroupUpdate) {
+                    converted - converted.last()
+                } else {
+                    converted
+                }
+            }
+
+            handleSafely {
+                for (update in updates) {
+                    updatesReceiver(update)
+
+                    lastUpdateIdentifier = update.lastUpdateIdentifier()
+                }
+            }
+        }
+    }
+}
+
+/**
+ * This method will create a new one [FlowsUpdatesFilter]. This method could be unsafe due to the fact that it will start
+ * getting updates IMMEDIATELY. That means that your bot will be able to skip some of them until you will call
+ * [kotlinx.coroutines.flow.Flow.collect] on one of [FlowsUpdatesFilter] flows. To avoid it, you can pass
+ * [flowUpdatesPreset] lambda - it will be called BEFORE starting updates getting
+ */
+@FlowPreview
+@PreviewFeature
+@Suppress("unused")
+fun RequestsExecutor.startGettingFlowsUpdatesByLongPolling(
+    timeoutSeconds: Seconds = 30,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    flowsUpdatesFilterUpdatesKeeperCount: Int = 64,
+    flowUpdatesPreset: FlowsUpdatesFilter.() -> Unit = {}
+): FlowsUpdatesFilter = FlowsUpdatesFilter(flowsUpdatesFilterUpdatesKeeperCount).apply {
+    flowUpdatesPreset()
+    startGettingOfUpdatesByLongPolling(timeoutSeconds, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
+}
+
+fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
+    updatesFilter: UpdatesFilter,
+    timeoutSeconds: Seconds = 30,
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+): Job = startGettingOfUpdatesByLongPolling(
+    timeoutSeconds,
+    scope,
+    exceptionsHandler,
+    updatesFilter.allowedUpdates,
+    updatesFilter.asUpdateReceiver
+)
+
+fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
+    messageCallback: UpdateReceiver<MessageUpdate>? = null,
+    messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
+    editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
+    editedMessageMediaGroupCallback: UpdateReceiver<EditMessageMediaGroupUpdate>? = null,
+    channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
+    channelPostMediaGroupCallback: UpdateReceiver<ChannelPostMediaGroupUpdate>? = null,
+    editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
+    editedChannelPostMediaGroupCallback: UpdateReceiver<EditChannelPostMediaGroupUpdate>? = null,
+    chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
+    inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
+    callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
+    shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
+    preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
+    pollCallback: UpdateReceiver<PollUpdate>? = null,
+    pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
+    timeoutSeconds: Seconds = 30,
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    scope: CoroutineScope = GlobalScope
+): Job {
+    return startGettingOfUpdatesByLongPolling(
+        SimpleUpdatesFilter(
+            messageCallback,
+            messageMediaGroupCallback,
+            editedMessageCallback,
+            editedMessageMediaGroupCallback,
+            channelPostCallback,
+            channelPostMediaGroupCallback,
+            editedChannelPostCallback,
+            editedChannelPostMediaGroupCallback,
+            chosenInlineResultCallback,
+            inlineQueryCallback,
+            callbackQueryCallback,
+            shippingQueryCallback,
+            preCheckoutQueryCallback,
+            pollCallback,
+            pollAnswerCallback
+        ),
+        timeoutSeconds,
+        exceptionsHandler,
+        scope
+    )
+}
+
+@Suppress("unused")
+fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
+    messageCallback: UpdateReceiver<MessageUpdate>? = null,
+    mediaGroupCallback: UpdateReceiver<MediaGroupUpdate>? = null,
+    editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
+    channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
+    editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
+    chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
+    inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
+    callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
+    shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
+    preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
+    pollCallback: UpdateReceiver<PollUpdate>? = null,
+    pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
+    timeoutSeconds: Seconds = 30,
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+): Job = startGettingOfUpdatesByLongPolling(
+    messageCallback = messageCallback,
+    messageMediaGroupCallback = mediaGroupCallback,
+    editedMessageCallback = editedMessageCallback,
+    editedMessageMediaGroupCallback = mediaGroupCallback,
+    channelPostCallback = channelPostCallback,
+    channelPostMediaGroupCallback = mediaGroupCallback,
+    editedChannelPostCallback = editedChannelPostCallback,
+    editedChannelPostMediaGroupCallback = mediaGroupCallback,
+    chosenInlineResultCallback = chosenInlineResultCallback,
+    inlineQueryCallback = inlineQueryCallback,
+    callbackQueryCallback = callbackQueryCallback,
+    shippingQueryCallback = shippingQueryCallback,
+    preCheckoutQueryCallback = preCheckoutQueryCallback,
+    pollCallback = pollCallback,
+    pollAnswerCallback = pollAnswerCallback,
+    timeoutSeconds = timeoutSeconds,
+    exceptionsHandler = exceptionsHandler,
+    scope = scope
+)
+

TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt

@@ -0,0 +1,60 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving
+
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.convertWithMediaGroupUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver
+import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.accumulateByKey
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.launch
+
+
+/**
+ * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE
+ * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s.
+ *
+ * @see UpdateReceiver
+ */
+fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
+    output: UpdateReceiver<Update>,
+    debounceTimeMillis: Long = 1000L
+): UpdateReceiver<Update> {
+    val updatesChannel = Channel<Update>(Channel.UNLIMITED)
+    val mediaGroupChannel = Channel<Pair<String, BaseMessageUpdate>>(Channel.UNLIMITED)
+    val mediaGroupAccumulatedChannel = mediaGroupChannel.accumulateByKey(
+        debounceTimeMillis,
+        scope = this
+    )
+
+    launch {
+        launch {
+            for (update in updatesChannel) {
+                when (val data = update.data) {
+                    is MediaGroupMessage -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
+                    else -> output(update)
+                }
+            }
+        }
+        launch {
+            for ((_, mediaGroup) in mediaGroupAccumulatedChannel) {
+                mediaGroup.convertWithMediaGroupUpdates().forEach {
+                    output(it)
+                }
+            }
+        }
+    }
+
+    return { updatesChannel.send(it) }
+}
+
+/**
+ * Create [UpdateReceiver] object which will correctly accumulate updates and send into output updates which INCLUDE
+ * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate]s.
+ *
+ * @see UpdateReceiver
+ */
+fun CoroutineScope.updateHandlerWithMediaGroupsAdaptation(
+    output: UpdateReceiver<Update>
+) = updateHandlerWithMediaGroupsAdaptation(output, 1000L)

TelegramBotAPI-extensions-utils/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/updates/retrieving/Webhook.kt

@@ -0,0 +1,201 @@
+package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving
+
+import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.nonstrictJsonFormat
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
+import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.MultipartRequestImpl
+import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.SetWebhook
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateDeserializationStrategy
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdatesFilter
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.webhook.WebhookPrivateKeyConfig
+import com.github.insanusmokrassar.TelegramBotAPI.utils.ExceptionHandler
+import com.github.insanusmokrassar.TelegramBotAPI.utils.handleSafely
+import io.ktor.application.call
+import io.ktor.request.receiveText
+import io.ktor.response.respond
+import io.ktor.routing.*
+import io.ktor.server.engine.*
+import kotlinx.coroutines.*
+import java.util.concurrent.Executors
+
+
+/**
+ * Allows to include webhook in custom route everywhere in your server
+ *
+ * @param [scope] Will be used for mapping of media groups
+ * @param [exceptionsHandler] Pass this parameter to set custom exception handler for getting updates
+ * @param [block] Some receiver block like [com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter]
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
+ * @see UpdatesFilter
+ * @see UpdatesFilter.asUpdateReceiver
+ */
+fun Route.includeWebhookHandlingInRoute(
+    scope: CoroutineScope,
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    block: UpdateReceiver<Update>
+) {
+    val transformer = scope.updateHandlerWithMediaGroupsAdaptation(block)
+    post {
+        handleSafely(
+            exceptionsHandler ?: {}
+        ) {
+            val asJson =
+                nonstrictJsonFormat.parseJson(call.receiveText())
+            val update = nonstrictJsonFormat.fromJson(
+                UpdateDeserializationStrategy,
+                asJson
+            )
+            transformer(update)
+        }
+        call.respond("Ok")
+    }
+}
+
+/**
+ * Setting up ktor server, set webhook info via [SetWebhook] request.
+ *
+ * @param listenPort port which will be listen by bot
+ * @param listenRoute address to listen by bot. If null - will be set up in root of host
+ * @param scope Scope which will be used for
+ * @param privateKeyConfig If configured - server will be created with [sslConnector]. [connector] will be used otherwise
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
+ * @see UpdatesFilter
+ * @see UpdatesFilter.asUpdateReceiver
+ */
+fun startListenWebhooks(
+    listenPort: Int,
+    engineFactory: ApplicationEngineFactory<*, *>,
+    exceptionsHandler: ExceptionHandler<Unit>,
+    listenHost: String = "0.0.0.0",
+    listenRoute: String? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
+    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
+    block: UpdateReceiver<Update>
+): ApplicationEngine {
+    lateinit var engine: ApplicationEngine
+    val env = applicationEngineEnvironment {
+
+        module {
+            routing {
+                listenRoute ?.also {
+                    createRouteFromPath(it).includeWebhookHandlingInRoute(scope, exceptionsHandler, block)
+                } ?: includeWebhookHandlingInRoute(scope, exceptionsHandler, block)
+            }
+        }
+        privateKeyConfig ?.let {
+            sslConnector(
+                privateKeyConfig.keyStore,
+                privateKeyConfig.aliasName,
+                privateKeyConfig::keyStorePassword,
+                privateKeyConfig::aliasPassword
+            ) {
+                host = listenHost
+                port = listenPort
+            }
+        } ?: connector {
+            host = listenHost
+            port = listenPort
+        }
+
+    }
+    engine = embeddedServer(engineFactory, env)
+    engine.start(false)
+
+    return engine
+}
+
+private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhooks(
+    listenPort: Int,
+    engineFactory: ApplicationEngineFactory<*, *>,
+    setWebhookRequest: Request<Boolean>,
+    exceptionsHandler: ExceptionHandler<Unit> = {},
+    listenHost: String = "0.0.0.0",
+    listenRoute: String? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
+    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
+    block: UpdateReceiver<Update>
+): Job {
+    return try {
+        execute(setWebhookRequest)
+        val engine = startListenWebhooks(listenPort, engineFactory, exceptionsHandler, listenHost, listenRoute, privateKeyConfig, scope, block)
+        scope.launch {
+            engine.environment.parentCoroutineContext[Job] ?.join()
+            engine.stop(1000, 5000)
+        }
+    } catch (e: Exception) {
+        throw e
+    }
+}
+
+/**
+ * Setting up ktor server, set webhook info via [SetWebhook] request.
+ *
+ * @param listenPort port which will be listen by bot
+ * @param listenRoute address to listen by bot
+ * @param scope Scope which will be used for
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
+ * @see UpdatesFilter
+ * @see UpdatesFilter.asUpdateReceiver
+ */
+@Suppress("unused")
+suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
+    listenPort: Int,
+    engineFactory: ApplicationEngineFactory<*, *>,
+    setWebhookRequest: SetWebhook,
+    exceptionsHandler: ExceptionHandler<Unit> = {},
+    listenHost: String = "0.0.0.0",
+    listenRoute: String = "/",
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
+    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
+    block: UpdateReceiver<Update>
+): Job = internalSetWebhookInfoAndStartListenWebhooks(
+    listenPort,
+    engineFactory,
+    setWebhookRequest as Request<Boolean>,
+    exceptionsHandler,
+    listenHost,
+    listenRoute,
+    privateKeyConfig,
+    scope,
+    block
+)
+
+/**
+ * Setting up ktor server, set webhook info via [SetWebhook] request.
+ *
+ * @param listenPort port which will be listen by bot
+ * @param listenRoute address to listen by bot
+ * @param scope Scope which will be used for
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
+ * @see UpdatesFilter
+ * @see UpdatesFilter.asUpdateReceiver
+ */
+@Suppress("unused")
+suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
+    listenPort: Int,
+    engineFactory: ApplicationEngineFactory<*, *>,
+    setWebhookRequest: MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean>,
+    exceptionsHandler: ExceptionHandler<Unit> = {},
+    listenHost: String = "0.0.0.0",
+    listenRoute: String? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
+    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
+    block: UpdateReceiver<Update>
+): Job = internalSetWebhookInfoAndStartListenWebhooks(
+    listenPort,
+    engineFactory,
+    setWebhookRequest as Request<Boolean>,
+    exceptionsHandler,
+    listenHost,
+    listenRoute,
+    privateKeyConfig,
+    scope,
+    block
+)

TelegramBotAPI/README.md

@@ -10,7 +10,7 @@ moments are describing by official [Telegram Bot API](https://core.telegram.org/
 
 ## Compatibility
 
-This version compatible with [30th of March 2020 update of TelegramBotAPI (version 4.7)](https://core.telegram.org/bots/api#march-30-2020).
+This version compatible with [24th of April 2020 update of TelegramBotAPI (version 4.8)](https://core.telegram.org/bots/api#april-24-2020).
 There is only one exception of implemented functionality - Telegram Passport API, which was presented in
 [August 2018 update of TelegramBotAPI](https://core.telegram.org/bots/api-changelog#august-27-2018) update. It will be implemented
 as soon as possible.
@@ -149,53 +149,3 @@ Here was used `okhttp` realisation of client, but there are several others engin
 available on ktor.io site for [client](https://ktor.io/clients/http-client/engines.html) and [server](https://ktor.io/quickstart/artifacts.html)
 engines.
 
-## Getting updates
-
-In this library currently realised two ways to get updates from telegram:
-
-* Polling - in this case bot will request updates from time to time (you can set up delay between requests)
-* Webhook via reverse proxy or something like this
-
-### Updates filters
-
-Currently webhook method contains `UpdatesFilter` as necessary argument for getting updates.
-`UpdatesFilter` will sort updates and throw their into different callbacks. Currently supporting
-separate getting updates for media groups - they are accumulating with debounce in one second
-(for being sure that all objects of media group was received).
-
-Updates polling also support `UpdatesFilter` but it is not required to use it and you can get updates directly
-in `UpdateReceiver`, which you will provide to `startGettingOfUpdates` method
-
-### Webhook set up
-
-If you wish to use webhook method, you will need:
-
-* White IP - your IP address or host, which available for calling. [TelegramBotAPI](https://core.telegram.org/bots/api#setwebhook)
-recommend to use some unique address for each bot which you are using
-* SSL certificate. Usually you can obtain the certificate using your domain provider, [Let'sEncrypt](https://letsencrypt.org/) or [create it](https://core.telegram.org/bots/self-signed)
-* Nginx or something like this
-
-Template for Nginx server config you can find in [this gist](https://gist.github.com/InsanusMokrassar/fcc6e09cebd07e46e8f0fdec234750c4#file-nginxssl-conf).
-
-For webhook you can provide `File` with public part of certificate, `URL` where bot will be available and inner `PORT` which
-will be used to start receiving of updates. Actually, you can skip passing of `File` when you have something like
-nginx for proxy forwarding.
-
-In case of using `nginx` with reverse-proxy config, setting up of Webhook will look like:
-
-```kotlin
-requestsExecutor.setWebhook(
-    WEBHOOK_URL,
-    INTERNAL_PORT,
-    filter,
-    ENGINE_FACTORY
-)
-``` 
-
-Here:
-
-* `WEBHOOK_URL` - the url which will be used by Telegram system to send updates
-* `INTERNAL_PORT` - the port which will be used in bot for listening of updates
-* `filter` - instance of [UpdatesFilter](https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt),
-which will be used to filter incoming updates
-* `ENGINE_FACTORY` - used factory name, for example, `CIO` in case of usage `io.ktor:ktor-server-cio` as server engine

TelegramBotAPI/build.gradle

@@ -64,6 +64,8 @@ kotlin {
 
                 api "io.ktor:ktor-server-host-common:$ktor_version"
                 api "io.ktor:ktor-client-cio:$ktor_version"
+
+                api "javax.activation:activation:$javax_activation_version"
             }
         }
         jvmTest {
@@ -81,13 +83,4 @@ kotlin {
             }
         }
     }
-
-
-    targets.all {
-        compilations.all {
-            kotlinOptions {
-                freeCompilerArgs += ["-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", "-Xopt-in=kotlin.RequiresOptIn"]
-            }
-        }
-    }
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt

@@ -12,7 +12,15 @@ interface CaptionedOutput : Captioned {
 }
 
 interface CaptionedInput : Captioned {
+    /**
+     * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+     * @see [CaptionedInput.fullEntitiesList]
+     */
     val captionEntities: List<TextPart>
 }
 
-fun CaptionedInput.fullEntitiesList() = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()
+/**
+ * Convert its [CaptionedInput.captionEntities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource]
+ * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+ */
+fun CaptionedInput.fullEntitiesList(): FullTextSourcesList = caption ?.fullListOfSubSource(captionEntities) ?.map { it.source } ?: emptyList()

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Explained.kt

@@ -0,0 +1,26 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource
+
+interface Explained {
+    val explanation: String?
+}
+
+interface ExplainedOutput : Explained {
+    val parseMode: ParseMode?
+}
+
+interface ExplainedInput : Explained {
+    /**
+     * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+     * @see [ExplainedInput.fullEntitiesList]
+     */
+    val explanationEntities: List<TextPart>
+}
+
+/**
+ * Convert its [ExplainedInput.explanationEntities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource]
+ * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+ */
+fun ExplainedInput.fullEntitiesList(): FullTextSourcesList = explanation ?.fullListOfSubSource(explanationEntities) ?.map { it.source } ?: emptyList()

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/MimeTyped.kt

@@ -1,5 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
 
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
+
 interface MimeTyped {
-    val mimeType: String? // TODO::replace by something like enum or interface
+    val mimeType: MimeType?
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/TextSource.kt

@@ -1,5 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
 
+typealias FullTextSourcesList = List<TextSource>
+typealias FullTextPartsList = List<TextPart>
+
 interface TextSource {
     val asMarkdownSource: String
     val asMarkdownV2Source: String
@@ -16,3 +19,5 @@ data class TextPart(
     val range: IntRange,
     val source: TextSource
 )
+
+fun List<TextPart>.justTextSources() = map { it.source }

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

@@ -9,15 +9,13 @@ import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.RequestL
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.types.Response
 import com.github.insanusmokrassar.TelegramBotAPI.types.RetryAfterError
-import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
-import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 import io.ktor.client.HttpClient
 import io.ktor.client.call.receive
 import io.ktor.client.features.*
 import io.ktor.client.statement.HttpStatement
 import io.ktor.client.statement.readText
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.supervisorScope
 import kotlinx.serialization.json.Json
 
 class KtorRequestsExecutor(
@@ -43,54 +41,56 @@ class KtorRequestsExecutor(
     }
 
     override suspend fun <T : Any> execute(request: Request<T>): T {
-        return try {
-            supervisorScope {
-                requestsLimiter.limit {
-                    var statement: HttpStatement? = null
-                    for (factory in callsFactories) {
-                        statement = factory.prepareCall(
-                            client,
-                            telegramAPIUrlsKeeper.commonAPIUrl,
-                            request
-                        )
-                        if (statement != null) {
-                            break
-                        }
-                    }
-
-                    val response = statement?.execute() ?: throw IllegalArgumentException("Can't execute request: $request")
-                    val content = response.receive<String>()
+        return handleSafely(
+            { e ->
+                throw if (e is ClientRequestException) {
+                    val content = e.response.readText()
                     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)
-                            execute(request)
-                        } else {
-                            null
-                        }
-                    } ?: response.let {
-                        throw newRequestException(
-                            responseObject,
-                            content,
-                            "Can't get result object from $content"
-                        )
-                    })
+                    newRequestException(
+                        responseObject,
+                        content,
+                        "Can't get result object from $content"
+                    )
+                } else {
+                    e
                 }
             }
-        } catch (e: ClientRequestException) {
-            val content = e.response.readText()
-            val responseObject = jsonFormatter.parse(Response.serializer(), content)
-            throw newRequestException(
-                responseObject,
-                content,
-                "Can't get result object from $content"
-            )
-        } catch (e: Exception) {
-            throw e
+        ) {
+            requestsLimiter.limit {
+                var statement: HttpStatement? = null
+                for (factory in callsFactories) {
+                    statement = factory.prepareCall(
+                        client,
+                        telegramAPIUrlsKeeper.commonAPIUrl,
+                        request
+                    )
+                    if (statement != null) {
+                        break
+                    }
+                }
+
+                val response = statement?.execute() ?: throw IllegalArgumentException("Can't execute request: $request")
+                val content = response.receive<String>()
+                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)
+                        execute(request)
+                    } else {
+                        null
+                    }
+                } ?: response.let {
+                    throw newRequestException(
+                        responseObject,
+                        content,
+                        "Can't get result object from $content"
+                    )
+                })
+            }
         }
     }
 

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt

@@ -3,9 +3,20 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import io.ktor.utils.io.core.Closeable
 
+/**
+ * Interface for making requests to Telegram Bot API. Currently, there is only one built-in implementation -
+ * [com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor]
+ *
+ * @see Request
+ * @see com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor
+ */
 interface RequestsExecutor : Closeable {
     /**
-     * @throws com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
+     * Unsafe execution of incoming [request]. Can throw almost any exception. So, it is better to use
+     * something like [com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.executeAsync] or
+     * [com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.executeUnsafe]
+     *
+     * @throws Exception
      */
     suspend fun <T : Any> execute(request: Request<T>): T
 }

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

@@ -3,14 +3,23 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateSerializerWithoutDeserialization
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UpdateSerializerWithoutSerialization
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 
 private val updatesListSerializer = ListSerializer(
-    UpdateSerializerWithoutDeserialization
+    UpdateSerializerWithoutSerialization
 )
 
+/**
+ * Request updates from Telegram Bot API system. It is important, that the result updates WILL NOT include
+ * [com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate] objects due to the fact,
+ * that it is internal abstraction and in fact any [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage]
+ * is just a common [com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message]
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.updateHandlerWithMediaGroupsAdaptation
+ * @see com.github.insanusmokrassar.TelegramBotAPI.utils.convertWithMediaGroupUpdates
+ */
 @Serializable
 data class GetUpdates(
     val offset: UpdateIdentifier? = null,// set `last update id + 1` to receive next part of updates

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

@@ -5,11 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
-/**
- * Representation of https://core.telegram.org/bots/api#setchatadministratorcustomtitle
- *
- * Please, remember about restrictions for characters in custom title
- */
 @Serializable
 data class SetChatAdministratorCustomTitle(
     @SerialName(chatIdField)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendDice.kt

@@ -5,6 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMes
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.DiceContent
@@ -17,6 +18,8 @@ internal val DiceContentMessageResultDeserializer: DeserializationStrategy<Conte
 data class SendDice(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
+    @SerialName(emojiField)
+    val animationType: DiceAnimationType? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)

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

@@ -4,9 +4,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.JsonObject
 
-/**
- * Will be used as SimpleRequest if
- */
 class MultipartRequestImpl<D: DataRequest<R>, F: Files, R: Any>(
     val data: D,
     val files: F

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

@@ -1,13 +1,19 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.polls
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializationStrategyClass
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.PollContent
 import com.github.insanusmokrassar.TelegramBotAPI.types.polls.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.fullListOfSubSource
+import com.github.insanusmokrassar.TelegramBotAPI.utils.toMarkdownV2Captions
+import com.soywiz.klock.DateTime
 import kotlinx.serialization.*
 
 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PollContent>> = TelegramBotAPIMessageDeserializationStrategyClass()
@@ -66,6 +72,7 @@ fun Poll.createRequest(
         isAnonymous,
         isClosed,
         allowMultipleAnswers,
+        scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
         replyMarkup
@@ -78,6 +85,9 @@ fun Poll.createRequest(
             correctOptionId,
             isAnonymous,
             isClosed,
+            explanation ?.fullListOfSubSource(explanationEntities) ?.justTextSources() ?.toMarkdownV2Captions() ?.firstOrNull(),
+            MarkdownV2,
+            scheduledCloseInfo,
             disableNotification,
             replyToMessageId,
             replyMarkup
@@ -89,6 +99,7 @@ fun Poll.createRequest(
         isAnonymous,
         isClosed,
         false,
+        scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
         replyMarkup
@@ -100,20 +111,35 @@ fun Poll.createRequest(
         isAnonymous,
         isClosed,
         false,
+        scheduledCloseInfo,
         disableNotification,
         replyToMessageId,
         replyMarkup
     )
 }
 
+private fun ScheduledCloseInfo.checkSendData() {
+    val span = when (this) {
+        is ExactScheduledCloseInfo -> (closeDateTime - DateTime.now()).seconds
+        is ApproximateScheduledCloseInfo -> openDuration.seconds
+    }.toInt()
+    if (span !in openPeriodPollSecondsLimit) {
+        error("Duration of autoclose for polls must be in range $openPeriodPollSecondsLimit, but was $span")
+    }
+}
+
 sealed class SendPoll : SendMessageRequest<ContentMessage<PollContent>>,
     ReplyingMarkupSendMessageRequest<ContentMessage<PollContent>> {
     abstract val question: String
     abstract val options: List<String>
     abstract val isAnonymous: Boolean
     abstract val isClosed: Boolean
+    abstract val closeInfo: ScheduledCloseInfo?
     abstract val type: String
 
+    internal abstract val openPeriod: LongSeconds?
+    internal abstract val closeDate: LongSeconds?
+
     override fun method(): String = "sendPoll"
     override val resultDeserializer: DeserializationStrategy<ContentMessage<PollContent>>
         get() = commonResultDeserializer
@@ -133,6 +159,8 @@ data class SendRegularPoll(
     override val isClosed: Boolean = false,
     @SerialName(allowsMultipleAnswersField)
     val allowMultipleAnswers: Boolean = false,
+    @Transient
+    override val closeInfo: ScheduledCloseInfo? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
@@ -144,8 +172,17 @@ data class SendRegularPoll(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 
+    @SerialName(openPeriodField)
+    override val openPeriod: LongSeconds?
+        = (closeInfo as? ApproximateScheduledCloseInfo) ?.openDuration ?.millisecondsLong ?.div(1000)
+
+    @SerialName(closeDateField)
+    override val closeDate: LongSeconds?
+        = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000)
+
     init {
         checkPollInfo(question, options)
+        closeInfo ?.checkSendData()
     }
 }
 
@@ -163,23 +200,46 @@ data class SendQuizPoll(
     override val isAnonymous: Boolean = true,
     @SerialName(isClosedField)
     override val isClosed: Boolean = false,
+    @SerialName(explanationField)
+    override val explanation: String? = null,
+    @SerialName(explanationParseModeField)
+    override val parseMode: ParseMode? = null,
+    @Transient
+    override val closeInfo: ScheduledCloseInfo? = null,
     @SerialName(disableNotificationField)
     override val disableNotification: Boolean = false,
     @SerialName(replyToMessageIdField)
     override val replyToMessageId: MessageIdentifier? = null,
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
-) : SendPoll() {
+) : SendPoll(), CaptionedOutput, ExplainedOutput {
     override val type: String = quizPollType
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 
+    @Deprecated("Will be removed in near updates", ReplaceWith("explanation"))
+    override val caption: String?
+        get() = explanation
+
+    @SerialName(openPeriodField)
+    override val openPeriod: LongSeconds?
+        = (closeInfo as? ApproximateScheduledCloseInfo) ?.openDuration ?.millisecondsLong ?.div(1000)
+
+    @SerialName(closeDateField)
+    override val closeDate: LongSeconds?
+        = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000)
+
     init {
         checkPollInfo(question, options)
+        closeInfo ?.checkSendData()
         val correctOptionIdRange = 0 .. options.size
         if (correctOptionId !in correctOptionIdRange) {
             throw IllegalArgumentException("Correct option id must be in range of $correctOptionIdRange, but actual " +
                 "value is $correctOptionId")
         }
+        if (explanation != null && explanation.length !in explanationLimit) {
+            error("Quiz poll explanation size must be in range $explanationLimit," +
+                "but actual explanation contains ${explanation.length} symbols")
+        }
     }
 }

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

@@ -7,33 +7,56 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
+private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")) {
+    sourceUrl
+} else {
+    "https://$sourceUrl"
+}
+
+fun SetWebhook(
+    url: String,
+    certificate: MultipartFile,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null
+): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
+    SetWebhook(
+        correctWebhookUrl(url),
+        null,
+        maxAllowedConnections,
+        allowedUpdates
+    ),
+    mapOf(certificateField to certificate)
+)
+
+fun SetWebhook(
+    url: String,
+    certificate: FileId,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null
+): SetWebhook = SetWebhook(
+    correctWebhookUrl(url),
+    certificate.fileId,
+    maxAllowedConnections,
+    allowedUpdates
+)
+
+@Suppress("USELESS_CAST")
 fun SetWebhook(
     url: String,
     certificate: InputFile,
     maxAllowedConnections: Int? = null,
     allowedUpdates: List<String>? = null
-) : Request<Boolean> {
-    val data = SetWebhook(
-        url,
-        (certificate as? FileId) ?.fileId,
-        maxAllowedConnections,
-        allowedUpdates
-    )
-    return when (certificate) {
-        is FileId -> data
-        is MultipartFile -> MultipartRequestImpl(
-            data,
-            mapOf(certificateField to certificate)
-        )
-    }
+): Request<Boolean> = when (certificate) {
+    is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, maxAllowedConnections, allowedUpdates)
+    is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, maxAllowedConnections, allowedUpdates)
 }
 
 fun SetWebhook(
     url: String,
     maxAllowedConnections: Int? = null,
     allowedUpdates: List<String>? = null
-) : Request<Boolean> = SetWebhook(
-    url,
+) = SetWebhook(
+    correctWebhookUrl(url),
     null,
     maxAllowedConnections,
     allowedUpdates

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt

@@ -22,6 +22,7 @@ typealias FileUniqueId = String
 typealias DiceResult = Int
 
 typealias Seconds = Int
+typealias LongSeconds = Long
 
 val getUpdatesLimit = 1 .. 100
 val callbackQueryAnswerLength = 0 until 200
@@ -54,6 +55,12 @@ val botCommandLimit = botCommandLengthLimit
 val botCommandDescriptionLimit = 3 .. 256
 val botCommandsLimit = 0 .. 100
 
+val explanationLimit = 0 .. 200
+@Deprecated("Will be removed in near updates", ReplaceWith("explanationLimit"))
+val quizPollExplanationLimit = explanationLimit
+
+val openPeriodPollSecondsLimit = 5 .. 600
+
 const val chatIdField = "chat_id"
 const val messageIdField = "message_id"
 const val updateIdField = "update_id"
@@ -82,6 +89,7 @@ const val containsMasksField = "contains_masks"
 const val resultIdField = "result_id"
 const val inlineMessageIdField = "inline_message_id"
 const val callbackDataField = "callback_data"
+const val callbackGameField = "callback_game"
 const val callbackQueryIdField = "callback_query_id"
 const val inlineQueryIdField = "inline_query_id"
 const val inlineKeyboardField = "inline_keyboard"
@@ -198,6 +206,7 @@ const val tgsStickerField = "tgs_sticker"
 
 const val okField = "ok"
 const val captionField = "caption"
+const val explanationField = "explanation"
 const val idField = "id"
 const val pollIdField = "poll_id"
 const val textField = "text"
@@ -249,6 +258,10 @@ const val xShiftField = "x_shift"
 const val yShiftField = "y_shift"
 const val scaleField = "scale"
 
+const val explanationEntitiesField = "explanation_entities"
+const val explanationParseModeField = "explanation_parse_mode"
+const val openPeriodField = "open_period"
+const val closeDateField = "close_date"
 
 const val smallFileIdField = "small_file_id"
 const val bigFileIdField = "big_file_id"

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Dice.kt

@@ -1,10 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
 
-@Serializable
-data class Dice(
-    @SerialName(valueField)
-    val value: DiceResult
+@Deprecated(
+    "Replaced",
+    ReplaceWith("Dice", "com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice")
 )
+typealias Dice = Dice

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt

@@ -8,6 +8,7 @@ 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.files.abstracts.mimeTypeField
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -20,7 +21,7 @@ data class InlineQueryResultDocumentImpl(
     @SerialName(titleField)
     override val title: String,
     @SerialName(mimeTypeField)
-    override val mimeType: String,
+    override val mimeType: MimeType,
     @SerialName(thumbUrlField)
     override val thumbUrl: String? = null,
     @SerialName(thumbWidthField)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt

@@ -8,6 +8,7 @@ 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.files.abstracts.mimeTypeField
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -20,7 +21,7 @@ data class InlineQueryResultVideoImpl(
     @SerialName(thumbUrlField)
     override val thumbUrl: String,
     @SerialName(mimeTypeField)
-    override val mimeType: String,
+    override val mimeType: MimeType,
     @SerialName(titleField)
     override val title: String,
     @SerialName(videoWidthField)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaPhoto.kt

@@ -7,6 +7,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.files.PhotoSize
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
 import kotlinx.serialization.*
 
+internal const val photoInputMediaType = "photo"
+
 @Serializable
 data class InputMediaPhoto(
     override val file: InputFile,
@@ -14,7 +16,7 @@ data class InputMediaPhoto(
     @SerialName(parseModeField)
     override val parseMode: ParseMode? = null
 ) : InputMedia, MediaGroupMemberInputMedia {
-    override val type: String = "photo"
+    override val type: String = photoInputMediaType
 
     override fun serialize(format: StringFormat): String = format.stringify(serializer(), this)
 

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/InputMediaVideo.kt

@@ -6,6 +6,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.mediaField
 import kotlinx.serialization.*
 
+internal const val videoInputMediaType = "video"
+
 @Serializable
 data class InputMediaVideo(
     override val file: InputFile,
@@ -17,7 +19,7 @@ data class InputMediaVideo(
     override val duration: Long? = null,
     override val thumb: InputFile? = null
 ) : InputMedia, SizedInputMedia, DuratedInputMedia, ThumbedInputMedia, MediaGroupMemberInputMedia {
-    override val type: String = "video"
+    override val type: String = videoInputMediaType
 
     override fun serialize(format: StringFormat): String = format.stringify(serializer(), this)
 

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/MediaGroupMemberInputMediaSerializer.kt

@@ -1,6 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia
 
+import com.github.insanusmokrassar.TelegramBotAPI.types.typeField
+import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
+import kotlinx.serialization.json.JsonObjectSerializer
 
 @Serializer(MediaGroupMemberInputMedia::class)
 internal object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMemberInputMedia> {
@@ -13,6 +16,12 @@ internal object MediaGroupMemberInputMediaSerializer : KSerializer<MediaGroupMem
     }
 
     override fun deserialize(decoder: Decoder): MediaGroupMemberInputMedia {
-        TODO("not implemented")
+        val json = JsonObjectSerializer.deserialize(decoder)
+
+        return when (json.getPrimitiveOrNull(typeField) ?.contentOrNull) {
+            photoInputMediaType -> nonstrictJsonFormat.fromJson(InputMediaPhoto.serializer(), json)
+            videoInputMediaType -> nonstrictJsonFormat.fromJson(InputMediaVideo.serializer(), json)
+            else -> error("Illegal type of incoming MediaGroupMemberInputMedia")
+        }
     }
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InputMedia/ThumbedInputMedia.kt

@@ -5,7 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.thumbField
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-// TODO:: fill thumbed
 interface ThumbedInputMedia : InputMedia {
     val thumb: InputFile?
     @Serializable

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/RawMessageEntity.kt

@@ -83,6 +83,28 @@ internal fun createTextPart(from: String, entities: RawMessageEntities): List<Te
     return resultList
 }
 
+internal fun List<TextPart>.asRawMessageEntities() = mapNotNull {
+    val source = it.source
+    when (source) {
+        is MentionTextSource -> RawMessageEntity("mention", it.range.first, it.range.last - it.range.first)
+        is HashTagTextSource -> RawMessageEntity("hashtag", it.range.first, it.range.last - it.range.first)
+        is CashTagTextSource -> RawMessageEntity("cashtag", it.range.first, it.range.last - it.range.first)
+        is BotCommandTextSource -> RawMessageEntity("bot_command", it.range.first, it.range.last - it.range.first)
+        is URLTextSource -> RawMessageEntity("url", it.range.first, it.range.last - it.range.first)
+        is EMailTextSource -> RawMessageEntity("email", it.range.first, it.range.last - it.range.first)
+        is PhoneNumberTextSource -> RawMessageEntity("phone_number", it.range.first, it.range.last - it.range.first)
+        is BoldTextSource -> RawMessageEntity("bold", it.range.first, it.range.last - it.range.first)
+        is ItalicTextSource -> RawMessageEntity("italic", it.range.first, it.range.last - it.range.first)
+        is CodeTextSource -> RawMessageEntity("code", it.range.first, it.range.last - it.range.first)
+        is PreTextSource -> RawMessageEntity("pre", it.range.first, it.range.last - it.range.first, language = source.language)
+        is TextLinkTextSource -> RawMessageEntity("text_link", it.range.first, it.range.last - it.range.first, source.url)
+        is TextMentionTextSource -> RawMessageEntity("text_mention", it.range.first, it.range.last - it.range.first, user = source.user)
+        is UnderlineTextSource -> RawMessageEntity("underline", it.range.first, it.range.last - it.range.first)
+        is StrikethroughTextSource -> RawMessageEntity("strikethrough", it.range.first, it.range.last - it.range.first)
+        else -> null
+    }
+}
+
 internal fun RawMessageEntities.asTextParts(sourceString: String): List<TextPart> = createTextPart(sourceString, this)
 
 internal typealias RawMessageEntities = List<RawMessageEntity>

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextLinkTextSource.kt

@@ -5,7 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 
 class TextLinkTextSource(
     override val source: String,
-    url: String
+    val url: String
 ) : TextSource {
     override val asMarkdownSource: String by lazy { source.linkMarkdown(url) }
     override val asMarkdownV2Source: String by lazy { source.linkMarkdownV2(url) }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/MessageEntity/textsources/TextMentionTextSource.kt

@@ -2,16 +2,16 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsourc
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MultilevelTextSource
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
-import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PrivateChat
+import com.github.insanusmokrassar.TelegramBotAPI.types.User
 import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 
 class TextMentionTextSource(
     override val source: String,
-    privateChat: PrivateChat,
+    val user: User,
     textParts: List<TextPart>
 ) : MultilevelTextSource {
     override val textParts: List<TextPart> by lazy { source.fullListOfSubSource(textParts) }
-    override val asMarkdownSource: String by lazy { source.textMentionMarkdown(privateChat.id) }
-    override val asMarkdownV2Source: String by lazy { textMentionMarkdownV2(privateChat.id) }
-    override val asHtmlSource: String by lazy { textMentionHTML(privateChat.id) }
+    override val asMarkdownSource: String by lazy { source.textMentionMarkdown(user.id) }
+    override val asMarkdownV2Source: String by lazy { textMentionMarkdownV2(user.id) }
+    override val asHtmlSource: String by lazy { textMentionHTML(user.id) }
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/WebhookInfo.kt

@@ -7,7 +7,7 @@ data class WebhookInfo(
     @SerialName(urlField)
     val url: String,
     @SerialName(pendingUpdateCountField)
-    val awaitDeliery: Int,
+    val awaitDelivery: Int,
     @SerialName(maxAllowedConnectionsField)
     val maxConnections: Int = 40, // default count according to documentation
     @SerialName(hasCustomCertificateField)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/actions/BotAction.kt

@@ -2,6 +2,9 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.actions
 
 import kotlinx.serialization.*
 
+/**
+ * Use BotAction objects realisations to notify user about bot actions
+ */
 @Serializable(BotActionSerializer::class)
 sealed class BotAction {
     abstract val actionName: String
@@ -31,54 +34,80 @@ internal object BotActionSerializer: KSerializer<BotAction> {
 }
 
 /**
- * Use BotAction objects realisations to notify user about bot actions
+ * Will notify user that bot is "typing" something
  */
-
 @Serializable(BotActionSerializer::class)
 object TypingAction : BotAction() {
     override val actionName: String = "typing"
 }
 
+/**
+ * Will notify user that bot is uploading some photo
+ */
 @Serializable(BotActionSerializer::class)
 object UploadPhotoAction : BotAction() {
     override val actionName: String = "upload_photo"
 }
 
+/**
+ * Will notify user that bot is recording some video
+ */
 @Serializable(BotActionSerializer::class)
 object RecordVideoAction : BotAction() {
     override val actionName: String = "record_video"
 }
 
+/**
+ * Will notify user that bot is uploading some photo
+ */
 @Serializable(BotActionSerializer::class)
 object UploadVideoAction : BotAction() {
     override val actionName: String = "upload_video"
 }
 
+/**
+ * Will notify user that bot is recording some audio
+ */
 @Serializable(BotActionSerializer::class)
 object RecordAudioAction : BotAction() {
     override val actionName: String = "record_audio"
 }
 
+/**
+ * Will notify user that bot is uploading some audio
+ */
 @Serializable(BotActionSerializer::class)
 object UploadAudioAction : BotAction() {
     override val actionName: String = "upload_audio"
 }
 
+/**
+ * Will notify user that bot is uploading some document
+ */
 @Serializable(BotActionSerializer::class)
 object UploadDocumentAction : BotAction() {
     override val actionName: String = "upload_document"
 }
 
+/**
+ * Will notify user that bot is trying to find location
+ */
 @Serializable(BotActionSerializer::class)
 object FindLocationAction : BotAction() {
     override val actionName: String = "find_location"
 }
 
+/**
+ * Will notify user that bot is recording video note
+ */
 @Serializable(BotActionSerializer::class)
 object RecordVideoNoteAction : BotAction() {
     override val actionName: String = "record_video_note"
 }
 
+/**
+ * Will notify user that bot is uploading video note
+ */
 @Serializable(BotActionSerializer::class)
 object UploadVideoNoteAction : BotAction() {
     override val actionName: String = "upload_video_note"

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButton.kt

@@ -1,14 +1,22 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardButtons
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.games.CallbackGame
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 @Serializable(InlineKeyboardButtonSerializer::class)
 sealed class InlineKeyboardButton {
     abstract val text: String
 }
 
+@Serializable
+data class UnknownInlineKeyboardButton internal constructor(
+    override val text: String,
+    val rawData: JsonElement
+) : InlineKeyboardButton()
+
 @Serializable
 data class PayInlineKeyboardButton(
     override val text: String,
@@ -24,6 +32,15 @@ data class CallbackDataInlineKeyboardButton(
     val callbackData: String
 ) : InlineKeyboardButton()
 
+@Serializable
+data class CallbackGameInlineKeyboardButton(
+    @SerialName(textField)
+    override val text: String
+) : InlineKeyboardButton() {
+    @SerialName(callbackGameField)
+    private val callbackGame = CallbackGame
+}
+
 @Serializable
 data class LoginURLInlineKeyboardButton(
     override val text: String,

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/buttons/InlineKeyboardButtons/InlineKeyboardButtonSerializer.kt

@@ -12,22 +12,25 @@ internal object InlineKeyboardButtonSerializer : KSerializer<InlineKeyboardButto
         PolymorphicKind.SEALED
     )
 
-    private fun resolveSerializer(json: JsonObject): KSerializer<out InlineKeyboardButton> {
+    private fun resolveSerializer(json: JsonObject): KSerializer<out InlineKeyboardButton>? {
         return when {
             json[callbackDataField] != null -> CallbackDataInlineKeyboardButton.serializer()
+            json[callbackGameField] != null -> CallbackGameInlineKeyboardButton.serializer()
             json[loginUrlField] != null -> LoginURLInlineKeyboardButton.serializer()
             json[payField] != null -> PayInlineKeyboardButton.serializer()
             json[switchInlineQueryField] != null -> SwitchInlineQueryInlineKeyboardButton.serializer()
             json[switchInlineQueryCurrentChatField] != null -> SwitchInlineQueryCurrentChatInlineKeyboardButton.serializer()
             json[urlField] != null -> URLInlineKeyboardButton.serializer()
-            else -> throw IllegalArgumentException("Can't find correct serializer for inline button serialized as $json")
+            else -> null
         }
     }
 
     override fun deserialize(decoder: Decoder): InlineKeyboardButton {
         val json = JsonElementSerializer.deserialize(decoder)
 
-        return nonstrictJsonFormat.fromJson(resolveSerializer(json.jsonObject), json)
+        return (json as? JsonObject) ?.let { resolveSerializer(it) } ?.let {
+            nonstrictJsonFormat.fromJson(it, json)
+        } ?: UnknownInlineKeyboardButton("", json)
     }
 
     override fun serialize(encoder: Encoder, value: InlineKeyboardButton) {
@@ -38,6 +41,8 @@ internal object InlineKeyboardButtonSerializer : KSerializer<InlineKeyboardButto
             is SwitchInlineQueryInlineKeyboardButton -> SwitchInlineQueryInlineKeyboardButton.serializer().serialize(encoder, value)
             is SwitchInlineQueryCurrentChatInlineKeyboardButton -> SwitchInlineQueryCurrentChatInlineKeyboardButton.serializer().serialize(encoder, value)
             is URLInlineKeyboardButton -> URLInlineKeyboardButton.serializer().serialize(encoder, value)
+            is CallbackGameInlineKeyboardButton -> CallbackGameInlineKeyboardButton.serializer().serialize(encoder, value)
+            is UnknownInlineKeyboardButton -> JsonElementSerializer.serialize(encoder, value.rawData)
         }
     }
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/Dice.kt

@@ -0,0 +1,13 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.dice
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Dice(
+    @SerialName(valueField)
+    val value: DiceResult,
+    @SerialName(emojiField)
+    val animationType: DiceAnimationType
+)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/dice/DiceAnimationType.kt

@@ -0,0 +1,43 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.dice
+
+import kotlinx.serialization.*
+
+@Serializable(DiceAnimationTypeSerializer::class)
+sealed class DiceAnimationType {
+    abstract val emoji: String
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+object CubeDiceAnimationType : DiceAnimationType() {
+    override val emoji: String = "\uD83C\uDFB2"
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+object DartsDiceAnimationType : DiceAnimationType() {
+    override val emoji: String = "\uD83C\uDFAF"
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+object BasketballDiceAnimationType : DiceAnimationType() {
+    override val emoji: String = "\uD83C\uDFC0"
+}
+@Serializable(DiceAnimationTypeSerializer::class)
+data class CustomDiceAnimationType(
+    override val emoji: String
+) : DiceAnimationType()
+@Deprecated("Renamed", ReplaceWith("CustomDiceAnimationType"))
+typealias UnknownDiceAnimationType = CustomDiceAnimationType
+
+@Serializer(DiceAnimationType::class)
+internal object DiceAnimationTypeSerializer : KSerializer<DiceAnimationType> {
+    override val descriptor: SerialDescriptor = PrimitiveDescriptor("DiceAnimationType", PrimitiveKind.STRING)
+    override fun deserialize(decoder: Decoder): DiceAnimationType {
+        return when (val type = decoder.decodeString()) {
+            CubeDiceAnimationType.emoji -> CubeDiceAnimationType
+            DartsDiceAnimationType.emoji -> DartsDiceAnimationType
+            BasketballDiceAnimationType.emoji -> BasketballDiceAnimationType
+            else -> CustomDiceAnimationType(type)
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: DiceAnimationType) {
+        encoder.encodeString(value.emoji)
+    }
+}

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AnimationFile.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId
 import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -20,7 +21,7 @@ data class AnimationFile(
     @SerialName(fileNameField)
     override val fileName: String? = null,
     @SerialName(mimeTypeField)
-    override val mimeType: String? = null,
+    override val mimeType: MimeType? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null
 ) : TelegramMediaFile, MimedMediaFile, ThumbedMediaFile, PlayableMediaFile, CustomNamedMediaFile, SizedMediaFile

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/AudioFile.kt

@@ -5,6 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId
 import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -18,7 +19,7 @@ data class AudioFile(
     override val performer: String? = null,
     override val title: String? = null,
     @SerialName(mimeTypeField)
-    override val mimeType: String? = null,
+    override val mimeType: MimeType? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null,
     override val thumb: PhotoSize? = null

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/DocumentFile.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId
 import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -17,7 +18,7 @@ data class DocumentFile(
     override val fileSize: Long? = null,
     override val thumb: PhotoSize? = null,
     @SerialName(mimeTypeField)
-    override val mimeType: String? = null,
+    override val mimeType: MimeType? = null,
     @SerialName(fileNameField)
     override val fileName: String? = null
 ) : TelegramMediaFile, MimedMediaFile, ThumbedMediaFile, CustomNamedMediaFile

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VideoFile.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId
 import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -18,7 +19,7 @@ data class VideoFile(
     override val duration: Long? = null,
     override val thumb: PhotoSize? = null,
     @SerialName(mimeTypeField)
-    override val mimeType: String? = null,
+    override val mimeType: MimeType? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null
 ) : TelegramMediaFile, MimedMediaFile, ThumbedMediaFile, PlayableMediaFile, SizedMediaFile

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/VoiceFile.kt

@@ -1,9 +1,9 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.files
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
-import com.github.insanusmokrassar.TelegramBotAPI.types.FileUniqueId
-import com.github.insanusmokrassar.TelegramBotAPI.types.fileUniqueIdField
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -13,9 +13,10 @@ data class VoiceFile(
     override val fileId: FileId,
     @SerialName(fileUniqueIdField)
     override val fileUniqueId: FileUniqueId,
+    @SerialName(durationField)
     override val duration: Long? = null,
     @SerialName(mimeTypeField)
-    override val mimeType: String? = null,
+    override val mimeType: MimeType? = null,
     @SerialName(fileSizeField)
     override val fileSize: Long? = null
 ) : TelegramMediaFile, MimedMediaFile, PlayableMediaFile

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/files/abstracts/TelegramMediaFile.kt

@@ -8,7 +8,7 @@ internal const val fileSizeField = "file_size"
 internal const val filePathField = "file_path"
 
 /**
- * Declare common part of media files in Telegram. Note: it is not representation of `File` type
+ * Declare common part of media files in Telegram. Note: it is not representation of JVM `File` type
  */
 interface TelegramMediaFile {
     val fileId: FileId

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/games/CallbackGame.kt

@@ -3,8 +3,4 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.games
 import kotlinx.serialization.Serializable
 
 @Serializable
-class CallbackGame {
-    init {
-        TODO()
-    }
-}
+object CallbackGame

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt

@@ -5,6 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.RawMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.asTextParts
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.games.RawGame
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.*

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/DiceContent.kt

@@ -2,8 +2,10 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.message.content
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendDice
-import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.dice.Dice
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
 
@@ -15,5 +17,11 @@ data class DiceContent(
         disableNotification: Boolean,
         replyToMessageId: MessageIdentifier?,
         replyMarkup: KeyboardMarkup?
-    ): Request<ContentMessage<DiceContent>> = SendDice(chatId, disableNotification, replyToMessageId, replyMarkup)
+    ): Request<ContentMessage<DiceContent>> = SendDice(
+        chatId,
+        dice.animationType,
+        disableNotification,
+        replyToMessageId,
+        replyMarkup
+    )
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/TextContent.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.message.content
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.FullTextSourcesList
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextPart
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendTextMessage
@@ -13,6 +14,10 @@ import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 
 data class TextContent(
     val text: String,
+    /**
+     * Not full list of entities. This list WILL NOT contain [TextPart]s with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+     * @see [TextContent.fullEntitiesList]
+     */
     val entities: List<TextPart> = emptyList()
 ) : MessageContent {
     override fun createResend(
@@ -66,4 +71,8 @@ data class TextContent(
     }
 }
 
-fun TextContent.fullEntitiesList() = text.fullListOfSubSource(entities).map { it.source }
+/**
+ * Convert its [TextContent.entities] to list of [com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.TextSource]
+ * with [com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.textsources.RegularTextSource]
+ */
+fun TextContent.fullEntitiesList(): FullTextSourcesList = text.fullListOfSubSource(entities).map { it.source }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/polls/Poll.kt

@@ -1,10 +1,39 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.polls
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.MessageEntity.*
 import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat
+import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
 import kotlinx.serialization.*
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonObjectSerializer
+
+sealed class ScheduledCloseInfo {
+    abstract val closeDateTime: DateTime
+}
+
+data class ExactScheduledCloseInfo(
+    override val closeDateTime: DateTime
+) : ScheduledCloseInfo()
+
+data class ApproximateScheduledCloseInfo(
+    val openDuration: TimeSpan,
+    @Suppress("MemberVisibilityCanBePrivate")
+    val startPoint: DateTime = DateTime.now()
+) : ScheduledCloseInfo() {
+    override val closeDateTime: DateTime = startPoint + openDuration
+}
+
+val LongSeconds.asApproximateScheduledCloseInfo
+    get() = ApproximateScheduledCloseInfo(
+        TimeSpan(this * 1000.0)
+    )
+val LongSeconds.asExactScheduledCloseInfo
+    get() = ExactScheduledCloseInfo(
+        DateTime(unixMillis = this * 1000.0)
+    )
 
 @Serializable(PollSerializer::class)
 sealed class Poll {
@@ -14,6 +43,44 @@ sealed class Poll {
     abstract val votesCount: Int
     abstract val isClosed: Boolean
     abstract val isAnonymous: Boolean
+    abstract val scheduledCloseInfo: ScheduledCloseInfo?
+}
+
+@Serializable(PollSerializer::class)
+sealed class MultipleAnswersPoll : Poll()
+
+@Serializable
+private class RawPoll(
+    @SerialName(idField)
+    val id: PollIdentifier,
+    @SerialName(questionField)
+    val question: String,
+    @SerialName(optionsField)
+    val options: List<PollOption>,
+    @SerialName(totalVoterCountField)
+    val votesCount: Int,
+    @SerialName(isClosedField)
+    val isClosed: Boolean = false,
+    @SerialName(isAnonymousField)
+    val isAnonymous: Boolean = false,
+    @SerialName(typeField)
+    val type: String,
+    @SerialName(allowsMultipleAnswersField)
+    val allowMultipleAnswers: Boolean = false,
+    @SerialName(correctOptionIdField)
+    val correctOptionId: Int? = null,
+    @SerialName(explanationField)
+    val explanation: String? = null,
+    @SerialName(explanationEntitiesField)
+    val explanationEntities: List<RawMessageEntity> = emptyList(),
+    @SerialName(openPeriodField)
+    val openPeriod: LongSeconds? = null,
+    @SerialName(closeDateField)
+    val closeDate: LongSeconds? = null
+) {
+    @Transient
+    val scheduledCloseInfo: ScheduledCloseInfo?
+        = closeDate ?.asExactScheduledCloseInfo ?: openPeriod ?.asApproximateScheduledCloseInfo
 }
 
 @Serializable
@@ -30,91 +97,131 @@ data class UnknownPollType internal constructor(
     override val isClosed: Boolean = false,
     @SerialName(isAnonymousField)
     override val isAnonymous: Boolean = false,
-    val raw: String
-) : Poll()
+    @Serializable
+    val raw: JsonObject
+) : Poll() {
+    @Transient
+    override val scheduledCloseInfo: ScheduledCloseInfo? = raw.getPrimitiveOrNull(
+        closeDateField
+    ) ?.longOrNull ?.asExactScheduledCloseInfo ?: raw.getPrimitiveOrNull(
+        openPeriodField
+    ) ?.longOrNull ?.asApproximateScheduledCloseInfo
+}
 
-@Serializable
+@Serializable(PollSerializer::class)
 data class RegularPoll(
-    @SerialName(idField)
     override val id: PollIdentifier,
-    @SerialName(questionField)
     override val question: String,
-    @SerialName(optionsField)
     override val options: List<PollOption>,
-    @SerialName(totalVoterCountField)
     override val votesCount: Int,
-    @SerialName(isClosedField)
     override val isClosed: Boolean = false,
-    @SerialName(isAnonymousField)
     override val isAnonymous: Boolean = false,
-    @SerialName(allowsMultipleAnswersField)
-    val allowMultipleAnswers: Boolean = false
-) : Poll()
+    val allowMultipleAnswers: Boolean = false,
+    override val scheduledCloseInfo: ScheduledCloseInfo? = null
+) : MultipleAnswersPoll()
 
-@Serializable
+@Serializable(PollSerializer::class)
 data class QuizPoll(
-    @SerialName(idField)
     override val id: PollIdentifier,
-    @SerialName(questionField)
     override val question: String,
-    @SerialName(optionsField)
     override val options: List<PollOption>,
-    @SerialName(totalVoterCountField)
     override val votesCount: Int,
     /**
      * Nullable due to documentation (https://core.telegram.org/bots/api#poll)
      */
-    @SerialName(correctOptionIdField)
     val correctOptionId: Int? = null,
-    @SerialName(isClosedField)
+    override val explanation: String? = null,
+    override val explanationEntities: List<TextPart> = emptyList(),
     override val isClosed: Boolean = false,
-    @SerialName(isAnonymousField)
-    override val isAnonymous: Boolean = false
-) : Poll()
+    override val isAnonymous: Boolean = false,
+    override val scheduledCloseInfo: ScheduledCloseInfo? = null
+) : Poll(), CaptionedInput, ExplainedInput {
+    @Deprecated("Will be removed in near updates", ReplaceWith("explanation"))
+    override val caption: String?
+        get() = explanation
+    @Deprecated("Will be removed in near updates", ReplaceWith("explanationEntities"))
+    override val captionEntities: List<TextPart>
+        get() = explanationEntities
+}
 
 @Serializer(Poll::class)
 internal object PollSerializer : KSerializer<Poll> {
-    private val pollOptionsSerializer = ListSerializer(PollOption.serializer())
+    override val descriptor: SerialDescriptor
+        get() = RawPoll.serializer().descriptor
+
     override fun deserialize(decoder: Decoder): Poll {
         val asJson = JsonObjectSerializer.deserialize(decoder)
+        val rawPoll = nonstrictJsonFormat.fromJson(RawPoll.serializer(), asJson)
 
-        return when (asJson.getPrimitive(typeField).content) {
-            regularPollType -> nonstrictJsonFormat.fromJson(
-                RegularPoll.serializer(),
-                asJson
+        return when (rawPoll.type) {
+            quizPollType -> QuizPoll(
+                rawPoll.id,
+                rawPoll.question,
+                rawPoll.options,
+                rawPoll.votesCount,
+                rawPoll.correctOptionId,
+                rawPoll.explanation,
+                rawPoll.explanation?.let { rawPoll.explanationEntities.asTextParts(it) } ?: emptyList(),
+                rawPoll.isClosed,
+                rawPoll.isAnonymous,
+                rawPoll.scheduledCloseInfo
             )
-            quizPollType -> nonstrictJsonFormat.fromJson(
-                QuizPoll.serializer(),
-                asJson
+            regularPollType -> RegularPoll(
+                rawPoll.id,
+                rawPoll.question,
+                rawPoll.options,
+                rawPoll.votesCount,
+                rawPoll.isClosed,
+                rawPoll.isAnonymous,
+                rawPoll.allowMultipleAnswers,
+                rawPoll.scheduledCloseInfo
             )
             else -> UnknownPollType(
-                asJson.getPrimitive(idField).content,
-                asJson.getPrimitive(questionField).content,
-                nonstrictJsonFormat.fromJson(
-                    pollOptionsSerializer,
-                    asJson.getArray(optionsField)
-                ),
-                asJson.getPrimitive(totalVoterCountField).int,
-                asJson.getPrimitiveOrNull(isClosedField) ?.booleanOrNull ?: false,
-                asJson.getPrimitiveOrNull(isAnonymousField) ?.booleanOrNull ?: true,
-                asJson.toString()
+                rawPoll.id,
+                rawPoll.question,
+                rawPoll.options,
+                rawPoll.votesCount,
+                rawPoll.isClosed,
+                rawPoll.isAnonymous,
+                asJson
             )
         }
     }
 
     override fun serialize(encoder: Encoder, value: Poll) {
-        val asJson = when (value) {
-            is RegularPoll -> nonstrictJsonFormat.toJson(RegularPoll.serializer(), value)
-            is QuizPoll -> nonstrictJsonFormat.toJson(QuizPoll.serializer(), value)
-            is UnknownPollType -> throw IllegalArgumentException("Currently unable to correctly serialize object of poll $value")
+        val closeInfo = value.scheduledCloseInfo
+        val rawPoll = when (value) {
+            is RegularPoll -> RawPoll(
+                value.id,
+                value.question,
+                value.options,
+                value.votesCount,
+                value.isClosed,
+                value.isAnonymous,
+                regularPollType,
+                value.allowMultipleAnswers,
+                openPeriod = (closeInfo as? ApproximateScheduledCloseInfo) ?.openDuration ?.seconds ?.toLong(),
+                closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000L)
+            )
+            is QuizPoll -> RawPoll(
+                value.id,
+                value.question,
+                value.options,
+                value.votesCount,
+                value.isClosed,
+                value.isAnonymous,
+                regularPollType,
+                correctOptionId = value.correctOptionId,
+                explanation = value.explanation,
+                explanationEntities = value.explanationEntities.asRawMessageEntities(),
+                openPeriod = (closeInfo as? ApproximateScheduledCloseInfo) ?.openDuration ?.seconds ?.toLong(),
+                closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000L)
+            )
+            is UnknownPollType -> {
+                JsonObjectSerializer.serialize(encoder, value.raw)
+                return
+            }
         }
-        val resultJson = JsonObject(
-            asJson.jsonObject + (typeField to when (value) {
-                is RegularPoll -> JsonPrimitive(regularPollType)
-                is QuizPoll -> JsonPrimitive(quizPollType)
-                is UnknownPollType -> throw IllegalArgumentException("Currently unable to correctly serialize object of poll $value")
-            })
-        )
-        JsonObjectSerializer.serialize(encoder, resultJson)
+        RawPoll.serializer().serialize(encoder, rawPoll)
     }
 }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditChannelPostUpdate.kt

@@ -1,10 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.update
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseEditMessageUpdate
 
 data class EditChannelPostUpdate(
     override val updateId: UpdateIdentifier,
-    override val data: Message
+    override val data: CommonMessage<*>
 ) : BaseEditMessageUpdate

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/EditMessageUpdate.kt

@@ -1,10 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.update
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseEditMessageUpdate
 
 data class EditMessageUpdate(
     override val updateId: UpdateIdentifier,
-    override val data: Message
+    override val data: CommonMessage<*>
 ) : BaseEditMessageUpdate

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/MediaGroupUpdates/MediaGroupUpdate.kt

@@ -3,6 +3,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdate
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.*
 
+/**
+ * By default there is no instances of objects which could be deserialized from raw updates. If you want to get objects
+ * with this type, you should use something like [com.github.insanusmokrassar.TelegramBotAPI.extensions.api.SetWebhookKt.includeWebhookInRoute]
+ *
+ * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.api.SetWebhookKt.includeWebhookInRoute
+ * @see com.github.insanusmokrassar.TelegramBotAPI.extensions.api.updates.UpdatesPollingKt.startGettingOfUpdates
+ */
 interface MediaGroupUpdate : Update
 
 interface SentMediaGroupUpdate: MediaGroupUpdate {

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/RawUpdate.kt

@@ -4,8 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.RawCallbac
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.ChosenInlineResult.RawChosenInlineResult
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.query.RawInlineQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.polls.Poll
@@ -13,8 +12,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.polls.PollAnswer
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UnknownUpdateType
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 import com.github.insanusmokrassar.TelegramBotAPI.types.updateIdField
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonElement
 
 @Serializable
@@ -22,11 +20,11 @@ internal data class RawUpdate constructor(
     @SerialName(updateIdField)
     val updateId: UpdateIdentifier,
     @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
-    private val edited_message: Message? = null,
+    private val edited_message: CommonMessage<*>? = null,
     @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
     private val message: Message? = null,
     @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
-    private val edited_channel_post: Message? = null,
+    private val edited_channel_post: CommonMessage<*>? = null,
     @Serializable(TelegramBotAPIMessageDeserializeOnlySerializer::class)
     private val channel_post: Message? = null,
     private val inline_query: RawInlineQuery? = null,
@@ -42,26 +40,39 @@ internal data class RawUpdate constructor(
      * @return One of children of [Update] interface or null in case of unknown type of update
      */
     fun asUpdate(raw: JsonElement): Update {
-        return initedUpdate ?: when {
-            edited_message != null -> EditMessageUpdate(updateId, edited_message)
-            message != null -> MessageUpdate(updateId, message)
-            edited_channel_post != null -> EditChannelPostUpdate(updateId, edited_channel_post)
-            channel_post != null -> ChannelPostUpdate(updateId, channel_post)
+        return initedUpdate ?: try {
+            when {
+                edited_message != null -> EditMessageUpdate(updateId, edited_message)
+                message != null -> MessageUpdate(updateId, message)
+                edited_channel_post != null -> EditChannelPostUpdate(updateId, edited_channel_post)
+                channel_post != null -> ChannelPostUpdate(updateId, channel_post)
 
-            chosen_inline_result != null -> ChosenInlineResultUpdate(updateId, chosen_inline_result.asChosenInlineResult)
-            inline_query != null -> InlineQueryUpdate(updateId, inline_query.asInlineQuery)
-            callback_query != null -> CallbackQueryUpdate(
-                updateId,
-                callback_query.asCallbackQuery(raw.jsonObject["callback_query"].toString())
-            )
-            shipping_query != null -> ShippingQueryUpdate(updateId, shipping_query)
-            pre_checkout_query != null -> PreCheckoutQueryUpdate(updateId, pre_checkout_query)
-            poll != null -> PollUpdate(updateId, poll)
-            poll_answer != null -> PollAnswerUpdate(updateId, poll_answer)
-            else -> UnknownUpdateType(
-                updateId,
-                raw.toString()
-            )
+                chosen_inline_result != null -> ChosenInlineResultUpdate(updateId, chosen_inline_result.asChosenInlineResult)
+                inline_query != null -> InlineQueryUpdate(updateId, inline_query.asInlineQuery)
+                callback_query != null -> CallbackQueryUpdate(
+                    updateId,
+                    callback_query.asCallbackQuery(raw.jsonObject["callback_query"].toString())
+                )
+                shipping_query != null -> ShippingQueryUpdate(updateId, shipping_query)
+                pre_checkout_query != null -> PreCheckoutQueryUpdate(updateId, pre_checkout_query)
+                poll != null -> PollUpdate(updateId, poll)
+                poll_answer != null -> PollAnswerUpdate(updateId, poll_answer)
+                else -> UnknownUpdateType(
+                    updateId,
+                    raw.toString(),
+                    raw
+                )
+            }
+        } catch (e: Error) {
+            when (e) {
+                is SerializationException,
+                is NotImplementedError -> UnknownUpdateType(
+                    updateId,
+                    raw.toString(),
+                    raw
+                )
+                else -> throw e
+            }
         }.also {
             initedUpdate = it
         }

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/BaseEditMessageUpdate.kt

@@ -1,3 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts
 
-interface BaseEditMessageUpdate : BaseMessageUpdate
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage
+
+interface BaseEditMessageUpdate : BaseMessageUpdate {
+    override val data: CommonMessage<*>
+}

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/update/abstracts/Update.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.RawUpdate
 import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonElementSerializer
 
 interface Update {
@@ -13,10 +14,11 @@ interface Update {
 
 data class UnknownUpdateType(
     override val updateId: UpdateIdentifier,
-    override val data: String
+    override val data: String,
+    val rawJson: JsonElement
 ) : Update
 
-internal object UpdateSerializerWithoutDeserialization : KSerializer<Update> {
+internal object UpdateSerializerWithoutSerialization : KSerializer<Update> {
     override val descriptor: SerialDescriptor = JsonElementSerializer.descriptor
 
     override fun deserialize(decoder: Decoder): Update = UpdateDeserializationStrategy.deserialize(decoder)
@@ -24,7 +26,14 @@ internal object UpdateSerializerWithoutDeserialization : KSerializer<Update> {
     override fun serialize(encoder: Encoder, value: Update) = throw UnsupportedOperationException()
 }
 
-internal object UpdateDeserializationStrategy : DeserializationStrategy<Update> {
+/**
+ * Use this object to deserialize objects with type [Update]. Currently it is restricted to use this
+ * [DeserializationStrategy] only with JSON
+ *
+ * @see StringFormat.parse
+ * @see kotlinx.serialization.json.Json.parse
+ */
+object UpdateDeserializationStrategy : DeserializationStrategy<Update> {
     override val descriptor: SerialDescriptor = JsonElementSerializer.descriptor
 
     override fun patch(decoder: Decoder, old: Update): Update = throw UpdateNotSupportedException("Update")

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt

@@ -3,17 +3,16 @@ package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 
+@Suppress("EXPERIMENTAL_API_USAGE")
 private fun <T> BroadcastChannel<T>.createUpdateReceiver(): UpdateReceiver<T> = ::send
 
-@FlowPreview
+@Suppress("EXPERIMENTAL_API_USAGE", "unused")
 class FlowsUpdatesFilter(
-    broadcastChannelsSize: Int = Channel.CONFLATED
+    broadcastChannelsSize: Int = 64
 ): UpdatesFilter {
     private val messageChannel: BroadcastChannel<MessageUpdate> = BroadcastChannel(broadcastChannelsSize)
     private val messageMediaGroupChannel: BroadcastChannel<MessageMediaGroupUpdate> = BroadcastChannel(broadcastChannelsSize)

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/CaptionAndTextSourcesToText.kt

@@ -1,14 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.utils
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.*
-import com.github.insanusmokrassar.TelegramBotAPI.types.captionLength
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.fullEntitiesList
-import com.github.insanusmokrassar.TelegramBotAPI.types.textLength
 
 fun createFormattedText(
-    entities: List<TextSource>,
+    entities: FullTextSourcesList,
     partLength: Int = 4096,
     mode: ParseMode = MarkdownParseMode
 ): List<String> {
@@ -49,50 +48,74 @@ fun createFormattedText(
 
 
 fun createMarkdownText(
-    entities: List<TextSource>,
+    entities: FullTextSourcesList,
     partLength: Int = 4096
 ): List<String> = createFormattedText(entities, partLength, MarkdownParseMode)
 
-fun CaptionedInput.toMarkdownCaptions(): List<String> = createMarkdownText(
-    fullEntitiesList(),
+fun FullTextSourcesList.toMarkdownCaptions(): List<String> = createMarkdownText(
+    this,
     captionLength.last + 1
 )
+fun CaptionedInput.toMarkdownCaptions(): List<String> = fullEntitiesList().toMarkdownCaptions()
 
-fun TextContent.toMarkdownTexts(): List<String> = createMarkdownText(
-    fullEntitiesList(),
+fun FullTextSourcesList.toMarkdownTexts(): List<String> = createMarkdownText(
+    this,
     textLength.last + 1
 )
+fun TextContent.toMarkdownTexts(): List<String> = fullEntitiesList().toMarkdownTexts()
+
+fun FullTextSourcesList.toMarkdownExplanations(): List<String> = createMarkdownText(
+    this,
+    explanationLimit.last + 1
+)
+fun ExplainedInput.toMarkdownExplanations(): List<String> = fullEntitiesList().toMarkdownTexts()
 
 
 fun createMarkdownV2Text(
-    entities: List<TextSource>,
+    entities: FullTextSourcesList,
     partLength: Int = 4096
 ): List<String> = createFormattedText(entities, partLength, MarkdownV2ParseMode)
 
-fun CaptionedInput.toMarkdownV2Captions(): List<String> = createMarkdownV2Text(
-    fullEntitiesList(),
+fun FullTextSourcesList.toMarkdownV2Captions(): List<String> = createMarkdownV2Text(
+    this,
     captionLength.last + 1
 )
+fun CaptionedInput.toMarkdownV2Captions(): List<String> = fullEntitiesList().toMarkdownV2Captions()
 
-fun TextContent.toMarkdownV2Texts(): List<String> = createMarkdownV2Text(
-    fullEntitiesList(),
+fun FullTextSourcesList.toMarkdownV2Texts(): List<String> = createMarkdownV2Text(
+    this,
     textLength.last + 1
 )
+fun TextContent.toMarkdownV2Texts(): List<String> = fullEntitiesList().toMarkdownV2Texts()
+
+fun FullTextSourcesList.toMarkdownV2Explanations(): List<String> = createMarkdownV2Text(
+    this,
+    explanationLimit.last + 1
+)
+fun ExplainedInput.toMarkdownV2Explanations(): List<String> = fullEntitiesList().toMarkdownV2Texts()
 
 
 fun createHtmlText(
-    entities: List<TextSource>,
+    entities: FullTextSourcesList,
     partLength: Int = 4096
 ): List<String> = createFormattedText(entities, partLength, HTMLParseMode)
 
-fun CaptionedInput.toHtmlCaptions(): List<String> = createHtmlText(
-    fullEntitiesList(),
+fun FullTextSourcesList.toHtmlCaptions(): List<String> = createHtmlText(
+    this,
     captionLength.last + 1
 )
+fun CaptionedInput.toHtmlCaptions(): List<String> = fullEntitiesList().toHtmlCaptions()
 
-fun TextContent.toHtmlTexts(): List<String> = createHtmlText(
-    fullEntitiesList(),
+fun FullTextSourcesList.toHtmlTexts(): List<String> = createHtmlText(
+    this,
     textLength.last + 1
 )
+fun TextContent.toHtmlTexts(): List<String> = fullEntitiesList().toHtmlTexts()
+
+fun FullTextSourcesList.toHtmlExplanations(): List<String> = createHtmlText(
+    this,
+    explanationLimit.last + 1
+)
+fun ExplainedInput.toHtmlExplanations(): List<String> = fullEntitiesList().toHtmlTexts()
 
 

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/HandleSafely.kt

@@ -0,0 +1,23 @@
+package com.github.insanusmokrassar.TelegramBotAPI.utils
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.supervisorScope
+
+
+typealias ExceptionHandler<T> = suspend (Exception) -> T
+/**
+ * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions
+ *
+ * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this
+ * exception will be available for catching
+ */
+suspend inline fun <T> handleSafely(
+    noinline onException: ExceptionHandler<T> = { throw it },
+    noinline block: suspend CoroutineScope.() -> T
+): T {
+    return try {
+        supervisorScope(block)
+    } catch (e: Exception) {
+        onException(e)
+    }
+}

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt

@@ -3,6 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.utils
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.json.*
 
+@Suppress("EXPERIMENTAL_API_USAGE")
 internal val nonstrictJsonFormat = Json {
     isLenient = true
     ignoreUnknownKeys = true

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt

@@ -0,0 +1,11 @@
+package com.github.insanusmokrassar.TelegramBotAPI.utils
+
+import kotlinx.serialization.*
+
+@Serializable(MimeTypeSerializer::class)
+expect class MimeType {
+    val raw: String
+}
+
+@Serializer(MimeType::class)
+internal expect object MimeTypeSerializer : KSerializer<MimeType>

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/StorageFile.kt

@@ -3,7 +3,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.utils
 import com.benasher44.uuid.uuid4
 import io.ktor.utils.io.core.Input
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 
 @Serializable
 data class StorageFileInfo(

TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Executes.kt

@@ -4,6 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 import com.github.insanusmokrassar.TelegramBotAPI.types.Response
+import com.github.insanusmokrassar.TelegramBotAPI.utils.handleSafely
 import kotlinx.coroutines.*
 
 
@@ -33,16 +34,23 @@ fun <T: Any> RequestsExecutor.executeAsync(
 suspend fun <T: Any> RequestsExecutor.executeUnsafe(
     request: Request<T>,
     retries: Int = 0,
-    retriesDelay: Long = 1000L
+    retriesDelay: Long = 1000L,
+    onAllFailed: (suspend (exceptions: Array<Exception>) -> Unit)? = null
 ): T? {
     var leftRetries = retries
+    val exceptions = onAllFailed ?.let { mutableListOf<Exception>() }
     do {
-        try {
-            return execute(request)
-        } catch (e: RequestException) {
-            leftRetries--
-            delay(retriesDelay)
-        }
+        handleSafely(
+            {
+                leftRetries--
+                delay(retriesDelay)
+                exceptions ?.add(it)
+                null
+            }
+        ) {
+            execute(request)
+        } ?.let { return it }
     } while(leftRetries >= 0)
+    onAllFailed ?.invoke(exceptions ?.toTypedArray() ?: emptyArray())
     return null
 }

TelegramBotAPI/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt

@@ -4,9 +4,3 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 
 val TestsJsonFormat = Json(JsonConfiguration.Stable)
-val NonstrictTestsJsonFormat = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    serializeSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}

TelegramBotAPI/src/jsMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt

@@ -0,0 +1,33 @@
+package com.github.insanusmokrassar.TelegramBotAPI.utils
+
+import kotlinx.serialization.*
+import org.w3c.dom.get
+import kotlin.browser.window
+
+private val mimesCache = mutableMapOf<String, MimeType>()
+
+@Serializable(MimeTypeSerializer::class)
+actual class MimeType(
+    actual val raw: String
+) {
+    @Transient
+    val jsMimeType = window.navigator.mimeTypes[raw]
+
+    override fun toString(): String = raw
+}
+
+@Serializer(MimeType::class)
+internal actual object MimeTypeSerializer : KSerializer<MimeType> {
+    override val descriptor: SerialDescriptor = PrimitiveDescriptor("mimeType", PrimitiveKind.STRING)
+
+    override fun deserialize(decoder: Decoder): MimeType {
+        val mimeType = decoder.decodeString()
+        return mimesCache.getOrPut(mimeType) {
+            MimeType(mimeType)
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: MimeType) {
+        encoder.encodeString(value.raw)
+    }
+}

TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/MimeType.kt

@@ -0,0 +1,26 @@
+package com.github.insanusmokrassar.TelegramBotAPI.utils
+
+import kotlinx.serialization.*
+
+private val mimesCache = mutableMapOf<String, MimeType>()
+
+@Serializable(MimeTypeSerializer::class)
+actual class MimeType(
+    actual val raw: String
+) : javax.activation.MimeType(raw)
+
+@Serializer(MimeType::class)
+internal actual object MimeTypeSerializer : KSerializer<MimeType> {
+    override val descriptor: SerialDescriptor = PrimitiveDescriptor("mimeType", PrimitiveKind.STRING)
+
+    override fun deserialize(decoder: Decoder): MimeType {
+        val mimeType = decoder.decodeString()
+        return mimesCache.getOrPut(mimeType) {
+            MimeType(mimeType)
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: MimeType) {
+        encoder.encodeString(value.raw)
+    }
+}

TelegramBotAPI/src/jvmMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt

@@ -4,15 +4,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.InputFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.webhook.SetWebhook
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.MediaGroupUpdate
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.RawUpdate
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseMessageUpdate
-import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver
 import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdatesFilter
 import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.webhook.WebhookPrivateKeyConfig
-import com.github.insanusmokrassar.TelegramBotAPI.utils.convertWithMediaGroupUpdates
-import com.github.insanusmokrassar.TelegramBotAPI.utils.nonstrictJsonFormat
+import com.github.insanusmokrassar.TelegramBotAPI.utils.*
 import io.ktor.application.call
 import io.ktor.request.receiveText
 import io.ktor.response.respond
@@ -34,6 +30,7 @@ import java.util.concurrent.TimeUnit
  * which will be used by telegram to send encrypted messages
  * @param scope Scope which will be used for
  */
+@Deprecated("Replaced into project TelegramBotAPI-extensions-utils")
 suspend fun RequestsExecutor.setWebhook(
     url: String,
     port: Int,
@@ -45,6 +42,7 @@ suspend fun RequestsExecutor.setWebhook(
     scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
     allowedUpdates: List<String>? = null,
     maxAllowedConnections: Int? = null,
+    exceptionsHandler: (ExceptionHandler<Unit>)? = null,
     block: UpdateReceiver<Update>
 ): Job {
     val executeDeferred = certificate ?.let {
@@ -74,12 +72,18 @@ suspend fun RequestsExecutor.setWebhook(
         module {
             routing {
                 post(listenRoute) {
-                    val asJson = nonstrictJsonFormat.parseJson(call.receiveText())
-                    val update = nonstrictJsonFormat.fromJson(
-                        RawUpdate.serializer(),
-                        asJson
-                    )
-                    updatesChannel.send(update.asUpdate(asJson))
+                    handleSafely(
+                        {
+                            exceptionsHandler ?.invoke(it)
+                        }
+                    ) {
+                        val asJson = nonstrictJsonFormat.parseJson(call.receiveText())
+                        val update = nonstrictJsonFormat.fromJson(
+                            UpdateDeserializationStrategy,
+                            asJson
+                        )
+                        updatesChannel.send(update)
+                    }
                     call.respond("Ok")
                 }
             }
@@ -113,11 +117,6 @@ suspend fun RequestsExecutor.setWebhook(
         launch {
             for (update in updatesChannel) {
                 val data = update.data
-                if (data is MediaGroupUpdate) {
-
-                } else {
-
-                }
                 when (data) {
                     is MediaGroupMessage -> mediaGroupChannel.send("${data.mediaGroupId}${update::class.simpleName}" to update as BaseMessageUpdate)
                     else -> block(update)
@@ -139,6 +138,35 @@ suspend fun RequestsExecutor.setWebhook(
     }
 }
 
+@Deprecated("Replaced into project TelegramBotAPI-extensions-utils")
+suspend fun RequestsExecutor.setWebhook(
+    url: String,
+    port: Int,
+    engineFactory: ApplicationEngineFactory<*, *>,
+    listenHost: String = "0.0.0.0",
+    listenRoute: String = "/",
+    certificate: InputFile? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
+    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
+    allowedUpdates: List<String>? = null,
+    maxAllowedConnections: Int? = null,
+    block: UpdateReceiver<Update>
+) = setWebhook(
+    url,
+    port,
+    engineFactory,
+    listenHost,
+    listenRoute,
+    certificate,
+    privateKeyConfig,
+    scope,
+    allowedUpdates,
+    maxAllowedConnections,
+    null,
+    block
+)
+
+@Deprecated("Replaced into project TelegramBotAPI-extensions-utils")
 suspend fun RequestsExecutor.setWebhook(
     url: String,
     port: Int,
@@ -163,6 +191,7 @@ suspend fun RequestsExecutor.setWebhook(
     block
 )
 
+@Deprecated("Replaced into project TelegramBotAPI-extensions-utils")
 suspend fun RequestsExecutor.setWebhook(
     url: String,
     port: Int,

docs/build.gradle

@@ -0,0 +1,87 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        jcenter()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    id "org.jetbrains.dokka" version "$dokka_version"
+}
+
+repositories {
+    mavenLocal()
+    jcenter()
+    mavenCentral()
+}
+
+kotlin {
+    jvm()
+    js()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                project.parent.subprojects.forEach {
+                    if (it != project) {
+                        api it
+                    }
+                }
+            }
+        }
+    }
+}
+
+private Closure includeSourcesInDokka(String... approximateNames) {
+    return {
+        parent.subprojects.forEach {
+            if (it != project) {
+                File srcDir = new File(it.projectDir.absolutePath, "src")
+                if (srcDir.exists() && srcDir.isDirectory()) {
+                    srcDir.eachFile { file ->
+                        if (approximateNames.any { file.name.contains(it) } && file.isDirectory()) {
+                            String pathToSrc = file.absolutePath
+                            sourceRoot {
+                                path = pathToSrc
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+String dokkaFolder = "$buildDir/dokka"
+
+dokka {
+    outputFormat = 'html'
+    outputDirectory = dokkaFolder
+
+    multiplatform {
+        global {
+            skipDeprecated = true
+
+            sourceLink {
+                path = "./"
+                url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"
+                lineSuffix = "#L"
+            }
+        }
+
+        common(includeSourcesInDokka("commonMain"))
+        js(includeSourcesInDokka("jsMain"/*, "commonMain"*/))
+        jvm(includeSourcesInDokka("jvmMain"/*, "commonMain"*/))
+    }
+}

docs/gradle.properties

@@ -0,0 +1,3 @@
+dokka_version=0.10.1
+
+org.gradle.jvmargs=-Xmx1024m