RestrictionsChatPermissions

DiceAnimationType class casts
LeftRestrictionsChatPermissions
2025-11-18 13:00:18 +00:00 · 2021-02-18 00:28:36 +06:00 · 2021-02-17 22:29:29 +06:00 · 2021-02-17 22:12:58 +06:00 · 2021-02-17 22:11:26 +06:00 · 2021-02-17 22:00:46 +06:00
69 changed files with 954 additions and 549 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/tgbotapi.core" # Location of package manifests
+    schedule:
+      interval: "daily"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,69 @@
 # TelegramBotAPI changelog

+## 0.32.7
+
+* `Core`:
+    * New variable `LeftRestrictionsChatPermissions` and `RestrictionsChatPermissions`
+* `Extensions Utils`:
+    * `DiceAnimationType` class casts
+* `Behaviour Builder`:
+    * Now `doInSubContextWithUpdatesFilter` and `doInSubContext` will automatically subscribe on updates of parent
+      `BehaviourContext`
+    * `doInSubContextWithFlowsUpdatesFilterSetup`, `doInSubContextWithUpdatesFilter` and `doInSubContext` got new
+      parameter `stopOnCompletion` to be able to disable stopping of behaviour context on finishing
+
+## 0.32.6
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.24` -> `0.4.25`
+* `Extensions API`:
+    * New extension `TelegramBot#replyWithDice`
+* `Extensions Utils`:
+    * `SlotMachineReelImages` has been renamed to `SlotMachineReelImage`
+    * `SlotMachineReelImage` got two built-in parameters: `text` and `number`
+    * New extension `String#asSlotMachineReelImage`
+
+## 0.32.5
+
+* `Core`:
+    * Add `mention` variants for user ids and receiver variants ([#294](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/294))
+    * Now `AbstractRequestCallFactory` will set up one-second delay for zero timeouts in `GetUpdate` requests
+    * Several extensions for `TelegramBotAPI` like `retrieveAccumulatedUpdates` have been added as a solution for
+    [#293](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/293)
+    * Links for `tg://user?id=<user_id>` have been updated ([#292](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/292))
+    * All usages of captions or texts in resends and same things have been replaced with `textSources`
+    * Global `defaultParseMode` has been added ([#291](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/291))
+
+## 0.32.4
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.21` -> `1.4.30`
+        * `Klock`: `2.0.4` -> `2.0.6`
+        * `MicroUtils`: `0.4.23` -> `0.4.24`
+* `Core`:
+    * Renames:
+        * `ChannelMessage` -> `ChannelContentMessage`
+        * `PublicMessage` -> `PublicContentMessage`
+            * `GroupMessage` -> `GroupContentMessage`
+                * `FromChannelGroupMessage` -> `FromChannelGroupContentMessage`
+                * `AnonymousGroupMessage` -> `AnonymousGroupContentMessage`
+                * `CommonGroupMessage` -> `CommonGroupContentMessage`
+        * `PrivateMessage` -> `PrivateContentMessage`
+* `Extensions Utils`:
+    * Renames of extensions in `ClassCasts` according to changes in `Core`
+
+## 0.32.3
+
+* `Behaviour Builder`:
+    * Add expectators and waiters for inline queries
+
+## 0.32.2
+
+* `Core`:
+    * Fix of [#275](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/275)
+
 ## 0.32.1

 * `Core`:
--- a/README.md
+++ b/README.md
@@ -1,153 +1,118 @@
+[Participate in our common survey ☺](https://forms.gle/q6Xf8K3fD1pPsYUw9)
+
 # TelegramBotAPI

-<details>
-<summary><b>I do not wanna read a lot, just give me my bot</b></summary>
+Hello! This is a set of libraries for working with Telegram Bot API.

-You can simply use <a href="https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template">this template</a> (and button
-<a href="https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate">Use template</a>) to get your copy of bot and start to code.
-<p></p>
-<b>P.S. Do not forget to look into our <a href="https://bookstack.inmo.dev/books/telegrambotapi/">minidocs</a> and
-<a href="https://tgbotapi.inmo.dev/docs/index.html">kdocs</a></b>
-
-</details>
-
-| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
+| Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
-| TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
-| TelegramBotAPI API Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
-| TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
-| TelegramBotAPI Behaviour Builder Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.behaviour_builder/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.behaviour_builder/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder) |
-| TelegramBotAPI All status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi)                                                             |
+| TelegramBotAPI Core status                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
+| TelegramBotAPI API Extensions status      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
+| TelegramBotAPI Util Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |
+| TelegramBotAPI Behaviour Builder Extensions status | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.behaviour_builder) |
+| TelegramBotAPI All status                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi)                                                             |

-**At the time of publication of version `0.28.0` there are errors in serialization plugins like
-[kotlinx.serialization#1004](https://github.com/Kotlin/kotlinx.serialization/issues/1004). It is possible, that both JVM
-and JS version may work improperly in some cases with `kotlinx.serialization` version `1.0.0-RC`**
+## Examples

-## What is it?
+There are several things you need to do to launch examples below:

-It is a complex of libraries for working with `TelegramBotAPI` in type-safe and strict way as much as it possible. In
-the list of this complex currently next projects:
+* Add `mavenCentral()` to your project repositories
+    * [Maven variant](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project#pomxml)
+* Add dependency `implementation "dev.inmo:tgbotapi:$tgbotapi_version"` 
+    * Replace `tgbotapi_version` with exact version (see last one in the table above) or put variable with this name in project
+    * Alternative variant for maven [here](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project#telegrambotapi)

-* [TelegramBotAPI Core](tgbotapi.core/README.md) - core of library. In fact it is independent library and can be used alone
-  without any additional library
-* [TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md) - contains extensions (mostly for
-  `RequestsExecutor`), which allows to use the core library in more pleasant way
-* [TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) - contains extensions for more comfortable
-work with commands, updates and other different things
-* [TelegramBotAPI Behaviour  Builder Extensions](tgbotapi.extensions.behaviour_builder/README.md) - builder for
-  step-by-step handling of bot behaviour in more comfortable manner
-* [TelegramBotAPI](tgbotapi/README.md) - concentration of all previously mentioned libraries
+More including instructions [available here](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/Including-in-your-project).
+Other configuration examples:

-Most part of some specific solves or unuseful
-moments are describing by official [Telegram Bot API](https://core.telegram.org/bots/api).
+* [For multiplatform](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/tree/master/ResenderBot)
+* [For JVM](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/blob/master/GetMeBot/build.gradle)

-## JavaScript notes
+### Most common example

-### Versions before `0.28.0`
+```kotlin
+suspend fun main() {
+  val bot = telegramBot(TOKEN)

-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 (for versions before 0.28.0)</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")
-                }
-            }
-        }
+  bot.buildBehaviour {
+    println(getMe())
+  
+    onCommand("start") {
+      reply(it, "Hi:)")
    }
+  }.join()
 }
 ```

-</details>
+In this example you will see information about this bot at the moment of starting and answer with `Hi:)` every time it
+gets message `/start`

-## Ok, where should I start?
+### Handling only last messages

-![Libraries hierarchy](resources/TelegramBotAPI-libraries-hierarchy.svg)
+```kotlin
+suspend fun main() {
+  val bot = telegramBot(TOKEN)

-In most cases, the most simple way will be to implement [TelegramBotAPI](tgbotapi/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 BehaviourBuilder Extensions](tgbotapi.extensions.behaviour_builder/README.md),
-[TelegramBotAPI API Extensions](tgbotapi.extensions.api/README.md),
-[TelegramBotAPI Util Extensions](tgbotapi.extensions.utils/README.md) or even
-[TelegramBotAPI Core](tgbotapi.core/README.md).
+  val flowsUpdatesFilter = FlowsUpdatesFilter()
+  bot.buildBehaviour(flowUpdatesFilter = flowsUpdatesFilter) {
+    println(getMe())
+  
+    onCommand("start") {
+      reply(it, "Hi:)")
+    }

-If you want to dive deeper in the core of library or develop something for it - welcome to learn more from
-[TelegramBotAPI Core](tgbotapi.core/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())`
-* `tgbotapi.extensions.api` typical syntax look like `requestsExecutor.someRequest()` (in most cases it would be
-better to use `bot` name instead of `requestsExecutor`)
-* `tgbotapi.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()
+    retrieveAccumulatedUpdates(this).join()
+  }
 }
 ```

-Besides, for your own version you can change variable `library_version` in the file [gradle.properties](./gradle.properties).
+The main difference with the previous example is that bot will get only last updates (accumulated before bot launch
+and maybe some updates it got after launch)
+
+### Build a little bit more complex behaviour
+
+```kotlin
+suspend fun main() {
+  val bot = telegramBot(TOKEN)
+
+  bot.buildBehaviour {
+    println(getMe())
+
+    val nameReplyMarkup = ReplyKeyboardMarkup(
+      matrix {
+        row {
+          +SimpleKeyboardButton("nope")
+        }
+      }
+    )
+    onCommand("start") {
+      val photo = waitPhoto(
+        SendTextMessage(it.chat.id, "Send me your photo please")
+      ).first()
+
+      val name = waitText(
+        SendTextMessage(
+          it.chat.id,
+          "Send me your name or choose \"nope\"",
+          replyMarkup = nameReplyMarkup
+        )
+      ).first().text.takeIf { it != "nope" }
+
+      sendPhoto(
+        it.chat,
+        photo.mediaCollection,
+        entities = buildEntities {
+          if (name != null) regular(name) // may be collapsed up to name ?.let(::regular)
+        }
+      )
+    }
+  }.join()
+}
+```
+
+### More examples
+
+You may find examples in [this project](https://github.com/InsanusMokrassar/TelegramBotAPI-examples). Besides, you are
+always welcome in our [wiki](https://github.com/InsanusMokrassar/TelegramBotAPI/wiki/About-this-project) and
+[chat](https://t.me/InMoTelegramBotAPIChat).
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,18 +5,18 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true

-kotlin_version=1.4.21
+kotlin_version=1.4.30
 kotlin_coroutines_version=1.4.2
-kotlin_serialisation_runtime_version=1.0.1
-klock_version=2.0.4
+kotlin_serialisation_runtime_version=1.1.0-RC
+klock_version=2.0.6
 uuid_version=0.2.3
 ktor_version=1.5.1

-micro_utils_version=0.4.23
+micro_utils_version=0.4.25

 javax_activation_version=1.1.1

 library_group=dev.inmo
-library_version=0.32.1
+library_version=0.32.7

 github_release_plugin_version=2.2.12
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@@ -29,7 +29,9 @@ repositories {
 }

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js(BOTH) {
        browser()
        nodejs()
@@ -58,6 +60,7 @@ kotlin {
            dependencies {
                implementation kotlin('test-common')
                implementation kotlin('test-annotations-common')
+                implementation project(":tgbotapi.extensions.utils")
            }
        }

--- a/tgbotapi.core/mpp_publish_template.kpsb
+++ b/tgbotapi.core/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
--- a/tgbotapi.core/publish.gradle
+++ b/tgbotapi.core/publish.gradle
@@ -4,22 +4,6 @@ apply plugin: 'signing'
 task javadocsJar(type: Jar) {
    classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}

 publishing {
    publications.all {
@@ -64,6 +48,16 @@ publishing {
                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                }
            }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
        }
        
    }
@@ -71,5 +65,5 @@ publishing {

 signing {
    useGpgCmd()
-    publishing.publications.forEach { sign it }
+    sign publishing.publications
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/AbstractRequestCallFactory.kt
@@ -16,6 +16,8 @@ import io.ktor.http.ContentType
 import kotlinx.serialization.json.Json
 import kotlin.collections.set

+var defaultUpdateTimeoutForZeroDelay = 1000L
+
 abstract class AbstractRequestCallFactory : KtorCallFactory {
    private val methodsCache: MutableMap<String, String> = mutableMapOf()
    override suspend fun <T : Any> makeCall(
@@ -41,6 +43,11 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
                            requestTimeoutMillis = customTimeoutMillis
                            socketTimeoutMillis = customTimeoutMillis
                        }
+                    } else {
+                        timeout {
+                            requestTimeoutMillis = defaultUpdateTimeoutForZeroDelay
+                            socketTimeoutMillis = defaultUpdateTimeoutForZeroDelay
+                        }
                    }
                }
            }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/CommonLimiter.kt
@@ -17,7 +17,9 @@ class CommonLimiter(
    @Transient
    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
 ) : RequestLimiter {
+    @Transient
    private val quotaSemaphore = Semaphore(lockCount)
+    @Transient
    private val counterRegeneratorJob = scope.launch {
        val regenDelay: MilliSeconds = (regenTime.toDouble() / lockCount).roundToLong()
        while (isActive) {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt
@@ -37,11 +37,12 @@ class ExceptionsOnlyLimiter(
    override suspend fun <T> limit(block: suspend () -> T): T {
        while (true) {
            lockState.first { !it }
+            var throwable: Throwable? = null
            val result = safely({
-                when (it) {
+                throwable = when (it) {
                    is TooMuchRequestsException -> {
                        lock(it.retryAfter.leftToRetry)
-                        Result.failure(it)
+                        it
                    }
                    is ClientRequestException -> {
                        if (it.response.status == HttpStatusCode.TooManyRequests) {
@@ -49,15 +50,16 @@ class ExceptionsOnlyLimiter(
                        } else {
                            throw it
                        }
-                        Result.failure(it)
+                        it
                    }
                    else -> throw it
                }
+                null
            }) {
-                Result.success(block())
+                block()
            }
-            if (result.isSuccess) {
-                return result.getOrNull()!!
+            if (throwable == null) {
+                return result!!
            }
        }
    }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatPhoto.kt
@@ -18,6 +18,8 @@ data class SetChatPhoto (
    override fun method(): String = "setChatPhoto"
    override val resultDeserializer: DeserializationStrategy<Boolean>
        get() = Boolean.serializer()
+    @Transient
    override val mediaMap: Map<String, MultipartFile> = mapOf(photoField to photo)
+    @Transient
    override val paramsJson: JsonObject = toJson(serializer())
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt
@@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.utils.throwRangeError
 import kotlinx.serialization.*

 private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+const val editMessageLiveLocationMethod = "editMessageLiveLocation"

@Serializable
 data class EditChatMessageLiveLocation(
@@ -30,7 +31,7 @@ data class EditChatMessageLiveLocation(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<LocationContent>, EditReplyMessage, EditLocationMessage {
-    override fun method(): String = "editMessageLiveLocation"
+    override fun method(): String = editMessageLiveLocationMethod
    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
        get() = commonResultDeserializer
    override val requestSerializer: SerializationStrategy<*>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt
@@ -23,7 +23,7 @@ data class EditInlineMessageLiveLocation(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
-    override fun method(): String = "editMessageLiveLocation"
+    override fun method(): String = editMessageLiveLocationMethod
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt
@@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.types.message.content.LocationContent
 import kotlinx.serialization.*

 private val commonResultDeserializer = TelegramBotAPIMessageDeserializationStrategyClass<ContentMessage<LocationContent>>()
+const val stopMessageLiveLocationMethod = "stopMessageLiveLocation"

@Serializable
 data class StopChatMessageLiveLocation(
@@ -20,7 +21,7 @@ data class StopChatMessageLiveLocation(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditChatMessage<LocationContent>, EditReplyMessage {
-    override fun method(): String = "stopMessageLiveLocation"
+    override fun method(): String = stopMessageLiveLocationMethod
    override val resultDeserializer: DeserializationStrategy<ContentMessage<LocationContent>>
        get() = commonResultDeserializer
    override val requestSerializer: SerializationStrategy<*>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt
@@ -13,7 +13,7 @@ data class StopInlineMessageLiveLocation(
    @SerialName(replyMarkupField)
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
-    override fun method(): String = "stopMessageLiveLocation"
+    override fun method(): String = stopMessageLiveLocationMethod
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/text/EditInlineMessageText.kt
@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.requests.edit.text

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
-import dev.inmo.tgbotapi.requests.edit.media.editMessageMediaMethod
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.MessageEntity.*
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
@@ -55,10 +54,10 @@ data class EditInlineMessageText internal constructor(
    override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
    override val entities: List<TextSource>? by lazy {
-        rawEntities ?.asTextParts(text ?: return@lazy null) ?.justTextSources()
+        rawEntities ?.asTextParts(text) ?.justTextSources()
    }

-    override fun method(): String = editMessageMediaMethod
+    override fun method(): String = editMessageTextMethod
    override val requestSerializer: SerializationStrategy<*>
        get() = serializer()
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.requests.send.polls

 import com.soywiz.klock.DateTime
+import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
@@ -16,6 +17,11 @@ import kotlinx.serialization.*

 private val commonResultDeserializer: DeserializationStrategy<ContentMessage<PollContent>> = TelegramBotAPIMessageDeserializationStrategyClass()

+private inline val ApproximateScheduledCloseInfo.openPeriod
+    get() = openDuration.millisecondsLong.div(1000)
+private inline val ExactScheduledCloseInfo.closeDate
+    get() = closeDateTime.unixMillisLong.div(1000)
+
 private fun checkPollInfo(
    question: String,
    options: List<String>
@@ -138,12 +144,23 @@ sealed class SendPoll : SendMessageRequest<ContentMessage<PollContent>>,
    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?

+    protected val creationDate = DateTime.now()
+    open val closeInfo: ScheduledCloseInfo?
+        get() {
+            val openPeriod = openPeriod
+            val closeDate = closeDate
+            return when {
+                openPeriod != null -> openPeriod.asApproximateScheduledCloseInfo(creationDate)
+                closeDate != null -> closeDate.asExactScheduledCloseInfo
+                else -> null
+            }
+        }
+
    override fun method(): String = "sendPoll"
    override val resultDeserializer: DeserializationStrategy<ContentMessage<PollContent>>
        get() = commonResultDeserializer
@@ -163,8 +180,10 @@ data class SendRegularPoll(
    override val isClosed: Boolean = false,
    @SerialName(allowsMultipleAnswersField)
    val allowMultipleAnswers: Boolean = false,
-    @Transient
-    override val closeInfo: ScheduledCloseInfo? = null,
+    @SerialName(openPeriodField)
+    override val openPeriod: LongSeconds?= null,
+    @SerialName(closeDateField)
+    override val closeDate: LongSeconds?,
    @SerialName(disableNotificationField)
    override val disableNotification: Boolean = false,
    @SerialName(replyToMessageIdField)
@@ -178,20 +197,39 @@ 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()
    }
 }

+fun SendRegularPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    allowMultipleAnswers: Boolean = false,
+    closeInfo: ScheduledCloseInfo? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendRegularPoll(
+    chatId,
+    question,
+    options,
+    isAnonymous,
+    isClosed,
+    allowMultipleAnswers,
+    (closeInfo as? ApproximateScheduledCloseInfo) ?.openPeriod,
+    (closeInfo as? ExactScheduledCloseInfo) ?.closeDate,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
 fun SendQuizPoll(
    chatId: ChatIdentifier,
    question: String,
@@ -253,6 +291,39 @@ fun SendQuizPoll(
    replyMarkup
 )

+internal fun SendQuizPoll(
+    chatId: ChatIdentifier,
+    question: String,
+    options: List<String>,
+    correctOptionId: Int,
+    isAnonymous: Boolean = true,
+    isClosed: Boolean = false,
+    explanation: String? = null,
+    parseMode: ParseMode? = null,
+    rawEntities: List<RawMessageEntity>? = null,
+    closeInfo: ScheduledCloseInfo? = null,
+    disableNotification: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = SendQuizPoll(
+    chatId,
+    question,
+    options,
+    correctOptionId,
+    isAnonymous,
+    isClosed,
+    explanation,
+    parseMode,
+    rawEntities,
+    (closeInfo as? ApproximateScheduledCloseInfo) ?.openPeriod,
+    (closeInfo as? ExactScheduledCloseInfo) ?.closeDate,
+    disableNotification,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
@Serializable
 data class SendQuizPoll internal constructor(
    @SerialName(chatIdField)
@@ -273,8 +344,10 @@ data class SendQuizPoll internal constructor(
    override val parseMode: ParseMode? = null,
    @SerialName(explanationEntitiesField)
    private val rawEntities: List<RawMessageEntity>? = null,
-    @Transient
-    override val closeInfo: ScheduledCloseInfo? = null,
+    @SerialName(openPeriodField)
+    override val openPeriod: LongSeconds? = null,
+    @SerialName(closeDateField)
+    override val closeDate: LongSeconds? = null,
    @SerialName(disableNotificationField)
    override val disableNotification: Boolean = false,
    @SerialName(replyToMessageIdField)
@@ -291,14 +364,6 @@ data class SendQuizPoll internal constructor(
        rawEntities ?.asTextParts(explanation ?: return@lazy null) ?.justTextSources()
    }

-    @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()
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt
@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.types

+import dev.inmo.micro_utils.common.Warning
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
@@ -17,9 +19,20 @@ data class ChatId(
    val chatId: Identifier
 ) : ChatIdentifier()

-
-val ChatId.link: String
-    get() = "tg://user?id=$chatId"
+/**
+ * https://core.telegram.org/bots/api#formatting-options
+ */
+@Warning("This API have restrictions in Telegram System")
+val Identifier.link: String
+    get() = "tg://user?id=$this"
+/**
+ * https://core.telegram.org/bots/api#formatting-options
+ */
+@Warning("This API have restrictions in Telegram System")
+val UserId.link: String
+    get() = chatId.link
+val User.link: String
+    get() = id.link

 typealias UserId = ChatId

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaAudio.kt
@@ -74,3 +74,15 @@ fun AudioFile.toInputMediaAudio(
    title,
    thumb ?.fileId
 )
+
+fun AudioFile.toInputMediaAudio(
+    textSources: TextSourcesList = emptyList(),
+    title: String? = this.title
+): InputMediaAudio = InputMediaAudio(
+    fileId,
+    textSources,
+    duration,
+    performer,
+    title,
+    thumb ?.fileId
+)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaDocument.kt
@@ -70,3 +70,11 @@ fun DocumentFile.toInputMediaDocument(
    parseMode,
    thumb ?.fileId
 )
+
+fun DocumentFile.toInputMediaDocument(
+    textSources: TextSourcesList = emptyList()
+) = InputMediaDocument(
+    fileId,
+    textSources,
+    thumb ?.fileId
+)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InputMedia/InputMediaPhoto.kt
@@ -53,3 +53,10 @@ fun PhotoSize.toInputMediaPhoto(
    caption,
    parseMode
 )
+
+fun PhotoSize.toInputMediaPhoto(
+    textSources: TextSourcesList = emptyList()
+): InputMediaPhoto = InputMediaPhoto(
+    fileId,
+    textSources
+)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.internal.*

@@ -21,6 +21,26 @@ data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
@Suppress("NOTHING_TO_INLINE")
 inline fun mention(parts: List<TextSource>, user: User) = TextMentionTextSource(parts.makeString(), user, parts)
@Suppress("NOTHING_TO_INLINE")
+inline fun User.mention(parts: List<TextSource>) = mention(parts, this)
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(parts: List<TextSource>, userId: UserId) = mention(parts, CommonUser(userId, ""))
+@Suppress("NOTHING_TO_INLINE")
+inline fun UserId.mention(parts: List<TextSource>) = mention(parts, this)
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(parts: List<TextSource>, id: Identifier) = mention(parts, UserId(id))
+@Suppress("NOTHING_TO_INLINE")
+inline fun Identifier.mention(parts: List<TextSource>) = mention(parts, this)
+@Suppress("NOTHING_TO_INLINE")
 inline fun mention(user: User, vararg parts: TextSource) = mention(parts.toList(), user)
@Suppress("NOTHING_TO_INLINE")
 inline fun mention(text: String, user: User) = mention(user, regular(text))
+@Suppress("NOTHING_TO_INLINE")
+inline fun User.mention(text: String) = mention(this, regular(text))
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(text: String, userId: UserId) = mention(text, CommonUser(userId, ""))
+@Suppress("NOTHING_TO_INLINE")
+inline fun UserId.mention(text: String) = mention(text, this)
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(text: String, id: Identifier) = mention(text, UserId(id))
+@Suppress("NOTHING_TO_INLINE")
+inline fun Identifier.mention(text: String) = mention(text, this)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ParseMode/ParseMode.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ParseMode/ParseMode.kt
@@ -35,12 +35,21 @@ typealias Markdown = MarkdownParseMode
 typealias MarkdownV2 = MarkdownV2ParseMode
 typealias HTML = HTMLParseMode

+/**
+ * This variable respects to default parse mode used in places like next:
+ *
+ * * [dev.inmo.tgbotapi.types.message.content.TextContent.createResends]
+ * *
+ */
+var defaultParseMode: ParseMode = HTML
+
@Serializer(ParseMode::class)
 internal object ParseModeSerializerObject : KSerializer<ParseMode> {
    override fun deserialize(decoder: Decoder): ParseMode {
        return when (decoder.decodeString()) {
-            MarkdownParseMode.parseModeName -> MarkdownParseMode
-            HTMLParseMode.parseModeName -> HTMLParseMode
+            Markdown.parseModeName -> Markdown
+            MarkdownV2.parseModeName -> MarkdownV2
+            HTML.parseModeName -> HTML
            else -> throw IllegalArgumentException("Unknown parse mode")
        }
    }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatPermissions.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatPermissions.kt
@@ -23,3 +23,25 @@ data class ChatPermissions(
    @SerialName(canPinMessagesField)
    val canPinMessages: Boolean = false
 )
+
+val LeftRestrictionsChatPermissions = ChatPermissions(
+    canSendMessages = true,
+    canSendMediaMessages = true,
+    canSendPolls = true,
+    canSendOtherMessages = true,
+    canAddWebPagePreviews = true,
+    canChangeInfo = true,
+    canInviteUsers = true,
+    canPinMessages = true,
+)
+
+val RestrictionsChatPermissions = ChatPermissions(
+    canSendMessages = false,
+    canSendMediaMessages = false,
+    canSendPolls = false,
+    canSendOtherMessages = false,
+    canAddWebPagePreviews = false,
+    canChangeInfo = false,
+    canInviteUsers = false,
+    canPinMessages = false,
+)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt
@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.types.files

+import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo
@@ -44,3 +45,15 @@ inline fun VideoFile.toInputMediaVideo(
    duration,
    thumb ?.fileId
 )
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun VideoFile.toInputMediaVideo(
+    textSources: TextSourcesList
+) = InputMediaVideo(
+    fileId,
+    textSources,
+    width,
+    height,
+    duration,
+    thumb ?.fileId
+)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelMessageImpl.kt
@@ -4,11 +4,11 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
-import dev.inmo.tgbotapi.types.message.abstracts.ChannelMessage
+import dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent

-data class ChannelMessageImpl<T: MessageContent>(
+data class ChannelContentMessageImpl<T: MessageContent>(
    override val messageId: MessageIdentifier,
    override val chat: ChannelChat,
    override val content: T,
@@ -19,4 +19,6 @@ data class ChannelMessageImpl<T: MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : ChannelMessage<T>
+) : ChannelContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessageImpl", "dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl"))
+typealias ChannelMessageImpl<T> = ChannelContentMessageImpl<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt
@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent

-data class FromChannelGroupMessageImpl<T : MessageContent>(
+data class FromChannelGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val channel: ChannelChat,
    override val messageId: MessageIdentifier,
@@ -20,9 +20,11 @@ data class FromChannelGroupMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : FromChannelGroupMessage<T>
+) : FromChannelGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.FromChannelGroupContentMessageImpl"))
+typealias FromChannelGroupMessageImpl<T> = FromChannelGroupContentMessageImpl<T>

-data class AnonymousGroupMessageImpl<T : MessageContent>(
+data class AnonymousGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val messageId: MessageIdentifier,
    override val date: DateTime,
@@ -33,9 +35,11 @@ data class AnonymousGroupMessageImpl<T : MessageContent>(
    override val content: T,
    override val senderBot: CommonBot?,
    override val authorSignature: AuthorSignature?
-) : AnonymousGroupMessage<T>
+) : AnonymousGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl"))
+typealias AnonymousGroupMessageImpl<T> = AnonymousGroupContentMessageImpl<T>

-data class CommonGroupMessageImpl<T : MessageContent>(
+data class CommonGroupContentMessageImpl<T : MessageContent>(
    override val chat: GroupChat,
    override val messageId: MessageIdentifier,
    override val user: User,
@@ -46,4 +50,6 @@ data class CommonGroupMessageImpl<T : MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val content: T,
    override val senderBot: CommonBot?
-) : CommonGroupMessage<T>
+) : CommonGroupContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessageImpl", "dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl"))
+typealias CommonGroupMessageImpl<T> = CommonGroupContentMessageImpl<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt
@@ -4,12 +4,11 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.abstracts.PrivateMessage
+import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo

-data class PrivateMessageImpl<T: MessageContent>(
+data class PrivateContentMessageImpl<T: MessageContent>(
    override val messageId: MessageIdentifier,
    override val user: User,
    override val chat: Chat,
@@ -21,4 +20,6 @@ data class PrivateMessageImpl<T: MessageContent>(
    override val replyMarkup: InlineKeyboardMarkup?,
    override val senderBot: CommonBot?,
    val paymentInfo: SuccessfulPaymentInfo?
-) : PrivateMessage<T>
+) : PrivateContentMessage<T>
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessageImpl", "dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl"))
+typealias PrivateMessageImpl<T> = PrivateContentMessageImpl<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
@@ -256,7 +256,7 @@ internal data class RawMessage(
                    }
                } ?: when (chat) {
                    is PublicChat -> when (chat) {
-                        is ChannelChat -> ChannelMessageImpl(
+                        is ChannelChat -> ChannelContentMessageImpl(
                            messageId,
                            chat,
                            content,
@@ -269,7 +269,7 @@ internal data class RawMessage(
                            author_signature
                        )
                        is GroupChat -> when (sender_chat) {
-                            is ChannelChat -> FromChannelGroupMessageImpl(
+                            is ChannelChat -> FromChannelGroupContentMessageImpl(
                                chat,
                                sender_chat,
                                messageId,
@@ -282,7 +282,7 @@ internal data class RawMessage(
                                via_bot,
                                author_signature
                            )
-                            is GroupChat -> AnonymousGroupMessageImpl(
+                            is GroupChat -> AnonymousGroupContentMessageImpl(
                                chat,
                                messageId,
                                date.asDate,
@@ -294,7 +294,7 @@ internal data class RawMessage(
                                via_bot,
                                author_signature
                            )
-                            null -> CommonGroupMessageImpl(
+                            null -> CommonGroupContentMessageImpl(
                                chat,
                                messageId,
                                from ?: error("It is expected that in messages from non anonymous users and channels user must be specified"),
@@ -310,7 +310,7 @@ internal data class RawMessage(
                        }
                        else -> error("Unknown type of public chat: $chat")
                    }
-                    is PrivateChat -> PrivateMessageImpl(
+                    is PrivateChat -> PrivateContentMessageImpl(
                        messageId,
                        from ?: error("Was detected common message, but owner (sender) of the message was not found"),
                        chat,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelMessage.kt
@@ -4,8 +4,10 @@ import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage

-interface ChannelMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, SignedMessage, WithSenderChatMessage {
+interface ChannelContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, SignedMessage, WithSenderChatMessage {
    override val chat: ChannelChat
    override val senderChat: ChannelChat
        get() = chat
 }
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("ChannelContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage"))
+typealias ChannelMessage<T> = ChannelContentMessage<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt
@@ -4,17 +4,28 @@ import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
 import dev.inmo.tgbotapi.types.chat.abstracts.GroupChat
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent

-interface GroupMessage<T : MessageContent> : PublicMessage<T> {
+interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
    override val chat: GroupChat
 }
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("GroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage"))
+typealias GroupMessage<T> = GroupContentMessage<T>

-interface FromChannelGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMessage, WithSenderChatMessage {
+
+interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
    val channel: ChannelChat
    override val senderChat: ChannelChat
        get() = channel
 }
-interface AnonymousGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMessage, WithSenderChatMessage {
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("FromChannelGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.FromChannelGroupContentMessage"))
+typealias FromChannelGroupMessage<T> = FromChannelGroupContentMessage<T>
+
+interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
    override val senderChat: GroupChat
        get() = chat
 }
-interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("AnonymousGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage"))
+typealias AnonymousGroupMessage<T> = AnonymousGroupContentMessage<T>
+
+interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("CommonGroupContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage"))
+typealias CommonGroupMessage<T> = CommonGroupContentMessage<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt
@@ -3,4 +3,6 @@ package dev.inmo.tgbotapi.types.message.abstracts
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage

-interface PrivateMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
+interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PrivateContentMessage", "dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage"))
+typealias PrivateMessage<T> = PrivateContentMessage<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt
@@ -4,6 +4,8 @@ import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.PossiblySentViaBotCommonMessage

-interface PublicMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
+interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
    override val chat: PublicChat
 }
+@Deprecated("Renamed due to ambiguity of naming", ReplaceWith("PublicContentMessage", "dev.inmo.tgbotapi.types.message.PublicContentMessage"))
+typealias PublicMessage<T> = PublicContentMessage<T>
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.message.content

-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
-import dev.inmo.tgbotapi.CommonAbstracts.TextedInput
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
@@ -10,7 +9,6 @@ import dev.inmo.tgbotapi.types.ParseMode.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.utils.internal.*

 data class TextContent(
    override val text: String,
@@ -24,8 +22,7 @@ data class TextContent(
        replyMarkup: KeyboardMarkup?
    ): Request<ContentMessage<TextContent>> = SendTextMessage(
        chatId,
-        toHtmlTexts().first(),
-        HTMLParseMode,
+        textSources,
        false,
        disableNotification,
        replyToMessageId,
@@ -33,42 +30,36 @@ data class TextContent(
        replyMarkup
    )

+    @Deprecated(
+        "Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
+        ReplaceWith("createResend")
+    )
    override fun createResends(
        chatId: ChatIdentifier,
        disableNotification: Boolean,
        replyToMessageId: MessageIdentifier?,
        allowSendingWithoutReply: Boolean?,
        replyMarkup: KeyboardMarkup?
-    ): List<Request<ContentMessage<TextContent>>> = createResends(
-        chatId,
-        disableNotification,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup,
-        HTMLParseMode
+    ): List<Request<ContentMessage<TextContent>>> = listOf(
+        createResend(
+            chatId,
+            disableNotification,
+            replyToMessageId,
+            allowSendingWithoutReply,
+            replyMarkup
+        )
    )

+    @Deprecated(
+        "Useless due to fact that createResend currently use textSource and that will guarantee correct sending of message",
+        ReplaceWith("createResend")
+    )
    fun createResends(
        chatId: ChatIdentifier,
        disableNotification: Boolean,
        replyToMessageId: MessageIdentifier?,
        allowSendingWithoutReply: Boolean?,
        replyMarkup: KeyboardMarkup?,
-        parseMode: ParseMode = HTMLParseMode
-    ): List<Request<ContentMessage<TextContent>>> = when (parseMode) {
-        is MarkdownParseMode -> toMarkdownTexts()
-        is MarkdownV2ParseMode -> toMarkdownV2Texts()
-        is HTMLParseMode -> toHtmlTexts()
-    }.map {
-        SendTextMessage(
-            chatId,
-            it,
-            parseMode,
-            false,
-            disableNotification,
-            replyToMessageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
-    }
+        parseMode: ParseMode = defaultParseMode
+    ): List<Request<ContentMessage<TextContent>>> = createResends(chatId, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
@@ -1,21 +1,16 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendAnimation
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaAnimation
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
-import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AnimationFile
 import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions
-import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Captions

 data class AnimationContent(
    override val media: AnimationFile,
@@ -33,8 +28,7 @@ data class AnimationContent(
        chatId,
        media.fileId,
        media.thumb ?.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        media.duration,
        media.width,
        media.height,
@@ -46,8 +40,7 @@ data class AnimationContent(

    override fun asInputMedia(): InputMediaAnimation = InputMediaAnimation(
        media.fileId,
-        toMarkdownV2Captions().firstOrNull(),
-        MarkdownV2,
+        textSources,
        media.width,
        media.height,
        media.duration,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
@@ -1,18 +1,17 @@
 package dev.inmo.tgbotapi.types.message.content.media

 import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendAudio
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaAudio
 import dev.inmo.tgbotapi.types.InputMedia.toInputMediaAudio
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AudioFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.AudioMediaGroupContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class AudioContent(
    override val media: AudioFile,
@@ -29,8 +28,7 @@ data class AudioContent(
        chatId,
        media.fileId,
        media.thumb ?.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        media.duration,
        media.performer,
        media.title,
@@ -42,8 +40,5 @@ data class AudioContent(

    override fun toMediaGroupMemberInputMedia(): InputMediaAudio = asInputMedia()

-    override fun asInputMedia(): InputMediaAudio = media.toInputMediaAudio(
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode
-    )
+    override fun asInputMedia(): InputMediaAudio = media.toInputMediaAudio(textSources)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
@@ -1,21 +1,18 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendDocument
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaDocument
 import dev.inmo.tgbotapi.types.InputMedia.toInputMediaDocument
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.files.asDocumentFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.DocumentMediaGroupContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class DocumentContent(
    override val media: DocumentFile,
@@ -32,8 +29,7 @@ data class DocumentContent(
        chatId,
        media.fileId,
        media.thumb ?.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        disableNotification,
        replyToMessageId,
        allowSendingWithoutReply,
@@ -42,10 +38,7 @@ data class DocumentContent(

    override fun toMediaGroupMemberInputMedia(): InputMediaDocument = asInputMedia()

-    override fun asInputMedia(): InputMediaDocument = media.toInputMediaDocument(
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode
-    )
+    override fun asInputMedia(): InputMediaDocument = media.toInputMediaDocument(textSources)
 }

@Suppress("NOTHING_TO_INLINE")
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
@@ -1,19 +1,18 @@
 package dev.inmo.tgbotapi.types.message.content.media

 import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendPhoto
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaPhoto
 import dev.inmo.tgbotapi.types.InputMedia.toInputMediaPhoto
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaCollectionContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class PhotoContent(
    override val mediaCollection: Photo,
@@ -31,8 +30,7 @@ data class PhotoContent(
    ): Request<ContentMessage<PhotoContent>> = SendPhoto(
        chatId,
        media.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        disableNotification,
        replyToMessageId,
        allowSendingWithoutReply,
@@ -41,8 +39,5 @@ data class PhotoContent(

    override fun toMediaGroupMemberInputMedia(): InputMediaPhoto = asInputMedia()

-    override fun asInputMedia(): InputMediaPhoto = media.toInputMediaPhoto(
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode
-    )
+    override fun asInputMedia(): InputMediaPhoto = media.toInputMediaPhoto(textSources)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
@@ -1,18 +1,17 @@
 package dev.inmo.tgbotapi.types.message.content.media

 import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendVideo
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VideoFile
 import dev.inmo.tgbotapi.types.files.toInputMediaVideo
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class VideoContent(
    override val media: VideoFile,
@@ -29,8 +28,7 @@ data class VideoContent(
        chatId,
        media.fileId,
        media.thumb ?.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        media.duration,
        media.width,
        media.height,
@@ -43,8 +41,5 @@ data class VideoContent(

    override fun toMediaGroupMemberInputMedia(): InputMediaVideo = asInputMedia()

-    override fun asInputMedia(): InputMediaVideo = media.toInputMediaVideo(
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode
-    )
+    override fun asInputMedia(): InputMediaVideo = media.toInputMediaVideo(textSources)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
@@ -1,20 +1,15 @@
 package dev.inmo.tgbotapi.types.message.content.media

-import dev.inmo.tgbotapi.CommonAbstracts.CaptionedInput
-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.media.SendVoice
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaAudio
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.HTMLParseMode
-import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VoiceFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions
-import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Captions

 data class VoiceContent(
    override val media: VoiceFile,
@@ -30,8 +25,7 @@ data class VoiceContent(
    ): Request<ContentMessage<VoiceContent>> = SendVoice(
        chatId,
        media.fileId,
-        toHtmlCaptions().firstOrNull(),
-        HTMLParseMode,
+        textSources,
        media.duration,
        disableNotification,
        replyToMessageId,
@@ -41,8 +35,7 @@ data class VoiceContent(

    override fun asInputMedia(): InputMediaAudio = InputMediaAudio(
        media.fileId,
-        toMarkdownV2Captions().firstOrNull(),
-        MarkdownV2,
+        textSources,
        media.duration
    )
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/decrypted/AddressSecureValue.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/decrypted/AddressSecureValue.kt
@@ -4,13 +4,13 @@ import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.DataCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EndDataCredentials
 import dev.inmo.tgbotapi.types.passport.decrypted.abstracts.SecureValueWithData
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*

@Serializable
 data class AddressSecureValue(
    @SerialName(dataField)
    override val data: DataCredentials
 ) : SecureValueWithData {
+    @Transient
    override val credentials: List<EndDataCredentials> = listOf(data)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/decrypted/PersonalDetailsSecureValue.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/decrypted/PersonalDetailsSecureValue.kt
@@ -4,13 +4,13 @@ import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.DataCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EndDataCredentials
 import dev.inmo.tgbotapi.types.passport.decrypted.abstracts.SecureValueWithData
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*

@Serializable
 data class PersonalDetailsSecureValue(
    @SerialName(dataField)
    override val data: DataCredentials
 ) : SecureValueWithData {
+    @Transient
    override val credentials: List<EndDataCredentials> = listOf(data)
 }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt
@@ -33,6 +33,9 @@ val LongSeconds.asApproximateScheduledCloseInfo
    get() = ApproximateScheduledCloseInfo(
        TimeSpan(this * 1000.0)
    )
+fun LongSeconds.asApproximateScheduledCloseInfo(startPoint: DateTime) = ApproximateScheduledCloseInfo(
+    TimeSpan(this * 1000.0), startPoint
+)
 val LongSeconds.asExactScheduledCloseInfo
    get() = ExactScheduledCloseInfo(
        DateTime(unixMillis = this * 1000.0)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
@@ -1,97 +0,0 @@
-package dev.inmo.tgbotapi.utils.internal
-
-import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.ParseMode.*
-import dev.inmo.tgbotapi.types.captionLength
-import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.types.textLength
-
-internal fun createFormattedText(
-    entities: TextSourcesList,
-    partLength: Int = textLength.last,
-    mode: ParseMode = MarkdownParseMode
-): List<String> {
-    val texts = mutableListOf<String>()
-    val textBuilder = StringBuilder(partLength)
-    for (entity in entities) {
-        val string = when (mode) {
-            is MarkdownParseMode -> entity.markdown
-            is MarkdownV2ParseMode -> entity.markdownV2
-            is HTMLParseMode -> entity.html
-        }
-        if (textBuilder.length + string.length > partLength) {
-            if (textBuilder.isNotEmpty()) {
-                texts.add(textBuilder.toString())
-                textBuilder.clear()
-            }
-            val chunked = string.chunked(partLength)
-            val last = chunked.last()
-            textBuilder.append(last)
-            val listToAdd = if (chunked.size > 1) {
-                chunked.subList(0, chunked.size - 1)
-            } else {
-                emptyList()
-            }
-            listToAdd.forEach {
-                texts.add(it)
-            }
-        } else {
-            textBuilder.append(string)
-        }
-    }
-    if (textBuilder.isNotEmpty()) {
-        texts.add(textBuilder.toString())
-        textBuilder.clear()
-    }
-    return texts
-}
-
-
-internal fun createMarkdownText(
-    entities: TextSourcesList,
-    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, MarkdownParseMode)
-
-internal fun TextSourcesList.toMarkdownTexts(): List<String> = createMarkdownText(
-    this,
-    textLength.last
-)
-internal fun TextContent.toMarkdownTexts(): List<String> = textSources.toMarkdownTexts()
-
-
-internal fun createMarkdownV2Text(
-    entities: TextSourcesList,
-    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, MarkdownV2ParseMode)
-
-internal fun TextSourcesList.toMarkdownV2Captions(): List<String> = createMarkdownV2Text(
-    this,
-    captionLength.last
-)
-internal fun CaptionedInput.toMarkdownV2Captions(): List<String> = textSources.toMarkdownV2Captions()
-
-internal fun TextSourcesList.toMarkdownV2Texts(): List<String> = createMarkdownV2Text(
-    this,
-    textLength.last
-)
-internal fun TextContent.toMarkdownV2Texts(): List<String> = textSources.toMarkdownV2Texts()
-
-
-internal fun createHtmlText(
-    entities: TextSourcesList,
-    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, HTMLParseMode)
-
-internal fun TextSourcesList.toHtmlCaptions(): List<String> = createHtmlText(
-    this,
-    captionLength.last
-)
-internal fun CaptionedInput.toHtmlCaptions(): List<String> = textSources.toHtmlCaptions()
-
-internal fun TextSourcesList.toHtmlTexts(): List<String> = createHtmlText(
-    this,
-    textLength.last
-)
-internal fun TextContent.toHtmlTexts(): List<String> = textSources.toHtmlTexts()
-
-
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
@@ -2,8 +2,8 @@ package dev.inmo.tgbotapi.types.MessageEntity

 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.CommonAbstracts.plus
+import dev.inmo.tgbotapi.extensions.utils.formatting.*
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
-import dev.inmo.tgbotapi.utils.internal.*
 import kotlin.test.Test
 import kotlin.test.assertEquals

--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/TextPartsCreatingTests.kt
@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.types.MessageEntity

 import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
-import dev.inmo.tgbotapi.utils.internal.toHtmlTexts
-import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Texts
+import dev.inmo.tgbotapi.extensions.utils.formatting.toHtmlTexts
+import dev.inmo.tgbotapi.extensions.utils.formatting.toMarkdownV2Texts
 import kotlin.test.Test
 import kotlin.test.assertEquals

--- a/tgbotapi.extensions.api/build.gradle
+++ b/tgbotapi.extensions.api/build.gradle
@@ -29,7 +29,9 @@ repositories {
 }

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js(BOTH) {
        browser()
        nodejs()
--- a/tgbotapi.extensions.api/mpp_publish_template.kpsb
+++ b/tgbotapi.extensions.api/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
--- a/tgbotapi.extensions.api/publish.gradle
+++ b/tgbotapi.extensions.api/publish.gradle
@@ -4,22 +4,6 @@ apply plugin: 'signing'
 task javadocsJar(type: Jar) {
    classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}

 publishing {
    publications.all {
@@ -64,6 +48,16 @@ publishing {
                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                }
            }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
        }
        
    }
@@ -71,5 +65,5 @@ publishing {

 signing {
    useGpgCmd()
-    publishing.publications.forEach { sign it }
+    sign publishing.publications
 }
--- a/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt
+++ b/tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendDice.kt
@@ -29,10 +29,18 @@ suspend fun TelegramBot.sendDice(
    replyMarkup: KeyboardMarkup? = null
 ) = sendDice(chat.id, animationType, disableNotification, replyToMessageId, allowSendingWithoutReply, replyMarkup)

-suspend inline fun TelegramBot.reply(
+suspend inline fun TelegramBot.replyWithDice(
    to: Message,
    animationType: DiceAnimationType? = null,
    disableNotification: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
 ) = sendDice(to.chat, animationType, disableNotification, to.messageId, allowSendingWithoutReply, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    animationType: DiceAnimationType? = null,
+    disableNotification: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = replyWithDice(to, animationType, disableNotification, allowSendingWithoutReply, replyMarkup)
--- a/tgbotapi.extensions.behaviour_builder/build.gradle
+++ b/tgbotapi.extensions.behaviour_builder/build.gradle
@@ -29,7 +29,9 @@ repositories {
 }

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js(BOTH) {
        browser()
        nodejs()
--- a/tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb
+++ b/tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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 Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
--- a/tgbotapi.extensions.behaviour_builder/publish.gradle
+++ b/tgbotapi.extensions.behaviour_builder/publish.gradle
@@ -4,22 +4,6 @@ apply plugin: 'signing'
 task javadocsJar(type: Jar) {
    classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}

 publishing {
    publications.all {
@@ -64,6 +48,16 @@ publishing {
                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                }
            }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
        }
        
    }
@@ -71,5 +65,5 @@ publishing {

 signing {
    useGpgCmd()
-    publishing.publications.forEach { sign it }
+    sign publishing.publications
 }
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext.kt
@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.filter

@@ -25,12 +26,15 @@ data class BehaviourContext(

 /**
 * Creates new one [BehaviourContext], adding subsequent [FlowsUpdatesFilter] in case [newFlowsUpdatesFilterSetUp] is provided and
- * [CoroutineScope] as new [BehaviourContext.scope]
+ * [CoroutineScope] as new [BehaviourContext.scope]. You must do all subscription/running of longPolling manually.
 *
 * @param newFlowsUpdatesFilterSetUp As a parameter receives [FlowsUpdatesFilter] from old [this] [BehaviourContext.flowsUpdatesFilter]
 */
+@RiskFeature("It is recommended to use doInSubContextWithUpdatesFilter instead. " +
+    "This method is low level and should not be used in case you are not pretty sure you need it.")
 suspend fun <T> BehaviourContext.doInSubContextWithFlowsUpdatesFilterSetup(
    newFlowsUpdatesFilterSetUp: BehaviourContextAndTypeReceiver<Unit, FlowsUpdatesFilter>?,
+    stopOnCompletion: Boolean = true,
    behaviourContextReceiver: BehaviourContextReceiver<T>
 ) = copy(
    flowsUpdatesFilter = FlowsUpdatesFilter(),
@@ -39,7 +43,7 @@ suspend fun <T> BehaviourContext.doInSubContextWithFlowsUpdatesFilterSetup(
    newFlowsUpdatesFilterSetUp ?.let {
        it.apply { invoke(this@run, this@doInSubContextWithFlowsUpdatesFilterSetup.flowsUpdatesFilter) }
    }
-    behaviourContextReceiver().also { stop() }
+    behaviourContextReceiver().also { if (stopOnCompletion) stop() }
 }

 /**
@@ -48,19 +52,24 @@ suspend fun <T> BehaviourContext.doInSubContextWithFlowsUpdatesFilterSetup(
 */
 suspend fun <T> BehaviourContext.doInSubContextWithUpdatesFilter(
    updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>?,
+    stopOnCompletion: Boolean = true,
    behaviourContextReceiver: BehaviourContextReceiver<T>
 ) = doInSubContextWithFlowsUpdatesFilterSetup(
    newFlowsUpdatesFilterSetUp = updatesFilter ?.let {
        { oldOne ->
            oldOne.allUpdatesFlow.filter { updatesFilter(it) }.subscribeSafelyWithoutExceptions(scope, asUpdateReceiver)
        }
+    } ?: { oldOne ->
+         oldOne.allUpdatesFlow.subscribeSafelyWithoutExceptions(scope, asUpdateReceiver)
    },
+    stopOnCompletion,
    behaviourContextReceiver
 )

 suspend fun <T> BehaviourContext.doInSubContext(
+    stopOnCompletion: Boolean = true,
    behaviourContextReceiver: BehaviourContextReceiver<T>
-) = doInSubContextWithFlowsUpdatesFilterSetup(newFlowsUpdatesFilterSetUp = null, behaviourContextReceiver)
+) = doInSubContextWithUpdatesFilter(updatesFilter = null, stopOnCompletion, behaviourContextReceiver)

 /**
 * This method will cancel ALL subsequent contexts, expectations and waiters
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
@@ -24,7 +24,7 @@ private suspend fun <O> BehaviourContext.waitCallbackQueries(
 }.toList().toList()


-private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitEvents(
+private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitCallbacks(
    count: Int = 1,
    initRequest: Request<*>? = null,
    noinline errorFactory: NullableRequestBuilder<*> = { null },
@@ -51,52 +51,52 @@ suspend fun BehaviourContext.waitDataCallbackQuery(
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<DataCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitGameShortNameCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<GameShortNameCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<InlineMessageIdCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<InlineMessageIdDataCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<InlineMessageIdGameShortNameCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<MessageCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageDataCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<MessageDataCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<MessageGameShortNameCallbackQuery>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitUnknownCallbackQuery(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
    count: Int = 1,
    filter: CallbackQueryMapper<UnknownCallbackQueryType>? = null
-) = waitEvents(count, initRequest, errorFactory, filter)
+) = waitCallbacks(count, initRequest, errorFactory, filter)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt
@@ -0,0 +1,68 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
+
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
+import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.CallbackQuery.*
+import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
+import kotlinx.coroutines.flow.toList
+
+typealias InlineQueryMapper<T> = T.() -> T?
+
+private suspend fun <O> BehaviourContext.waitInlineQueries(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    mapper: suspend InlineQuery.() -> O?
+): List<O> = expectFlow(
+    initRequest,
+    count,
+    errorFactory
+) {
+    it.asInlineQueryUpdate() ?.data ?.mapper().let(::listOfNotNull)
+}.toList().toList()
+
+
+private suspend inline fun <reified T : InlineQuery> BehaviourContext.waitInlines(
+    count: Int = 1,
+    initRequest: Request<*>? = null,
+    noinline errorFactory: NullableRequestBuilder<*> = { null },
+    noinline filter: InlineQueryMapper<T>? = null
+) : List<T> = waitInlineQueries<T>(
+    count,
+    initRequest,
+    errorFactory
+) {
+    if (this is T) {
+        if (filter == null) {
+            this
+        } else {
+            filter(this)
+        }
+    } else {
+        null
+    }
+}
+
+suspend fun BehaviourContext.waitAnyInlineQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: InlineQueryMapper<InlineQuery>? = null
+) = waitInlines(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitBaseInlineQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: InlineQueryMapper<BaseInlineQuery>? = null
+) = waitInlines(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitLocationInlineQuery(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: InlineQueryMapper<LocationInlineQuery>? = null
+) = waitInlines(count, initRequest, errorFactory, filter)
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt
@@ -0,0 +1,57 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
+
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
+import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.types.CallbackQuery.DataCallbackQuery
+import dev.inmo.tgbotapi.types.CallbackQuery.GameShortNameCallbackQuery
+import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
+import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
+
+internal suspend inline fun <reified T : InlineQuery> BehaviourContext.onInlineQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    noinline additionalFilter: (suspend (T) -> Boolean)? = null,
+    noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, T>
+) = flowsUpdatesFilter.expectFlow(bot) {
+    it.asInlineQueryUpdate() ?.data ?.let { query ->
+        if (query is T) {
+            if (additionalFilter == null || additionalFilter(query)) query else null
+        } else {
+            null
+        }
+    }.let(::listOfNotNull)
+}.subscribeSafelyWithoutExceptions(scope) { triggerQuery ->
+    doInSubContextWithUpdatesFilter(
+        updatesFilter = if (includeFilterByChatInBehaviourSubContext) {
+            { it.sourceChat() ?.id ?.chatId == triggerQuery.from.id.chatId }
+        } else {
+            null
+        }
+    ) {
+        scenarioReceiver(triggerQuery)
+    }
+}
+
+
+suspend fun BehaviourContext.onAnyInlineQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (InlineQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, InlineQuery>
+) = onInlineQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+
+
+suspend fun BehaviourContext.onBaseInlineQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (BaseInlineQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, BaseInlineQuery>
+) = onInlineQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+
+
+suspend fun BehaviourContext.onLocationInlineQuery(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (LocationInlineQuery) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, LocationInlineQuery>
+) = onInlineQuery(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
--- a/tgbotapi.extensions.utils/build.gradle
+++ b/tgbotapi.extensions.utils/build.gradle
@@ -29,7 +29,9 @@ repositories {
 }

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js(BOTH) {
        browser()
        nodejs()
@@ -42,5 +44,23 @@ kotlin {
                api project(":tgbotapi.core")
            }
        }
+
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation kotlin('test-js')
+            }
+        }
    }
 }
--- a/tgbotapi.extensions.utils/mpp_publish_template.kpsb
+++ b/tgbotapi.extensions.utils/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
--- a/tgbotapi.extensions.utils/publish.gradle
+++ b/tgbotapi.extensions.utils/publish.gradle
@@ -4,22 +4,6 @@ apply plugin: 'signing'
 task javadocsJar(type: Jar) {
    classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}

 publishing {
    publications.all {
@@ -64,6 +48,16 @@ publishing {
                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                }
            }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
        }
        
    }
@@ -71,5 +65,5 @@ publishing {

 signing {
    useGpgCmd()
-    publishing.publications.forEach { sign it }
+    sign publishing.publications
 }
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt
@@ -28,6 +28,7 @@ import dev.inmo.tgbotapi.types.buttons.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.*
 import dev.inmo.tgbotapi.types.chat.abstracts.*
 import dev.inmo.tgbotapi.types.chat.abstracts.extended.*
+import dev.inmo.tgbotapi.types.dice.*
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.types.message.*
@@ -393,25 +394,41 @@ inline fun SecureValue.asSecureValueWithTranslations(): SecureValueWithTranslati
@PreviewFeature
 inline fun SecureValue.requireSecureValueWithTranslations(): SecureValueWithTranslations = this as SecureValueWithTranslations
@PreviewFeature
-inline fun Message.asAnonymousGroupMessageImpl(): AnonymousGroupMessageImpl<MessageContent>? = this as? AnonymousGroupMessageImpl<MessageContent>
+inline fun Message.asAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent>? = this as? AnonymousGroupContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessageImpl"))
+inline fun Message.asAnonymousGroupMessageImpl() = asAnonymousGroupContentMessageImpl()
@PreviewFeature
-inline fun Message.requireAnonymousGroupMessageImpl(): AnonymousGroupMessageImpl<MessageContent> = this as AnonymousGroupMessageImpl<MessageContent>
+inline fun Message.requireAnonymousGroupContentMessageImpl(): AnonymousGroupContentMessageImpl<MessageContent> = this as AnonymousGroupContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessageImpl"))
+inline fun Message.requireAnonymousGroupMessageImpl() = requireAnonymousGroupContentMessageImpl()
@PreviewFeature
-inline fun Message.asChannelMessageImpl(): ChannelMessageImpl<MessageContent>? = this as? ChannelMessageImpl<MessageContent>
+inline fun Message.asChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessageImpl"))
+inline fun Message.asChannelMessageImpl() = asChannelContentMessageImpl()
@PreviewFeature
-inline fun Message.requireChannelMessageImpl(): ChannelMessageImpl<MessageContent> = this as ChannelMessageImpl<MessageContent>
+inline fun Message.requireChannelContentMessageImpl(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireChannelContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessageImpl"))
+inline fun Message.requireChannelMessageImpl() = requireChannelContentMessageImpl()
@PreviewFeature
-inline fun Message.asFromChannelGroupMessageImpl(): FromChannelGroupMessageImpl<MessageContent>? = this as? FromChannelGroupMessageImpl<MessageContent>
+inline fun Message.asFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent>? = this as? FromChannelGroupContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessageImpl"))
+inline fun Message.asFromChannelGroupMessageImpl() = asFromChannelGroupContentMessageImpl()
@PreviewFeature
-inline fun Message.requireFromChannelGroupMessageImpl(): FromChannelGroupMessageImpl<MessageContent> = this as FromChannelGroupMessageImpl<MessageContent>
+inline fun Message.requireFromChannelGroupContentMessageImpl(): FromChannelGroupContentMessageImpl<MessageContent> = this as FromChannelGroupContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessageImpl"))
+inline fun Message.requireFromChannelGroupMessageImpl() = requireFromChannelGroupContentMessageImpl()
@PreviewFeature
 inline fun Message.asPassportMessage(): PassportMessage? = this as? PassportMessage
@PreviewFeature
 inline fun Message.requirePassportMessage(): PassportMessage = this as PassportMessage
@PreviewFeature
-inline fun Message.asPrivateMessageImpl(): PrivateMessageImpl<MessageContent>? = this as? PrivateMessageImpl<MessageContent>
+inline fun Message.asPrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent>? = this as? PrivateContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asPrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessageImpl"))
+inline fun Message.asPrivateMessageImpl() = asPrivateContentMessageImpl()
@PreviewFeature
-inline fun Message.requirePrivateMessageImpl(): PrivateMessageImpl<MessageContent> = this as PrivateMessageImpl<MessageContent>
+inline fun Message.requirePrivateContentMessageImpl(): PrivateContentMessageImpl<MessageContent> = this as PrivateContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessageImpl", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessageImpl"))
+inline fun Message.requirePrivateMessageImpl() = requirePrivateContentMessageImpl()
@PreviewFeature
 inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? = this as? ChannelEventMessage<ChannelEvent>
@PreviewFeature
@@ -433,21 +450,33 @@ inline fun Message.asCommonSupergroupEventMessage(): CommonSupergroupEventMessag
@PreviewFeature
 inline fun Message.requireCommonSupergroupEventMessage(): CommonSupergroupEventMessage<SupergroupEvent> = this as CommonSupergroupEventMessage<SupergroupEvent>
@PreviewFeature
-inline fun Message.asAnonymousGroupMessage(): AnonymousGroupMessage<MessageContent>? = this as? AnonymousGroupMessage<MessageContent>
+inline fun Message.asAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent>? = this as? AnonymousGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asAnonymousGroupContentMessage"))
+inline fun Message.asAnonymousGroupMessage() = asAnonymousGroupContentMessage()
@PreviewFeature
-inline fun Message.requireAnonymousGroupMessage(): AnonymousGroupMessage<MessageContent> = this as AnonymousGroupMessage<MessageContent>
+inline fun Message.requireAnonymousGroupContentMessage(): AnonymousGroupContentMessage<MessageContent> = this as AnonymousGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireAnonymousGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireAnonymousGroupContentMessage"))
+inline fun Message.requireAnonymousGroupMessage() = requireAnonymousGroupContentMessage()
@PreviewFeature
-inline fun Message.asChannelMessage(): ChannelMessage<MessageContent>? = this as? ChannelMessage<MessageContent>
+inline fun Message.asChannelContentMessage(): ChannelContentMessageImpl<MessageContent>? = this as? ChannelContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.asChannelContentMessage"))
+inline fun Message.asChannelMessage() = asChannelContentMessage()
@PreviewFeature
-inline fun Message.requireChannelMessage(): ChannelMessage<MessageContent> = this as ChannelMessage<MessageContent>
+inline fun Message.requireChannelContentMessage(): ChannelContentMessageImpl<MessageContent> = this as ChannelContentMessageImpl<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireChannelContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireChannelContentMessage"))
+inline fun Message.requireChannelMessage() = requireChannelContentMessage()
@PreviewFeature
 inline fun Message.asChatEventMessage(): ChatEventMessage<ChatEvent>? = this as? ChatEventMessage<ChatEvent>
@PreviewFeature
 inline fun Message.requireChatEventMessage(): ChatEventMessage<ChatEvent> = this as ChatEventMessage<ChatEvent>
@PreviewFeature
-inline fun Message.asCommonGroupMessage(): CommonGroupMessage<MessageContent>? = this as? CommonGroupMessage<MessageContent>
+inline fun Message.asCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent>? = this as? CommonGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asCommonGroupContentMessage"))
+inline fun Message.asCommonGroupMessage() = asCommonGroupContentMessage()
@PreviewFeature
-inline fun Message.requireCommonGroupMessage(): CommonGroupMessage<MessageContent> = this as CommonGroupMessage<MessageContent>
+inline fun Message.requireCommonGroupContentMessage(): CommonGroupContentMessage<MessageContent> = this as CommonGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireCommonGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireCommonGroupContentMessage"))
+inline fun Message.requireCommonGroupMessage() = requireCommonGroupContentMessage()
@PreviewFeature
 inline fun Message.asCommonMessage(): CommonMessage<MessageContent>? = this as? CommonMessage<MessageContent>
@PreviewFeature
@@ -457,17 +486,25 @@ inline fun Message.asContentMessage(): ContentMessage<MessageContent>? = this as
@PreviewFeature
 inline fun Message.requireContentMessage(): ContentMessage<MessageContent> = this as ContentMessage<MessageContent>
@PreviewFeature
-inline fun Message.asFromChannelGroupMessage(): FromChannelGroupMessage<MessageContent>? = this as? FromChannelGroupMessage<MessageContent>
+inline fun Message.asFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent>? = this as? FromChannelGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asFromChannelGroupContentMessage"))
+inline fun Message.asFromChannelGroupMessage() = asFromChannelGroupContentMessage()
@PreviewFeature
-inline fun Message.requireFromChannelGroupMessage(): FromChannelGroupMessage<MessageContent> = this as FromChannelGroupMessage<MessageContent>
+inline fun Message.requireFromChannelGroupContentMessage(): FromChannelGroupContentMessage<MessageContent> = this as FromChannelGroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireFromChannelGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireFromChannelGroupContentMessage"))
+inline fun Message.requireFromChannelGroupMessage() = requireFromChannelGroupContentMessage()
@PreviewFeature
 inline fun Message.asGroupEventMessage(): GroupEventMessage<GroupEvent>? = this as? GroupEventMessage<GroupEvent>
@PreviewFeature
 inline fun Message.requireGroupEventMessage(): GroupEventMessage<GroupEvent> = this as GroupEventMessage<GroupEvent>
@PreviewFeature
-inline fun Message.asGroupMessage(): GroupMessage<MessageContent>? = this as? GroupMessage<MessageContent>
+inline fun Message.asGroupContentMessage(): GroupContentMessage<MessageContent>? = this as? GroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage"))
+inline fun Message.asGroupMessage() = asGroupContentMessage()
@PreviewFeature
-inline fun Message.requireGroupMessage(): GroupMessage<MessageContent> = this as GroupMessage<MessageContent>
+inline fun Message.requireGroupContentMessage(): GroupContentMessage<MessageContent> = this as GroupContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requireGroupContentMessage", "dev.inmo.tgbotapi.extensions.utils.requireGroupContentMessage"))
+inline fun Message.requireGroupMessage() = requireGroupContentMessage()
@PreviewFeature
 inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupContent>? = this as? MediaGroupMessage<MediaGroupContent>
@PreviewFeature
@@ -485,13 +522,21 @@ inline fun Message.asPossiblyPaymentMessage(): PossiblyPaymentMessage? = this as
@PreviewFeature
 inline fun Message.requirePossiblyPaymentMessage(): PossiblyPaymentMessage = this as PossiblyPaymentMessage
@PreviewFeature
-inline fun Message.asPrivateMessage(): PrivateMessage<MessageContent>? = this as? PrivateMessage<MessageContent>
+inline fun Message.asPrivateContentMessage(): PrivateContentMessage<MessageContent>? = this as? PrivateContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asPrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPrivateContentMessage"))
+inline fun Message.asPrivateMessage() = asPrivateContentMessage()
@PreviewFeature
-inline fun Message.requirePrivateMessage(): PrivateMessage<MessageContent> = this as PrivateMessage<MessageContent>
+inline fun Message.requirePrivateContentMessage(): PrivateContentMessage<MessageContent> = this as PrivateContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requirePrivateContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePrivateContentMessage"))
+inline fun Message.requirePrivateMessage() = requirePrivateContentMessage()
@PreviewFeature
-inline fun Message.asPublicMessage(): PublicMessage<MessageContent>? = this as? PublicMessage<MessageContent>
+inline fun Message.asPublicContentMessage(): PublicContentMessage<MessageContent>? = this as? PublicContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("asPublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.asPublicContentMessage"))
+inline fun Message.asPublicMessage() = asPublicContentMessage()
@PreviewFeature
-inline fun Message.requirePublicMessage(): PublicMessage<MessageContent> = this as PublicMessage<MessageContent>
+inline fun Message.requirePublicContentMessage(): PublicContentMessage<MessageContent> = this as PublicContentMessage<MessageContent>
+@Deprecated("Renamed", ReplaceWith("requirePublicContentMessage", "dev.inmo.tgbotapi.extensions.utils.requirePublicContentMessage"))
+inline fun Message.requirePublicMessage() = requirePublicContentMessage()
@PreviewFeature
 inline fun Message.asSignedMessage(): SignedMessage? = this as? SignedMessage
@PreviewFeature
@@ -1172,3 +1217,31 @@ inline fun TextSource.requireURLTextSource(): URLTextSource = this as URLTextSou
 inline fun TextSource.asUnderlineTextSource(): UnderlineTextSource? = this as? UnderlineTextSource
@PreviewFeature
 inline fun TextSource.requireUnderlineTextSource(): UnderlineTextSource = this as UnderlineTextSource
+@PreviewFeature
+inline fun DiceAnimationType.asBasketballDiceAnimationType(): BasketballDiceAnimationType? = this as? BasketballDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireBasketballDiceAnimationType(): BasketballDiceAnimationType = this as BasketballDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asBowlingDiceAnimationType(): BowlingDiceAnimationType? = this as? BowlingDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireBowlingDiceAnimationType(): BowlingDiceAnimationType = this as BowlingDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asCubeDiceAnimationType(): CubeDiceAnimationType? = this as? CubeDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireCubeDiceAnimationType(): CubeDiceAnimationType = this as CubeDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asCustomDiceAnimationType(): CustomDiceAnimationType? = this as? CustomDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireCustomDiceAnimationType(): CustomDiceAnimationType = this as CustomDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asDartsDiceAnimationType(): DartsDiceAnimationType? = this as? DartsDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireDartsDiceAnimationType(): DartsDiceAnimationType = this as DartsDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asFootballDiceAnimationType(): FootballDiceAnimationType? = this as? FootballDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireFootballDiceAnimationType(): FootballDiceAnimationType = this as FootballDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.asSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType? = this as? SlotMachineDiceAnimationType
+@PreviewFeature
+inline fun DiceAnimationType.requireSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType = this as SlotMachineDiceAnimationType
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SlotMachineUtils.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SlotMachineUtils.kt
@@ -6,16 +6,30 @@ import dev.inmo.tgbotapi.types.dice.SlotMachineDiceAnimationType
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

-enum class SlotMachineReelImages {
-    BAR, BERRIES, LEMON, SEVEN
+/**
+ * @param text Is a text representation
+ * @param number Internal representation of reel
+ */
+enum class SlotMachineReelImage(val text: String, val number: Int) {
+    BAR("[bar]", 0),
+    BERRIES("\uD83C\uDF52", 1),
+    LEMON("\uD83C\uDF4B", 2),
+    SEVEN("7", 3)
 }
+@Deprecated("Renamed", ReplaceWith("SlotMachineReelImage", "dev.inmo.tgbotapi.extensions.utils.SlotMachineReelImage"))
+typealias SlotMachineReelImages = SlotMachineReelImage
+
+/**
+ * @return First [SlotMachineReelImage] with [SlotMachineReelImage.number] equal to receiver OR [SlotMachineReelImage.SEVEN]
+ */
 val Int.asSlotMachineReelImage
-    get() = when (this) {
-        0 -> SlotMachineReelImages.BAR
-        1 -> SlotMachineReelImages.BERRIES
-        2 -> SlotMachineReelImages.LEMON
-        else -> SlotMachineReelImages.SEVEN
-    }
+    get() = SlotMachineReelImage.values().firstOrNull { it.number == this } ?: SlotMachineReelImage.SEVEN
+
+/**
+ * @return First [SlotMachineReelImage] with [SlotMachineReelImage.text] equal to receiver OR [SlotMachineReelImage.SEVEN]
+ */
+val String.asSlotMachineReelImage
+    get() = SlotMachineReelImage.values().firstOrNull { it.text == this } ?: SlotMachineReelImage.SEVEN

@Serializable
 data class SlotMachineResult(
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/WithContent.kt
@@ -14,26 +14,26 @@ inline fun <reified T : MessageContent> CommonMessage<*>.requireWithContent() =
 inline fun <reified T : MessageContent> PossiblySentViaBotCommonMessage<*>.withContent() = if (content is T) { this as PossiblySentViaBotCommonMessage<T> } else { null }
 inline fun <reified T : MessageContent> PossiblySentViaBotCommonMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> ChannelMessage<*>.withContent() = if (content is T) { this as ChannelMessage<T> } else { null }
-inline fun <reified T : MessageContent> ChannelMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> ChannelContentMessage<*>.withContent() = if (content is T) { this as ChannelContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> ChannelContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> PrivateMessage<*>.withContent() = if (content is T) { this as PrivateMessage<T> } else { null }
-inline fun <reified T : MessageContent> PrivateMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> PrivateContentMessage<*>.withContent() = if (content is T) { this as PrivateContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> PrivateContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> PublicMessage<*>.withContent() = if (content is T) { this as PublicMessage<T> } else { null }
-inline fun <reified T : MessageContent> PublicMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> PublicContentMessage<*>.withContent() = if (content is T) { this as PublicContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> PublicContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> GroupMessage<*>.withContent() = if (content is T) { this as GroupMessage<T> } else { null }
-inline fun <reified T : MessageContent> GroupMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> GroupContentMessage<*>.withContent() = if (content is T) { this as GroupContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> GroupContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> FromChannelGroupMessage<*>.withContent() = if (content is T) { this as FromChannelGroupMessage<T> } else { null }
-inline fun <reified T : MessageContent> FromChannelGroupMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> FromChannelGroupContentMessage<*>.withContent() = if (content is T) { this as FromChannelGroupContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> FromChannelGroupContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> AnonymousGroupMessage<*>.withContent() = if (content is T) { this as AnonymousGroupMessage<T> } else { null }
-inline fun <reified T : MessageContent> AnonymousGroupMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> AnonymousGroupContentMessage<*>.withContent() = if (content is T) { this as AnonymousGroupContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> AnonymousGroupContentMessage<*>.requireWithContent() = withContent<T>()!!

-inline fun <reified T : MessageContent> CommonGroupMessage<*>.withContent() = if (content is T) { this as CommonGroupMessage<T> } else { null }
-inline fun <reified T : MessageContent> CommonGroupMessage<*>.requireWithContent() = withContent<T>()!!
+inline fun <reified T : MessageContent> CommonGroupContentMessage<*>.withContent() = if (content is T) { this as CommonGroupContentMessage<T> } else { null }
+inline fun <reified T : MessageContent> CommonGroupContentMessage<*>.requireWithContent() = withContent<T>()!!

 inline fun <reified T : MediaGroupContent> MediaGroupMessage<*>.withContent() = if (content is T) { this as MediaGroupMessage<T> } else { null }
 inline fun <reified T : MediaGroupContent> MediaGroupMessage<*>.requireWithContent() = withContent<T>()!!
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/ResendingTextFormatting.kt
@@ -8,15 +8,15 @@ import dev.inmo.tgbotapi.types.message.content.TextContent
 fun createFormattedText(
    entities: TextSourcesList,
    partLength: Int = textLength.last,
-    mode: ParseMode = MarkdownParseMode
+    mode: ParseMode = defaultParseMode
 ): List<String> {
    val texts = mutableListOf<String>()
    val textBuilder = StringBuilder(partLength)
    for (entity in entities) {
        val string = when (mode) {
-            is MarkdownParseMode -> entity.markdown
-            is MarkdownV2ParseMode -> entity.markdownV2
-            is HTMLParseMode -> entity.html
+            is Markdown -> entity.markdown
+            is MarkdownV2 -> entity.markdownV2
+            is HTML -> entity.html
        }
        if (textBuilder.length + string.length > partLength) {
            if (textBuilder.isNotEmpty()) {
@@ -49,7 +49,7 @@ fun createFormattedText(
 fun createMarkdownText(
    entities: TextSourcesList,
    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, MarkdownParseMode)
+): List<String> = createFormattedText(entities, partLength, Markdown)

 fun TextSourcesList.toMarkdownCaptions(): List<String> = createMarkdownText(
    this,
@@ -73,7 +73,7 @@ fun ExplainedInput.toMarkdownExplanations(): List<String> = textSources.toMarkdo
 fun createMarkdownV2Text(
    entities: TextSourcesList,
    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, MarkdownV2ParseMode)
+): List<String> = createFormattedText(entities, partLength, MarkdownV2)

 fun TextSourcesList.toMarkdownV2Captions(): List<String> = createMarkdownV2Text(
    this,
@@ -97,7 +97,7 @@ fun ExplainedInput.toMarkdownV2Explanations(): List<String> = textSources.toMark
 fun createHtmlText(
    entities: TextSourcesList,
    partLength: Int = textLength.last
-): List<String> = createFormattedText(entities, partLength, HTMLParseMode)
+): List<String> = createFormattedText(entities, partLength, HTML)

 fun TextSourcesList.toHtmlCaptions(): List<String> = createHtmlText(
    this,
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.extensions.utils.updates.retrieving

-import dev.inmo.micro_utils.coroutines.ExceptionHandler
-import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.exceptions.RequestException
@@ -14,7 +13,11 @@ import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.*
 import dev.inmo.tgbotapi.utils.*
+import io.ktor.client.features.HttpRequestTimeoutException
+import io.ktor.utils.io.core.use
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import kotlin.coroutines.coroutineContext

 fun TelegramBot.startGettingOfUpdatesByLongPolling(
    timeoutSeconds: Seconds = 30,
@@ -66,6 +69,70 @@ fun TelegramBot.startGettingOfUpdatesByLongPolling(
    }
 }

+fun TelegramBot.retrieveAccumulatedUpdates(
+    avoidInlineQueries: Boolean = false,
+    avoidCallbackQueries: Boolean = false,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: (ExceptionHandler<Unit>)? = null,
+    allowedUpdates: List<String>? = null,
+    updatesReceiver: UpdateReceiver<Update>
+): Job = scope.launch {
+    safelyWithoutExceptions {
+        startGettingOfUpdatesByLongPolling(
+            0,
+            CoroutineScope(coroutineContext + SupervisorJob()),
+            {
+                if (it is HttpRequestTimeoutException) {
+                    throw CancellationException("Cancel due to absence of new updates")
+                } else {
+                    exceptionsHandler ?.invoke(it)
+                }
+            },
+            allowedUpdates
+        ) {
+            when {
+                it is InlineQueryUpdate && avoidInlineQueries ||
+                it is CallbackQueryUpdate && avoidCallbackQueries -> return@startGettingOfUpdatesByLongPolling
+                else -> updatesReceiver(it)
+            }
+        }.join()
+    }
+}
+
+/**
+ * @return [kotlinx.coroutines.flow.Flow] which will emit updates to the collector while they will be accumulated. Works
+ * the same as [retrieveAccumulatedUpdates], but pass [kotlinx.coroutines.flow.FlowCollector.emit] as a callback
+ */
+fun TelegramBot.createAccumulatedUpdatesRetrieverFlow(
+    avoidInlineQueries: Boolean = false,
+    avoidCallbackQueries: Boolean = false,
+    exceptionsHandler: ExceptionHandler<Unit>? = null,
+    allowedUpdates: List<String>? = null
+): Flow<Update> = channelFlow {
+    val parentContext = kotlin.coroutines.coroutineContext
+    channel.apply {
+        retrieveAccumulatedUpdates(
+            avoidInlineQueries,
+            avoidCallbackQueries,
+            CoroutineScope(parentContext),
+            exceptionsHandler,
+            allowedUpdates,
+            ::send
+        ).join()
+        close()
+    }
+}
+
+fun TelegramBot.retrieveAccumulatedUpdates(
+    flowsUpdatesFilter: FlowsUpdatesFilter,
+    avoidInlineQueries: Boolean = false,
+    avoidCallbackQueries: Boolean = false,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    exceptionsHandler: ExceptionHandler<Unit>? = null
+) = flowsUpdatesFilter.run {
+    retrieveAccumulatedUpdates(avoidInlineQueries, avoidCallbackQueries, scope, exceptionsHandler, allowedUpdates, asUpdateReceiver)
+}
+
 /**
 * Will [startGettingOfUpdatesByLongPolling] using incoming [flowsUpdatesFilter]. It is assumed that you ALREADY CONFIGURE
 * all updates receivers, because this method will trigger getting of updates and.
--- a/tgbotapi/build.gradle
+++ b/tgbotapi/build.gradle
@@ -29,7 +29,9 @@ repositories {
 }

 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
    js(BOTH) {
        browser()
        nodejs()
--- a/tgbotapi/mpp_publish_template.kpsb
+++ b/tgbotapi/mpp_publish_template.kpsb
@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
--- a/tgbotapi/publish.gradle
+++ b/tgbotapi/publish.gradle
@@ -4,22 +4,6 @@ apply plugin: 'signing'
 task javadocsJar(type: Jar) {
    classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}

 publishing {
    publications.all {
@@ -64,6 +48,16 @@ publishing {
                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                }
            }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
        }
        
    }
@@ -71,5 +65,5 @@ publishing {

 signing {
    useGpgCmd()
-    publishing.publications.forEach { sign it }
+    sign publishing.publications
 }
Author	SHA1	Message	Date
InsanusMokrassar	563d784603	RestrictionsChatPermissions	2021-02-18 00:28:36 +06:00
InsanusMokrassar	0d9f18f346	DiceAnimationType class casts	2021-02-17 22:29:29 +06:00
InsanusMokrassar	23ceaf8e97	LeftRestrictionsChatPermissions	2021-02-17 22:12:58 +06:00
InsanusMokrassar	fe2dffd8b5	BehaviourContext updates	2021-02-17 22:11:26 +06:00
InsanusMokrassar	eeb46817c3	start 0.32.7	2021-02-17 22:00:46 +06:00
InsanusMokrassar	5ab00da31d	Merge pull request #300 from InsanusMokrassar/0.32.6 0.32.6	2021-02-17 17:15:40 +06:00
InsanusMokrassar	841ae73f7c	replyWithDice	2021-02-17 17:10:21 +06:00
InsanusMokrassar	41b4d29917	updates in slot machine utils	2021-02-17 16:58:57 +06:00
InsanusMokrassar	f8b3c44146	update micro_utils	2021-02-16 13:48:32 +06:00
InsanusMokrassar	f0eb670c3f	start 0.32.6	2021-02-16 13:47:31 +06:00
InsanusMokrassar	fe5d94f31e	Update README.md	2021-02-13 10:09:33 +06:00
InsanusMokrassar	7901d0a223	Update README.md	2021-02-13 01:42:35 +06:00
InsanusMokrassar	799f9123ba	Update README.md	2021-02-13 01:38:31 +06:00
InsanusMokrassar	f77f010e66	Update README.md	2021-02-11 13:38:55 +06:00
InsanusMokrassar	67ddf8d809	Update README.md	2021-02-11 13:37:24 +06:00
InsanusMokrassar	81afa46253	Update README.md	2021-02-11 13:36:53 +06:00
InsanusMokrassar	a5bba76f07	Update README.md	2021-02-11 13:35:06 +06:00
InsanusMokrassar	d882cf9c97	update readme	2021-02-11 12:06:34 +06:00
InsanusMokrassar	2e27b8b64d	Merge pull request #295 from InsanusMokrassar/0.32.5 0.32.5	2021-02-09 19:13:42 +06:00
InsanusMokrassar	4df800eaa9	fix of #291	2021-02-09 19:07:31 +06:00
InsanusMokrassar	8d27349868	update content resends and different other things	2021-02-09 18:26:10 +06:00
InsanusMokrassar	2a89c41a58	fix of #292	2021-02-09 17:15:28 +06:00
InsanusMokrassar	098b5cc393	rewrite createAccumulatedUpdatesRetrieverFlow onto channelFlow	2021-02-09 16:33:48 +06:00
InsanusMokrassar	10f4817283	solution of #293	2021-02-08 19:35:32 +06:00
InsanusMokrassar	4449893608	fix of #294	2021-02-08 18:15:54 +06:00
InsanusMokrassar	3a53f41f66	start 0.32.5	2021-02-08 11:36:20 +06:00
InsanusMokrassar	7cd366d893	Update README.md	2021-02-07 18:02:20 +06:00
InsanusMokrassar	1309a4111c	Merge pull request #290 from InsanusMokrassar/0.32.4 content messages renames	2021-02-07 16:59:51 +06:00
InsanusMokrassar	0ca815760b	content messages renames	2021-02-07 16:54:48 +06:00
InsanusMokrassar	eca0680f2f	update readme	2021-02-07 12:44:38 +06:00
InsanusMokrassar	d472d371ed	Merge pull request #282 from InsanusMokrassar/0.32.4 0.32.4	2021-02-07 12:43:08 +06:00
InsanusMokrassar	4748b6813a	ExceptionsOnlyLimiter now will not use Result to provide success/failure state of result	2021-02-07 12:40:05 +06:00
InsanusMokrassar	a2ea15d4b0	update wrapper version	2021-02-07 11:02:13 +06:00
InsanusMokrassar	27dc302f5d	update for compiling	2021-02-06 11:53:30 +06:00
InsanusMokrassar	baf8ed3a77	now JVM part will be compiled with IR	2021-02-06 00:52:39 +06:00
InsanusMokrassar	18913af3c3	update publishing scripts	2021-02-06 00:50:51 +06:00
InsanusMokrassar	51871ea94c	update micro_utils version	2021-02-05 16:08:45 +06:00
InsanusMokrassar	6a625d7b9f	update publishing scripts	2021-02-05 16:08:28 +06:00
InsanusMokrassar	0b93b472a3	update klock	2021-02-05 14:22:42 +06:00
InsanusMokrassar	ff16f9a315	Update README.md	2021-02-05 01:18:38 +06:00
InsanusMokrassar	86bfe043a5	update dependencies	2021-02-03 23:05:17 +06:00
InsanusMokrassar	fa18e7299d	0.32.4	2021-02-03 22:59:37 +06:00
InsanusMokrassar	c986025075	Merge pull request #277 from InsanusMokrassar/0.32.3 0.32.3	2021-02-02 11:44:53 +06:00
InsanusMokrassar	e8a7ea9ce4	inline qieries expectators and waiters	2021-02-02 11:17:51 +06:00
InsanusMokrassar	30f35e5488	start 0.32.3	2021-02-02 11:07:30 +06:00
InsanusMokrassar	b626974ea7	Create dependabot.yml	2021-02-01 23:22:26 +06:00
InsanusMokrassar	128b782a27	Merge pull request #276 from InsanusMokrassar/0.32.2 0.32.2	2021-02-01 21:43:21 +06:00
InsanusMokrassar	dc83b8d77a	fix of #275 and several other internal problems	2021-02-01 21:09:11 +06:00
InsanusMokrassar	2aac6c0bde	start 0.32.2	2021-02-01 21:04:54 +06:00
InsanusMokrassar	b637d0d2a6	Merge pull request #274 from InsanusMokrassar/0.32.1 0.32.1	2021-01-30 21:06:15 +06:00