update uuid

9.4.1

.github/workflows/greetings.yml

@@ -5,6 +5,9 @@ on: [pull_request, issues]
 jobs:
   greeting:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
     - uses: actions/first-interaction@v1
       with:

.github/workflows/kdocs.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build
         run: ./gradlew dokkaHtmlMultiModule
       - name: Publish KDocs

.github/workflows/packages_publishing.yml

@@ -7,9 +7,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Setup LibCurl
-        run: sudo apt install -y libcurl4-openssl-dev
+        run: sudo apt update && sudo apt install -y libcurl4-openssl-dev
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -22,9 +22,10 @@ jobs:
         run: ./gradlew build
       - name: Publish to Gitea
         continue-on-error: true
-        run: ./gradlew publishAllPublicationsToGiteaRepository
+        run: ./gradlew publishAllPublicationsToInmoNexusRepository
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
+          INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
       - name: Publish to GithubPackages
         continue-on-error: true
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel

CHANGELOG.md

@@ -1,5 +1,121 @@
 # TelegramBotAPI changelog
 
+## 9.4.2
+
+* `Version`:
+  * `Serialization`: `1.6.1` -> `1.6.2`
+  * `Ktor`: `2.3.6` -> `2.3.7`
+  * `MicroUtils`: `0.20.15` -> `0.20.19`
+  * `UUID`: `0.8.1` -> `0.8.2`
+
+## 9.4.1
+
+* Replace warning about two bots from `LongPolling` to `DefaultKtorRequestsExecutor`
+
+## 9.4.0
+
+* `Version`:
+  * `Kotlin`: `1.9.20` -> `1.9.21`
+  * `Serialization`: `1.6.0` -> `1.6.1`
+  * `Ktor`: `2.3.5` -> `2.3.6`
+  * `MicroUtils`: `0.20.12` -> `0.20.15`
+
+## 9.3.0
+
+This release become possible thanks to [Anton Lakotka](https://youtrack.jetbrains.com/users/anton.lakotka)
+
+**THIS RELEASE CONTAINS UPDATES UP TO RELEASE CANDIDATES VERSIONS**
+
+**UPDATE MAY HAVE BREAKING CHANGES**
+
+**SINCE THIS UPDATE IT WILL BE REQUIRED TO USE JDK 17+ FOR DEVELOPMENT**
+
+* `Version`:
+  * `Kotlin`: `1.8.22` -> `1.9.20`
+  * `Serialization`: `1.5.1` -> `1.6.0`
+  * `KorLibs`: `4.0.3` -> `4.0.10`
+  * `UUID`: `0.7.1` -> `0.8.1`
+  * `Ktor`: `2.3.4` -> `2.3.5`
+  * `MicroUtils`: `0.19.9` -> `0.20.12`
+
+## 9.2.4
+
+* `Utils`:
+  * New extensions `*.parseCommandsWithNamedArgs`
+* `BehaviourBuilder`:
+  * In expectaters and triggers of `commands` add `*WithNamedArgs` variants
+  * In expectaters and triggers of `commands` add opportunity to use custom separator
+
+## 9.2.3
+
+* `Core`:
+  * Fix in `VoiceContent#createResend`
+
+## 9.2.2
+
+* `Core`:
+  * Fix of [#793](https://github.com/InsanusMokrassar/ktgbotapi/issues/793): Add `PreviewChat`
+
+## 9.2.1
+
+* `Version`:
+  * `Ktor`: `2.3.3` -> `2.3.4`
+* `Core`:
+  * All `ChatMember` inheritors have fixes `status` field
+
+## 9.2.0
+
+**Add support of [Telegram Bots API 6.9](https://core.telegram.org/bots/api-changelog#september-22-2023)**
+
+* Rename `ChatAdministratorRightsImpl` -> `ChatCommonAdministratorRights`
+* All the request chat keyboards has changed their parameters `ChatAdministratorRights` to `ChatCommonAdministratorRights`
+
+## 9.1.2
+
+* `Core`:
+  * Fix of `MessageContent` serialization
+
+## 9.1.1
+
+* `Core`:
+  * Potential fix of incorrect parsing in `RawMessageEntity`
+
+## 9.1.0
+
+**This update contains adding of [Telegram Bot API 6.8](https://core.telegram.org/bots/api-changelog#august-18-2023) support**
+
+* `Version`:
+  * `Coroutines`: `1.7.2` -> `1.7.3`
+  * `Ktor`: `2.3.2` -> `2.3.3`
+  * `MicroUtils`: `0.19.7` -> `0.19.9`
+
+## 9.0.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES: USERNAMES OF BOTS NOW BECAME NULLABLE**
+
+* `Version`:
+  * `Coroutines`: `1.6.4` -> `1.7.1`
+  * `Ktor`: `2.3.1` -> `2.3.2`
+  * `MicroUtils`: `0.19.4` -> `0.19.7`
+* `Core`:
+    * **All bots now have nullable usernames just like common users ([#772](https://github.com/InsanusMokrassar/ktgbotapi/issues/772))**
+    * Decrease possible errors in updates handling by additional handling of update deserialization wrapping ([#773](https://github.com/InsanusMokrassar/ktgbotapi/issues/773))
+    * New interface `GetUpdatesRequest`. You may implement it to show default telegram bot ktor executor that this
+      request is an updates request and should be handled in a different way
+        * Now it is possible to get raw updates with `GetUpdatesRaw` request
+* `Utils`:
+    * Improve extension `Update.sourceChat` to add opportunity to select some chats by logic different with the default
+
+## 8.1.0
+
+**PARTIALLY BREAKING CHANGES: Exclude `.*Impl` classcasts from `ClassCastsNew`**
+
+* `Version`:
+  * `MicroUtils`: `0.19.2` -> `0.19.4`
+* `Utils`:
+    * Add deep links formatting for internal `tg://` prefix (thanks to [@klimatov](https://github.com/klimatov))
+    * Exclude `.*Impl` classcasts from `ClassCastsNew`
+
 ## 8.0.1
 
 * `Version`:

README.md

@@ -1,6 +1,6 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.7-blue)](https://core.telegram.org/bots/api-changelog#april-21-2023)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.9-blue)](https://core.telegram.org/bots/api-changelog#september-22-2023)
 
-|          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial)                                    |
+|          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
 |:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
 |      Useful repos      |                           [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/)                           |
 |          Misc          |                              [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link)                               |

build.gradle

@@ -16,6 +16,7 @@ buildscript {
 
 plugins {
     alias(libs.plugins.kotlin.dokka)
+    alias(libs.plugins.versions)
 }
 
 // temporal crutch until legacy tests will be stabled or legacy target will be removed
@@ -24,7 +25,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
     if (it != rootProject.findProject("docs")) {
         tasks.whenTaskAdded { task ->

docs/build.gradle

@@ -54,8 +54,8 @@ Object callback = {
             skipDeprecated.set(true)
 
             sourceLink {
-                localDirectory.set(file("./"))
+                localDirectory.set(file("../"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/"))
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/ktgbotapi/tree/master"))
                 remoteLineSuffix.set("#L")
             }
         }

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=8.0.1
+library_version=9.4.2

gradle/libs.versions.toml

@@ -1,22 +1,25 @@
 [versions]
 
-kotlin = "1.8.21"
+kotlin = "1.9.21"
-kotlin-serialization = "1.5.1"
+kotlin-serialization = "1.6.2"
-kotlin-coroutines = "1.6.4"
+kotlin-coroutines = "1.7.3"
 
 javax-activation = "1.1.1"
 
-korlibs = "4.0.3"
+korlibs = "4.0.10"
-uuid = "0.7.1"
+uuid = "0.8.2"
-ktor = "2.3.1"
+ktor = "2.3.7"
 
-ksp = "1.8.21-1.0.11"
+ksp = "1.9.21-1.0.15"
-kotlin-poet = "1.14.2"
+kotlin-poet = "1.15.3"
 
-microutils = "0.19.2"
+microutils = "0.20.19"
+kslog = "1.3.1"
+
+versions = "0.50.0"
 
 github-release-plugin = "2.4.1"
-dokka = "1.8.10"
+dokka = "1.9.10"
 
 [libraries]
 
@@ -52,6 +55,8 @@ microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", ver
 microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
 microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
 
+kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
+
 # ksp dependencies
 
 kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }
@@ -71,3 +76,4 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

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-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

mppProjectWithSerialization.gradle

@@ -5,7 +5,7 @@ kotlin {
     jvm {
         compilations.main {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -15,6 +15,7 @@ kotlin {
     }
     linuxX64()
     mingwX64()
+    linuxArm64()
 
     sourceSets {
         commonMain {
@@ -40,10 +41,18 @@ kotlin {
                 implementation libs.kotlin.test.junit
             }
         }
+        all {
+            languageSettings {
+                optIn('dev.inmo.tgbotapi.utils.RiskFeature')
+                optIn('dev.inmo.tgbotapi.utils.PreviewFeature')
+                optIn('dev.inmo.micro_utils.common.Warning')
+                optIn('dev.inmo.micro_utils.common.PreviewFeature')
+            }
+        }
     }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }

publish.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    archiveClassifier.convention("javadoc")
+    archiveClassifier = 'javadoc'
-    archiveClassifier.set("javadoc")
 }
 
 publishing {
@@ -20,22 +19,22 @@ publishing {
             }
 
             developers {
-
+                
                     developer {
                         id = "InsanusMokrassar"
                         name = "Ovsiannikov Aleksei"
                         email = "ovsyannikov.alexey95@gmail.com"
                     }
-
+                
             }
 
             licenses {
-
+                
                     license {
                         name = "Apache Software License 2.0"
                         url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
                     }
-
+                
             }
         }
         repositories {
@@ -43,58 +42,77 @@ publishing {
                 maven {
                     name = "GithubPackages"
                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
-
+            
                     credentials {
                         username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
                         password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                     }
-
+            
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
+                    name = "InmoNexus"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-
+            
-                    credentials(HttpHeaderCredentials) {
+                    credentials {
-                        name = "Authorization"
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                     }
-
+            
-                    authentication {
-                        header(HttpHeaderAuthentication)
-                    }
-
                 }
             }
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                 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')
                     }
-
+            
                 }
             }
         }
     }
 }
-
+    
 if (project.hasProperty("signing.gnupg.keyName")) {
     apply plugin: 'signing'
-
+    
     signing {
         useGpgCmd()
-
+    
         sign publishing.publications
     }
-
+    
     task signAll {
         tasks.withType(Sign).forEach {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"${project.description}","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/GetUpdatesRaw.kt

@@ -0,0 +1,27 @@
+package dev.inmo.tgbotapi.extensions.api
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.GetUpdates
+import dev.inmo.tgbotapi.requests.GetUpdatesRaw
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.update.abstracts.Update
+
+suspend fun TelegramBot.getRawUpdates(
+    offset: UpdateIdentifier? = null,
+    limit: Int = getUpdatesLimit.last,
+    timeout: Seconds? = null,
+    allowed_updates: List<String>? = ALL_UPDATES_LIST
+) = execute(
+    GetUpdatesRaw(
+        offset, limit, timeout, allowed_updates
+    )
+)
+
+suspend fun TelegramBot.getRawUpdates(
+    lastUpdate: Update,
+    limit: Int = getUpdatesLimit.last,
+    timeout: Seconds? = null,
+    allowed_updates: List<String>? = ALL_UPDATES_LIST
+) = getRawUpdates(
+    lastUpdate.updateId + 1, limit, timeout, allowed_updates
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/bot/SetMyDefaultAdministratorRights.kt

@@ -2,17 +2,17 @@ package dev.inmo.tgbotapi.extensions.api.bot
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.bot.SetMyDefaultAdministratorRights
-import dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRightsImpl
+import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
 
 suspend fun TelegramBot.setMyDefaultAdministratorRights(
-    rights: ChatAdministratorRightsImpl,
+    rights: ChatCommonAdministratorRights,
     forChannels: Boolean? = null
 ) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
 
 suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
-    rights: ChatAdministratorRightsImpl
+    rights: ChatCommonAdministratorRights
 ) = setMyDefaultAdministratorRights(rights, forChannels = true)
 
 suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
-    rights: ChatAdministratorRightsImpl
+    rights: ChatCommonAdministratorRights
 ) = setMyDefaultAdministratorRights(rights, forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/forum/UnpinAllGeneralForumTopicMessages.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.extensions.api.chat.forum
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllForumTopicMessages
+import dev.inmo.tgbotapi.requests.chat.forum.UnpinAllGeneralForumTopicMessages
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.ForumTopic
+import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.chat.Chat
+
+suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
+    chatId: ChatIdentifier
+) = execute(
+    UnpinAllGeneralForumTopicMessages(
+        chatId
+    )
+)
+
+suspend fun TelegramBot.unpinAllGeneralForumTopicMessages(
+    chat: Chat
+) = unpinAllGeneralForumTopicMessages(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChannelAdministrator.kt

@@ -0,0 +1,157 @@
+package dev.inmo.tgbotapi.extensions.api.chat.members
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.PromoteChannelAdministrator
+import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.User
+
+suspend fun TelegramBot.promoteChannelAdministrator(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
+) = execute(
+    PromoteChannelAdministrator(
+        chatId = chatId,
+        userId = userId,
+        untilDate = untilDate,
+        isAnonymous = isAnonymous,
+        canChangeInfo = canChangeInfo,
+        canPostMessages = canPostMessages,
+        canEditMessages = canEditMessages,
+        canDeleteMessages = canDeleteMessages,
+        canInviteUsers = canInviteUsers,
+        canRestrictMembers = canRestrictMembers,
+        canPromoteMembers = canPromoteMembers,
+        canManageVideoChats = canManageVideoChats,
+        canManageChat = canManageChat,
+        canPostStories = canPostStories,
+        canEditStories = canEditStories,
+        canDeleteStories = canDeleteStories
+    )
+)
+
+suspend fun TelegramBot.promoteChannelAdministrator(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
+) = promoteChannelAdministrator(
+    chat.id,
+    userId,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = canPostMessages,
+    canEditMessages = canEditMessages,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
+)
+
+suspend fun TelegramBot.promoteChannelAdministrator(
+    chatId: IdChatIdentifier,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
+) = promoteChannelAdministrator(
+    chatId,
+    user.id,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = canPostMessages,
+    canEditMessages = canEditMessages,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
+)
+
+suspend fun TelegramBot.promoteChannelAdministrator(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
+) = promoteChannelAdministrator(
+    chat.id,
+    user.id,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = canPostMessages,
+    canEditMessages = canEditMessages,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatAdministrator.kt

@@ -0,0 +1,116 @@
+package dev.inmo.tgbotapi.extensions.api.chat.members
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.User
+
+suspend fun TelegramBot.promoteChatAdministrator(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+) = execute(
+    PromoteChatMember(
+        chatId,
+        userId,
+        untilDate,
+        isAnonymous,
+        canChangeInfo,
+        canDeleteMessages,
+        canInviteUsers,
+        canRestrictMembers,
+        canPromoteMembers,
+        canManageVideoChats,
+        canManageChat
+    )
+)
+
+suspend fun TelegramBot.promoteChatAdministrator(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+) = promoteChatAdministrator(
+    chat.id,
+    userId,
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat
+)
+
+suspend fun TelegramBot.promoteChatAdministrator(
+    chatId: IdChatIdentifier,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+) = promoteChatAdministrator(
+    chatId,
+    user.id,
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat
+)
+
+suspend fun TelegramBot.promoteChatAdministrator(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+) = promoteChatAdministrator(
+    chat.id,
+    user.id,
+    untilDate,
+    isAnonymous,
+    canChangeInfo,
+    canDeleteMessages,
+    canInviteUsers,
+    canRestrictMembers,
+    canPromoteMembers,
+    canManageVideoChats,
+    canManageChat
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt

@@ -1,14 +1,13 @@
 package dev.inmo.tgbotapi.extensions.api.chat.members
 
+import dev.inmo.micro_utils.common.Warning
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
-import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.chat.PublicChat
 import dev.inmo.tgbotapi.types.chat.User
 
+@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
@@ -24,27 +23,34 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageTopics: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
 ) = execute(
     PromoteChatMember(
-        chatId,
+        chatId = chatId,
-        userId,
+        userId = userId,
-        untilDate,
+        untilDate = untilDate,
-        isAnonymous,
+        isAnonymous = isAnonymous,
-        canChangeInfo,
+        canChangeInfo = canChangeInfo,
-        canPostMessages,
+        canPostMessages = canPostMessages,
-        canEditMessages,
+        canEditMessages = canEditMessages,
-        canDeleteMessages,
+        canDeleteMessages = canDeleteMessages,
-        canInviteUsers,
+        canInviteUsers = canInviteUsers,
-        canRestrictMembers,
+        canRestrictMembers = canRestrictMembers,
-        canPinMessages,
+        canPinMessages = canPinMessages,
-        canPromoteMembers,
+        canPromoteMembers = canPromoteMembers,
-        canManageVideoChats,
+        canManageVideoChats = canManageVideoChats,
-        canManageChat,
+        canManageChat = canManageChat,
-        canManageTopics
+        canManageTopics = canManageTopics,
+        canPostStories = canPostStories,
+        canEditStories = canEditStories,
+        canDeleteStories = canDeleteStories
     )
 )
 
+@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     userId: UserId,
@@ -60,25 +66,32 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageTopics: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     userId,
-    untilDate,
+    untilDate = untilDate,
-    isAnonymous,
+    isAnonymous = isAnonymous,
-    canChangeInfo,
+    canChangeInfo = canChangeInfo,
-    canPostMessages,
+    canPostMessages = canPostMessages,
-    canEditMessages,
+    canEditMessages = canEditMessages,
-    canDeleteMessages,
+    canDeleteMessages = canDeleteMessages,
-    canInviteUsers,
+    canInviteUsers = canInviteUsers,
-    canRestrictMembers,
+    canRestrictMembers = canRestrictMembers,
-    canPinMessages,
+    canPinMessages = canPinMessages,
-    canPromoteMembers,
+    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats,
+    canManageVideoChats = canManageVideoChats,
-    canManageChat,
+    canManageChat = canManageChat,
-    canManageTopics
+    canManageTopics = canManageTopics,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
 )
 
+@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chatId: IdChatIdentifier,
     user: User,
@@ -94,25 +107,32 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageTopics: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
 ) = promoteChatMember(
     chatId,
     user.id,
-    untilDate,
+    untilDate = untilDate,
-    isAnonymous,
+    isAnonymous = isAnonymous,
-    canChangeInfo,
+    canChangeInfo = canChangeInfo,
-    canPostMessages,
+    canPostMessages = canPostMessages,
-    canEditMessages,
+    canEditMessages = canEditMessages,
-    canDeleteMessages,
+    canDeleteMessages = canDeleteMessages,
-    canInviteUsers,
+    canInviteUsers = canInviteUsers,
-    canRestrictMembers,
+    canRestrictMembers = canRestrictMembers,
-    canPinMessages,
+    canPinMessages = canPinMessages,
-    canPromoteMembers,
+    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats,
+    canManageVideoChats = canManageVideoChats,
-    canManageChat,
+    canManageChat = canManageChat,
-    canManageTopics
+    canManageTopics = canManageTopics,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
 )
 
+@Warning("This method is too common. Use it with caution")
 suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     user: User,
@@ -128,21 +148,27 @@ suspend fun TelegramBot.promoteChatMember(
     canPromoteMembers: Boolean? = null,
     canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null,
-    canManageTopics: Boolean? = null
+    canManageTopics: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     user.id,
-    untilDate,
+    untilDate = untilDate,
-    isAnonymous,
+    isAnonymous = isAnonymous,
-    canChangeInfo,
+    canChangeInfo = canChangeInfo,
-    canPostMessages,
+    canPostMessages = canPostMessages,
-    canEditMessages,
+    canEditMessages = canEditMessages,
-    canDeleteMessages,
+    canDeleteMessages = canDeleteMessages,
-    canInviteUsers,
+    canInviteUsers = canInviteUsers,
-    canRestrictMembers,
+    canRestrictMembers = canRestrictMembers,
-    canPinMessages,
+    canPinMessages = canPinMessages,
-    canPromoteMembers,
+    canPromoteMembers = canPromoteMembers,
-    canManageVideoChats,
+    canManageVideoChats = canManageVideoChats,
-    canManageChat,
+    canManageChat = canManageChat,
-    canManageTopics
+    canManageTopics = canManageTopics,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteSupergroupAdministrator.kt

@@ -0,0 +1,133 @@
+package dev.inmo.tgbotapi.extensions.api.chat.members
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.members.PromoteChatMember
+import dev.inmo.tgbotapi.requests.chat.members.PromoteSupergroupAdministrator
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.chat.PublicChat
+import dev.inmo.tgbotapi.types.chat.User
+
+suspend fun TelegramBot.promoteSupergroupAdministrator(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canManageTopics: Boolean? = null,
+) = execute(
+    PromoteSupergroupAdministrator(
+        chatId = chatId,
+        userId = userId,
+        untilDate = untilDate,
+        isAnonymous = isAnonymous,
+        canChangeInfo = canChangeInfo,
+        canDeleteMessages = canDeleteMessages,
+        canInviteUsers = canInviteUsers,
+        canRestrictMembers = canRestrictMembers,
+        canPinMessages = canPinMessages,
+        canPromoteMembers = canPromoteMembers,
+        canManageVideoChats = canManageVideoChats,
+        canManageChat = canManageChat,
+        canManageTopics = canManageTopics
+    )
+)
+
+suspend fun TelegramBot.promoteSupergroupAdministrator(
+    chat: PublicChat,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canManageTopics: Boolean? = null,
+) = promoteSupergroupAdministrator(
+    chat.id,
+    userId,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = canPinMessages,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = canManageTopics
+)
+
+suspend fun TelegramBot.promoteSupergroupAdministrator(
+    chatId: IdChatIdentifier,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canManageTopics: Boolean? = null,
+) = promoteSupergroupAdministrator(
+    chatId,
+    user.id,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = canPinMessages,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = canManageTopics
+)
+
+suspend fun TelegramBot.promoteSupergroupAdministrator(
+    chat: PublicChat,
+    user: User,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canManageTopics: Boolean? = null,
+) = promoteSupergroupAdministrator(
+    chat.id,
+    user.id,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = canPinMessages,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = canManageTopics
+)

tgbotapi.behaviour_builder.fsm/build.gradle

@@ -13,6 +13,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                api project(":tgbotapi.core")
+                api project(":tgbotapi.utils")
                 api project(":tgbotapi.behaviour_builder")
                 api libs.microutils.fsm.common
             }

tgbotapi.behaviour_builder/build.gradle

@@ -13,7 +13,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api project(":tgbotapi.utils")
+                api project(path: ':tgbotapi.core')
+                api project(path: ':tgbotapi.utils')
             }
         }
     }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCommandsMessages.kt

@@ -3,6 +3,10 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.handlers_registrar.doWithRegistration
 import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.extensions.TelegramBotCommandsDefaults
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgs
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgsSources
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithNamedArgs
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
@@ -79,35 +83,54 @@ fun Flow<CommonMessage<TextContent>>.requireCommandsWithoutParams() = filter {
 }
 
 /**
- * Map the commands with their arguments and source messages
+ * Uses [parseCommandsWithArgsSources] on incoming text sources and map them with [CommonMessage]
  */
 fun Flow<CommonMessage<TextContent>>.commandsWithParams(): Flow<Pair<CommonMessage<TextContent>, List<Pair<BotCommandTextSource, Array<TextSource>>>>> = mapNotNull {
-    var currentCommandTextSource: BotCommandTextSource? = null
+    it to it.content.textSources.parseCommandsWithArgsSources().toList()
-    val currentArgs = mutableListOf<TextSource>()
-    val result = mutableListOf<Pair<BotCommandTextSource, Array<TextSource>>>()
-
-    fun addCurrentCommandToResult() {
-        currentCommandTextSource ?.let {
-            result.add(it to currentArgs.toTypedArray())
-            currentArgs.clear()
-        }
-    }
-
-    it.content.textSources.forEach {
-        it.ifBotCommandTextSource {
-            addCurrentCommandToResult()
-            currentCommandTextSource = it
-            return@forEach
-        }
-        currentArgs.add(it)
-    }
-    addCurrentCommandToResult()
-
-    result.toList().takeIf { it.isNotEmpty() } ?.let { result ->
-        it to result
-    }
 }
 
+/**
+ * Uses [parseCommandsWithArgs] on incoming text sources and map them with [CommonMessage]
+ */
+fun Flow<CommonMessage<TextContent>>.commandsWithArgs(
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex
+): Flow<Pair<CommonMessage<TextContent>, List<Pair<String, Array<String>>>>> = mapNotNull {
+    val commandsWithArgs = it.content.textSources.parseCommandsWithArgs(argsSeparator).toList().ifEmpty {
+        return@mapNotNull null
+    }
+
+    it to commandsWithArgs
+}
+
+/**
+ * Uses [parseCommandsWithArgs] on incoming text sources and map them with [CommonMessage]
+ */
+fun Flow<CommonMessage<TextContent>>.commandsWithArgs(
+    argsSeparator: String
+): Flow<Pair<CommonMessage<TextContent>, List<Pair<String, Array<String>>>>> = commandsWithArgs(Regex(argsSeparator))
+
+/**
+ * Uses [parseCommandsWithNamedArgs] on incoming text sources and map them with [CommonMessage]
+ */
+fun Flow<CommonMessage<TextContent>>.commandsWithNamedArgs(
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+): Flow<Pair<CommonMessage<TextContent>, List<Pair<String, List<Pair<String, String>>>>>> = mapNotNull {
+    val commandsWithArgs = it.content.textSources.parseCommandsWithNamedArgs(argsSeparator, nameArgSeparator).toList().ifEmpty {
+        return@mapNotNull null
+    }
+
+    it to commandsWithArgs
+}
+
+/**
+ * Uses [parseCommandsWithNamedArgs] on incoming text sources and map them with [CommonMessage]
+ */
+fun Flow<CommonMessage<TextContent>>.commandsWithNamedArgs(
+    argsSeparator: String,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+): Flow<Pair<CommonMessage<TextContent>, List<Pair<String, List<Pair<String, String>>>>>> = commandsWithNamedArgs(Regex(argsSeparator), nameArgSeparator)
+
 /**
  * Flat [commandsWithParams]. Each [Pair] of [BotCommandTextSource] and its [Array] of arg text sources will
  * be associated with its source message

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt

@@ -62,6 +62,10 @@ suspend fun BehaviourContext.waitText(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent(initRequest, errorFactory).mapContent<TextContent>()
+suspend fun BehaviourContext.waitStory(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitContent(initRequest, errorFactory).mapContent<StoryContent>()
 suspend fun BehaviourContext.waitVenue(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt

@@ -74,6 +74,10 @@ suspend fun BehaviourContext.waitTextMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage(initRequest, errorFactory).mapWithContent<TextContent>()
+suspend fun BehaviourContext.waitStoryMessage(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitContentMessage(initRequest, errorFactory).mapWithContent<StoryContent>()
 suspend fun BehaviourContext.waitVenueMessage(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt

@@ -174,6 +174,25 @@ suspend fun BehaviourContext.waitWriteAccessAllowed(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEvents<WriteAccessAllowed>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitWriteAccessAllowedFromRequest(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEvents<WriteAccessAllowed.FromRequest>(initRequest, errorFactory)
+
+suspend fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenu(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEvents<WriteAccessAllowed.FromAttachmentMenu>(initRequest, errorFactory)
+
+suspend fun BehaviourContext.waitWriteAccessAllowedFromWebAppLink(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEvents<WriteAccessAllowed.FromWebAppLink>(initRequest, errorFactory)
+
+suspend fun BehaviourContext.waitWriteAccessAllowedOther(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEvents<WriteAccessAllowed.Other>(initRequest, errorFactory)
 
 suspend fun BehaviourContext.waitChatSharedRequest(
     initRequest: Request<*>? = null,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventActionMessages.kt

@@ -171,6 +171,22 @@ suspend fun BehaviourContext.waitWriteAccessAllowedEventsMessages(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitEventsMessages<WriteAccessAllowed>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitWriteAccessAllowedFromRequestEventsMessages(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEventsMessages<WriteAccessAllowed.FromRequest>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitWriteAccessAllowedFromAttachmentMenuEventsMessages(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEventsMessages<WriteAccessAllowed.FromAttachmentMenu>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitWriteAccessAllowedFromWebAppLinkEventsMessages(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEventsMessages<WriteAccessAllowed.FromWebAppLink>(initRequest, errorFactory)
+suspend fun BehaviourContext.waitWriteAccessAllowedOtherEventsMessages(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null }
+) = waitEventsMessages<WriteAccessAllowed.Other>(initRequest, errorFactory)
 
 suspend fun BehaviourContext.waitChatSharedRequestEventsMessages(
     initRequest: Request<*>? = null,

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/filters/MessageFilterByChat.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.filters
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
+import dev.inmo.tgbotapi.extensions.utils.extensions.sourceUser
 import dev.inmo.tgbotapi.types.InlineQueries.query.InlineQuery
 import dev.inmo.tgbotapi.types.chat.ChatJoinRequest
 import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated
@@ -15,7 +16,9 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  * Allow only events from the same chat as base [Message]
  */
 val MessageFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, Message, Update> = { message, update ->
-    update.sourceChat() ?.id == message.chat.id
+    update.sourceChat() ?.let {
+        it.id == message.chat.id
+    } != false
 }
 /**
  * Allow only events from the same chat as base [List] of [Message]
@@ -29,31 +32,41 @@ val MessagesFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, List<Mess
  * Allow only updates from the same user as base [CallbackQuery.user]
  */
 val CallbackQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, CallbackQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
+    update.sourceUser() ?.let {
+        it.id == query.user.id
+    } != false
 }
 /**
  * Allow only updates from the same user as base [ShippingQuery.user]
  */
 val ShippingQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, ShippingQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
+    update.sourceUser() ?.let {
+        it.id == query.user.id
+    } != false
 }
 /**
  * Allow only updates from the same user as base [ShippingQuery.user]
  */
 val PreCheckoutQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, PreCheckoutQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.user.id
+    update.sourceUser() ?.let {
+        it.id == query.user.id
+    } != false
 }
 /**
  * Allow only updates from the same user as base [InlineQuery.from]
  */
 val InlineQueryFilterByUser: BehaviourContextAndTwoTypesReceiver<Boolean, InlineQuery, Update> = { query, update ->
-    update.sourceChat() ?.id == query.from.id
+    update.sourceUser() ?.let {
+        it.id == query.user.id
+    } != false
 }
 /**
  * Allow only events from the same chat as base [ChatMemberUpdated]
  */
 val ChatMemberUpdatedFilterByChat: BehaviourContextAndTwoTypesReceiver<Boolean, ChatMemberUpdated, Update> = { updated, update ->
-    update.sourceChat() ?.id == updated.chat.id
+    update.sourceChat() ?.let {
+        it.id == updated.chat.id
+    } != false
 }
 /**
  * Allow only events from the same chat as base [ChatMemberUpdated]

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ChatJoinRequestTriggers.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ChatJoinRequestFilterByChat
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatJoinRequestMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
@@ -25,7 +24,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
  */
 suspend fun <BC : BehaviourContext> BC.onChatJoinRequest(
     initialFilter: SimpleFilter<ChatJoinRequest>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatJoinRequest, Update>? = ChatJoinRequestFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatJoinRequest, Update>? = null,
     markerFactory: MarkerFactory<in ChatJoinRequest, Any> = ByChatChatJoinRequestMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatJoinRequest>
 ) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandling.kt

@@ -11,7 +11,9 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByC
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times
 import dev.inmo.tgbotapi.extensions.utils.botCommandTextSourceOrNull
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
+import dev.inmo.tgbotapi.extensions.utils.extensions.TelegramBotCommandsDefaults
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgs
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithNamedArgs
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.content.TextMessage
@@ -22,7 +24,7 @@ internal suspend fun <BC : BehaviourContext> BC.commandUncounted(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = onText(
@@ -49,7 +51,7 @@ suspend fun <BC : BehaviourContext> BC.command(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = runCatchingSafely {
@@ -78,7 +80,7 @@ suspend fun <BC : BehaviourContext> BC.command(
     command: String,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ) = command(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -87,7 +89,7 @@ suspend fun <BC : BehaviourContext> BC.command(
     botCommand: BotCommand,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ) = command(botCommand.command, requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -96,7 +98,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = command(commandRegex, requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -105,7 +107,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
     command: String,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = onCommand(command.toRegex(), requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -114,7 +116,7 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
     botCommand: BotCommand,
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = onCommand(botCommand.command, requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -122,8 +124,9 @@ suspend fun <BC : BehaviourContext> BC.onCommand(
 suspend fun <BC : BehaviourContext> BC.commandWithArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
 ) = command(
     commandRegex,
@@ -132,7 +135,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
     subcontextUpdatesFilter = subcontextUpdatesFilter,
     markerFactory = markerFactory
 ) {
-    val args = it.parseCommandsWithParams().let { commandsWithArgs ->
+    val args = it.parseCommandsWithArgs(argsSeparator = argsSeparator).let { commandsWithArgs ->
         val key = commandsWithArgs.keys.firstOrNull { it.matches(commandRegex) } ?: return@let null
         commandsWithArgs[key]
     } ?: emptyArray()
@@ -142,51 +145,191 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
 suspend fun <BC : BehaviourContext> BC.commandWithArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
 ) = commandWithArgs(
     command.toRegex(),
     initialFilter = initialFilter,
     subcontextUpdatesFilter = subcontextUpdatesFilter,
     markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
     scenarioReceiver = scenarioReceiver
 )
 
 suspend fun <BC : BehaviourContext> BC.commandWithArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
 ) = commandWithArgs(
     botCommand.command,
     initialFilter = initialFilter,
     subcontextUpdatesFilter = subcontextUpdatesFilter,
     markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    scenarioReceiver = scenarioReceiver
+)
+
+suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+    commandRegex: Regex,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = command(
+    commandRegex,
+    requireOnlyCommandInMessage = false,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory
+) {
+    val args = it.parseCommandsWithNamedArgs(argsSeparator = argsSeparator, nameArgSeparator = nameArgSeparator).let { commandsWithArgs ->
+        val key = commandsWithArgs.keys.firstOrNull { it.matches(commandRegex) } ?: return@let null
+        commandsWithArgs[key]
+    } ?: emptyList()
+    scenarioReceiver(it, args)
+}
+
+suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+    command: String,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = commandWithNamedArgs(
+    command.toRegex(),
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    nameArgSeparator = nameArgSeparator,
+    scenarioReceiver = scenarioReceiver
+)
+
+suspend fun <BC : BehaviourContext> BC.commandWithNamedArgs(
+    botCommand: BotCommand,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = commandWithNamedArgs(
+    botCommand.command,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    nameArgSeparator = nameArgSeparator,
     scenarioReceiver = scenarioReceiver
 )
 
 suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
     commandRegex: Regex,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
-): Job = commandWithArgs(commandRegex, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+): Job = commandWithArgs(
+    commandRegex = commandRegex,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    scenarioReceiver = scenarioReceiver
+)
 
 suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
     command: String,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
-): Job = onCommandWithArgs(command.toRegex(), initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+): Job = onCommandWithArgs(
+    commandRegex = command.toRegex(),
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    scenarioReceiver = scenarioReceiver
+)
 
 suspend fun <BC : BehaviourContext> BC.onCommandWithArgs(
     botCommand: BotCommand,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Array<String>>
-): Job = onCommandWithArgs(botCommand.command, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+): Job = onCommandWithArgs(
+    command = botCommand.command,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    scenarioReceiver = scenarioReceiver
+)
+
+suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+    commandRegex: Regex,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = commandWithNamedArgs(
+    commandRegex,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    nameArgSeparator = nameArgSeparator,
+    scenarioReceiver = scenarioReceiver,
+)
+
+suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+    command: String,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = onCommandWithNamedArgs(
+    command.toRegex(),
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    nameArgSeparator = nameArgSeparator,
+    scenarioReceiver = scenarioReceiver
+)
+
+suspend fun <BC : BehaviourContext> BC.onCommandWithNamedArgs(
+    botCommand: BotCommand,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
+    argsSeparator: Regex = TelegramBotCommandsDefaults.defaultArgsSeparatorRegex,
+    nameArgSeparator: Regex = TelegramBotCommandsDefaults.defaultNamesArgsSeparatorRegex,
+    scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, List<Pair<String, String>>>
+) = onCommandWithNamedArgs(
+    botCommand.command,
+    initialFilter = initialFilter,
+    subcontextUpdatesFilter = subcontextUpdatesFilter,
+    markerFactory = markerFactory,
+    argsSeparator = argsSeparator,
+    nameArgSeparator = nameArgSeparator,
+    scenarioReceiver = scenarioReceiver
+)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CommandHandlingUnhandled.kt

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByC
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times
 import dev.inmo.tgbotapi.extensions.utils.botCommandTextSourceOrNull
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
+import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgs
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.content.TextMessage
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -20,7 +20,7 @@ import kotlinx.coroutines.Job
 suspend fun <BC : BehaviourContext> BC.unhandledCommand(
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = onText(
@@ -48,7 +48,7 @@ suspend fun <BC : BehaviourContext> BC.unhandledCommand(
 suspend fun <BC : BehaviourContext> BC.onUnhandledCommand(
     requireOnlyCommandInMessage: Boolean = true,
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ): Job = unhandledCommand(requireOnlyCommandInMessage, initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
@@ -56,7 +56,7 @@ suspend fun <BC : BehaviourContext> BC.onUnhandledCommand(
 @PreviewFeature
 suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Map<String, Array<String>>>
 ) = onUnhandledCommand(
@@ -65,7 +65,7 @@ suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
     subcontextUpdatesFilter = subcontextUpdatesFilter,
     markerFactory = markerFactory
 ) {
-    val args = it.parseCommandsWithParams().let { commandsWithArgs ->
+    val args = it.parseCommandsWithArgs().let { commandsWithArgs ->
         commandsWithArgs
     }
     scenarioReceiver(it, args)
@@ -74,7 +74,7 @@ suspend fun <BC : BehaviourContext> BC.unhandledCommandWithArgs(
 @PreviewFeature
 suspend fun <BC : BehaviourContext> BC.onUnhandledCommandWithArgs(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, TextMessage, Map<String, Array<String>>>
 ): Job = unhandledCommandWithArgs(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt

@@ -46,7 +46,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent>
  */
 suspend fun <BC : BehaviourContext> BC.onContentMessage(
     initialFilter: CommonMessageFilter<MessageContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MessageContent>>
 ) = onContentMessageWithType(
@@ -70,7 +70,7 @@ suspend fun <BC : BehaviourContext> BC.onContentMessage(
  */
 suspend fun <BC : BehaviourContext> BC.onContact(
     initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ContactMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ContactMessage>
 ) = onContentMessageWithType(
@@ -94,7 +94,7 @@ suspend fun <BC : BehaviourContext> BC.onContact(
  */
 suspend fun <BC : BehaviourContext> BC.onDice(
     initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DiceMessage>
 ) = onContentMessageWithType(
@@ -118,7 +118,7 @@ suspend fun <BC : BehaviourContext> BC.onDice(
  */
 suspend fun <BC : BehaviourContext> BC.onGame(
     initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GameMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, GameMessage>
 ) = onContentMessageWithType(
@@ -142,7 +142,7 @@ suspend fun <BC : BehaviourContext> BC.onGame(
  */
 suspend fun <BC : BehaviourContext> BC.onLocation(
     initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LocationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, LocationMessage>
 ) = onContentMessageWithType(
@@ -166,7 +166,7 @@ suspend fun <BC : BehaviourContext> BC.onLocation(
  */
 suspend fun <BC : BehaviourContext> BC.onLiveLocation(
     initialFilter: CommonMessageFilter<LiveLocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LiveLocationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LiveLocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LiveLocationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, LiveLocationMessage>
 ) = onContentMessageWithType(
@@ -190,7 +190,7 @@ suspend fun <BC : BehaviourContext> BC.onLiveLocation(
  */
 suspend fun <BC : BehaviourContext> BC.onStaticLocation(
     initialFilter: CommonMessageFilter<StaticLocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StaticLocationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StaticLocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StaticLocationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, StaticLocationMessage>
 ) = onContentMessageWithType(
@@ -214,7 +214,7 @@ suspend fun <BC : BehaviourContext> BC.onStaticLocation(
  */
 suspend fun <BC : BehaviourContext> BC.onPoll(
     initialFilter: CommonMessageFilter<PollContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PollMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PollMessage>
 ) = onContentMessageWithType(
@@ -238,7 +238,7 @@ suspend fun <BC : BehaviourContext> BC.onPoll(
  */
 suspend fun <BC : BehaviourContext> BC.onText(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 ) = onContentMessageWithType(
@@ -248,6 +248,30 @@ suspend fun <BC : BehaviourContext> BC.onText(
     scenarioReceiver
 )
 
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param [markerFactory] Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onStory(
+    initialFilter: CommonMessageFilter<StoryContent>? = CommonMessageFilterExcludeMediaGroups,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StoryMessage, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in StoryMessage, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, StoryMessage>
+) = onContentMessageWithType(
+    initialFilter,
+    subcontextUpdatesFilter,
+    markerFactory,
+    scenarioReceiver
+)
+
 /**
  * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
  * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
@@ -262,7 +286,7 @@ suspend fun <BC : BehaviourContext> BC.onText(
  */
 suspend fun <BC : BehaviourContext> BC.onTextedContent(
     initialFilter: CommonMessageFilter<TextedContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextedMessage>
 ) = onContentMessageWithType(
@@ -286,7 +310,7 @@ suspend fun <BC : BehaviourContext> BC.onTextedContent(
  */
 suspend fun <BC : BehaviourContext> BC.onVenue(
     initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VenueMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VenueMessage>
 ) = onContentMessageWithType(
@@ -310,7 +334,7 @@ suspend fun <BC : BehaviourContext> BC.onVenue(
  */
 suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
     initialFilter: CommonMessageFilter<AudioMediaGroupPartContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AudioMediaGroupMessage>
 ) = onContentMessageWithType(
@@ -334,7 +358,7 @@ suspend fun <BC : BehaviourContext> BC.onAudioMediaGroup(
  */
 suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
     initialFilter: CommonMessageFilter<DocumentMediaGroupPartContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DocumentMediaGroupMessage>
 ) = onContentMessageWithType(
@@ -358,7 +382,7 @@ suspend fun <BC : BehaviourContext> BC.onDocumentMediaGroupContent(
  */
 suspend fun <BC : BehaviourContext> BC.onTextedMediaContent(
     initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMediaMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextedMediaMessage>
 ) = onContentMessageWithType(
@@ -382,7 +406,7 @@ suspend fun <BC : BehaviourContext> BC.onTextedMediaContent(
  */
 suspend fun <BC : BehaviourContext> BC.onMediaCollection(
     initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaCollectionMessage<TelegramMediaFile>, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MediaCollectionMessage<TelegramMediaFile>>
 ) = onContentMessageWithType(
@@ -406,7 +430,7 @@ suspend fun <BC : BehaviourContext> BC.onMediaCollection(
  */
 suspend fun <BC : BehaviourContext> BC.onMedia(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MediaMessage>
 ) = onContentMessageWithType(
@@ -430,7 +454,7 @@ suspend fun <BC : BehaviourContext> BC.onMedia(
  */
 suspend fun <BC : BehaviourContext> BC.onAnimation(
     initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AnimationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AnimationMessage>
 ) = onContentMessageWithType(
@@ -454,7 +478,7 @@ suspend fun <BC : BehaviourContext> BC.onAnimation(
  */
 suspend fun <BC : BehaviourContext> BC.onAudio(
     initialFilter: CommonMessageFilter<AudioContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AudioMessage>
 ) = onContentMessageWithType(
@@ -478,7 +502,7 @@ suspend fun <BC : BehaviourContext> BC.onAudio(
  */
 suspend fun <BC : BehaviourContext> BC.onDocument(
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DocumentMessage>
 ) = onContentMessageWithType(
@@ -502,7 +526,7 @@ suspend fun <BC : BehaviourContext> BC.onDocument(
  */
 suspend fun <BC : BehaviourContext> BC.onPhoto(
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PhotoMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PhotoMessage>
 ) = onContentMessageWithType(
@@ -526,7 +550,7 @@ suspend fun <BC : BehaviourContext> BC.onPhoto(
  */
 suspend fun <BC : BehaviourContext> BC.onSticker(
     initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StickerMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, StickerMessage>
 ) = onContentMessageWithType(
@@ -550,7 +574,7 @@ suspend fun <BC : BehaviourContext> BC.onSticker(
  */
 suspend fun <BC : BehaviourContext> BC.onVideo(
     initialFilter: CommonMessageFilter<VideoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VideoMessage>
 ) = onContentMessageWithType(
@@ -574,7 +598,7 @@ suspend fun <BC : BehaviourContext> BC.onVideo(
  */
 suspend fun <BC : BehaviourContext> BC.onVideoNote(
     initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoNoteMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VideoNoteMessage>
 ) = onContentMessageWithType(
@@ -598,7 +622,7 @@ suspend fun <BC : BehaviourContext> BC.onVideoNote(
  */
 suspend fun <BC : BehaviourContext> BC.onVoice(
     initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VoiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VoiceMessage>
 ) = onContentMessageWithType(
@@ -622,7 +646,7 @@ suspend fun <BC : BehaviourContext> BC.onVoice(
  */
 suspend fun <BC : BehaviourContext> BC.onInvoice(
     initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in InvoiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InvoiceMessage>
 ) = onContentMessageWithType(
@@ -646,7 +670,7 @@ suspend fun <BC : BehaviourContext> BC.onInvoice(
  */
 suspend fun <BC : BehaviourContext> BC.onVisualContent(
     initialFilter: CommonMessageFilter<VisualMediaGroupPartContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VisualMediaGroupMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VisualMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VisualMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VisualMediaGroupMessage>
 ) = onContentMessageWithType(
@@ -670,7 +694,7 @@ suspend fun <BC : BehaviourContext> BC.onVisualContent(
  */
 suspend fun <BC : BehaviourContext> BC.onMediaContent(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MediaMessage>
 ) = onContentMessageWithType(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/DeepLinkHandling.kt

@@ -4,27 +4,23 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 
 import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitDeepLinks
-import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatMessageMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times
 import dev.inmo.tgbotapi.extensions.utils.*
-import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.types.message.content.TextMessage
 import dev.inmo.tgbotapi.types.message.textsources.RegularTextSource
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import io.ktor.http.decodeURLQueryComponent
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.filter
 
 private val startRegex = Regex("start")
 suspend fun <BC : BehaviourContext> BC.onDeepLink(
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update> = { (message, _), update -> MessageFilterByChat(this, message, update) },
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },
     markerFactory: MarkerFactory<Pair<TextMessage, String>, Any> = MarkerFactory { (message, _) -> ByChatMessageMarkerFactory(message) },
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, Pair<TextMessage, String>>
 ): Job = on(
@@ -50,7 +46,7 @@ suspend fun <BC : BehaviourContext> BC.onDeepLink(
 suspend fun <BC : BehaviourContext> BC.onDeepLink(
     regex: Regex,
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update> = { (message, _), update -> MessageFilterByChat(this, message, update) },
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },
     markerFactory: MarkerFactory<Pair<TextMessage, String>, Any> = MarkerFactory { (message, _) -> ByChatMessageMarkerFactory(message) },
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, Pair<TextMessage, String>>
 ): Job {
@@ -63,7 +59,7 @@ suspend fun <BC : BehaviourContext> BC.onDeepLink(
 suspend fun <BC : BehaviourContext> BC.onDeepLink(
     deepLink: String,
     initialFilter: SimpleFilter<Pair<TextMessage, String>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update> = { (message, _), update -> MessageFilterByChat(this, message, update) },
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, Pair<TextMessage, String>, Update>? = { (message, _), update -> MessageFilterByChat(this, message, update) },
     markerFactory: MarkerFactory<Pair<TextMessage, String>, Any> = MarkerFactory { (message, _) -> ByChatMessageMarkerFactory(message) },
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, Pair<TextMessage, String>>
 ): Job = onDeepLink(Regex("^$deepLink$"), initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EditedContentTriggers.kt

@@ -40,7 +40,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent>
  */
 suspend fun <BC : BehaviourContext> BC.onEditedContentMessage(
     initialFilter: CommonMessageFilter<MessageContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<MessageContent>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<MessageContent>, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<MessageContent>>
 )= onEditedContent(
@@ -64,7 +64,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedContentMessage(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedContact(
     initialFilter: CommonMessageFilter<ContactContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ContactMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ContactMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ContactMessage>
 )= onEditedContent(
@@ -88,7 +88,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedContact(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedDice(
     initialFilter: CommonMessageFilter<DiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DiceMessage>
 )= onEditedContent(
@@ -112,7 +112,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDice(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedGame(
     initialFilter: CommonMessageFilter<GameContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, GameMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in GameMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, GameMessage>
 )= onEditedContent(
@@ -136,7 +136,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedGame(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedLocation(
     initialFilter: CommonMessageFilter<LocationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, LocationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in LocationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, LocationMessage>
 )= onEditedContent(
@@ -160,7 +160,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedLocation(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedText(
     initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextMessage>
 )= onEditedContent(
@@ -184,7 +184,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedText(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedVenue(
     initialFilter: CommonMessageFilter<VenueContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VenueMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VenueMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VenueMessage>
 )= onEditedContent(
@@ -208,7 +208,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVenue(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
     initialFilter: CommonMessageFilter<AudioMediaGroupPartContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AudioMediaGroupMessage>
 )= onEditedContent(
@@ -232,7 +232,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAudioMediaGroup(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
     initialFilter: CommonMessageFilter<DocumentMediaGroupPartContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMediaGroupMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMediaGroupMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DocumentMediaGroupMessage>
 )= onEditedContent(
@@ -256,7 +256,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDocumentMediaGroupContent(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
     initialFilter: CommonMessageFilter<TextedMediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, TextedMediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in TextedMediaMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, TextedMediaMessage>
 )= onEditedContent(
@@ -280,7 +280,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedTextedMediaContent(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedMediaCollection(
     initialFilter: CommonMessageFilter<MediaCollectionContent<TelegramMediaFile>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaCollectionMessage<TelegramMediaFile>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaCollectionMessage<TelegramMediaFile>, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MediaCollectionMessage<TelegramMediaFile>>
 )= onEditedContent(
@@ -304,7 +304,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedMediaCollection(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedMedia(
     initialFilter: CommonMessageFilter<MediaContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, MediaMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in MediaMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MediaMessage>
 )= onEditedContent(
@@ -328,7 +328,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedMedia(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedAnimation(
     initialFilter: CommonMessageFilter<AnimationContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AnimationMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AnimationMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AnimationMessage>
 )= onEditedContent(
@@ -352,7 +352,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAnimation(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedAudio(
     initialFilter: CommonMessageFilter<AudioContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, AudioMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in AudioMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, AudioMessage>
 )= onEditedContent(
@@ -376,7 +376,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedAudio(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedDocument(
     initialFilter: CommonMessageFilter<DocumentContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, DocumentMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in DocumentMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DocumentMessage>
 )= onEditedContent(
@@ -400,7 +400,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedDocument(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedPhoto(
     initialFilter: CommonMessageFilter<PhotoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PhotoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PhotoMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PhotoMessage>
 )= onEditedContent(
@@ -424,7 +424,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedPhoto(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedSticker(
     initialFilter: CommonMessageFilter<StickerContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, StickerMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in StickerMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, StickerMessage>
 )= onEditedContent(
@@ -448,7 +448,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedSticker(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedVideo(
     initialFilter: CommonMessageFilter<VideoContent>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VideoMessage>
 )= onEditedContent(
@@ -472,7 +472,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVideo(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedVideoNote(
     initialFilter: CommonMessageFilter<VideoNoteContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VideoNoteMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VideoNoteMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VideoNoteMessage>
 )= onEditedContent(
@@ -496,7 +496,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVideoNote(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedVoice(
     initialFilter: CommonMessageFilter<VoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, VoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in VoiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, VoiceMessage>
 )= onEditedContent(
@@ -520,7 +520,7 @@ suspend fun <BC : BehaviourContext> BC.onEditedVoice(
  */
 suspend fun <BC : BehaviourContext> BC.onEditedInvoice(
     initialFilter: CommonMessageFilter<InvoiceContent>? = CommonMessageFilterExcludeMediaGroups,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update> = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, InvoiceMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in InvoiceMessage, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InvoiceMessage>
 )= onEditedContent(

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt

@@ -655,10 +655,90 @@ suspend fun <BC : BehaviourContext> BC.onGeneralForumTopicUnhidden(
  * data
  */
 suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowed(
-    initialFilter: SimpleFilter<SupergroupEventMessage<WriteAccessAllowed>>? = null,
+    initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, SupergroupEventMessage<WriteAccessAllowed>, Update>? = MessageFilterByChat,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, SupergroupEventMessage<WriteAccessAllowed>>
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<WriteAccessAllowed>>
+) = onEventWithCustomChatEventMessage(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+
+
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromRequest(
+    initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromRequest>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromRequest>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromRequest>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<WriteAccessAllowed.FromRequest>>
+) = onEventWithCustomChatEventMessage(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+
+
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromAttachmentMenu(
+    initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<WriteAccessAllowed.FromAttachmentMenu>>
+) = onEventWithCustomChatEventMessage(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+
+
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedOther(
+    initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.Other>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.Other>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.Other>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<WriteAccessAllowed.Other>>
+) = onEventWithCustomChatEventMessage(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
+
+
+/**
+ * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
+ * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
+ * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
+ * to combinate several filters
+ * @param markerFactory Will be used to identify different "stream". [scenarioReceiver] will be called synchronously
+ * in one "stream". Output of [markerFactory] will be used as a key for "stream"
+ * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
+ * data
+ */
+suspend fun <BC : BehaviourContext> BC.onWriteAccessAllowedFromWebAppLink(
+    initialFilter: SimpleFilter<ChatEventMessage<WriteAccessAllowed.FromWebAppLink>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<WriteAccessAllowed.FromWebAppLink>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<WriteAccessAllowed.FromWebAppLink>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<WriteAccessAllowed.FromWebAppLink>>
 ) = onEventWithCustomChatEventMessage(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 
 

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt

@@ -20,7 +20,7 @@ internal suspend inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.
 
 /**
  * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * @param subcontextUpdatesFilter **Default is [InlineQueryFilterByUser]]**. This filter will be applied to each update inside of [scenarioReceiver]. For example,
  * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
@@ -40,7 +40,7 @@ suspend fun <BC : BehaviourContext> BC.onAnyInlineQuery(
 
 /**
  * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * @param subcontextUpdatesFilter **Default is [InlineQueryFilterByUser]]**. This filter will be applied to each update inside of [scenarioReceiver]. For example,
  * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]
@@ -60,7 +60,7 @@ suspend fun <BC : BehaviourContext> BC.onBaseInlineQuery(
 
 /**
  * @param initialFilter This filter will be called to remove unnecessary data BEFORE [scenarioReceiver] call
- * @param subcontextUpdatesFilter This filter will be applied to each update inside of [scenarioReceiver]. For example,
+ * @param subcontextUpdatesFilter **Default is [InlineQueryFilterByUser]]**. This filter will be applied to each update inside of [scenarioReceiver]. For example,
  * this filter will be used if you will call [dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMessage].
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver] function to create your own.
  * Use [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus] or [dev.inmo.tgbotapi.extensions.behaviour_builder.utils.times]

tgbotapi.behaviour_builder/src/linuxArm64Main/kotlin/ActualDefaultCoroutineScopeProvider.kt

@@ -0,0 +1,6 @@
+package dev.inmo.tgbotapi.extensions.behaviour_builder
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+
+actual var defaultCoroutineScopeProvider: () -> CoroutineScope = { CoroutineScope(Dispatchers.Default) }

tgbotapi.core/build.gradle

@@ -31,6 +31,8 @@ kotlin {
                 api libs.microutils.languageCodes
 
                 api libs.ktor.client.core
+
+                api libs.kslog
             }
         }
         commonTest {
@@ -55,6 +57,12 @@ kotlin {
             }
         }
 
+        linuxArm64Main {
+            dependencies {
+                api libs.ktor.client.cio
+            }
+        }
+
         mingwX64Main {
             dependencies {
                 api libs.ktor.client.winhttp

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/WithChat.kt

@@ -1,10 +1,17 @@
 package dev.inmo.tgbotapi.abstracts
 
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PreviewChat
 
 /**
  * All inheritors of this interface have [chat] field and related to this [chat]
  */
-interface WithChat {
+interface WithPreviewChat {
-    val chat: Chat
+    val chat: PreviewChat
 }
+
+/**
+ * All inheritors of this interface have [chat] field and related to this [chat]
+ */
+@Deprecated("Renamed", ReplaceWith("WithPreviewChat", "dev.inmo.tgbotapi.abstracts.WithPreviewChat"))
+typealias WithChat = WithPreviewChat

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/abstracts/WithUser.kt

@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.types.chat.User
  *
  * @see FromUser
  */
-@ClassCastsIncluded
+@ClassCastsIncluded(excludeRegex = ".*Impl")
 interface WithUser {
     val user: User
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutor.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.bot.ktor
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
 import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import io.ktor.client.*
@@ -14,12 +16,35 @@ import kotlinx.serialization.json.Json
  * * On JS, JVM and MingwX64 platforms it is [dev.inmo.tgbotapi.bot.ktor.base.DefaultKtorRequestsExecutor]
  * * On LinuxX64 it is [dev.inmo.tgbotapi.bot.ktor.base.MultipleClientKtorRequestsExecutor]
  */
-expect class KtorRequestsExecutor (
+expect class KtorRequestsExecutor internal constructor(
+    telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
+    client: HttpClient,
+    callsFactories: List<KtorCallFactory>,
+    excludeDefaultFactories: Boolean,
+    requestsLimiter: RequestLimiter,
+    jsonFormatter: Json,
+    pipelineStepsHolder: KtorPipelineStepsHolder,
+    logger: KSLog,
+    diff: Unit // just a diff property to know where constructor and where calling function with defaults
+) : BaseRequestsExecutor
+
+fun KtorRequestsExecutor(
     telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
     client: HttpClient = HttpClient(),
     callsFactories: List<KtorCallFactory> = emptyList(),
     excludeDefaultFactories: Boolean = false,
     requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter,
     jsonFormatter: Json = nonstrictJsonFormat,
-    pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder
+    pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder,
-) : BaseRequestsExecutor
+    logger: KSLog = DefaultKTgBotAPIKSLog,
+) = KtorRequestsExecutor(
+    telegramAPIUrlsKeeper = telegramAPIUrlsKeeper,
+    client = client,
+    callsFactories = callsFactories,
+    excludeDefaultFactories = excludeDefaultFactories,
+    requestsLimiter = requestsLimiter,
+    jsonFormatter = jsonFormatter,
+    pipelineStepsHolder = pipelineStepsHolder,
+    logger = logger,
+    diff = kotlin.Unit,
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutorFactories.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.bot.ktor
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.bot.ktor.base.*
@@ -10,9 +11,9 @@ import io.ktor.client.HttpClient
 import kotlinx.serialization.json.Json
 
 @RiskFeature
-fun createTelegramBotDefaultKtorCallRequestsFactories() = listOf(
+fun createTelegramBotDefaultKtorCallRequestsFactories(logger: KSLog? = null) = listOf(
-    SimpleRequestCallFactory(),
+    SimpleRequestCallFactory(logger),
-    MultipartRequestCallFactory(),
+    MultipartRequestCallFactory(logger),
     DownloadFileRequestCallFactory,
     DownloadFileChannelRequestCallFactory
 )
@@ -25,6 +26,8 @@ class KtorRequestsExecutorBuilder(
     var excludeDefaultFactories: Boolean = false
     var requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter
     var jsonFormatter: Json = nonstrictJsonFormat
+    var logger: KSLog = DefaultKTgBotAPIKSLog
+    var pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder
 
     fun build() = KtorRequestsExecutor(
         telegramAPIUrlsKeeper,
@@ -32,7 +35,9 @@ class KtorRequestsExecutorBuilder(
         callsFactories,
         excludeDefaultFactories,
         requestsLimiter,
-        jsonFormatter
+        jsonFormatter,
+        pipelineStepsHolder,
+        logger
     )
 }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/AbstractRequestCallFactory.kt

@@ -1,23 +1,30 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.v
+import dev.inmo.kslog.common.w
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
-import dev.inmo.tgbotapi.requests.GetUpdates
+import dev.inmo.tgbotapi.requests.GetUpdatesRequest
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.timeout
 import io.ktor.client.request.*
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.collections.set
 
 var defaultUpdateTimeoutForZeroDelay = 1000L
 
-abstract class AbstractRequestCallFactory : KtorCallFactory {
+abstract class AbstractRequestCallFactory(
+    protected open val logger: KSLog = DefaultKTgBotAPIKSLog
+) : KtorCallFactory {
     private val methodsCache: MutableMap<String, String> = mutableMapOf()
     override suspend fun <T : Any> makeCall(
         client: HttpClient,
@@ -26,6 +33,7 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
         jsonFormatter: Json
     ): T? {
         val preparedBody = prepareCallBody(client, urlsKeeper, request) ?: return null
+        logger.v { "Prepared body for $request: $preparedBody" }
 
         client.post {
             url(
@@ -35,7 +43,7 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
             )
             accept(ContentType.Application.Json)
 
-            if (request is GetUpdates) {
+            if (request is GetUpdatesRequest) {
                 request.timeout?.times(1000L) ?.let { customTimeoutMillis ->
                     if (customTimeoutMillis > 0) {
                         timeout {
@@ -54,7 +62,9 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
             setBody(preparedBody)
         }.let { response ->
             val content = response.bodyAsText()
+            logger.v { "Raw answer for $request: $content" }
             val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
+            logger.v { "Answer as json for $request: $responseObject" }
 
             return runCatchingSafely {
                 (responseObject.result?.let {
@@ -66,6 +76,8 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
                         "Can't get result object from $content"
                     )
                 })
+            }.onFailure {
+                logger.w { "Got exception answer for $request: $it" }
             }.getOrThrow()
         }
     }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DefaultKtorRequestsExecutor.kt

@@ -1,12 +1,16 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
+import dev.inmo.kslog.common.*
+import dev.inmo.micro_utils.coroutines.defaultSafelyExceptionHandler
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.exceptions.BotException
 import dev.inmo.tgbotapi.bot.exceptions.CommonBotException
+import dev.inmo.tgbotapi.bot.exceptions.GetUpdatesConflict
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.ktor.KtorPipelineStepsHolder
+import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutor
 import dev.inmo.tgbotapi.bot.ktor.createTelegramBotDefaultKtorCallRequestsFactories
 import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
 import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
@@ -19,19 +23,23 @@ import io.ktor.client.plugins.*
 import io.ktor.client.statement.*
 import kotlinx.serialization.json.Json
 
-class DefaultKtorRequestsExecutor(
+class DefaultKtorRequestsExecutor internal constructor(
     telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
-    client: HttpClient = HttpClient(),
+    client: HttpClient,
-    callsFactories: List<KtorCallFactory> = emptyList(),
+    callsFactories: List<KtorCallFactory>,
-    excludeDefaultFactories: Boolean = false,
+    excludeDefaultFactories: Boolean,
-    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter,
+    private val requestsLimiter: RequestLimiter,
-    private val jsonFormatter: Json = nonstrictJsonFormat,
+    private val jsonFormatter: Json,
-    private val pipelineStepsHolder: KtorPipelineStepsHolder = KtorPipelineStepsHolder
+    private val pipelineStepsHolder: KtorPipelineStepsHolder,
+    private val logger: KSLog,
+    diff: Unit
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
     private val callsFactories: List<KtorCallFactory> = callsFactories.run {
         if (!excludeDefaultFactories) {
-            this + createTelegramBotDefaultKtorCallRequestsFactories()
+            logger.v { "Installing default factories" }
+            this + createTelegramBotDefaultKtorCallRequestsFactories(logger)
         } else {
+            logger.v { "Default factories will not be installed" }
             this
         }
     }
@@ -44,19 +52,23 @@ class DefaultKtorRequestsExecutor(
 
     override suspend fun <T : Any> execute(request: Request<T>): T {
         return runCatchingSafely {
+            logger.v { "Start request $request" }
             pipelineStepsHolder.onBeforeSearchCallFactory(request, callsFactories)
             requestsLimiter.limit(request) {
                 var result: T? = null
                 lateinit var factoryHandledRequest: KtorCallFactory
                 for (potentialFactory in callsFactories) {
                     pipelineStepsHolder.onBeforeCallFactoryMakeCall(request, potentialFactory)
-                    result = potentialFactory.makeCall(
+                    logger.v { "Trying factory $potentialFactory for $request" }
+                    val resultFromFactory = potentialFactory.makeCall(
                         client,
                         telegramAPIUrlsKeeper,
                         request,
                         jsonFormatter
                     )
-                    result = pipelineStepsHolder.onAfterCallFactoryMakeCall(result, request, potentialFactory)
+                    logger.v { "Result of factory $potentialFactory handling $request: $resultFromFactory" }
+                    result = pipelineStepsHolder.onAfterCallFactoryMakeCall(resultFromFactory, request, potentialFactory)
+                    logger.v { "Result of pipeline $pipelineStepsHolder handling $resultFromFactory: $result" }
                     if (result != null) {
                         factoryHandledRequest = potentialFactory
                         break
@@ -69,6 +81,7 @@ class DefaultKtorRequestsExecutor(
             }
         }.let {
             val result = it.exceptionOrNull() ?.let { e ->
+                logger.v(e) { "Got exception on handling of $request" }
                 pipelineStepsHolder.onRequestException(request, e) ?.let { return@let it }
 
                 when (e) {
@@ -88,9 +101,18 @@ class DefaultKtorRequestsExecutor(
                     }
                     is BotException -> e
                     else -> CommonBotException(cause = e)
+                }.also { newException ->
+                    logger.v(newException) { "Result exception on handling of $request is an exception" }
+                    if (newException is GetUpdatesConflict) {
+                        logger.w(newException) {
+                            "Warning!!! Other bot with the same bot token requests updates with getUpdate in parallel"
+                        }
+                    }
                 }
             } ?.let { Result.failure(it) } ?: it
-            pipelineStepsHolder.onRequestReturnResult(result, request, callsFactories)
+            pipelineStepsHolder.onRequestReturnResult(result, request, callsFactories).also {
+                logger.v { "Result of handling $request: $it" }
+            }
         }
     }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DownloadFileChannelRequestCallFactory.kt

@@ -5,6 +5,7 @@ import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.ByteReadChannelAllocator
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.call.receive
@@ -15,6 +16,7 @@ import io.ktor.utils.io.*
 import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
 
+@RiskFeature
 object DownloadFileChannelRequestCallFactory : KtorCallFactory {
     override suspend fun <T : Any> makeCall(
         client: HttpClient,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/DownloadFileRequestCallFactory.kt

@@ -4,12 +4,14 @@ import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.requests.DownloadFile
 import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import io.ktor.client.statement.readBytes
 import kotlinx.serialization.json.Json
 
+@RiskFeature
 object DownloadFileRequestCallFactory : KtorCallFactory {
     override suspend fun <T : Any> makeCall(
         client: HttpClient,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/MultipartRequestCallFactory.kt

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import dev.inmo.tgbotapi.utils.mapWithCommonValues
 import io.ktor.client.HttpClient
@@ -8,7 +10,7 @@ import io.ktor.client.request.forms.*
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
 
-class MultipartRequestCallFactory : AbstractRequestCallFactory() {
+class MultipartRequestCallFactory(logger: KSLog? = null) : AbstractRequestCallFactory(logger ?: DefaultKTgBotAPIKSLog) {
     override fun <T : Any> prepareCallBody(
         client: HttpClient,
         urlsKeeper: TelegramAPIUrlsKeeper,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/MultipleClientKtorRequestsExecutor.kt

@@ -1,12 +1,16 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.ktor.KtorPipelineStepsHolder
+import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutor
+import dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter
 import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import io.ktor.client.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
@@ -45,6 +49,7 @@ class MultipleClientKtorRequestsExecutor (
     jsonFormatter: Json,
     pipelineStepsHolder: KtorPipelineStepsHolder,
     requestExecutorsCount: Int,
+    logger: KSLog,
     clientFactory: () -> HttpClient
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
     private val requestExecutors = (0 until requestExecutorsCount).map {
@@ -55,7 +60,9 @@ class MultipleClientKtorRequestsExecutor (
             excludeDefaultFactories,
             requestsLimiter,
             jsonFormatter,
-            pipelineStepsHolder
+            pipelineStepsHolder,
+            logger,
+            Unit
         )
     }.toSet()
     private val freeClients = MutableStateFlow<Set<DefaultKtorRequestsExecutor>>(requestExecutors)
@@ -68,14 +75,16 @@ class MultipleClientKtorRequestsExecutor (
         }
     }
 
-    constructor(
+    internal constructor(
         telegramAPIUrlsKeeper: TelegramAPIUrlsKeeper,
         client: HttpClient,
         callsFactories: List<KtorCallFactory>,
         excludeDefaultFactories: Boolean,
         requestsLimiter: RequestLimiter,
         jsonFormatter: Json,
-        pipelineStepsHolder: KtorPipelineStepsHolder
+        pipelineStepsHolder: KtorPipelineStepsHolder,
+        logger: KSLog,
+        diff: Unit
     ) : this(
         telegramAPIUrlsKeeper,
         callsFactories,
@@ -84,6 +93,7 @@ class MultipleClientKtorRequestsExecutor (
         jsonFormatter,
         pipelineStepsHolder,
         client.engineConfig.threadsCount,
+        logger,
         { platformClientCopy(client) }
     )
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/SimpleRequestCallFactory.kt

@@ -1,12 +1,14 @@
 package dev.inmo.tgbotapi.bot.ktor.base
 
+import dev.inmo.kslog.common.KSLog
 import dev.inmo.tgbotapi.requests.abstracts.*
+import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.http.ContentType
 import io.ktor.http.content.TextContent
 
-class SimpleRequestCallFactory : AbstractRequestCallFactory() {
+class SimpleRequestCallFactory(logger: KSLog? = null) : AbstractRequestCallFactory(logger ?: DefaultKTgBotAPIKSLog) {
     override fun <T : Any> prepareCallBody(
         client: HttpClient,
         urlsKeeper: TelegramAPIUrlsKeeper,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdates.kt

@@ -22,13 +22,11 @@ private val updatesListSerializer = ListSerializer(
  */
 @Serializable
 data class GetUpdates(
-    val offset: UpdateIdentifier? = null,// set `last update id + 1` to receive next part of updates
+    override val offset: UpdateIdentifier? = null,// set `last update id + 1` to receive next part of updates
-    val limit: Int = getUpdatesLimit.last,
+    override val limit: Int = getUpdatesLimit.last,
-    val timeout: Seconds? = null,
+    override val timeout: Seconds? = null,
-    val allowed_updates: List<String>? = ALL_UPDATES_LIST
+    override val allowed_updates: List<String>? = ALL_UPDATES_LIST
-): SimpleRequest<List<Update>> {
+): GetUpdatesRequest<List<Update>> {
-    override fun method(): String = "getUpdates"
-
     override val resultDeserializer: DeserializationStrategy<List<Update>>
         get() = updatesListSerializer
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdatesRaw.kt

@@ -0,0 +1,37 @@
+package dev.inmo.tgbotapi.requests
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.ALL_UPDATES_LIST
+import dev.inmo.tgbotapi.types.Seconds
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.getUpdatesLimit
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.json.JsonArray
+
+/**
+ * Raw variant of [GetUpdates]. This type will be useful in case you wish to get some updates and handle them by
+ * yourself or with [dev.inmo.tgbotapi.utils.convertWithMediaGroupUpdates]
+ */
+@Serializable
+data class GetUpdatesRaw(
+    override val offset: UpdateIdentifier? = null,// set `last update id + 1` to receive next part of updates
+    override val limit: Int = getUpdatesLimit.last,
+    override val timeout: Seconds? = null,
+    override val allowed_updates: List<String>? = ALL_UPDATES_LIST
+): GetUpdatesRequest<JsonArray> {
+    override fun method(): String = "getUpdates"
+
+    override val resultDeserializer: DeserializationStrategy<JsonArray>
+        get() = JsonArray.serializer()
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    init {
+        if (limit !in getUpdatesLimit) {
+            error("GetUpdates request can be called only with limit in range $getUpdatesLimit (actual value is $limit)")
+        }
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/GetUpdatesRequest.kt

@@ -0,0 +1,17 @@
+package dev.inmo.tgbotapi.requests
+
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.ALL_UPDATES_LIST
+import dev.inmo.tgbotapi.types.Seconds
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.getUpdatesLimit
+
+interface GetUpdatesRequest<T : Any> : SimpleRequest<T> {
+    val offset: UpdateIdentifier?
+    val limit: Int
+    val timeout: Seconds?
+    val allowed_updates: List<String>?
+
+    override fun method(): String = "getUpdates"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/bot/SetMyDefaultAdministratorRights.kt

@@ -2,14 +2,14 @@ package dev.inmo.tgbotapi.requests.bot
 
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRightsImpl
+import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
 class SetMyDefaultAdministratorRights(
     @SerialName(rightsField)
-    val rights: ChatAdministratorRightsImpl,
+    val rights: ChatCommonAdministratorRights,
     @SerialName(forChannelsField)
     val forChannels: Boolean? = null
 ) : SimpleRequest<Boolean> {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/forum/UnpinAllGeneralForumTopicMessages.kt

@@ -0,0 +1,14 @@
+package dev.inmo.tgbotapi.requests.chat.forum
+
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+
+@Serializable
+data class UnpinAllGeneralForumTopicMessages (
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+): ModifyForumRequest {
+    override fun method(): String = "unpinAllGeneralForumTopicMessages"
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.requests.chat.members
 
+import dev.inmo.micro_utils.common.Warning
 import dev.inmo.tgbotapi.abstracts.types.UntilDate
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
@@ -7,6 +8,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
 @Serializable
+@Warning("This method is too common. Use it with caution")
 data class PromoteChatMember(
     @SerialName(chatIdField)
     override val chatId: ChatIdentifier,
@@ -37,7 +39,13 @@ data class PromoteChatMember(
     @SerialName(canManageChatField)
     private val canManageChat: Boolean? = null,
     @SerialName(canManageTopicsField)
-    private val canManageTopics: Boolean? = null
+    private val canManageTopics: Boolean? = null,
+    @SerialName(canPostStoriesField)
+    private val canPostStories: Boolean? = null,
+    @SerialName(canEditStoriesField)
+    private val canEditStories: Boolean? = null,
+    @SerialName(canDeleteStoriesField)
+    private val canDeleteStories: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "promoteChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>
@@ -45,3 +53,109 @@ data class PromoteChatMember(
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }
+
+fun PromoteChatMember(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+) = PromoteChatMember(
+    chatId = chatId,
+    userId = userId,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = null,
+    canEditMessages = null,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = null,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = null,
+    canPostStories = null,
+    canEditStories = null,
+    canDeleteStories = null
+)
+
+fun PromoteChannelAdministrator(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canPostMessages: Boolean? = null,
+    canEditMessages: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canPostStories: Boolean? = null,
+    canEditStories: Boolean? = null,
+    canDeleteStories: Boolean? = null
+) = PromoteChatMember(
+    chatId = chatId,
+    userId = userId,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = canPostMessages,
+    canEditMessages = canEditMessages,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = null,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = null,
+    canPostStories = canPostStories,
+    canEditStories = canEditStories,
+    canDeleteStories = canDeleteStories
+)
+
+fun PromoteSupergroupAdministrator(
+    chatId: ChatIdentifier,
+    userId: UserId,
+    untilDate: TelegramDate? = null,
+    isAnonymous: Boolean? = null,
+    canChangeInfo: Boolean? = null,
+    canDeleteMessages: Boolean? = null,
+    canInviteUsers: Boolean? = null,
+    canRestrictMembers: Boolean? = null,
+    canPinMessages: Boolean? = null,
+    canPromoteMembers: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
+    canManageChat: Boolean? = null,
+    canManageTopics: Boolean? = null,
+) = PromoteChatMember(
+    chatId = chatId,
+    userId = userId,
+    untilDate = untilDate,
+    isAnonymous = isAnonymous,
+    canChangeInfo = canChangeInfo,
+    canPostMessages = null,
+    canEditMessages = null,
+    canDeleteMessages = canDeleteMessages,
+    canInviteUsers = canInviteUsers,
+    canRestrictMembers = canRestrictMembers,
+    canPinMessages = canPinMessages,
+    canPromoteMembers = canPromoteMembers,
+    canManageVideoChats = canManageVideoChats,
+    canManageChat = canManageChat,
+    canManageTopics = canManageTopics,
+    canPostStories = null,
+    canEditStories = null,
+    canDeleteStories = null
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt

@@ -177,6 +177,11 @@ val stickerKeywordLengthLimit = 0 .. 64
 
 const val botActionActualityTime: Seconds = 5
 
+val cloudStorageKeyLimit = 1 .. 128
+val cloudStorageValueLimit = 0 .. 4096
+val cloudStorageKeyRegex = Regex("[A-Za-z0-9_-]{${cloudStorageKeyLimit.first},${cloudStorageKeyLimit.last}}")
+val cloudStorageValueRegex = Regex(".{${cloudStorageValueLimit.first},${cloudStorageValueLimit.last}}")
+
 // Made as lazy for correct work in K/JS
 val telegramInlineModeGifPermittedMimeTypes by lazy {
     listOf(
@@ -210,10 +215,12 @@ const val firstNameField = "first_name"
 const val lastNameField = "last_name"
 const val languageCodeField = "language_code"
 const val addedToAttachmentMenuField = "added_to_attachment_menu"
+const val allowsWriteToPMField = "allows_write_to_pm"
 const val isPremiumField = "is_premium"
 const val hasPrivateForwardsField = "has_private_forwards"
 const val hasRestrictedVoiceAndVideoMessagesField = "has_restricted_voice_and_video_messages"
 const val emojiStatusCustomEmojiIdField = "emoji_status_custom_emoji_id"
+const val emojiStatusExpirationDateField = "emoji_status_expiration_date"
 const val iconCustomEmojiIdField = "icon_custom_emoji_id"
 const val canJoinGroupsField = "can_join_groups"
 const val canReadAllGroupMessagesField = "can_read_all_group_messages"
@@ -273,6 +280,9 @@ const val correctOptionIdField = "correct_option_id"
 const val allowsMultipleAnswersField = "allows_multiple_answers"
 const val isAnonymousField = "is_anonymous"
 const val canManageTopicsField = "can_manage_topics"
+const val canPostStoriesField = "can_post_stories"
+const val canEditStoriesField = "can_edit_stories"
+const val canDeleteStoriesField = "can_delete_stories"
 const val captionEntitiesField = "caption_entities"
 const val hasSpoilerField = "has_spoiler"
 const val loginUrlField = "login_url"
@@ -289,6 +299,7 @@ const val pinnedMessageField = "pinned_message"
 const val activeUsernamesField = "active_usernames"
 const val customTitleField = "custom_title"
 const val optionIdsField = "option_ids"
+const val voterChatField = "voter_chat"
 const val ipAddressField = "ip_address"
 const val linkedChatIdField = "linked_chat_id"
 const val hasHiddenMembersField = "has_hidden_members"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.Serializable
 
 @Serializable(InlineQueryResultSerializer::class)
-@ClassCastsIncluded
+@ClassCastsIncluded(excludeRegex = ".*Impl")
 interface InlineQueryResult {
     val type: String
     val id: InlineQueryIdentifier

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.buttons
 
 import dev.inmo.tgbotapi.types.botAdministratorRightsField
 import dev.inmo.tgbotapi.types.botIsMemberField
-import dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRights
+import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
 import dev.inmo.tgbotapi.types.chatHasUsernameField
 import dev.inmo.tgbotapi.types.chatIsChannelField
 import dev.inmo.tgbotapi.types.chatIsCreatedField
@@ -30,9 +30,9 @@ data class KeyboardButtonRequestChat(
     @SerialName(chatIsCreatedField)
     val isOwnedBy: Boolean? = null,
     @SerialName(userAdministratorRightsField)
-    val userRightsInChat: ChatAdministratorRights? = null,
+    val userRightsInChat: ChatCommonAdministratorRights? = null,
     @SerialName(botAdministratorRightsField)
-    val botRightsInChat: ChatAdministratorRights? = null,
+    val botRightsInChat: ChatCommonAdministratorRights? = null,
     @SerialName(botIsMemberField)
     val botIsMember: Boolean? = null
 ) {
@@ -41,8 +41,8 @@ data class KeyboardButtonRequestChat(
             requestId: RequestId,
             isPublic: Boolean? = null,
             isOwnedBy: Boolean? = null,
-            userRightsInChat: ChatAdministratorRights? = null,
+            userRightsInChat: ChatCommonAdministratorRights? = null,
-            botRightsInChat: ChatAdministratorRights? = null,
+            botRightsInChat: ChatCommonAdministratorRights? = null,
             botIsMember: Boolean? = null
         ) = KeyboardButtonRequestChat(
             requestId = requestId,
@@ -60,8 +60,8 @@ data class KeyboardButtonRequestChat(
             isForum: Boolean? = null,
             isPublic: Boolean? = null,
             isOwnedBy: Boolean? = null,
-            userRightsInChat: ChatAdministratorRights? = null,
+            userRightsInChat: ChatCommonAdministratorRights? = null,
-            botRightsInChat: ChatAdministratorRights? = null,
+            botRightsInChat: ChatCommonAdministratorRights? = null,
             botIsMember: Boolean? = null
         ) = KeyboardButtonRequestChat(
             requestId = requestId,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/inline/InlineKeyboardButtonsShortcuts.kt

@@ -5,20 +5,14 @@ import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.*
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 
 /**
- * Creates and put [PayInlineKeyboardButton]
+ * Creates [PayInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun payInlineButton(
     text: String
 ) = PayInlineKeyboardButton(text)
 
 /**
- * Creates and put [CallbackDataInlineKeyboardButton]
+ * Creates [CallbackDataInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun dataInlineButton(
     text: String,
@@ -26,20 +20,14 @@ inline fun dataInlineButton(
 ) = CallbackDataInlineKeyboardButton(text, data)
 
 /**
- * Creates and put [CallbackGameInlineKeyboardButton]
+ * Creates [CallbackGameInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun gameInlineButton(
     text: String
 ) = CallbackGameInlineKeyboardButton(text)
 
 /**
- * Creates and put [LoginURLInlineKeyboardButton]
+ * Creates [LoginURLInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun loginInlineButton(
     text: String,
@@ -47,10 +35,7 @@ inline fun loginInlineButton(
 ) = LoginURLInlineKeyboardButton(text, loginUrl)
 
 /**
- * Creates and put [SwitchInlineQueryCurrentChatInlineKeyboardButton]
+ * Creates [SwitchInlineQueryCurrentChatInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun inlineQueryInCurrentChatInlineButton(
     text: String,
@@ -58,10 +43,7 @@ inline fun inlineQueryInCurrentChatInlineButton(
 ) = SwitchInlineQueryCurrentChatInlineKeyboardButton(text, data)
 
 /**
- * Creates and put [SwitchInlineQueryChosenChatInlineKeyboardButton]
+ * Creates [SwitchInlineQueryChosenChatInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun inlineQueryInCurrentChatInlineButton(
     text: String,
@@ -69,10 +51,7 @@ inline fun inlineQueryInCurrentChatInlineButton(
 ) = SwitchInlineQueryChosenChatInlineKeyboardButton(text, parameters)
 
 /**
- * Creates and put [SwitchInlineQueryChosenChatInlineKeyboardButton]
+ * Creates [SwitchInlineQueryChosenChatInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun inlineQueryInCurrentChatInlineButton(
     text: String,
@@ -93,10 +72,7 @@ inline fun inlineQueryInCurrentChatInlineButton(
 )
 
 /**
- * Creates and put [SwitchInlineQueryChosenChatInlineKeyboardButton]
+ * Creates [SwitchInlineQueryChosenChatInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun inlineQueryInAnyCurrentChatInlineButton(
     text: String,
@@ -104,10 +80,7 @@ inline fun inlineQueryInAnyCurrentChatInlineButton(
 ) = inlineQueryInCurrentChatInlineButton(text, query, allowUsers = true, allowBots = true, allowGroups = true, allowChannels = true)
 
 /**
- * Creates and put [SwitchInlineQueryInlineKeyboardButton]
+ * Creates [SwitchInlineQueryInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun inlineQueryInlineButton(
     text: String,
@@ -115,10 +88,7 @@ inline fun inlineQueryInlineButton(
 ) = SwitchInlineQueryInlineKeyboardButton(text, data)
 
 /**
- * Creates and put [URLInlineKeyboardButton]
+ * Creates [URLInlineKeyboardButton]
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun urlInlineButton(
     text: String,
@@ -126,10 +96,7 @@ inline fun urlInlineButton(
 ) = URLInlineKeyboardButton(text, url)
 
 /**
- * Creates and put [WebAppInlineKeyboardButton]. Please, remember that this button is available in private chats only
+ * Creates [WebAppInlineKeyboardButton]. Please, remember that this button is available in private chats only
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun webAppInlineButton(
     text: String,
@@ -137,10 +104,7 @@ inline fun webAppInlineButton(
 ) = WebAppInlineKeyboardButton(text, webApp)
 
 /**
- * Creates and put [WebAppInlineKeyboardButton]. Please, remember that this button is available in private chats only
+ * Creates [WebAppInlineKeyboardButton]. Please, remember that this button is available in private chats only
- *
- * @see inlineKeyboard
- * @see InlineKeyboardBuilder.row
  */
 inline fun webAppInlineButton(
     text: String,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcuts.kt

@@ -1,47 +1,34 @@
 package dev.inmo.tgbotapi.types.buttons.reply
 
 import dev.inmo.tgbotapi.types.buttons.*
-import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.*
+import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
-import dev.inmo.tgbotapi.types.chat.member.ChatAdministratorRights
 import dev.inmo.tgbotapi.types.request.RequestId
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 
 
 /**
- * Creates and put [SimpleKeyboardButton]
+ * Creates [SimpleKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun simpleReplyButton(
     text: String
 ) = SimpleKeyboardButton(text)
 
 /**
- * Creates and put [RequestContactKeyboardButton]
+ * Creates [RequestContactKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestContactReplyButton(
     text: String
 ) = RequestContactKeyboardButton(text)
 
 /**
- * Creates and put [RequestLocationKeyboardButton]
+ * Creates [RequestLocationKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestLocationReplyButton(
     text: String
 ) = RequestLocationKeyboardButton(text)
 
 /**
- * Creates and put [RequestPollKeyboardButton]
+ * Creates [RequestPollKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestPollReplyButton(
     text: String,
@@ -49,10 +36,7 @@ inline fun requestPollReplyButton(
 ) = RequestPollKeyboardButton(text, pollType)
 
 /**
- * Creates and put [WebAppKeyboardButton]
+ * Creates [WebAppKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun webAppReplyButton(
     text: String,
@@ -60,10 +44,7 @@ inline fun webAppReplyButton(
 ) = WebAppKeyboardButton(text, webApp)
 
 /**
- * Creates and put [WebAppKeyboardButton]
+ * Creates [WebAppKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun webAppReplyButton(
     text: String,
@@ -72,10 +53,7 @@ inline fun webAppReplyButton(
 
 
 /**
- * Creates and put [RequestUserKeyboardButton]
+ * Creates [RequestUserKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestUserReplyButton(
     text: String,
@@ -86,10 +64,7 @@ inline fun requestUserReplyButton(
 )
 
 /**
- * Creates and put [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Bot]
+ * Creates [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Bot]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestBotReplyButton(
     text: String,
@@ -100,10 +75,7 @@ inline fun requestBotReplyButton(
 )
 
 /**
- * Creates and put [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Common]
+ * Creates [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Common]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestUserReplyButton(
     text: String,
@@ -115,10 +87,7 @@ inline fun requestUserReplyButton(
 )
 
 /**
- * Creates and put [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Any]
+ * Creates [RequestUserKeyboardButton] with [KeyboardButtonRequestUser.Any]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestUserOrBotReplyButton(
     text: String,
@@ -130,10 +99,7 @@ inline fun requestUserOrBotReplyButton(
 
 
 /**
- * Creates and put [RequestChatKeyboardButton]
+ * Creates [RequestChatKeyboardButton]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestChatReplyButton(
     text: String,
@@ -144,10 +110,7 @@ inline fun requestChatReplyButton(
 )
 
 /**
- * Creates and put [RequestChatKeyboardButton] with [KeyboardButtonRequestChat]
+ * Creates [RequestChatKeyboardButton] with [KeyboardButtonRequestChat]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestChatReplyButton(
     text: String,
@@ -156,8 +119,8 @@ inline fun requestChatReplyButton(
     isForum: Boolean? = null,
     isPublic: Boolean? = null,
     isOwnedBy: Boolean? = null,
-    userRightsInChat: ChatAdministratorRights? = null,
+    userRightsInChat: ChatCommonAdministratorRights? = null,
-    botRightsInChat: ChatAdministratorRights? = null,
+    botRightsInChat: ChatCommonAdministratorRights? = null,
     botIsMember: Boolean = false
 ) = requestChatReplyButton(
     text,
@@ -174,18 +137,15 @@ inline fun requestChatReplyButton(
 )
 
 /**
- * Creates and put [RequestChatKeyboardButton] with [KeyboardButtonRequestChat.Channel]
+ * Creates [RequestChatKeyboardButton] with [KeyboardButtonRequestChat.Channel]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestChannelReplyButton(
     text: String,
     requestId: RequestId,
     isPublic: Boolean? = null,
     isOwnedBy: Boolean? = null,
-    userRightsInChat: ChatAdministratorRights? = null,
+    userRightsInChat: ChatCommonAdministratorRights? = null,
-    botRightsInChat: ChatAdministratorRights? = null,
+    botRightsInChat: ChatCommonAdministratorRights? = null,
     botIsMember: Boolean = false
 ) = requestChatReplyButton(
     text,
@@ -201,10 +161,7 @@ inline fun requestChannelReplyButton(
 
 
 /**
- * Creates and put [RequestChatKeyboardButton] with [KeyboardButtonRequestChat.Group]
+ * Creates [RequestChatKeyboardButton] with [KeyboardButtonRequestChat.Group]
- *
- * @see replyKeyboard
- * @see ReplyKeyboardBuilder.row
  */
 inline fun requestChannelReplyButton(
     text: String,
@@ -212,8 +169,8 @@ inline fun requestChannelReplyButton(
     isForum: Boolean? = null,
     isPublic: Boolean? = null,
     isOwnedBy: Boolean? = null,
-    userRightsInChat: ChatAdministratorRights? = null,
+    userRightsInChat: ChatCommonAdministratorRights? = null,
-    botRightsInChat: ChatAdministratorRights? = null,
+    botRightsInChat: ChatCommonAdministratorRights? = null,
     botIsMember: Boolean? = null
 ) = requestChatReplyButton(
     text,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Abstracts.kt

@@ -4,52 +4,52 @@ import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.Serializable
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface UsernameChat : Chat {
     val username: Username?
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface PrivateChat : Chat, UsernameChat {
     override val id: UserId
     val firstName: String
     val lastName: String
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface PublicChat : Chat {
     val title: String
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface SuperPublicChat : PublicChat, UsernameChat
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface ChannelChat : SuperPublicChat {
     override val id: ChatId
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface GroupChat : PublicChat
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface SupergroupChat : GroupChat, SuperPublicChat
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface ForumChat : SupergroupChat
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface PossiblyPremiumChat : Chat {
     val isPremium: Boolean
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
 sealed interface AbleToAddInAttachmentMenuChat : Chat {
     val addedToAttachmentMenu: Boolean
 }
 
-@Serializable(PreviewChatSerializer::class)
+@Serializable(ChatSerializer::class)
-@ClassCastsIncluded
+@ClassCastsIncluded(excludeRegex = ".*Impl")
 sealed interface Chat {
     val id: IdChatIdentifier
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ChatSerializers.kt

@@ -49,13 +49,54 @@ object ChatTypeSerializer : KSerializer<ChatType> {
 }
 
 @RiskFeature
-object PreviewChatSerializer : KSerializer<Chat> {
+object ChatSerializer : KSerializer<Chat> {
     @OptIn(InternalSerializationApi::class)
     override val descriptor: SerialDescriptor = buildSerialDescriptor("PreviewChatSerializer", PolymorphicKind.OPEN)
 
     override fun deserialize(decoder: Decoder): Chat {
         val decodedJson = JsonObject.serializer().deserialize(decoder)
 
+        return try {
+            formatter.decodeFromJsonElement(ExtendedChatSerializer, decodedJson)
+        } catch (e: SerializationException) {
+            val type = decodedJson[typeField] ?.jsonPrimitive ?.content ?.asChatType ?: error("Field $typeField must be presented, but absent in $decodedJson")
+            val isForum = decodedJson[isForumField] ?.jsonPrimitive ?.booleanOrNull == true
+
+            when (type) {
+                ChatType.PrivateChatType -> formatter.decodeFromJsonElement(PrivateChatImpl.serializer(), decodedJson)
+                ChatType.GroupChatType -> formatter.decodeFromJsonElement(GroupChatImpl.serializer(), decodedJson)
+                ChatType.SupergroupChatType -> if (isForum) {
+                    formatter.decodeFromJsonElement(ForumChatImpl.serializer(), decodedJson)
+                } else {
+                    formatter.decodeFromJsonElement(SupergroupChatImpl.serializer(), decodedJson)
+                }
+                ChatType.ChannelChatType -> formatter.decodeFromJsonElement(ChannelChatImpl.serializer(), decodedJson)
+                is ChatType.UnknownChatType -> UnknownChatType(
+                    formatter.decodeFromJsonElement(Long.serializer(), decodedJson[chatIdField] ?: JsonPrimitive(-1)).toChatId(),
+                    decodedJson.toString(),
+                    decodedJson
+                )
+            }
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: Chat) {
+        when (value) {
+            is ExtendedChat -> ExtendedChatSerializer.serialize(encoder, value)
+            is PreviewChat -> PreviewChatSerializer.serialize(encoder, value)
+            is ExtendedBot -> ExtendedBot.serializer().serialize(encoder, value)
+        }
+    }
+}
+
+@RiskFeature
+object PreviewChatSerializer : KSerializer<PreviewChat> {
+    @OptIn(InternalSerializationApi::class)
+    override val descriptor: SerialDescriptor = buildSerialDescriptor("PreviewChatSerializer", PolymorphicKind.OPEN)
+
+    override fun deserialize(decoder: Decoder): PreviewChat {
+        val decodedJson = JsonObject.serializer().deserialize(decoder)
+
         val type = decodedJson[typeField] ?.jsonPrimitive ?.content ?.asChatType ?: error("Field $typeField must be presented, but absent in $decodedJson")
         val isForum = decodedJson[isForumField] ?.jsonPrimitive ?.booleanOrNull == true
 
@@ -76,16 +117,14 @@ object PreviewChatSerializer : KSerializer<Chat> {
         }
     }
 
-    override fun serialize(encoder: Encoder, value: Chat) {
+    override fun serialize(encoder: Encoder, value: PreviewChat) {
         when (value) {
-            is ExtendedChat -> ExtendedChatSerializer.serialize(encoder, value)
             is PrivateChatImpl -> PrivateChatImpl.serializer().serialize(encoder, value)
             is GroupChatImpl -> GroupChatImpl.serializer().serialize(encoder, value)
             is SupergroupChatImpl -> SupergroupChatImpl.serializer().serialize(encoder, value)
             is ForumChatImpl -> ForumChatImpl.serializer().serialize(encoder, value)
             is ChannelChatImpl -> ChannelChatImpl.serializer().serialize(encoder, value)
             is CommonBot -> CommonBot.serializer().serialize(encoder, value)
-            is ExtendedBot -> ExtendedBot.serializer().serialize(encoder, value)
             is CommonUser -> CommonUser.serializer().serialize(encoder, value)
             is UnknownChatType -> JsonObject.serializer().serialize(encoder, value.rawJson)
         }
@@ -128,6 +167,7 @@ sealed class ExtendedChatSerializer : KSerializer<ExtendedChat> {
             is ExtendedSupergroupChatImpl -> ExtendedSupergroupChatImpl.serializer().serialize(encoder, value)
             is ExtendedForumChatImpl -> ExtendedForumChatImpl.serializer().serialize(encoder, value)
             is ExtendedChannelChatImpl -> ExtendedChannelChatImpl.serializer().serialize(encoder, value)
+            is ExtendedBot -> ExtendedBot.serializer().serialize(encoder, value)
             is UnknownExtendedChat -> JsonObject.serializer().serialize(encoder, value.rawJson)
         }
     }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Extended.kt

@@ -3,11 +3,14 @@ package dev.inmo.tgbotapi.types.chat
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
+import dev.inmo.tgbotapi.utils.RiskFeature
+import korlibs.time.DateTime
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ExtendedChannelChat due")
 data class ExtendedChannelChatImpl(
     @SerialName(idField)
     override val id: ChatId,
@@ -33,6 +36,7 @@ data class ExtendedChannelChatImpl(
 ) : ExtendedChannelChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ExtendedGroupChat due")
 data class ExtendedGroupChatImpl(
     @SerialName(idField)
     override val id: ChatId,
@@ -54,6 +58,7 @@ data class ExtendedGroupChatImpl(
 ) : ExtendedGroupChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ExtendedPrivateChat due")
 data class ExtendedPrivateChatImpl(
     @SerialName(idField)
     override val id: UserId,
@@ -74,12 +79,15 @@ data class ExtendedPrivateChatImpl(
     @SerialName(hasRestrictedVoiceAndVideoMessagesField)
     override val hasRestrictedVoiceAndVideoMessages: Boolean = false,
     @SerialName(emojiStatusCustomEmojiIdField)
-    override val statusEmojiId: CustomEmojiId? = null
+    override val statusEmojiId: CustomEmojiId? = null,
+    @SerialName(emojiStatusExpirationDateField)
+    override val statusEmojiExpiration: TelegramDate? = null
 ) : ExtendedPrivateChat
 
 typealias ExtendedUser = ExtendedPrivateChatImpl
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ExtendedSupergroupChat due")
 data class ExtendedSupergroupChatImpl(
     @SerialName(idField)
     override val id: ChatId,
@@ -121,6 +129,7 @@ data class ExtendedSupergroupChatImpl(
 ) : ExtendedSupergroupChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ExtendedForumChat due")
 data class ExtendedForumChatImpl(
     @SerialName(idField)
     override val id: IdChatIdentifier,
@@ -164,19 +173,21 @@ data class ExtendedForumChatImpl(
 @Serializable
 data class ExtendedBot(
     override val id: UserId,
-    @SerialName(usernameField)
-    override val username: Username,
     @SerialName(firstNameField)
     override val firstName: String,
     @SerialName(lastNameField)
     override val lastName: String = "",
+    @SerialName(usernameField)
+    override val username: Username? = null,
     @SerialName(canJoinGroupsField)
     val canJoinGroups: Boolean = false,
     @SerialName(canReadAllGroupMessagesField)
     val canReadAllGroupMessages: Boolean = false,
     @SerialName(supportInlineQueriesField)
-    val supportsInlineQueries: Boolean = false
+    val supportsInlineQueries: Boolean = false,
-) : Bot() {
+    @SerialName(photoField)
+    override val chatPhoto: ChatPhoto? = null
+) : Bot(), ExtendedChat {
     @SerialName(isBotField)
     private val isBot = true
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/ExtendedAbstracts.kt

@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.types.chat
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializeOnlySerializer
+import korlibs.time.DateTime
 import kotlinx.serialization.Serializable
 
 @Serializable(ExtendedChatSerializer.Companion::class)
@@ -21,6 +22,7 @@ sealed interface ExtendedPrivateChat : PrivateChat, ExtendedChatWithUsername {
     val hasPrivateForwards: Boolean
     val hasRestrictedVoiceAndVideoMessages: Boolean
     val statusEmojiId: CustomEmojiId?
+    val statusEmojiExpiration: TelegramDate?
 
     val allowCreateUserIdLink: Boolean
         get() = hasPrivateForwards

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt

@@ -4,18 +4,21 @@ import dev.inmo.micro_utils.language_codes.IetfLanguageCode
 import dev.inmo.micro_utils.language_codes.IetfLanguageCodeSerializer
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.abstracts.WithOptionalLanguageCode
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use GroupChat due")
 data class GroupChatImpl(
     @SerialName(idField)
     override val id: ChatId,
     @SerialName(titleField)
     override val title: String
-) : GroupChat
+) : PreviewGroupChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use PrivateChat due")
 data class PrivateChatImpl(
     @SerialName(idField)
     override val id: UserId,
@@ -25,9 +28,10 @@ data class PrivateChatImpl(
     override val firstName: String = "",
     @SerialName(lastNameField)
     override val lastName: String = ""
-) : PrivateChat
+) : PreviewPrivateChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use SupergroupChat due")
 data class SupergroupChatImpl(
     @SerialName(idField)
     override val id: ChatId,
@@ -35,9 +39,10 @@ data class SupergroupChatImpl(
     override val title: String,
     @SerialName(usernameField)
     override val username: Username? = null
-) : SupergroupChat
+) : PreviewSupergroupChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ForumChat due")
 data class ForumChatImpl(
     @SerialName(idField)
     override val id: IdChatIdentifier,
@@ -45,9 +50,10 @@ data class ForumChatImpl(
     override val title: String,
     @SerialName(usernameField)
     override val username: Username? = null
-) : ForumChat
+) : PreviewForumChat
 
 @Serializable
+@RiskFeature("This class is a subject of changes. It is better to use ChannelChat due")
 data class ChannelChatImpl(
     @SerialName(idField)
     override val id: ChatId,
@@ -55,26 +61,30 @@ data class ChannelChatImpl(
     override val title: String,
     @SerialName(usernameField)
     override val username: Username? = null
-) : ChannelChat
+) : PreviewChannelChat
 
 @Serializable(UserSerializer::class)
 sealed class User : PrivateChat
 
 @Serializable(UserSerializer::class)
-sealed class Bot : User() {
+sealed class PreviewUser : PreviewPrivateChat, User()
-    abstract override val username: Username
+
-}
+@Serializable(UserSerializer::class)
+sealed class Bot : User()
+
+@Serializable(UserSerializer::class)
+sealed class PreviewBot : PreviewUser()
 
 @Serializable
 data class CommonBot(
     override val id: UserId,
-    @SerialName(usernameField)
-    override val username: Username,
     @SerialName(firstNameField)
     override val firstName: String,
     @SerialName(lastNameField)
-    override val lastName: String = ""
+    override val lastName: String = "",
-) : Bot() {
+    @SerialName(usernameField)
+    override val username: Username? = null,
+) : PreviewBot() {
     @SerialName(isBotField)
     private val isBot = true
 }
@@ -95,7 +105,7 @@ data class CommonUser(
     override val isPremium: Boolean = false,
     @SerialName(addedToAttachmentMenuField)
     override val addedToAttachmentMenu: Boolean = false
-) : User(), WithOptionalLanguageCode, PossiblyPremiumChat, AbleToAddInAttachmentMenuChat {
+) : PreviewUser(), WithOptionalLanguageCode, PossiblyPremiumChat, AbleToAddInAttachmentMenuChat {
     constructor(
         id: UserId,
         firstName: String,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/PreviewAbstracts.kt

@@ -0,0 +1,30 @@
+package dev.inmo.tgbotapi.types.chat
+
+import kotlinx.serialization.Serializable
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewChat : Chat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewUsernameChat : PreviewChat, UsernameChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewPrivateChat : PreviewUsernameChat, PrivateChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewPublicChat : PreviewChat, PublicChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewSuperPublicChat : PreviewPublicChat, PreviewUsernameChat, SuperPublicChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewChannelChat : PreviewSuperPublicChat, ChannelChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewGroupChat : PreviewPublicChat, GroupChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewSupergroupChat : PreviewGroupChat, PreviewSuperPublicChat, SupergroupChat
+
+@Serializable(PreviewChatSerializer::class)
+sealed interface PreviewForumChat : PreviewSupergroupChat, ForumChat

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/UnknownChatType.kt

@@ -7,4 +7,4 @@ data class UnknownChatType(
     override val id: IdChatIdentifier,
     val raw: String,
     val rawJson: JsonObject
-) : Chat
+) : Chat, PreviewChat

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/AdministratorChatMemberImpl.kt

@@ -35,9 +35,15 @@ data class AdministratorChatMemberImpl(
     @SerialName(customTitleField)
     override val customTitle: String? = null,
     @SerialName(canManageTopicsField)
-    override val canManageTopics: Boolean = false
+    override val canManageTopics: Boolean = false,
+    @SerialName(canPostStoriesField)
+    override val canPostStories: Boolean = false,
+    @SerialName(canEditStoriesField)
+    override val canEditStories: Boolean = false,
+    @SerialName(canDeleteStoriesField)
+    override val canDeleteStories: Boolean = false
 ) : AdministratorChatMember {
     @SerialName(statusField)
     @Required
-    private val type: String = "administrator"
+    override val status: ChatMember.Status = ChatMember.Status.Administrator
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatAdministratorRights.kt

@@ -16,4 +16,43 @@ sealed interface ChatAdministratorRights : SpecialChatAdministratorRights {
     val canPromoteMembers: Boolean
     val canPostMessages: Boolean
     val canEditMessages: Boolean
+    val canPostStories: Boolean
+    val canEditStories: Boolean
+    val canDeleteStories: Boolean
+
+    companion object {
+        operator fun invoke(
+            canChangeInfo: Boolean = false,
+            canPostMessages: Boolean = false,
+            canEditMessages: Boolean = false,
+            canRemoveMessages: Boolean = false,
+            canInviteUsers: Boolean = false,
+            canRestrictMembers: Boolean = false,
+            canPinMessages: Boolean = false,
+            canPromoteMembers: Boolean = false,
+            canManageVideoChats: Boolean = false,
+            canManageChat: Boolean = false,
+            isAnonymous: Boolean = false,
+            canManageTopics: Boolean = false,
+            canPostStories: Boolean = false,
+            canEditStories: Boolean = false,
+            canDeleteStories: Boolean = false
+        ) = ChatCommonAdministratorRights(
+            canChangeInfo = canChangeInfo,
+            canPostMessages = canPostMessages,
+            canEditMessages = canEditMessages,
+            canRemoveMessages = canRemoveMessages,
+            canInviteUsers = canInviteUsers,
+            canRestrictMembers = canRestrictMembers,
+            canPinMessages = canPinMessages,
+            canPromoteMembers = canPromoteMembers,
+            canManageVideoChats = canManageVideoChats,
+            canManageChat = canManageChat,
+            isAnonymous = isAnonymous,
+            canManageTopics = canManageTopics,
+            canPostStories = canPostStories,
+            canEditStories = canEditStories,
+            canDeleteStories = canDeleteStories
+        )
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights.kt

@@ -5,7 +5,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ChatAdministratorRightsImpl(
+data class ChatCommonAdministratorRights(
     @SerialName(canChangeInfoField)
     override val canChangeInfo: Boolean = false,
     @SerialName(canPostMessagesField)
@@ -29,5 +29,20 @@ data class ChatAdministratorRightsImpl(
     @SerialName(isAnonymousField)
     override val isAnonymous: Boolean = false,
     @SerialName(canManageTopicsField)
-    override val canManageTopics: Boolean = false
+    override val canManageTopics: Boolean = false,
+    @SerialName(canPostStoriesField)
+    override val canPostStories: Boolean = false,
+    @SerialName(canEditStoriesField)
+    override val canEditStories: Boolean = false,
+    @SerialName(canDeleteStoriesField)
+    override val canDeleteStories: Boolean = false
 ) : ChatAdministratorRights
+
+@Deprecated(
+    "Renamed to ChatCommonAdministratorRights and will be removed soon",
+    ReplaceWith(
+        "ChatCommonAdministratorRights",
+        "dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights"
+    )
+)
+typealias ChatAdministratorRightsImpl = ChatCommonAdministratorRights

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMember.kt

@@ -4,8 +4,10 @@ import dev.inmo.tgbotapi.abstracts.WithUser
 import dev.inmo.tgbotapi.types.statusField
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
@@ -13,7 +15,38 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 
 @Serializable(ChatMemberSerializer::class)
-sealed interface ChatMember : WithUser
+sealed interface ChatMember : WithUser {
+    @Serializable(StatusSerializer::class)
+    enum class Status(
+        val status: String,
+        val deserializationStrategy: DeserializationStrategy<ChatMember>
+    ) {
+        Creator("creator", OwnerChatMember.serializer()),
+        Administrator("administrator", AdministratorChatMemberImpl.serializer()),
+        Member("member", MemberChatMemberImpl.serializer()),
+        Restricted("restricted", RestrictedChatMember.serializer()),
+        Left("left", LeftChatMemberImpl.serializer()),
+        Kicked("kicked", KickedChatMember.serializer())
+    }
+
+    object StatusSerializer : KSerializer<Status> {
+        override val descriptor: SerialDescriptor
+            get() = String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Status {
+            val status = decoder.decodeString()
+            return Status.values().first {
+                it.status == status
+            }
+        }
+
+        override fun serialize(encoder: Encoder, value: Status) {
+            encoder.encodeString(value.status)
+        }
+    }
+
+    val status: Status
+}
 
 @RiskFeature
 object ChatMemberSerializer : KSerializer<ChatMember> {
@@ -21,15 +54,14 @@ object ChatMemberSerializer : KSerializer<ChatMember> {
 
     override fun deserialize(decoder: Decoder): ChatMember {
         val json = JsonObject.serializer().deserialize(decoder)
-        return when (json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")) {
+        val status = json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")
-            "creator" -> nonstrictJsonFormat.decodeFromJsonElement(OwnerChatMember.serializer(), json)
+        return ChatMember.Status.values().firstNotNullOfOrNull {
-            "administrator" -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json)
+            if (it.status == status) {
-            "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMemberImpl.serializer(), json)
+                nonstrictJsonFormat.decodeFromJsonElement(it.deserializationStrategy, json)
-            "restricted" -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json)
+            } else {
-            "left" -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMemberImpl.serializer(), json)
+                null
-            "kicked" -> nonstrictJsonFormat.decodeFromJsonElement(KickedChatMember.serializer(), json)
+            }
-            else -> error("Unknown type of chat member in json: $json")
+        } ?: error("Unknown type of chat member in json: $json")
-        }
     }
 
     override fun serialize(encoder: Encoder, value: ChatMember) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated.kt

@@ -1,9 +1,10 @@
 package dev.inmo.tgbotapi.types.chat.member
 
-import dev.inmo.tgbotapi.abstracts.WithChat
+import dev.inmo.tgbotapi.abstracts.WithPreviewChat
 import dev.inmo.tgbotapi.abstracts.WithUser
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PreviewChat
 import dev.inmo.tgbotapi.types.chat.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -11,7 +12,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ChatMemberUpdated(
     @SerialName(chatField)
-    override val chat: Chat,
+    override val chat: PreviewChat,
     @SerialName(fromField)
     override val user: User,
     @SerialName(dateField)
@@ -24,4 +25,4 @@ data class ChatMemberUpdated(
     val inviteLink: ChatInviteLink? = null,
     @SerialName(viaChatFolderInviteLinkField)
     val viaChatFolderInviteLink: Boolean? = false
-) : WithChat, WithUser
+) : WithPreviewChat, WithUser

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/KickedChatMember.kt

@@ -13,5 +13,5 @@ data class KickedChatMember(
 ) : BannedChatMember {
     @SerialName(statusField)
     @Required
-    private val type: String = "kicked"
+    override val status: ChatMember.Status = ChatMember.Status.Kicked
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/LeftChatMemberImpl.kt

@@ -5,8 +5,11 @@ import dev.inmo.tgbotapi.types.chat.User
 import kotlinx.serialization.*
 
 @Serializable
-data class LeftChatMemberImpl(@SerialName(userField) override val user: User) : LeftChatMember {
+data class LeftChatMemberImpl(
+    @SerialName(userField)
+    override val user: User
+) : LeftChatMember {
     @SerialName(statusField)
     @Required
-    private val type: String = "left"
+    override val status: ChatMember.Status = ChatMember.Status.Left
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/MemberChatMemberImpl.kt

@@ -5,8 +5,11 @@ import dev.inmo.tgbotapi.types.chat.User
 import kotlinx.serialization.*
 
 @Serializable
-data class MemberChatMemberImpl(@SerialName(userField) override val user: User) : MemberChatMember {
+data class MemberChatMemberImpl(
+    @SerialName(userField)
+    override val user: User
+) : MemberChatMember {
     @SerialName(statusField)
     @Required
-    private val type: String = "member"
+    override val status: ChatMember.Status = ChatMember.Status.Member
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/OwnerChatMember.kt

@@ -36,7 +36,14 @@ data class OwnerChatMember(
     override val canManageChat: Boolean = true
     @Transient
     override val canManageTopics: Boolean = true
+    @Transient
+    override val canPostStories: Boolean = true
+    @Transient
+    override val canEditStories: Boolean = true
+    @Transient
+    override val canDeleteStories: Boolean = true
+
     @SerialName(statusField)
     @Required
-    private val type: String = "creator"
+    override val status: ChatMember.Status = ChatMember.Status.Creator
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/member/RestrictedChatMember.kt

@@ -44,5 +44,5 @@ data class RestrictedChatMember(
 ) : BannedChatMember, SpecialRightsChatMember, ChatPermissions {
     @SerialName(statusField)
     @Required
-    private val type: String = "restricted"
+    override val status: ChatMember.Status = ChatMember.Status.Restricted
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelContentMessageImpl.kt

@@ -5,12 +5,13 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.ChannelChat
 import dev.inmo.tgbotapi.types.chat.CommonBot
+import dev.inmo.tgbotapi.types.chat.PreviewChannelChat
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 data class ChannelContentMessageImpl<T: MessageContent>(
     override val messageId: MessageId,
-    override val chat: ChannelChat,
+    override val chat: PreviewChannelChat,
     override val content: T,
     override val date: DateTime,
     override val editDate: DateTime?,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelEventMessage.kt

@@ -3,12 +3,13 @@ package dev.inmo.tgbotapi.types.message
 import korlibs.time.DateTime
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.ChannelChat
+import dev.inmo.tgbotapi.types.chat.PreviewChannelChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
 data class ChannelEventMessage<T : ChannelEvent>(
     override val messageId: MessageId,
-    override val chat: ChannelChat,
+    override val chat: PreviewChannelChat,
     override val chatEvent: T,
     override val date: DateTime
 ) : ChatEventMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/forum/WriteAccessAllowed.kt

@@ -1,12 +1,75 @@
 package dev.inmo.tgbotapi.types.message.ChatEvents.forum
 
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChatEvent
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ForumEvent
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.PrivateEvent
 import dev.inmo.tgbotapi.types.webAppNameField
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-@Serializable
+@Serializable(WriteAccessAllowed.Companion::class)
-data class WriteAccessAllowed(
+sealed interface WriteAccessAllowed : PrivateEvent, ForumEvent {
-    @SerialName(webAppNameField)
+    val webAppName: String?
-    val webAppName: String? = null
+        get() = null
-) : ForumEvent
+    val fromRequest: Boolean
+        get() = false
+    val fromAttachmentMenu: Boolean
+        get() = false
+
+    @Serializable
+    object Other : WriteAccessAllowed
+    @Serializable
+    data class FromWebAppLink(
+        override val webAppName: String
+    ) : WriteAccessAllowed
+    @Serializable
+    object FromRequest : WriteAccessAllowed {
+        override val fromRequest: Boolean
+            get() = true
+    }
+
+    @Serializable
+    object FromAttachmentMenu : WriteAccessAllowed {
+        override val fromAttachmentMenu: Boolean
+            get() = true
+    }
+
+    @Serializable
+    private class WriteAccessAllowedRaw(
+        val web_app_name: String? = null,
+        val from_request: Boolean = false,
+        val from_attachment_menu: Boolean = false
+    )
+
+    companion object : KSerializer<WriteAccessAllowed> {
+        override val descriptor: SerialDescriptor
+            get() = WriteAccessAllowedRaw.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): WriteAccessAllowed {
+            val raw = WriteAccessAllowedRaw.serializer().deserialize(decoder)
+
+            return when {
+                raw.web_app_name != null -> FromWebAppLink(raw.web_app_name)
+                raw.from_request -> FromRequest
+                raw.from_attachment_menu -> Other
+                else -> Other
+            }
+        }
+
+        override fun serialize(encoder: Encoder, value: WriteAccessAllowed) {
+            val raw = when (value) {
+                FromAttachmentMenu -> WriteAccessAllowedRaw(from_attachment_menu = true)
+                FromRequest -> WriteAccessAllowedRaw(from_request = true)
+                Other -> WriteAccessAllowedRaw()
+                is FromWebAppLink -> WriteAccessAllowedRaw(web_app_name = value.webAppName)
+            }
+            WriteAccessAllowedRaw.serializer().serialize(encoder, raw)
+        }
+
+        operator fun invoke(webAppName: String?): WriteAccessAllowed = webAppName ?.let(::FromWebAppLink) ?: Other
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonGroupEventMessage.kt

@@ -4,13 +4,14 @@ import korlibs.time.DateTime
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.chat.GroupChat
+import dev.inmo.tgbotapi.types.chat.PreviewGroupChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
 
 data class CommonGroupEventMessage<T : GroupEvent>(
     override val messageId: MessageId,
     override val from: User,
-    override val chat: GroupChat,
+    override val chat: PreviewGroupChat,
     override val chatEvent: T,
     override val date: DateTime
 ) : GroupEventMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/CommonSupergroupEventMessage.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.message
 
 import korlibs.time.DateTime
 import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.chat.PreviewSupergroupChat
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.chat.SupergroupChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
@@ -10,7 +11,7 @@ import dev.inmo.tgbotapi.types.message.abstracts.SupergroupEventMessage
 data class CommonSupergroupEventMessage<T : SupergroupEvent>(
     override val messageId: MessageId,
     override val from: User,
-    override val chat: SupergroupChat,
+    override val chat: PreviewSupergroupChat,
     override val chatEvent: T,
     override val date: DateTime
 ) : SupergroupEventMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/GroupMessages.kt

@@ -10,8 +10,8 @@ import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 data class ConnectedFromChannelGroupContentMessageImpl<T : MessageContent>(
-    override val chat: GroupChat,
+    override val chat: PreviewGroupChat,
-    override val channel: ChannelChat,
+    override val channel: PreviewChannelChat,
     override val messageId: MessageId,
     override val date: DateTime,
     override val forwardInfo: ForwardInfo?,
@@ -26,8 +26,8 @@ data class ConnectedFromChannelGroupContentMessageImpl<T : MessageContent>(
 ) : ConnectedFromChannelGroupContentMessage<T>
 
 data class UnconnectedFromChannelGroupContentMessageImpl<T: MessageContent>(
-    override val chat: GroupChat,
+    override val chat: PreviewGroupChat,
-    override val channel: ChannelChat,
+    override val channel: PreviewChannelChat,
     override val messageId: MessageId,
     override val date: DateTime,
     override val forwardInfo: ForwardInfo?,
@@ -42,7 +42,7 @@ data class UnconnectedFromChannelGroupContentMessageImpl<T: MessageContent>(
 ) : UnconnectedFromChannelGroupContentMessage<T>
 
 data class AnonymousGroupContentMessageImpl<T : MessageContent>(
-    override val chat: GroupChat,
+    override val chat: PreviewGroupChat,
     override val messageId: MessageId,
     override val date: DateTime,
     override val forwardInfo: ForwardInfo?,
@@ -57,7 +57,7 @@ data class AnonymousGroupContentMessageImpl<T : MessageContent>(
 ) : AnonymousGroupContentMessage<T>
 
 data class CommonGroupContentMessageImpl<T : MessageContent>(
-    override val chat: GroupChat,
+    override val chat: PreviewGroupChat,
     override val messageId: MessageId,
     override val from: User,
     override val date: DateTime,
@@ -72,8 +72,8 @@ data class CommonGroupContentMessageImpl<T : MessageContent>(
 ) : CommonGroupContentMessage<T>
 
 data class FromChannelForumContentMessageImpl<T: MessageContent>(
-    override val chat: ForumChat,
+    override val chat: PreviewForumChat,
-    override val channel: ChannelChat,
+    override val channel: PreviewChannelChat,
     override val messageId: MessageId,
     override val threadId: MessageThreadId,
     override val date: DateTime,
@@ -89,7 +89,7 @@ data class FromChannelForumContentMessageImpl<T: MessageContent>(
 ) : FromChannelForumContentMessage<T>
 
 data class AnonymousForumContentMessageImpl<T : MessageContent>(
-    override val chat: ForumChat,
+    override val chat: PreviewForumChat,
     override val messageId: MessageId,
     override val threadId: MessageThreadId,
     override val date: DateTime,
@@ -105,7 +105,7 @@ data class AnonymousForumContentMessageImpl<T : MessageContent>(
 ) : AnonymousForumContentMessage<T>
 
 data class CommonForumContentMessageImpl<T : MessageContent>(
-    override val chat: ForumChat,
+    override val chat: PreviewForumChat,
     override val messageId: MessageId,
     override val threadId: MessageThreadId,
     override val from: User,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PassportMessage.kt

@@ -4,13 +4,14 @@ import korlibs.time.DateTime
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PreviewChat
 import dev.inmo.tgbotapi.types.message.abstracts.FromUserMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.passport.PassportData
 
 data class PassportMessage(
     override val messageId: MessageId,
-    override val chat: Chat,
+    override val chat: PreviewChat,
     override val from: User,
     override val date: DateTime,
     val passportData: PassportData

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateContentMessageImpl.kt

@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.types.message.content.MessageContent
 data class PrivateContentMessageImpl<T: MessageContent>(
     override val messageId: MessageId,
     override val from: User,
-    override val chat: Chat,
+    override val chat: PreviewPrivateChat,
     override val content: T,
     override val date: DateTime,
     override val editDate: DateTime?,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateEventMessage.kt

@@ -2,13 +2,14 @@ package dev.inmo.tgbotapi.types.message
 
 import korlibs.time.DateTime
 import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.chat.PreviewPrivateChat
 import dev.inmo.tgbotapi.types.chat.PrivateChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.PrivateEvent
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
 data class PrivateEventMessage<T : PrivateEvent>(
     override val messageId: MessageId,
-    override val chat: PrivateChat,
+    override val chat: PreviewPrivateChat,
     override val chatEvent: T,
     override val date: DateTime
 ) : ChatEventMessage<T>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt

@@ -31,6 +31,7 @@ import dev.inmo.tgbotapi.types.payments.SuccessfulPayment
 import dev.inmo.tgbotapi.types.polls.Poll
 import dev.inmo.tgbotapi.types.request.ChatShared
 import dev.inmo.tgbotapi.types.request.UserShared
+import dev.inmo.tgbotapi.types.stories.Story
 import dev.inmo.tgbotapi.types.venue.Venue
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -42,11 +43,11 @@ internal data class RawMessage(
     @SerialName(messageIdField)
     val messageId: MessageId,
     val date: TelegramDate,
-    private val chat: Chat,
+    private val chat: PreviewChat,
     @SerialName(messageThreadIdField)
     private val messageThreadId: MessageThreadId? = null,
     private val from: User? = null,
-    private val sender_chat: PublicChat? = null,
+    private val sender_chat: PreviewPublicChat? = null,
     private val forward_from: User? = null,
     private val forward_from_chat: Chat? = null,
     private val forward_from_message_id: MessageId? = null,
@@ -65,6 +66,7 @@ internal data class RawMessage(
     private val caption: String? = null,
     private val caption_entities: RawMessageEntities? = null,
     private val has_media_spoiler: Boolean? = null,
+    private val story: Story? = null,
     private val audio: AudioFile? = null,
     private val document: DocumentFile? = null,
     private val animation: AnimationFile? = null,
@@ -134,6 +136,11 @@ internal data class RawMessage(
         } ?: emptyList()
 
         when {
+            story != null -> StoryContent(
+                chat,
+                messageId,
+                story
+            )
             text != null -> TextContent(text, (entities ?: emptyList()).asTextSources(text))
             audio != null -> AudioContent(
                 audio,
@@ -267,27 +274,27 @@ internal data class RawMessage(
         try {
             chatEvent?.let { chatEvent ->
                 when (chat) {
-                    is SupergroupChat -> CommonSupergroupEventMessage(
+                    is PreviewSupergroupChat -> CommonSupergroupEventMessage(
                         messageId,
                         from ?: error("Supergroup events are expected to contain 'from' field"),
                         chat,
                         chatEvent as? SupergroupEvent ?: throwWrongChatEvent(SupergroupEvent::class, chatEvent),
                         date.asDate
                     )
-                    is GroupChat -> CommonGroupEventMessage(
+                    is PreviewGroupChat -> CommonGroupEventMessage(
                         messageId,
                         from ?: error("Supergroup events are expected to contain 'from' field"),
                         chat,
                         chatEvent as? GroupEvent ?: throwWrongChatEvent(GroupChat::class, chatEvent),
                         date.asDate
                     )
-                    is ChannelChat -> ChannelEventMessage(
+                    is PreviewChannelChat -> ChannelEventMessage(
                         messageId,
                         chat,
                         chatEvent as? ChannelEvent ?: throwWrongChatEvent(ChannelEvent::class, chatEvent),
                         date.asDate
                     )
-                    is PrivateChat -> PrivateEventMessage(
+                    is PreviewPrivateChat -> PrivateEventMessage(
                         messageId,
                         chat,
                         chatEvent as? PrivateEvent ?: throwWrongChatEvent(PrivateEvent::class, chatEvent),
@@ -296,8 +303,8 @@ internal data class RawMessage(
                     else -> error("Expected one of the public chats, but was $chat (in extracting of chat event message)")
                 }
             } ?: content?.let { content -> when (chat) {
-                    is PublicChat -> when (chat) {
+                    is PreviewPublicChat -> when (chat) {
-                        is ChannelChat -> ChannelContentMessageImpl(
+                        is PreviewChannelChat -> ChannelContentMessageImpl(
                             messageId,
                             chat,
                             content,
@@ -311,17 +318,16 @@ internal data class RawMessage(
                             author_signature,
                             media_group_id
                         )
-                        is ForumChat -> if (messageThreadId != null) {
+                        is PreviewForumChat -> if (messageThreadId != null) {
                             val chatId = ChatIdWithThreadId(
                                 chat.id.chatId,
                                 messageThreadId
                             )
                             val actualForumChat = when (chat) {
-                                is ExtendedForumChatImpl -> chat.copy(id = chatId)
                                 is ForumChatImpl -> chat.copy(id = chatId)
                             }
                             when (sender_chat) {
-                                is ChannelChat -> FromChannelForumContentMessageImpl(
+                                is PreviewChannelChat -> FromChannelForumContentMessageImpl(
                                     actualForumChat,
                                     sender_chat,
                                     messageId,
@@ -337,7 +343,7 @@ internal data class RawMessage(
                                     author_signature,
                                     media_group_id
                                 )
-                                is GroupChat -> AnonymousForumContentMessageImpl(
+                                is PreviewGroupChat -> AnonymousForumContentMessageImpl(
                                     actualForumChat,
                                     messageId,
                                     messageThreadId,
@@ -370,7 +376,7 @@ internal data class RawMessage(
                             }
                         } else {
                             when (sender_chat) {
-                                is ChannelChat -> if (is_automatic_forward == true) {
+                                is PreviewChannelChat -> if (is_automatic_forward == true) {
                                     ConnectedFromChannelGroupContentMessageImpl(
                                         chat,
                                         sender_chat,
@@ -433,8 +439,8 @@ internal data class RawMessage(
                                 )
                             }
                         }
-                        is GroupChat -> when (sender_chat) {
+                        is PreviewGroupChat -> when (sender_chat) {
-                            is ChannelChat -> if (is_automatic_forward == true) {
+                            is PreviewChannelChat -> if (is_automatic_forward == true) {
                                 ConnectedFromChannelGroupContentMessageImpl(
                                     chat,
                                     sender_chat,
@@ -467,7 +473,7 @@ internal data class RawMessage(
                                     media_group_id
                                 )
                             }
-                            is GroupChat -> AnonymousGroupContentMessageImpl(
+                            is PreviewGroupChat -> AnonymousGroupContentMessageImpl(
                                 chat,
                                 messageId,
                                 date.asDate,
@@ -497,7 +503,7 @@ internal data class RawMessage(
                             )
                         }
                     }
-                    is PrivateChat -> PrivateContentMessageImpl(
+                    is PreviewPrivateChat -> PrivateContentMessageImpl(
                         messageId,
                         from ?: error("Was detected common message, but owner (sender) of the message was not found"),
                         chat,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessageEntity.kt

@@ -18,6 +18,30 @@ internal data class RawMessageEntity(
     internal val range by lazy {
         offset until (offset + length)
     }
+
+    val priority by lazy {
+        when (type) {
+            // Types with potential subsources should have priority
+            "mention" -> 0
+            "hashtag" -> 0
+            "cashtag" -> 0
+            "email" -> 0
+            "phone_number" -> 0
+            "bold" -> 0
+            "italic" -> 0
+            "text_mention" -> 0
+            "strikethrough" -> 0
+            "underline" -> 0
+            "spoiler" -> 0
+            "custom_emoji" -> 0
+            "bot_command" -> 1
+            "url" -> 1
+            "code" -> 1
+            "pre" -> 1
+            "text_link" -> 1
+            else -> 1
+        }
+    }
 }
 
 internal fun RawMessageEntity.asTextSource(
@@ -85,7 +109,10 @@ private fun createTextSources(
     originalFullString: String,
     entities: RawMessageEntities
 ): List<Pair<Int, TextSource>> {
-    val mutableEntities = entities.toMutableList().apply { sortBy { it.offset } }
+    val mutableEntities = entities.toMutableList().apply {
+        sortBy { it.priority } // sorting to fix potential issues in source sorting of entities
+        sortBy { it.offset }
+    }
     val resultList = mutableListOf<Pair<Int, TextSource>>()
 
     while (mutableEntities.isNotEmpty()) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/ChannelContentMessage.kt

@@ -1,10 +1,11 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.chat.ChannelChat
+import dev.inmo.tgbotapi.types.chat.PreviewChannelChat
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 interface ChannelContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, SignedMessage, WithSenderChatMessage {
-    override val chat: ChannelChat
+    override val chat: PreviewChannelChat
-    override val senderChat: ChannelChat
+    override val senderChat: PreviewChannelChat
         get() = chat
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt

@@ -1,5 +1,9 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.types.chat.PreviewChat
+import dev.inmo.tgbotapi.types.chat.PreviewGroupChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 
-interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserMessage
+interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserMessage {
+    override val chat: PreviewGroupChat
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupMessages.kt

@@ -1,24 +1,22 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.MessageThreadId
-import dev.inmo.tgbotapi.types.chat.ChannelChat
+import dev.inmo.tgbotapi.types.chat.*
-import dev.inmo.tgbotapi.types.chat.ForumChat
-import dev.inmo.tgbotapi.types.chat.GroupChat
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 sealed interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
-    override val chat: GroupChat
+    override val chat: PreviewGroupChat
 }
 
 sealed interface ForumContentMessage<T : MessageContent> : GroupContentMessage<T>, PossiblyTopicMessage {
-    override val chat: ForumChat
+    override val chat: PreviewForumChat
     override val threadId: MessageThreadId
 }
 
 
 sealed interface FromChannelGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
-    val channel: ChannelChat
+    val channel: PreviewChannelChat
-    override val senderChat: ChannelChat
+    override val senderChat: PreviewChannelChat
         get() = channel
 }
 
@@ -26,7 +24,7 @@ interface ConnectedFromChannelGroupContentMessage<T: MessageContent> : FromChann
 interface UnconnectedFromChannelGroupContentMessage<T: MessageContent> : FromChannelGroupContentMessage<T>
 
 interface AnonymousGroupContentMessage<T : MessageContent> : GroupContentMessage<T>, SignedMessage, WithSenderChatMessage {
-    override val senderChat: GroupChat
+    override val senderChat: PreviewGroupChat
         get() = chat
 }
 
@@ -35,7 +33,7 @@ interface CommonGroupContentMessage<T : MessageContent> : GroupContentMessage<T>
 interface FromChannelForumContentMessage<T: MessageContent> : FromChannelGroupContentMessage<T>, ForumContentMessage<T>
 
 interface AnonymousForumContentMessage<T : MessageContent> : ForumContentMessage<T>, SignedMessage, WithSenderChatMessage {
-    override val senderChat: GroupChat
+    override val senderChat: PreviewGroupChat
         get() = chat
 }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/Message.kt

@@ -1,25 +1,26 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
 import korlibs.time.DateTime
-import dev.inmo.tgbotapi.abstracts.WithChat
+import dev.inmo.tgbotapi.abstracts.WithPreviewChat
 import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PreviewChat
 import dev.inmo.tgbotapi.types.message.RawMessage
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
-@ClassCastsIncluded
+@ClassCastsIncluded(excludeRegex = ".*Impl")
-interface Message : WithChat {
+interface Message : WithPreviewChat {
     val messageId: MessageId
     val date: DateTime
 }
 
 data class UnknownMessageType(
     override val messageId: MessageId,
-    override val chat: Chat,
+    override val chat: PreviewChat,
     override val date: DateTime,
     val insideException: Exception
 ) : Message

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PrivateMessage.kt

@@ -1,5 +1,9 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.types.chat.PreviewChat
+import dev.inmo.tgbotapi.types.chat.PreviewPrivateChat
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
-interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage
+interface PrivateContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T>, FromUserMessage {
+    override val chat: PreviewPrivateChat
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/PublicMessage.kt

@@ -1,8 +1,9 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.types.chat.PreviewPublicChat
 import dev.inmo.tgbotapi.types.chat.PublicChat
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 sealed interface PublicContentMessage<T: MessageContent> : PossiblySentViaBotCommonMessage<T> {
-    override val chat: PublicChat
+    override val chat: PreviewPublicChat
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt

@@ -1,5 +1,9 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.types.chat.PreviewGroupChat
+import dev.inmo.tgbotapi.types.chat.PreviewSupergroupChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
 
-interface SupergroupEventMessage<T : SupergroupEvent> : GroupEventMessage<T>
+interface SupergroupEventMessage<T : SupergroupEvent> : GroupEventMessage<T> {
+    override val chat: PreviewSupergroupChat
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/WithSenderChatMessage.kt

@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PreviewChat
 
 interface WithSenderChatMessage {
-    val senderChat: Chat
+    val senderChat: PreviewChat
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Abstracts.kt

@@ -13,8 +13,10 @@ import dev.inmo.tgbotapi.types.media.TelegramMedia
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.threadId
 import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.modules.*
 
+@Serializable
 sealed interface MessageContent: ResendableContent {
     companion object {
         @RiskFeature("This serialization module can be changed in near releases")
@@ -49,6 +51,7 @@ sealed interface MessageContent: ResendableContent {
                 subclass(AnimationContent::class)
                 subclass(StickerContent::class)
                 subclass(InvoiceContent::class)
+                subclass(StoryContent::class)
 
                 additionalBuilder()
             }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt

@@ -58,7 +58,6 @@ sealed interface LocationContent : MessageContent {
 /**
  * [KSerializer] for [LocationContent]
  */
-@Serializer(LocationContent::class)
 object LocationContentSerializer : KSerializer<LocationContent> {
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("LocationContent") {
         element(LocationContent::location.name, LocationSerializer.descriptor)
@@ -85,7 +84,6 @@ object LocationContentSerializer : KSerializer<LocationContent> {
             encodeSerializableElement(descriptor, 0, LocationSerializer, value.location)
         }.endStructure(descriptor)
     }
-
 }
 
 /**
@@ -94,7 +92,7 @@ object LocationContentSerializer : KSerializer<LocationContent> {
  *
  * @see dev.inmo.tgbotapi.extensions.behaviour_builder.utils.followLocation
  */
-@Serializable(LocationContentSerializer::class)
+@Serializable
 data class LiveLocationContent(
     override val location: LiveLocation
 ) : LocationContent {
@@ -127,7 +125,7 @@ data class LiveLocationContent(
  * Just a [LocationContent] with [StaticLocation] [location]. It could be [LiveLocationContent] in previous time in case
  * when somebody has sent [LiveLocation] in chat and then stop to broadcast location
  */
-@Serializable(LocationContentSerializer::class)
+@Serializable
 data class StaticLocationContent(
     override val location: StaticLocation
 ) : LocationContent {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StoryContent.kt

@@ -0,0 +1,40 @@
+package dev.inmo.tgbotapi.types.message.content
+
+import dev.inmo.tgbotapi.requests.ForwardMessage
+import dev.inmo.tgbotapi.requests.abstracts.Request
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.MessageId
+import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage
+import dev.inmo.tgbotapi.types.stories.Story
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StoryContent(
+    private val chat: Chat,
+    private val messageId: MessageId,
+    val story: Story
+) : MessageContent {
+    override fun createResend(
+        chatId: ChatIdentifier,
+        messageThreadId: MessageThreadId?,
+        disableNotification: Boolean,
+        protectContent: Boolean,
+        replyToMessageId: MessageId?,
+        allowSendingWithoutReply: Boolean?,
+        replyMarkup: KeyboardMarkup?
+    ): Request<PossiblyForwardedMessage> {
+        return ForwardMessage(
+            chat.id,
+            toChatId = chatId,
+            messageId = messageId,
+            threadId = messageThreadId,
+            disableNotification = disableNotification,
+            protectContent = protectContent
+        )
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Typealiases.kt

@@ -11,6 +11,7 @@ typealias DiceMessage = CommonMessage<DiceContent>
 typealias ContactMessage = CommonMessage<ContactContent>
 typealias PollMessage = CommonMessage<PollContent>
 typealias TextMessage = CommonMessage<TextContent>
+typealias StoryMessage = CommonMessage<StoryContent>
 
 typealias LocationMessage = CommonMessage<LocationContent>
 typealias LiveLocationMessage = CommonMessage<LiveLocationContent>