fix of #546

CHANGELOG.md

@@ -1,5 +1,20 @@
 # TelegramBotAPI changelog
 
+## 1.0.0
+
+__This update contains including of [Telegram Bot API 6.0](https://core.telegram.org/bots/api-changelog#april-16-2022)__
+
+__All the `tgbotapi.extensions.*` packages have been removed__
+
+* `Core`:
+    * Constructor of `UnknownInlineKeyboardButton` is not internal and can be created with any `json` ([#563](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/563))
+    * All the interfaces from `dev.inmo.tgbotapi.types.files.abstracts` have been replaced to `dev.inmo.tgbotapi.types.files` and converted to sealed ([#550](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/550))
+    * `PassportFile` has been replaced to `dev.inmo.tgbotapi.types.files`
+* `WebApps`:
+    * Created 🎉
+* `BehaviourBuilder`:
+    * `SimpleFilter` now is a `fun interface` instead of just callback (fix of [#546](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/546))
+
 ## 0.38.13
 
 * `Core`:

README.md

@@ -1,4 +1,4 @@
-# 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-5.7-blue)](https://core.telegram.org/bots/api-changelog#january-31-2022)
+# 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.0-blue)](https://core.telegram.org/bots/api-changelog#april-16-2022)
 
 | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://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) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue&logo=telegram)](https://t.me/InMoTelegramBotAPI) |
 |:---:|

docs/build.gradle

@@ -40,11 +40,17 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                rootProject.subprojects.forEach {
-                    if (it != project) {
-                        api it
-                    }
-                }
+                api project(":tgbotapi.core")
+                api project(":tgbotapi.api")
+                api project(":tgbotapi.utils")
+                api project(":tgbotapi.behaviour_builder")
+                api project(":tgbotapi.behaviour_builder.fsm")
+                api project(":tgbotapi")
+            }
+        }
+        jsMain {
+            dependencies {
+                api project(":tgbotapi.webapps")
             }
         }
     }

gradle.properties

@@ -20,6 +20,6 @@ javax_activation_version=1.1.1
 dokka_version=1.6.10
 
 library_group=dev.inmo
-library_version=0.38.13
+library_version=1.0.0
 
 github_release_plugin_version=2.3.7

settings.gradle

@@ -16,9 +16,6 @@ include ":tgbotapi.api"
 include ":tgbotapi.utils"
 include ":tgbotapi.behaviour_builder"
 include ":tgbotapi.behaviour_builder.fsm"
-include ":tgbotapi.extensions.api"
-include ":tgbotapi.extensions.utils"
-include ":tgbotapi.extensions.behaviour_builder"
-include ":tgbotapi.extensions.behaviour_builder.fsm"
 include ":tgbotapi"
+include ":tgbotapi.webapps"
 include ":docs"

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/answers/AnswerWebAppQuery.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.answers
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.answers.AnswerWebAppQuery
+import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import dev.inmo.tgbotapi.types.WebAppQueryId
+
+suspend fun TelegramBot.answerWebAppQuery(
+    webAppQueryId: WebAppQueryId,
+    result: InlineQueryResult
+) = execute(AnswerWebAppQuery(webAppQueryId, result))
+
+suspend fun TelegramBot.answer(
+    webAppQueryId: WebAppQueryId,
+    result: InlineQueryResult
+) = execute(AnswerWebAppQuery(webAppQueryId, result))

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

@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.ClearMyDefaultAdministratorRights
+import dev.inmo.tgbotapi.types.ChatAdministratorRightsImpl
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRights(
+    forChannels: Boolean? = null
+) = execute(ClearMyDefaultAdministratorRights(forChannels))
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRightsForChannels() = clearMyDefaultAdministratorRights(forChannels = true)
+
+suspend fun TelegramBot.clearMyDefaultAdministratorRightsForGroupsAndSupergroups() = clearMyDefaultAdministratorRights(forChannels = false)

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

@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.extensions.api.bot
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.bot.GetMyDefaultAdministratorRights
+
+suspend fun TelegramBot.getMyDefaultAdministratorRights(
+    forChannels: Boolean? = null
+) = execute(GetMyDefaultAdministratorRights(forChannels))
+
+suspend fun TelegramBot.getMyDefaultAdministratorRightsForChannels() = getMyDefaultAdministratorRights(forChannels = true)
+
+suspend fun TelegramBot.getMyDefaultAdministratorRightsForGroupsAndSupergroups() = getMyDefaultAdministratorRights(forChannels = false)

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

@@ -0,0 +1,18 @@
+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.ChatAdministratorRightsImpl
+
+suspend fun TelegramBot.setMyDefaultAdministratorRights(
+    rights: ChatAdministratorRightsImpl,
+    forChannels: Boolean? = null
+) = execute(SetMyDefaultAdministratorRights(rights, forChannels))
+
+suspend fun TelegramBot.setMyDefaultAdministratorRightsForChannels(
+    rights: ChatAdministratorRightsImpl
+) = setMyDefaultAdministratorRights(rights, forChannels = true)
+
+suspend fun TelegramBot.setMyDefaultAdministratorRightsForGroupsAndSupergroups(
+    rights: ChatAdministratorRightsImpl
+) = setMyDefaultAdministratorRights(rights, forChannels = false)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetChatMenuButton.kt

@@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.extensions.api.chat.get
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.get.GetChatMenuButton
+import dev.inmo.tgbotapi.requests.chat.modify.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
+
+suspend fun TelegramBot.getChatMenuButton(
+    chatId: ChatId
+) = execute(GetChatMenuButton(chatId))
+
+suspend fun TelegramBot.getChatMenuButton(
+    chat: PrivateChat
+) = getChatMenuButton(chat.id)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/get/GetDefaultChatMenuButton.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.extensions.api.chat.get
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.get.GetDefaultChatMenuButton
+import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
+import dev.inmo.tgbotapi.types.MenuButton
+
+suspend fun TelegramBot.getDefaultChatMenuButton() = execute(GetDefaultChatMenuButton)

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

@@ -18,7 +18,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean?
 ) = execute(
     PromoteChatMember(
@@ -34,7 +34,7 @@ suspend fun TelegramBot.promoteChatMember(
         canRestrictMembers,
         canPinMessages,
         canPromoteMembers,
-        canManageVoiceChats,
+        canManageVideoChats,
         canManageChat
     )
 )
@@ -52,7 +52,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -67,7 +67,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )
 
@@ -84,7 +84,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chatId,
@@ -99,7 +99,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )
 
@@ -116,7 +116,7 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
     canPromoteMembers: Boolean? = null,
-    canManageVoiceChats: Boolean? = null,
+    canManageVideoChats: Boolean? = null,
     canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
@@ -131,6 +131,6 @@ suspend fun TelegramBot.promoteChatMember(
     canRestrictMembers,
     canPinMessages,
     canPromoteMembers,
-    canManageVoiceChats,
+    canManageVideoChats,
     canManageChat
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetChatMenuButton.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.extensions.api.chat.modify
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.modify.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
+
+suspend fun TelegramBot.setChatMenuButton(
+    chatId: ChatId,
+    menuButton: MenuButton
+) = execute(SetChatMenuButton(chatId, menuButton))
+
+suspend fun TelegramBot.setChatMenuButton(
+    chat: PrivateChat,
+    menuButton: MenuButton
+) = setChatMenuButton(chat.id, menuButton)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/modify/SetDefaultChatMenuButton.kt

@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.extensions.api.chat.modify
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.modify.SetDefaultChatMenuButton
+import dev.inmo.tgbotapi.types.MenuButton
+
+suspend fun TelegramBot.setDefaultChatMenuButton(
+    menuButton: MenuButton
+) = execute(SetDefaultChatMenuButton(menuButton))

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFile.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.requests.DownloadFile
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 
 suspend fun TelegramBot.downloadFile(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStream.kt

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 
 suspend fun TelegramBot.downloadFileStream(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileStreamAllocator.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 
 suspend fun TelegramBot.downloadFileStreamAllocator(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetFile.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.get
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.get.GetFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 
 suspend fun TelegramBot.getFileAdditionalInfo(

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/get/GetStickerSet.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.extensions.api.get
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.get.GetStickerSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker
 
 suspend fun TelegramBot.getStickerSet(
     name: String

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt

@@ -18,12 +18,11 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.dice.DiceAnimationType
 import dev.inmo.tgbotapi.types.files.*
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.Sticker
 import dev.inmo.tgbotapi.types.games.Game
 import dev.inmo.tgbotapi.types.location.*
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.content.media.*
 import dev.inmo.tgbotapi.types.payments.LabeledPrice

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendSticker.kt

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker
 
 /**
  * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/DeleteStickerFromSet.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.stickers.DeleteStickerFromSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker
 
 suspend fun TelegramBot.deleteStickerFromSet(
     sticker: FileId

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/stickers/SetStickerPositionInSet.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.api.stickers
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.stickers.SetStickerPositionInSet
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.types.files.Sticker
 
 suspend fun TelegramBot.setStickerPositionInSet(
     sticker: FileId,

tgbotapi.api/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/api/files/DownloadFileToFile.kt

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
 import io.ktor.util.cio.use
 import io.ktor.util.cio.writeChannel

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

@@ -35,7 +35,7 @@ private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitCall
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: CallbackQueryMapper<T>? = null
 ) : List<T> = waitCallbackQueries<T>(
     count,

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

@@ -15,7 +15,7 @@ private suspend inline fun <reified T : ChatMemberUpdatedUpdate> BehaviourContex
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>
 ): List<ChatMemberUpdated> = expectFlow(
     initRequest,
@@ -34,7 +34,7 @@ private suspend inline fun <reified T : ChatMemberUpdatedUpdate> BehaviourContex
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: ChatMemberUpdatedMapper<ChatMemberUpdated>? = null
 ) : List<ChatMemberUpdated> = waitChatMemberUpdated<T>(
     count,

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

@@ -34,7 +34,7 @@ private suspend inline fun <reified T : ChosenInlineResult> BehaviourContext.wai
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: ChosenInlineResultMapper<T>? = null
 ) : List<T> = this@waitChosenInlineResults.waitChosenInlineResultsUpdates<T>(
     count,

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

@@ -75,7 +75,7 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitCon
     initRequest: Request<*>? = null,
     includeMediaGroups: Boolean = true,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
+    filter: SimpleFilter<CommonMessage<T>>? = null,
     noinline mapper: CommonMessageToContentMapper<T>? = null
 ) : List<T> = waitCommonContent<T>(
     count,

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

@@ -78,7 +78,7 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitCon
     initRequest: Request<*>? = null,
     includeMediaGroups: Boolean = true,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
+    filter: SimpleFilter<CommonMessage<T>>? = null,
     noinline mapper: CommonMessageToCommonMessageMapper<T>? = null
 ) : List<CommonMessage<T>> = waitCommonMessage<T>(
     count,

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

@@ -58,7 +58,7 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitEdi
     initRequest: Request<*>? = null,
     includeMediaGroups: Boolean = true,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<CommonMessage<T>>? = null,
+    filter: SimpleFilter<CommonMessage<T>>? = null,
     noinline mapper: CommonMessageToContentMapper<T>? = null
 ) : List<T> = waitEditedCommonMessage<T>(
     count,

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

@@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
+import dev.inmo.tgbotapi.types.message.PrivateEventMessage
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
 import kotlinx.coroutines.flow.toList
@@ -40,7 +41,7 @@ private suspend inline fun <reified T : ChatEvent> BehaviourContext.waitEvents(
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<ChatEventMessage<T>>? = null,
+    filter: SimpleFilter<ChatEventMessage<T>>? = null,
     noinline mapper: EventMessageToEventMapper<T>? = null
 ) : List<T> = waitEventMessages<T>(
     initRequest,
@@ -89,33 +90,66 @@ suspend fun BehaviourContext.waitChatEvents(
     mapper: EventMessageToEventMapper<ChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
 
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
     count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatEvent>? = null
+    filter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatStartedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
     count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatStarted>? = null
+    filter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatStarted>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatEndedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
     count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatEnded>? = null
+    filter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatEnded>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun BehaviourContext.waitVoiceChatParticipantsInvitedEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
     count: Int = 1,
-    filter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
-    mapper: EventMessageToEventMapper<VoiceChatParticipantsInvited>? = null
+    filter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatParticipantsInvited>? = null
+) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+
+suspend fun BehaviourContext.waitVideoChatEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+suspend fun BehaviourContext.waitVideoChatStartedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatStarted>? = null
+) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+suspend fun BehaviourContext.waitVideoChatEndedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatEnded>? = null
+) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+suspend fun BehaviourContext.waitVideoChatParticipantsInvitedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
+    mapper: EventMessageToEventMapper<VideoChatParticipantsInvited>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
 
 suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
@@ -241,3 +275,10 @@ suspend fun BehaviourContext.waitUserLoggedInEvents(
     filter: SimpleFilter<ChatEventMessage<UserLoggedIn>>? = null,
     mapper: EventMessageToEventMapper<UserLoggedIn>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter, mapper)
+suspend fun BehaviourContext.waitWebAppDataEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: SimpleFilter<PrivateEventMessage<WebAppData>>? = null,
+    mapper: EventMessageToEventMapper<WebAppData>? = null
+) = waitEvents(count, initRequest, errorFactory, filter ?.let { { it is PrivateEventMessage && filter(it) } }, mapper)

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

@@ -33,7 +33,7 @@ private suspend inline fun <reified T : InlineQuery> BehaviourContext.waitInline
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: InlineQueryMapper<T>? = null
 ) : List<T> = waitInlineQueries<T>(
     count,

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

@@ -37,7 +37,7 @@ suspend inline fun <reified T : EncryptedPassportElement> BehaviourContext.waitP
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<PassportMessage>? = null,
+    filter: SimpleFilter<PassportMessage>? = null,
     noinline mapper: PassportMessageMapper? = null
 ) : List<PassportData> = waitPassportMessages(
     initRequest,

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

@@ -33,7 +33,7 @@ private suspend inline fun BehaviourContext.waitPollAnswers(
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<PollAnswer>? = null,
+    filter: SimpleFilter<PollAnswer>? = null,
     noinline mapper: PollAnswerMapper? = null
 ) : List<PollAnswer> = this@waitPollAnswers.waitPollsAnswers<PollAnswer>(
     count,

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

@@ -33,7 +33,7 @@ private suspend inline fun <reified T : Poll> BehaviourContext.waitPolls(
     count: Int = 1,
     initRequest: Request<*>? = null,
     noinline errorFactory: NullableRequestBuilder<*> = { null },
-    noinline filter: SimpleFilter<T>? = null,
+    filter: SimpleFilter<T>? = null,
     noinline mapper: PollMapper<T>? = null
 ) : List<T> = this@waitPolls.waitPollsUpdates<T>(
     count,

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

@@ -2,8 +2,9 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.filters
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextAndTwoTypesReceiver
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.CommonMessageFilter
-import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
-import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
+import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 /**
@@ -16,6 +17,6 @@ val MessageFilterExcludingMediaGroups: BehaviourContextAndTwoTypesReceiver<Boole
 /**
  * Allow only messages which are not [MediaGroupMessage]
  */
-val CommonMessageFilterExcludeMediaGroups: CommonMessageFilter<*> = {
+val CommonMessageFilterExcludeMediaGroups = SimpleFilter<Message> {
     it !is MediaGroupMessage<*>
 }

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

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.CallbackQuery.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : CallbackQuery> BC.onCallbackQuery(
-    noinline initialFilter: SimpleFilter<T>? = null,
+    initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = CallbackQueryFilterByUser,
     markerFactory: MarkerFactory<in T, Any> = ByUserCallbackQueryMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>

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

@@ -14,7 +14,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified U : ChatMemberUpdatedUpdate> BC.onChatMemberUpdatedInternal(
-    noinline initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
+    initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatMemberUpdated, Update>? = ChatMemberUpdatedFilterByChat,
     markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatMemberUpdated>

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

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : ChosenInlineResult> BC.onChosenInlineResultBase(
-    noinline initialFilter: SimpleFilter<T>? = null,
+    initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     markerFactory: MarkerFactory<in T, Any> = ByUserIdChosenInlineResultMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>

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

@@ -55,7 +55,7 @@ suspend fun <BC : BehaviourContext> BC.command(
 suspend inline fun <BC : BehaviourContext> BC.onCommand(
     commandRegex: Regex,
     requireOnlyCommandInMessage: Boolean = true,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
@@ -64,7 +64,7 @@ suspend inline fun <BC : BehaviourContext> BC.onCommand(
 suspend inline fun <BC : BehaviourContext> BC.onCommand(
     command: String,
     requireOnlyCommandInMessage: Boolean = true,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<TextContent>>
@@ -106,7 +106,7 @@ suspend fun <BC : BehaviourContext> BC.commandWithArgs(
 
 suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
     commandRegex: Regex,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>
@@ -114,7 +114,7 @@ suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
 
 suspend inline fun <BC : BehaviourContext> BC.onCommandWithArgs(
     command: String,
-    noinline initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
+    initialFilter: CommonMessageFilter<TextContent>? = CommonMessageFilterExcludeMediaGroups,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<TextContent>, Update> = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<TextContent>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTwoTypesReceiver<BC, Unit, CommonMessage<TextContent>, Array<String>>

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

@@ -9,7 +9,7 @@ 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.utils.whenCommonMessage
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
@@ -22,10 +22,9 @@ import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 typealias CommonMessageFilter<T> = SimpleFilter<CommonMessage<T>>
-inline fun <T : MessageContent> CommonMessageFilter(noinline block: CommonMessageFilter<T>) = block
 
 internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onContentMessageWithType(
-    noinline initialFilter: CommonMessageFilter<T>? = null,
+    initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<T>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<T>>

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

@@ -22,7 +22,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.utils.asEditMessageUpdate
 import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.types.files.abstracts.TelegramMediaFile
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
@@ -36,7 +36,7 @@ import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
 internal suspend inline fun <BC : BehaviourContext, reified T : MessageContent> BC.onEditedContent(
-    noinline initialFilter: CommonMessageFilter<T>? = null,
+    initialFilter: CommonMessageFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, CommonMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in CommonMessage<T>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, CommonMessage<T>>

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

@@ -12,12 +12,13 @@ import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
+import dev.inmo.tgbotapi.types.message.PrivateEventMessage
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentEvent
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : ChatEvent> BC.onEvent(
-    noinline initialFilter: SimpleFilter<ChatEventMessage<T>>? = null,
+    initialFilter: SimpleFilter<ChatEventMessage<T>>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<T>, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in ChatEventMessage<T>, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<T>>
@@ -94,11 +95,12 @@ suspend fun <BC : BehaviourContext> BC.onChatEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEvent>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEvent>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEvent>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEvent>>
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEvent>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEvent>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEvent>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 
 /**
@@ -113,11 +115,12 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatStartedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatStarted>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatStarted>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatStarted>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatStarted>>
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatStarted>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatStarted>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatStarted>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 
 /**
@@ -132,11 +135,12 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatStartedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatEndedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatEnded>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatEnded>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatEnded>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatEnded>>
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEnded>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEnded>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEnded>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 
 /**
@@ -151,11 +155,88 @@ suspend fun <BC : BehaviourContext> BC.onVoiceChatEndedEvent(
  * @param scenarioReceiver Main callback which will be used to handle incoming data if [initialFilter] will pass that
  * data
  */
+@Deprecated("Renamed as Video instead of Voice")
 suspend fun <BC : BehaviourContext> BC.onVoiceChatParticipantsInvitedEvent(
-    initialFilter: SimpleFilter<ChatEventMessage<VoiceChatParticipantsInvited>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VoiceChatParticipantsInvited>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<VoiceChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VoiceChatParticipantsInvited>>
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatParticipantsInvited>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatParticipantsInvited>>
+) = onEvent(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.onVideoChatEvent(
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEvent>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEvent>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEvent>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEvent>>
+) = onEvent(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.onVideoChatStartedEvent(
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatStarted>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatStarted>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatStarted>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatStarted>>
+) = onEvent(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.onVideoChatEndedEvent(
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatEnded>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatEnded>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatEnded>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatEnded>>
+) = onEvent(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.onVideoChatParticipantsInvitedEvent(
+    initialFilter: SimpleFilter<ChatEventMessage<VideoChatParticipantsInvited>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<VideoChatParticipantsInvited>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<VideoChatParticipantsInvited>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<VideoChatParticipantsInvited>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)
 
 /**
@@ -483,3 +564,30 @@ suspend fun <BC : BehaviourContext> BC.onUserLoggedIn(
     markerFactory: MarkerFactory<in ChatEventMessage<UserLoggedIn>, Any> = ByChatMessageMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<UserLoggedIn>>
 ) = onEvent(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.onWebAppData(
+    initialFilter: SimpleFilter<PrivateEventMessage<WebAppData>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PrivateEventMessage<WebAppData>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<WebAppData>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PrivateEventMessage<WebAppData>>
+) = onEvent(
+    initialFilter ?.let { { it is PrivateEventMessage<WebAppData> && initialFilter(it) } },
+    subcontextUpdatesFilter ?.let { { it: ChatEventMessage<WebAppData>, update: Update -> it is PrivateEventMessage<WebAppData> && subcontextUpdatesFilter(it, update) } },
+    markerFactory
+) {
+    if (it is PrivateEventMessage<WebAppData>) {
+        scenarioReceiver(it)
+    }
+}

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

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.InlineQueries.query.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : InlineQuery> BC.onInlineQuery(
-    noinline initialFilter: SimpleFilter<T>? = null,
+    initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = InlineQueryFilterByUser,
     markerFactory: MarkerFactory<in T, Any> = ByUserInlineQueryMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>

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

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T> BC.on(
     markerFactory: MarkerFactory<in T, Any>,
-    noinline initialFilter: SimpleFilter<T>? = null,
+    initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>,
     noinline updateToData: (Update) -> List<T>?

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

@@ -19,7 +19,7 @@ import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
 internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupContent> BC.buildMediaGroupTrigger(
-    noinline initialFilter: SimpleFilter<List<MediaGroupMessage<T>>>? = null,
+    initialFilter: SimpleFilter<List<MediaGroupMessage<T>>>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, List<MediaGroupMessage<T>>, Update>? = MessagesFilterByChat,
     markerFactory: MarkerFactory<in List<MediaGroupMessage<T>>, Any> = ByChatMediaGroupMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, List<MediaGroupMessage<T>>>

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

@@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportEle
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : EncryptedPassportElement> BC.onPassportMessageWith(
-    noinline initialFilter: SimpleFilter<PassportMessage>? = null,
+    initialFilter: SimpleFilter<PassportMessage>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PassportMessage, Update>? = MessageFilterByChat,
     markerFactory: MarkerFactory<in PassportMessage, Any> = ByChatMessageMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PassportMessage>

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext> BC.onPollAnswered(
-    noinline initialFilter: SimpleFilter<PollAnswer>? = null,
+    initialFilter: SimpleFilter<PollAnswer>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, PollAnswer, Update>? = null,
     markerFactory: MarkerFactory<in PollAnswer, Any> = ByIdPollAnswerMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, PollAnswer>

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

@@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 internal suspend inline fun <BC : BehaviourContext, reified T : Poll> BC.onPollUpdatedBase(
-    noinline initialFilter: SimpleFilter<T>? = null,
+    initialFilter: SimpleFilter<T>? = null,
     noinline subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, T, Update>? = null,
     markerFactory: MarkerFactory<in T, Any> = ByIdPollMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, T>

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/SimpleFilter.kt

@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.utils
 
-typealias SimpleFilter<T> = suspend (T) -> Boolean
-
-inline fun <T> SimpleFilter(noinline block: SimpleFilter<T>) = block
+fun interface SimpleFilter<in T> {
+    suspend operator fun invoke(o: T): Boolean
+}
 
 /**
  * @return [SimpleFilter] which will return true in case when all the items in incoming data passed [this] filter
@@ -28,20 +28,20 @@ fun <T> SimpleFilter<T>.listNone() = SimpleFilter<Iterable<T>> {
 /**
  * Makes an AND (&&) operation between [this] and [other]
  */
-operator fun <T> SimpleFilter<T>.times(other: SimpleFilter<T>): SimpleFilter<T> = {
+operator fun <T> SimpleFilter<T>.times(other: SimpleFilter<T>) = SimpleFilter<T> {
     this(it) && other(it)
 }
 
 /**
  * Makes an OR (||) operation between [this] and [other]
  */
-operator fun <T> SimpleFilter<T>.plus(other: SimpleFilter<T>): SimpleFilter<T> = {
+operator fun <T> SimpleFilter<T>.plus(other: SimpleFilter<T>) = SimpleFilter<T> {
     this(it) || other(it)
 }
 
 /**
  * Reverse results of [this]
  */
-operator fun <T> SimpleFilter<T>.not(): SimpleFilter<T> = {
+operator fun <T> SimpleFilter<T>.not() = SimpleFilter<T> {
     !this(it)
 }

tgbotapi.core/build.gradle

@@ -64,7 +64,7 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
-                implementation project(":tgbotapi.extensions.utils")
+                implementation project(":tgbotapi.utils")
             }
         }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/ChatRequest.kt

@@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.CommonAbstracts.types
 
 import dev.inmo.tgbotapi.types.ChatIdentifier
 
-interface ChatRequest {
-    val chatId: ChatIdentifier
-}
+interface ChatRequest : OptionalChatRequest {
+    override val chatId: ChatIdentifier
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/types/OptionalChatRequest.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.CommonAbstracts.types
+
+import dev.inmo.tgbotapi.types.ChatIdentifier
+
+interface OptionalChatRequest {
+    val chatId: ChatIdentifier?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/answers/AnswerWebAppQuery.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.requests.answers
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import dev.inmo.tgbotapi.types.webapps.query.SentWebAppMessage
+import kotlinx.serialization.*
+
+@Serializable
+data class AnswerWebAppQuery(
+    @SerialName(webAppQueryIdField)
+    val webAppQueryId: WebAppQueryId,
+    @SerialName(resultField)
+    val result: InlineQueryResult
+) : SimpleRequest<SentWebAppMessage> {
+    override fun method(): String = "answerWebAppQuery"
+    override val resultDeserializer: DeserializationStrategy<SentWebAppMessage>
+        get() = SentWebAppMessage.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

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

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class ClearMyDefaultAdministratorRights(
+    @SerialName(forChannelsField)
+    val forChannels: Boolean? = null
+) : SimpleRequest<Boolean> {
+    override fun method(): String = "setMyDefaultAdministratorRights"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

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

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl
+import kotlinx.serialization.*
+
+@Serializable
+data class GetMyDefaultAdministratorRights(
+    @SerialName(forChannelsField)
+    val forChannels: Boolean? = null
+) : SimpleRequest<AdministratorChatMemberImpl> {
+    override fun method(): String = "getMyDefaultAdministratorRights"
+    override val resultDeserializer: DeserializationStrategy<AdministratorChatMemberImpl>
+        get() = AdministratorChatMemberImpl.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    companion object {
+        val ForChannels = GetMyDefaultAdministratorRights(true)
+        val ForGroups = GetMyDefaultAdministratorRights(false)
+    }
+}

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

@@ -0,0 +1,20 @@
+package dev.inmo.tgbotapi.requests.bot
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+class SetMyDefaultAdministratorRights(
+    @SerialName(rightsField)
+    val rights: ChatAdministratorRightsImpl,
+    @SerialName(forChannelsField)
+    val forChannels: Boolean? = null
+) : SimpleRequest<Boolean> {
+    override fun method(): String = "setMyDefaultAdministratorRights"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetChatMenuButton.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.requests.chat.get
+
+import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class GetChatMenuButton(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier
+) : ChatRequest, SimpleRequest<MenuButton> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = GetDefaultChatMenuButton.method()
+
+    override val resultDeserializer: DeserializationStrategy<MenuButton>
+        get() = MenuButtonSerializer
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/get/GetDefaultChatMenuButton.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.requests.chat.get
+
+import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.CommonAbstracts.types.OptionalChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+object GetDefaultChatMenuButton : OptionalChatRequest, SimpleRequest<MenuButton> {
+    override val chatId: ChatIdentifier?
+        get() = null
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "getChatMenuButton"
+
+    override val resultDeserializer: DeserializationStrategy<MenuButton>
+        get() = MenuButtonSerializer
+}

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

@@ -32,8 +32,8 @@ data class PromoteChatMember(
     private val canPinMessages: Boolean? = null,
     @SerialName(canPromoteMembersField)
     private val canPromoteMembers: Boolean? = null,
-    @SerialName(canManageVoiceChatsField)
-    private val canManageVoiceChats: Boolean? = null,
+    @SerialName(canManageVideoChatsField)
+    private val canManageVideoChats: Boolean? = null,
     @SerialName(canManageChatField)
     private val canManageChat: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetChatMenuButton.kt

@@ -0,0 +1,24 @@
+package dev.inmo.tgbotapi.requests.chat.modify
+
+import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetChatMenuButton(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @Serializable(MenuButtonSerializer::class)
+    @SerialName(menuButtonField)
+    val menuButton: MenuButton
+) : ChatRequest, SimpleRequest<Boolean> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = SetDefaultChatMenuButton.method()
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/modify/SetDefaultChatMenuButton.kt

@@ -0,0 +1,25 @@
+package dev.inmo.tgbotapi.requests.chat.modify
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetDefaultChatMenuButton(
+    @Serializable(MenuButtonSerializer::class)
+    @SerialName(menuButtonField)
+    val menuButton: MenuButton
+) : SimpleRequest<Boolean> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = Companion.method()
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+
+    companion object {
+        fun method() = "setChatMenuButton"
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/get/GetFile.kt

@@ -2,8 +2,8 @@ package dev.inmo.tgbotapi.requests.get
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.fileIdField
 import dev.inmo.tgbotapi.types.files.PathedFile
-import dev.inmo.tgbotapi.types.files.abstracts.fileIdField
 import kotlinx.serialization.*
 
 @Serializable

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

@@ -0,0 +1,31 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatAdministratorRights
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ChatAdministratorRightsImpl(
+    @SerialName(canChangeInfoField)
+    override val canChangeInfo: Boolean = false,
+    @SerialName(canPostMessagesField)
+    override val canPostMessages: Boolean = false,
+    @SerialName(canEditMessagesField)
+    override val canEditMessages: Boolean = false,
+    @SerialName(canDeleteMessagesField)
+    override val canRemoveMessages: Boolean = false,
+    @SerialName(canInviteUsersField)
+    override val canInviteUsers: Boolean = false,
+    @SerialName(canRestrictMembersField)
+    override val canRestrictMembers: Boolean = false,
+    @SerialName(canPinMessagesField)
+    override val canPinMessages: Boolean = false,
+    @SerialName(canPromoteMembersField)
+    override val canPromoteMembers: Boolean = false,
+    @SerialName(canManageVideoChatsField)
+    override val canManageVideoChats: Boolean = false,
+    @SerialName(canManageChatField)
+    override val canManageChat: Boolean = false,
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = false
+) : ChatAdministratorRights

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

@@ -26,8 +26,8 @@ data class AdministratorChatMemberImpl(
     override val canPinMessages: Boolean = false,
     @SerialName(canPromoteMembersField)
     override val canPromoteMembers: Boolean = false,
-    @SerialName(canManageVoiceChatsField)
-    override val canManageVoiceChats: Boolean = false,
+    @SerialName(canManageVideoChatsField)
+    override val canManageVideoChats: Boolean = false,
     @SerialName(canManageChatField)
     override val canManageChat: Boolean = false,
     @SerialName(isAnonymousField)

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

@@ -31,7 +31,7 @@ data class CreatorChatMember(
     @Transient
     override val canPromoteMembers: Boolean = true
     @Transient
-    override val canManageVoiceChats: Boolean = true
+    override val canManageVideoChats: Boolean = true
     @Transient
     override val canManageChat: Boolean = true
     @SerialName(statusField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt

@@ -8,17 +8,12 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
 @Serializable(AdministratorChatMemberSerializer::class)
-interface AdministratorChatMember : SpecialRightsChatMember {
+interface AdministratorChatMember : SpecialRightsChatMember, ChatAdministratorRights {
     val canBeEdited: Boolean
-    val canPostMessages: Boolean
-    val canEditMessages: Boolean
-    val canRemoveMessages: Boolean
-    val canRestrictMembers: Boolean
-    val canPromoteMembers: Boolean
-    val canManageVoiceChats: Boolean
-    val canManageChat: Boolean
-    val isAnonymous: Boolean
     val customTitle: String?
+
+    val canManageVoiceChats: Boolean
+        get() = canManageVideoChats
 }
 
 @RiskFeature

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatAdministratorRights.kt

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types.ChatMember.abstracts
+
+sealed interface SpecialChatAdministratorRights {
+    val canChangeInfo: Boolean
+    val canInviteUsers: Boolean
+    val canPinMessages: Boolean
+}
+
+interface ChatAdministratorRights : SpecialChatAdministratorRights {
+    val isAnonymous: Boolean
+    val canManageChat: Boolean
+    val canRemoveMessages: Boolean
+    val canManageVideoChats: Boolean
+    val canRestrictMembers: Boolean
+    val canPromoteMembers: Boolean
+    val canPostMessages: Boolean
+    val canEditMessages: Boolean
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/SpecialRightsChatMember.kt

@@ -3,8 +3,4 @@ package dev.inmo.tgbotapi.types.ChatMember.abstracts
 import kotlinx.serialization.Serializable
 
 @Serializable(ChatMemberSerializer::class)
-interface SpecialRightsChatMember : ChatMember {
-    val canChangeInfo: Boolean
-    val canInviteUsers: Boolean
-    val canPinMessages: Boolean
-}
+interface SpecialRightsChatMember : ChatMember, SpecialChatAdministratorRights

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

@@ -27,6 +27,7 @@ typealias FoursquareType = String
 typealias GooglePlaceId = String
 typealias GooglePlaceType = String
 typealias MembersLimit = Int
+typealias WebAppQueryId = String
 
 typealias Seconds = Int
 typealias MilliSeconds = Long
@@ -133,6 +134,7 @@ const val inlineMessageIdField = "inline_message_id"
 const val callbackDataField = "callback_data"
 const val callbackGameField = "callback_game"
 const val callbackQueryIdField = "callback_query_id"
+const val webAppQueryIdField = "web_app_query_id"
 const val inlineQueryIdField = "inline_query_id"
 const val inlineKeyboardField = "inline_keyboard"
 const val showAlertField = "show_alert"
@@ -154,6 +156,7 @@ const val dropPendingUpdatesField = "drop_pending_updates"
 const val hasCustomCertificateField = "has_custom_certificate"
 const val pendingUpdateCountField = "pending_update_count"
 const val lastErrorDateField = "last_error_date"
+const val lastSynchronizationErrorDateField = "last_synchronization_error_date"
 const val lastErrorMessageField = "last_error_message"
 const val votesCountField = "voter_count"
 const val isClosedField = "is_closed"
@@ -189,6 +192,13 @@ const val requestContactField = "request_contact"
 const val requestLocationField = "request_location"
 const val requestPollField = "request_poll"
 
+const val fileNameField = "file_name"
+const val mimeTypeField = "mime_type"
+const val fileIdField = "file_id"
+const val fileSizeField = "file_size"
+const val fileDateField = "file_date"
+const val filePathField = "file_path"
+
 
 const val requestWriteAccessField = "request_write_access"
 
@@ -263,6 +273,9 @@ const val canRestrictMembersField = "can_restrict_members"
 const val canPinMessagesField = "can_pin_messages"
 const val canPromoteMembersField = "can_promote_members"
 const val canManageVoiceChatsField = "can_manage_voice_chats"
+const val canManageVideoChatsField = "can_manage_video_chats"
+const val rightsField = "rights"
+const val forChannelsField = "for_channels"
 const val canManageChatField = "can_manage_chat"
 const val pngStickerField = "png_sticker"
 const val tgsStickerField = "tgs_sticker"
@@ -313,6 +326,7 @@ const val pricesField = "prices"
 const val payloadField = "payload"
 const val vcardField = "vcard"
 const val resultsField = "results"
+const val resultField = "result"
 const val certificateField = "certificate"
 const val questionField = "question"
 const val optionsField = "options"
@@ -430,3 +444,7 @@ const val bankStatementField = "bank_statement"
 const val rentalAgreementField = "rental_agreement"
 const val passportRegistrationField = "passport_registration"
 const val temporaryRegistrationField = "temporary_registration"
+
+const val buttonTextField = "button_text"
+const val webAppField = "web_app"
+const val menuButtonField = "menu_button"

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

@@ -9,7 +9,6 @@ import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.files.abstracts.mimeTypeField
 import dev.inmo.tgbotapi.utils.MimeType
 import dev.inmo.tgbotapi.utils.extensions.makeString
 import kotlinx.serialization.SerialName

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

@@ -9,7 +9,6 @@ import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSource
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
 import dev.inmo.tgbotapi.types.ParseMode.parseModeField
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
-import dev.inmo.tgbotapi.types.files.abstracts.mimeTypeField
 import dev.inmo.tgbotapi.utils.MimeType
 import dev.inmo.tgbotapi.utils.extensions.makeString
 import kotlinx.serialization.SerialName

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

@@ -0,0 +1,122 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.tgbotapi.types.webapps.WebAppInfo
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
+
+@Serializable(MenuButtonSerializer::class)
+sealed interface MenuButton {
+    @Required
+    val type: String
+
+    @Serializable
+    object Commands : MenuButton {
+        @Required
+        override val type: String
+            get() = "commands"
+    }
+
+    @Serializable
+    data class WebApp(
+        val text: String,
+        @SerialName(webAppField)
+        val webApp: WebAppInfo
+    ) : MenuButton {
+        @Required
+        override val type: String
+            get() = Companion.type
+
+        companion object {
+            val type: String
+                get() = "web_app"
+        }
+    }
+
+    @Serializable
+    object Default : MenuButton {
+        @Required
+        override val type: String
+            get() = "default"
+    }
+
+    @Serializable
+    @RiskFeature
+    data class Unknown (
+        override val type: String,
+        val rawJson: JsonElement
+    ) : MenuButton
+
+    companion object {
+        fun serializer(): KSerializer<MenuButton> = MenuButtonSerializer
+    }
+}
+
+@Serializable
+internal data class MenuButtonSurrogate(
+    val type: String,
+    val text: String? = null,
+    @SerialName(webAppField)
+    val webApp: WebAppInfo? = null,
+    val srcJsonElement: JsonElement? = null
+)
+
+@Serializer(MenuButton::class)
+object MenuButtonSerializer : KSerializer<MenuButton> {
+    override val descriptor: SerialDescriptor
+        get() = MenuButtonSurrogate.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): MenuButton {
+        val surrogate = if (decoder is JsonDecoder) {
+            val json = JsonElement.serializer().deserialize(decoder)
+            runCatching {
+                decoder.json.decodeFromJsonElement(MenuButtonSurrogate.serializer(), json)
+            }.onFailure {
+                return MenuButton.Unknown(
+                    runCatching { json.jsonObject[typeField] ?.jsonPrimitive ?.content }.getOrNull() ?: "",
+                    json
+                )
+            }.getOrThrow().copy(
+                srcJsonElement = json
+            )
+        } else {
+            MenuButtonSurrogate.serializer().deserialize(decoder)
+        }
+
+        return when (surrogate.type) {
+            MenuButton.Commands.type -> MenuButton.Commands
+            MenuButton.Default.type -> MenuButton.Default
+            MenuButton.WebApp.type -> if (surrogate.text != null && surrogate.webApp != null) {
+                MenuButton.WebApp(surrogate.text, surrogate.webApp)
+            } else {
+                null
+            }
+            else -> null
+        } ?: MenuButton.Unknown(
+            surrogate.type,
+            surrogate.srcJsonElement ?: buildJsonObject { }
+        )
+    }
+
+    override fun serialize(encoder: Encoder, value: MenuButton) {
+        encoder.encodeSerializableValue(
+            MenuButtonSurrogate.serializer(),
+            when (value) {
+                MenuButton.Default,
+                MenuButton.Commands -> MenuButtonSurrogate(value.type)
+                is MenuButton.WebApp -> MenuButtonSurrogate(value.type, value.text, value.webApp)
+                is MenuButton.Unknown -> {
+                    encoder.encodeSerializableValue(
+                        JsonElement.serializer(),
+                        value.rawJson
+                    )
+                    return
+                }
+            }
+        )
+    }
+
+}

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

@@ -16,6 +16,8 @@ data class WebhookInfo(
     val allowedUpdates: List<String> = ALL_UPDATES_LIST,
     @SerialName(lastErrorDateField)
     val lastErrorDate: TelegramDate? = null,
+    @SerialName(lastSynchronizationErrorDateField)
+    val lastSynchronizationErrorDate: TelegramDate? = null,
     @SerialName(lastErrorMessageField)
     val lastErrorMessage: String? = null
 ) {

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

@@ -2,8 +2,9 @@ package dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.games.CallbackGame
+import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 import kotlinx.serialization.*
-import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.*
 
 /**
  * Some button of [dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup]. See inheritors and visit
@@ -15,10 +16,14 @@ sealed interface InlineKeyboardButton {
 }
 
 @Serializable
-data class UnknownInlineKeyboardButton internal constructor(
-    override val text: String,
+data class UnknownInlineKeyboardButton (
     val rawData: JsonElement
-) : InlineKeyboardButton
+) : InlineKeyboardButton {
+    override val text: String
+        get() = runCatching {
+            rawData.jsonObject[textField] ?.jsonPrimitive ?.content
+        }.getOrNull() ?: ""
+}
 
 /**
  * This type of button must always be the first button in the first row. Visit
@@ -116,3 +121,14 @@ data class URLInlineKeyboardButton(
     @SerialName(urlField)
     val url: String
 ) : InlineKeyboardButton
+
+/**
+ * Button with [WebAppInfo]. Web App will be launched when the button is pressed. The Web App will be able to send a
+ * `web_app_data` service message. **Available in private chats only**.
+ */
+@Serializable
+data class WebAppInlineKeyboardButton(
+    override val text: String,
+    @SerialName(webAppField)
+    val webApp: WebAppInfo
+) : InlineKeyboardButton

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

@@ -37,7 +37,7 @@ object InlineKeyboardButtonSerializer : KSerializer<InlineKeyboardButton> {
 
         return (json as? JsonObject) ?.let { resolveSerializer(it) } ?.let {
             nonstrictJsonFormat.decodeFromJsonElement(it, json)
-        } ?: UnknownInlineKeyboardButton("", json)
+        } ?: UnknownInlineKeyboardButton(json)
     }
 
     override fun serialize(encoder: Encoder, value: InlineKeyboardButton) {
@@ -48,6 +48,7 @@ object InlineKeyboardButtonSerializer : KSerializer<InlineKeyboardButton> {
             is SwitchInlineQueryInlineKeyboardButton -> SwitchInlineQueryInlineKeyboardButton.serializer().serialize(encoder, value)
             is SwitchInlineQueryCurrentChatInlineKeyboardButton -> SwitchInlineQueryCurrentChatInlineKeyboardButton.serializer().serialize(encoder, value)
             is URLInlineKeyboardButton -> URLInlineKeyboardButton.serializer().serialize(encoder, value)
+            is WebAppInlineKeyboardButton -> WebAppInlineKeyboardButton.serializer().serialize(encoder, value)
             is CallbackGameInlineKeyboardButton -> CallbackGameInlineKeyboardButton.serializer().serialize(encoder, value)
             is UnknownInlineKeyboardButton -> JsonElement.serializer().serialize(encoder, value.rawData)
         }

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

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.types.buttons
 
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
@@ -63,10 +64,22 @@ data class RequestLocationKeyboardButton(
     override val text: String
 ) : KeyboardButton {
     @SerialName(requestLocationField)
-    @EncodeDefault
+    @Required
     val requestLocation: Boolean = true
 }
 
+/**
+ * Private chats only. Description of the Web App that will be launched when the user presses the button. The Web App
+ * will be able to send an arbitrary message on behalf of the user using the method `answerWebAppQuery`. Available only
+ * in private chats between a user and the bot.
+ */
+@Serializable
+data class WebAppKeyboardButton(
+    override val text: String,
+    @SerialName(webAppField)
+    val webApp: WebAppInfo
+) : KeyboardButton
+
 /**
  * Private chats only. When user will tap on this button, he will be asked for the poll with [requestPoll] options. You will be able
  * to catch this poll in updates and data using [dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPoll] in
@@ -97,6 +110,13 @@ object KeyboardButtonSerializer : KSerializer<KeyboardButton> {
             asJson is JsonObject && asJson[requestLocationField] != null -> RequestLocationKeyboardButton(
                 asJson[textField]!!.jsonPrimitive.content
             )
+            asJson is JsonObject && asJson[webAppField] != null -> WebAppKeyboardButton(
+                asJson[textField]!!.jsonPrimitive.content,
+                nonstrictJsonFormat.decodeFromJsonElement(
+                    WebAppInfo.serializer(),
+                    asJson[webAppField]!!
+                )
+            )
             asJson is JsonObject && asJson[requestPollField] != null -> RequestPollKeyboardButton(
                 asJson[textField]!!.jsonPrimitive.content,
                 nonstrictJsonFormat.decodeFromJsonElement(
@@ -119,6 +139,7 @@ object KeyboardButtonSerializer : KSerializer<KeyboardButton> {
         when (value) {
             is RequestContactKeyboardButton -> RequestContactKeyboardButton.serializer().serialize(encoder, value)
             is RequestLocationKeyboardButton -> RequestLocationKeyboardButton.serializer().serialize(encoder, value)
+            is WebAppKeyboardButton -> WebAppKeyboardButton.serializer().serialize(encoder, value)
             is RequestPollKeyboardButton -> RequestPollKeyboardButton.serializer().serialize(encoder, value)
             is SimpleKeyboardButton -> encoder.encodeString(value.text)
             is UnknownKeyboardButton -> JsonElement.serializer().serialize(encoder, nonstrictJsonFormat.parseToJsonElement(value.raw))

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AnimationFile.kt

@@ -1,9 +1,8 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/AudioFile.kt

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.types.files
 import dev.inmo.tgbotapi.CommonAbstracts.Performerable
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/CustomNamedMediaFile.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.types.files
+
+sealed interface CustomNamedMediaFile {
+    val fileName: String?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/DocumentFile.kt

@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.DocumentContent
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/File.kt

@@ -1,9 +1,8 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/MimedMediaFile.kt

@@ -0,0 +1,6 @@
+package dev.inmo.tgbotapi.types.files
+
+import dev.inmo.tgbotapi.CommonAbstracts.MimeTyped
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
+
+sealed interface MimedMediaFile : TelegramMediaFile, MimeTyped

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PassportFile.kt

@@ -0,0 +1,22 @@
+package dev.inmo.tgbotapi.types.files
+
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * This object represents a file uploaded to Telegram Passport. Currently all Telegram Passport files are in JPEG format
+ * when decrypted and don't exceed 10MB.
+ */
+@Serializable
+data class PassportFile(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(fileDateField)
+    val uploadingDate: TelegramDate,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null
+) : TelegramMediaFile

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PathedFile.kt

@@ -1,9 +1,7 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.utils.*
 import kotlinx.serialization.*
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PhotoSize.kt

@@ -1,9 +1,8 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/PlayableMediaFile.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.types.files
+
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
+
+sealed interface PlayableMediaFile : TelegramMediaFile {
+    val duration: Long?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/SizedMediaFile.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.types.files
+
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
+
+sealed interface SizedMediaFile : TelegramMediaFile {
+    val width: Int
+    val height: Int
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/Sticker.kt

@@ -1,6 +1,156 @@
 package dev.inmo.tgbotapi.types.files
 
-import dev.inmo.tgbotapi.types.files.sticker.Sticker
+import dev.inmo.tgbotapi.requests.abstracts.FileId
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.stickers.MaskPosition
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-@Deprecated("Replaced", ReplaceWith("Sticker", "dev.inmo.tgbotapi.types.files.sticker.Sticker"))
-typealias Sticker = Sticker
+@Serializable
+@RiskFeature("This class is used for serialization/deserialization of Sticker interface")
+data class StickerSurrogate(
+    val file_id: FileId,
+    val file_unique_id: FileUniqueId,
+    val width: Int,
+    val height: Int,
+    val is_animated: Boolean? = null,
+    val is_video: Boolean? = null,
+    val thumb: PhotoSize? = null,
+    val emoji: String? = null,
+    val set_name: StickerSetName? = null,
+    val mask_position: MaskPosition? = null,
+    val file_size: Long? = null
+)
+
+// TODO:: Serializer
+@Serializable(StickerSerializer::class)
+sealed interface Sticker : TelegramMediaFile, SizedMediaFile, ThumbedMediaFile {
+    val emoji: String?
+    val maskPosition: MaskPosition?
+    val stickerSetName: StickerSetName?
+
+    val isAnimated
+        get() = this is AnimatedSticker
+    val isVideo
+        get() = this is VideoSticker
+
+    companion object {
+        fun serializer(): KSerializer<Sticker> = StickerSerializer
+    }
+}
+
+object StickerSerializer : KSerializer<Sticker> {
+    override val descriptor: SerialDescriptor = StickerSurrogate.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): Sticker {
+        val surrogate = StickerSurrogate.serializer().deserialize(decoder)
+
+        return when {
+            surrogate.is_animated == true -> AnimatedSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+            surrogate.is_video == true -> VideoSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+            else -> SimpleSticker(
+                surrogate.file_id,
+                surrogate.file_unique_id,
+                surrogate.width,
+                surrogate.height,
+                surrogate.thumb,
+                surrogate.emoji,
+                surrogate.set_name,
+                surrogate.mask_position,
+                surrogate.file_size
+            )
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: Sticker) {
+        TODO("Not yet implemented")
+    }
+
+}
+
+@Serializable
+data class SimpleSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker
+@Serializable
+data class AnimatedSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker
+@Serializable
+data class VideoSticker(
+    @SerialName(fileIdField)
+    override val fileId: FileId,
+    @SerialName(fileUniqueIdField)
+    override val fileUniqueId: FileUniqueId,
+    @SerialName(widthField)
+    override val width: Int,
+    @SerialName(heightField)
+    override val height: Int,
+    @SerialName(thumbField)
+    override val thumb: PhotoSize? = null,
+    @SerialName(emojiField)
+    override val emoji: String? = null,
+    @SerialName(stickerSetNameField)
+    override val stickerSetName: StickerSetName? = null,
+    @SerialName(maskPositionField)
+    override val maskPosition: MaskPosition? = null,
+    @SerialName(fileSizeField)
+    override val fileSize: Long? = null,
+) : Sticker

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/TelegramMediaFile.kt

@@ -1,17 +1,12 @@
-package dev.inmo.tgbotapi.types.files.abstracts
+package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.FileUniqueId
 
-internal const val fileIdField = "file_id"
-internal const val fileSizeField = "file_size"
-internal const val fileDateField = "file_date"
-internal const val filePathField = "file_path"
-
 /**
  * Declare common part of media files in Telegram. Note: it is not representation of JVM `File` type
  */
-interface TelegramMediaFile {
+sealed interface TelegramMediaFile {
     val fileId: FileId
     val fileUniqueId: FileUniqueId
     val fileSize: Long?

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/ThumbedMediaFile.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.types.files
+
+import dev.inmo.tgbotapi.types.files.PhotoSize
+import dev.inmo.tgbotapi.types.files.TelegramMediaFile
+
+sealed interface ThumbedMediaFile : TelegramMediaFile {
+    val thumb: PhotoSize?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/TitledMediaFile.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.types.files
+
+sealed interface TitledMediaFile {
+    val title: String?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoFile.kt

@@ -5,7 +5,6 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InputMedia.InputMediaVideo
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.TextSourcesList
 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VideoNoteFile.kt

@@ -1,9 +1,8 @@
 package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
-import dev.inmo.tgbotapi.types.FileUniqueId
-import dev.inmo.tgbotapi.types.fileUniqueIdField
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/VoiceFile.kt

@@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.types.files
 
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.files.abstracts.*
+import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.utils.MimeType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/CustomNamedMediaFile.kt

@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.types.files.abstracts
-
-internal const val fileNameField = "file_name"
-
-interface CustomNamedMediaFile {
-    val fileName: String?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/MimedMediaFile.kt

@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.types.files.abstracts
-
-import dev.inmo.tgbotapi.CommonAbstracts.MimeTyped
-
-internal const val mimeTypeField = "mime_type"
-
-interface MimedMediaFile : TelegramMediaFile, MimeTyped

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/OldTypealiases.kt

@@ -0,0 +1,22 @@
+package dev.inmo.tgbotapi.types.files.abstracts
+
+@Deprecated("Renamed", ReplaceWith("CustomNamedMediaFile", "dev.inmo.tgbotapi.types.files.CustomNamedMediaFile"))
+typealias CustomNamedMediaFile = dev.inmo.tgbotapi.types.files.CustomNamedMediaFile
+
+@Deprecated("Replaced", ReplaceWith("MimedMediaFile", "dev.inmo.tgbotapi.types.files.MimedMediaFile"))
+typealias MimedMediaFile = dev.inmo.tgbotapi.types.files.MimedMediaFile
+
+@Deprecated("Replaced", ReplaceWith("PlayableMediaFile", "dev.inmo.tgbotapi.types.files.PlayableMediaFile"))
+typealias PlayableMediaFile = dev.inmo.tgbotapi.types.files.PlayableMediaFile
+
+@Deprecated("Replaced", ReplaceWith("SizedMediaFile", "dev.inmo.tgbotapi.types.files.SizedMediaFile"))
+typealias SizedMediaFile = dev.inmo.tgbotapi.types.files.SizedMediaFile
+
+@Deprecated("Replaced", ReplaceWith("TelegramMediaFile", "dev.inmo.tgbotapi.types.files.TelegramMediaFile"))
+typealias TelegramMediaFile = dev.inmo.tgbotapi.types.files.TelegramMediaFile
+
+@Deprecated("Replaced", ReplaceWith("ThumbedMediaFile", "dev.inmo.tgbotapi.types.files.ThumbedMediaFile"))
+typealias ThumbedMediaFile = dev.inmo.tgbotapi.types.files.ThumbedMediaFile
+
+@Deprecated("Replaced", ReplaceWith("TitledMediaFile", "dev.inmo.tgbotapi.types.files.TitledMediaFile"))
+typealias TitledMediaFile = dev.inmo.tgbotapi.types.files.TitledMediaFile

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/PlayableMediaFile.kt

@@ -1,5 +0,0 @@
-package dev.inmo.tgbotapi.types.files.abstracts
-
-interface PlayableMediaFile : TelegramMediaFile {
-    val duration: Long?
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/files/abstracts/SizedMediaFile.kt

@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.types.files.abstracts
-
-interface SizedMediaFile : TelegramMediaFile {
-    val width: Int
-    val height: Int
-}