jvmApiDump

23.1.0

CHANGELOG.md

@@ -1,5 +1,51 @@
 # TelegramBotAPI changelog
 
+## 23.1.1
+
+* `Version`:
+  * `MicroUtils`: `0.24.0` -> `0.24.4`
+* `Core`:
+  * Replace `removeFirst` with `removeAt(0)` in `createTextSources`
+
+## 23.1.0
+
+**THIS UPDATE CONTAINS ADDING SUPPORT OF [Telegram Bots API 8.2](https://core.telegram.org/bots/api-changelog#january-1-2025)**
+
+## 23.0.0
+
+* `Version`:
+  * `Coroutines`: `1.9.0` -> `1.10.1`
+  * `MicroUtils`: `0.23.2` -> `0.24.0`
+  * `KSLog`: `1.3.6` -> `1.4.0`
+  * `Ktor`: `3.0.2` -> `3.0.3`
+* `Core`:
+  * All old factory methods for `TextSource`s took suffix `TextSource`. For example: `regular` -> `regularTextSource`.
+  That has been for excluding names resolution ambiguity with extensions for `EntitiesBuilder`
+
+## 22.0.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES**
+
+**IN THIS UPDATE HAS BEEN REWORKED EVENTS API IN WEBAPPS**
+
+**THIS UPDATE ADDING SUPPORT OF [BOT API 8.0](https://core.telegram.org/bots/api-changelog#november-17-2024) AND [BOT API 8.1](https://core.telegram.org/bots/api-changelog#december-4-2024)**
+
+* `Version`:
+  * `MicroUtils`: `0.23.1` -> `0.23.2`
+  * `Ktor`: `3.0.1` -> `3.0.2`
+
+## 21.0.1
+
+* `Core`:
+  * Improvements in `Update.sourceUser` extension
+  * Add extension `PrivateChat.toUser`
+  * Builder methods of `TextSource`s (like `pre` which returns `PreTextSource`) lost suppression of `redundant inline`
+due to its redundancy
+  * Add `mention` builders for `EntitiesBuilder` with `UserId` as variant instead of `User`
+* `BehaviourBuilder`:
+  * Add support of several rounds for `CombinedSubcontextInitialAction`. Now it will try hard to execute all its
+`SubAction` while all actions will not be completed successfully OR all left actions will not complete with errors
+
 ## 21.0.0
 
 * `Version`:
@@ -8,9 +54,9 @@
 * `BehaviourBuilder`:
   * Add special `val data: BehaviourContextData` into all realizations of `BehaviourContext`
   * Add `CombinedSubcontextInitialAction` and functions
-`buildSubcontextInitialAction`/`buildSubcontextInitialActionWithSubActions`
+    `buildSubcontextInitialAction`/`buildSubcontextInitialActionWithSubActions`
   * Add `subcontextInitialAction` for all the functions-builders of `BehaviourContext` and
-`additionalSubcontextInitialAction` to all triggers
+    `additionalSubcontextInitialAction` to all triggers
 
 ## 20.0.1
 

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-7.11-blue)](https://core.telegram.org/bots/api-changelog#october-31-2024)
+# 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-8.2-blue)](https://core.telegram.org/bots/api-changelog#january-1-2025)
 
 |          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
 |:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

docs/build.gradle

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

gradle.properties

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

gradle/libs.versions.toml

@@ -2,26 +2,26 @@
 
 kotlin = "2.1.0"
 kotlin-serialization = "1.7.3"
-kotlin-coroutines = "1.9.0"
+kotlin-coroutines = "1.10.1"
 
 javax-activation = "1.1.1"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
-ktor = "3.0.1"
+ktor = "3.0.3"
 
 ksp = "2.1.0-1.0.29"
 kotlin-poet = "1.18.1"
 
-microutils = "0.23.1"
-kslog = "1.3.6"
+microutils = "0.24.4"
+kslog = "1.4.0"
 
 versions = "0.51.0"
 
 github-release-plugin = "2.5.2"
-dokka = "1.9.20"
+dokka = "2.0.0"
 
-validator = "0.16.3"
+validator = "0.17.0"
 
 [libraries]
 
@@ -57,6 +57,8 @@ microutils-serialization-mapper = { module = "dev.inmo:micro_utils.serialization
 microutils-languageCodes = { module = "dev.inmo:micro_utils.language_codes", version.ref = "microutils" }
 microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
 microutils-fsm-common = { module = "dev.inmo:micro_utils.fsm.common", version.ref = "microutils" }
+microutils-ksp-sealed = { module = "dev.inmo:micro_utils.ksp.sealed", version.ref = "microutils" }
+microutils-ksp-sealed-generator = { module = "dev.inmo:micro_utils.ksp.sealed.generator", version.ref = "microutils" }
 
 kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip

tgbotapi.api/api/tgbotapi.api.api

@@ -96,7 +96,6 @@ public synthetic class dev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo$$se
 	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
 public final class dev/inmo/tgbotapi/extensions/api/EditLiveLocationInfo$Companion {
@@ -898,6 +897,15 @@ public final class dev/inmo/tgbotapi/extensions/api/edit/media/EditInlineMessage
 	public static synthetic fun editMessageMedia-FrLM24I$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ldev/inmo/tgbotapi/types/media/TelegramFreeMedia;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class dev/inmo/tgbotapi/extensions/api/edit/payments/EditUserStarSubscriptionKt {
+	public static final fun cancelUserStarSubscription-0SkZb-I (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun cancelUserStarSubscription-AASCvMI (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun editUserStarSubscription-0x-hEcU (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun editUserStarSubscription-TFuYNzM (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun enableUserStarSubscription-0SkZb-I (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun enableUserStarSubscription-AASCvMI (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public final class dev/inmo/tgbotapi/extensions/api/edit/reply_markup/EditChatMessageReplyMarkupKt {
 	public static final fun editMessageReplyMarkup-iJMbh4A (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun editMessageReplyMarkup-iJMbh4A$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
@@ -1076,6 +1084,36 @@ public final class dev/inmo/tgbotapi/extensions/api/get/GetUserProfilePhotosKt {
 	public static synthetic fun getUserProfilePhotos-4iNBclM$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/Integer;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class dev/inmo/tgbotapi/extensions/api/gifts/GetAvailableGiftsKt {
+	public static final fun getAvailableGifts (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/inmo/tgbotapi/extensions/api/gifts/SendGiftKt {
+	public static final fun sendGift (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/gifts/Gift;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun sendGift (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/gifts/Gift;Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/gifts/Gift;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun sendGift$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/gifts/Gift;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-0SDnvgk (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-0SDnvgk$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-1FWvrZc (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-1FWvrZc$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-CrS58cM (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-CrS58cM$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-GROm3fU (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-GROm3fU$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-VjR9mJc (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/gifts/Gift;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-VjR9mJc$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/gifts/Gift;Ljava/lang/String;Ldev/inmo/tgbotapi/types/message/ParseMode;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun sendGift-ySMgKnk (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/gifts/Gift;Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun sendGift-ySMgKnk$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/gifts/Gift;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public final class dev/inmo/tgbotapi/extensions/api/inline/SavePreparedInlineMessageKt {
+	public static final fun savePreparedInlineMessage (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult;ZZZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun savePreparedInlineMessage$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult;ZZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun savePreparedInlineMessage-W2FzMBY (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult;ZZZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun savePreparedInlineMessage-W2FzMBY$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLdev/inmo/tgbotapi/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult;ZZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
 public final class dev/inmo/tgbotapi/extensions/api/passport/SetPassportDataErrorsKt {
 	public static final fun setPassportDataErrors (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ldev/inmo/tgbotapi/types/passport/PassportData;Ldev/inmo/tgbotapi/utils/passport/Decryptor;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun setPassportDataErrors (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -2121,9 +2159,9 @@ public final class dev/inmo/tgbotapi/extensions/api/send/media/SendVoiceKt {
 
 public final class dev/inmo/tgbotapi/extensions/api/send/payments/CreateInvoiceLinkKt {
 	public static final fun createInvoiceLink (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun createInvoiceLink (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun createInvoiceLink$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static synthetic fun createInvoiceLink$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun createInvoiceLink-1vVIECE (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lkotlin/time/Duration;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun createInvoiceLink-1vVIECE$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lkotlin/time/Duration;Ljava/lang/Integer;Ljava/util/List;Ljava/lang/String;ZZZZZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class dev/inmo/tgbotapi/extensions/api/send/payments/RefundStarPaymentKt {
@@ -2172,6 +2210,15 @@ public final class dev/inmo/tgbotapi/extensions/api/send/polls/SendRegularPollKt
 	public static synthetic fun sendRegularPoll-smr50Sk$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/util/List;Ljava/util/List;Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo;ZZZLdev/inmo/tgbotapi/types/MessageThreadId;Ljava/lang/String;ZZZLjava/lang/String;Ldev/inmo/tgbotapi/types/ReplyParameters;Ldev/inmo/tgbotapi/types/buttons/KeyboardMarkup;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
+public final class dev/inmo/tgbotapi/extensions/api/set/SetUserEmojiStatusKt {
+	public static final fun setUserEmojiStatus-8OHYyMQ (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;DLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun setUserEmojiStatus-OZgzbMQ (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;DLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun setUserEmojiStatus-SrqJ0BM (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ldev/inmo/tgbotapi/types/TelegramDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun setUserEmojiStatus-SrqJ0BM$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/User;Ljava/lang/String;Ldev/inmo/tgbotapi/types/TelegramDate;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun setUserEmojiStatus-bic5Y5o (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ldev/inmo/tgbotapi/types/TelegramDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun setUserEmojiStatus-bic5Y5o$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Ldev/inmo/tgbotapi/types/TelegramDate;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
 public final class dev/inmo/tgbotapi/extensions/api/stickers/AddStickerToSetKt {
 	public static final fun addStickerToSet (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ldev/inmo/tgbotapi/types/stickers/StickerSet;Ldev/inmo/tgbotapi/requests/abstracts/InputFile;Ldev/inmo/tgbotapi/types/StickerFormat;Ljava/util/List;Ldev/inmo/tgbotapi/types/stickers/MaskPosition;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun addStickerToSet (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/CommonUser;Ldev/inmo/tgbotapi/types/stickers/StickerSet;Ldev/inmo/tgbotapi/requests/abstracts/InputFile;Ldev/inmo/tgbotapi/types/StickerFormat;Ljava/util/List;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -2271,6 +2318,20 @@ public final class dev/inmo/tgbotapi/extensions/api/utils/UpdatesHandlingKt {
 	public static synthetic fun updateHandlerWithMediaGroupsAdaptation$default (Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;JILjava/lang/Object;)Lkotlin/jvm/functions/Function2;
 }
 
+public final class dev/inmo/tgbotapi/extensions/api/verifications/VerifyChatKt {
+	public static final fun verifyChat (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun verifyChat (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun verifyChat$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/ChatIdentifier;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun verifyChat$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public final class dev/inmo/tgbotapi/extensions/api/verifications/VerifyUserKt {
+	public static final fun verifyUser (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun verifyUser$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Ldev/inmo/tgbotapi/types/chat/Chat;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun verifyUser-nc95W0g (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun verifyUser-nc95W0g$default (Ldev/inmo/tgbotapi/bot/RequestsExecutor;JLjava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
 public final class dev/inmo/tgbotapi/extensions/api/webhook/DeleteWebhookKt {
 	public static final fun deleteWebhook (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/payments/EditUserStarSubscription.kt

@@ -0,0 +1,65 @@
+package dev.inmo.tgbotapi.extensions.api.edit.payments
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.edit.payments.EditUserStarSubscription
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.payments.abstracts.TelegramPaymentChargeId
+
+public suspend fun TelegramBot.editUserStarSubscription(
+    userId: UserId,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+    isCanceled: Boolean
+): Boolean = execute(
+    EditUserStarSubscription(
+        userId = userId,
+        telegramPaymentChargeId = telegramPaymentChargeId,
+        isCanceled = isCanceled
+    )
+)
+
+public suspend fun TelegramBot.editUserStarSubscription(
+    user: User,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+    isCanceled: Boolean
+): Boolean = editUserStarSubscription(
+    userId = user.id,
+    telegramPaymentChargeId = telegramPaymentChargeId,
+    isCanceled = isCanceled
+)
+
+public suspend fun TelegramBot.cancelUserStarSubscription(
+    userId: UserId,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+): Boolean = editUserStarSubscription(
+    userId = userId,
+    telegramPaymentChargeId = telegramPaymentChargeId,
+    isCanceled = true
+)
+
+public suspend fun TelegramBot.cancelUserStarSubscription(
+    user: User,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+): Boolean = editUserStarSubscription(
+    user = user,
+    telegramPaymentChargeId = telegramPaymentChargeId,
+    isCanceled = true
+)
+
+public suspend fun TelegramBot.enableUserStarSubscription(
+    userId: UserId,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+): Boolean = editUserStarSubscription(
+    userId = userId,
+    telegramPaymentChargeId = telegramPaymentChargeId,
+    isCanceled = false
+)
+
+public suspend fun TelegramBot.enableUserStarSubscription(
+    user: User,
+    telegramPaymentChargeId: TelegramPaymentChargeId,
+): Boolean = editUserStarSubscription(
+    user = user,
+    telegramPaymentChargeId = telegramPaymentChargeId,
+    isCanceled = false
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/gifts/GetAvailableGifts.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.extensions.api.gifts
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.gifts.GetAvailableGifts
+import dev.inmo.tgbotapi.types.gifts.Gifts
+
+public suspend fun TelegramBot.getAvailableGifts(): Gifts = execute(GetAvailableGifts)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/gifts/SendGift.kt

@@ -0,0 +1,119 @@
+package dev.inmo.tgbotapi.extensions.api.gifts
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.gifts.SendGift
+import dev.inmo.tgbotapi.types.GiftId
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.gifts.Gift
+import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+
+public suspend fun TelegramBot.sendGift(
+    userId: UserId,
+    giftId: GiftId,
+    text: String,
+    parseMode: ParseMode?,
+    upgradableToUnique: Boolean = false
+): Boolean = execute(
+    SendGift(
+        userId = userId,
+        giftId = giftId,
+        text = text,
+        parseMode = parseMode,
+        upgradableToUnique = upgradableToUnique
+    )
+)
+
+public suspend fun TelegramBot.sendGift(
+    userId: UserId,
+    giftId: GiftId,
+    textSources: TextSourcesList,
+    upgradableToUnique: Boolean = false,
+): Boolean = execute(
+    SendGift(
+        userId = userId,
+        giftId = giftId,
+        textSources = textSources,
+        upgradableToUnique = upgradableToUnique
+    )
+)
+
+public suspend fun TelegramBot.sendGift(
+    user: User,
+    giftId: GiftId,
+    text: String,
+    parseMode: ParseMode?,
+    upgradableToUnique: Boolean = false
+): Boolean = sendGift(
+    userId = user.id,
+    giftId = giftId,
+    text = text,
+    parseMode = parseMode,
+    upgradableToUnique = upgradableToUnique
+)
+
+public suspend fun TelegramBot.sendGift(
+    user: User,
+    giftId: GiftId,
+    textSources: TextSourcesList,
+    upgradableToUnique: Boolean = false,
+): Boolean = sendGift(
+    userId = user.id,
+    giftId = giftId,
+    textSources = textSources,
+    upgradableToUnique = upgradableToUnique
+)
+
+public suspend fun TelegramBot.sendGift(
+    user: UserId,
+    gift: Gift,
+    text: String,
+    parseMode: ParseMode?,
+    upgradableToUnique: Boolean = false
+): Boolean = sendGift(
+    userId = user,
+    giftId = gift.id,
+    text = text,
+    parseMode = parseMode,
+    upgradableToUnique = upgradableToUnique
+)
+
+public suspend fun TelegramBot.sendGift(
+    user: UserId,
+    gift: Gift,
+    textSources: TextSourcesList,
+    upgradableToUnique: Boolean = false,
+): Boolean = sendGift(
+    userId = user,
+    giftId = gift.id,
+    textSources = textSources,
+    upgradableToUnique = upgradableToUnique
+)
+
+
+public suspend fun TelegramBot.sendGift(
+    user: User,
+    gift: Gift,
+    text: String,
+    parseMode: ParseMode?,
+    upgradableToUnique: Boolean = false
+): Boolean = sendGift(
+    userId = user.id,
+    giftId = gift.id,
+    text = text,
+    parseMode = parseMode,
+    upgradableToUnique = upgradableToUnique
+)
+
+public suspend fun TelegramBot.sendGift(
+    user: User,
+    gift: Gift,
+    textSources: TextSourcesList,
+    upgradableToUnique: Boolean = false,
+): Boolean = sendGift(
+    userId = user.id,
+    giftId = gift.id,
+    textSources = textSources,
+    upgradableToUnique = upgradableToUnique
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/inline/SavePreparedInlineMessage.kt

@@ -0,0 +1,45 @@
+package dev.inmo.tgbotapi.extensions.api.inline
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.answers.InlineQueryAnswersResultsSerializer
+import dev.inmo.tgbotapi.requests.inline.SavePreparedInlineMessage
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import dev.inmo.tgbotapi.types.InlineQueries.prepared.PreparedInlineMessage
+import dev.inmo.tgbotapi.types.chat.User
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+public suspend fun TelegramBot.savePreparedInlineMessage(
+    userId: UserId,
+    result: InlineQueryResult,
+    allowSendToUsers: Boolean = false,
+    allowSendToBots: Boolean = false,
+    allowSendToGroups: Boolean = false,
+    allowSendToChannels: Boolean = false,
+): PreparedInlineMessage = execute(
+    SavePreparedInlineMessage(
+        userId = userId,
+        result = result,
+        allowSendToUsers = allowSendToUsers,
+        allowSendToBots = allowSendToBots,
+        allowSendToGroups = allowSendToGroups,
+        allowSendToChannels = allowSendToChannels
+    )
+)
+
+public suspend fun TelegramBot.savePreparedInlineMessage(
+    user: User,
+    result: InlineQueryResult,
+    allowSendToUsers: Boolean = false,
+    allowSendToBots: Boolean = false,
+    allowSendToGroups: Boolean = false,
+    allowSendToChannels: Boolean = false,
+): PreparedInlineMessage = savePreparedInlineMessage(
+    userId = user.id,
+    result = result,
+    allowSendToUsers = allowSendToUsers,
+    allowSendToBots = allowSendToBots,
+    allowSendToGroups = allowSendToGroups,
+    allowSendToChannels = allowSendToChannels
+)

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

@@ -2,9 +2,11 @@ package dev.inmo.tgbotapi.extensions.api.send.payments
 
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.send.payments.CreateInvoiceLink
+import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.payments.abstracts.XTR
+import korlibs.time.TimeSpan
 
 public suspend fun TelegramBot.createInvoiceLink(
     title: String,
@@ -24,7 +26,25 @@ public suspend fun TelegramBot.createInvoiceLink(
     shouldSendEmailToProvider: Boolean = false,
     priceDependOnShipAddress: Boolean = false
 ): String = execute(
-    CreateInvoiceLink(title, description, payload, providerToken, currency, prices, maxTipAmount, suggestedTipAmounts ?.sorted(), providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress)
+    CreateInvoiceLink(
+        title = title,
+        description = description,
+        payload = payload,
+        providerToken = providerToken,
+        currency = currency,
+        prices = prices,
+        subscriptionPeriod = null,
+        maxTipAmount = maxTipAmount,
+        suggestedTipAmounts = suggestedTipAmounts ?.sorted(),
+        providerData = providerData,
+        requireName = requireName,
+        requirePhoneNumber = requirePhoneNumber,
+        requireEmail = requireEmail,
+        requireShippingAddress = requireShippingAddress,
+        shouldSendPhoneNumberToProvider = shouldSendPhoneNumberToProvider,
+        shouldSendEmailToProvider = shouldSendEmailToProvider,
+        priceDependOnShipAddress = priceDependOnShipAddress
+    )
 )
 
 /**
@@ -35,6 +55,8 @@ public suspend fun TelegramBot.createInvoiceLink(
     description: String,
     payload: String,
     prices: List<LabeledPrice>,
+    businessConnectionId: BusinessConnectionId? = null,
+    subscriptionPeriod: TimeSpan? = null,
     maxTipAmount: Int? = null,
     suggestedTipAmounts: List<Int>? = null,
     providerData: String? = null,
@@ -46,5 +68,24 @@ public suspend fun TelegramBot.createInvoiceLink(
     shouldSendEmailToProvider: Boolean = false,
     priceDependOnShipAddress: Boolean = false
 ): String = execute(
-    CreateInvoiceLink(title, description, payload, null, Currency.XTR, prices, maxTipAmount, suggestedTipAmounts ?.sorted(), providerData, requireName, requirePhoneNumber, requireEmail, requireShippingAddress, shouldSendPhoneNumberToProvider, shouldSendEmailToProvider, priceDependOnShipAddress)
+    CreateInvoiceLink(
+        title = title,
+        description = description,
+        payload = payload,
+        providerToken = null,
+        currency = Currency.XTR,
+        businessConnectionId = businessConnectionId,
+        prices = prices,
+        subscriptionPeriod = subscriptionPeriod,
+        maxTipAmount = maxTipAmount,
+        suggestedTipAmounts = suggestedTipAmounts ?.sorted(),
+        providerData = providerData,
+        requireName = requireName,
+        requirePhoneNumber = requirePhoneNumber,
+        requireEmail = requireEmail,
+        requireShippingAddress = requireShippingAddress,
+        shouldSendPhoneNumberToProvider = shouldSendPhoneNumberToProvider,
+        shouldSendEmailToProvider = shouldSendEmailToProvider,
+        priceDependOnShipAddress = priceDependOnShipAddress
+    )
 )

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/set/SetUserEmojiStatus.kt

@@ -0,0 +1,50 @@
+package dev.inmo.tgbotapi.extensions.api.set
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.set.SetUserEmojiStatus
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.User
+import korlibs.time.DateTime
+
+public suspend fun TelegramBot.setUserEmojiStatus(
+    userId: UserId,
+    customEmojiId: CustomEmojiId,
+    expirationDate: TelegramDate? = null
+): Boolean = execute(
+    SetUserEmojiStatus(
+        userId = userId,
+        customEmojiId = customEmojiId,
+        expirationDate = expirationDate
+    )
+)
+
+public suspend fun TelegramBot.setUserEmojiStatus(
+    user: User,
+    customEmojiId: CustomEmojiId,
+    expirationDate: TelegramDate? = null
+): Boolean = setUserEmojiStatus(
+    user.id,
+    customEmojiId,
+    expirationDate
+)
+
+
+public suspend fun TelegramBot.setUserEmojiStatus(
+    userId: UserId,
+    customEmojiId: CustomEmojiId,
+    expirationDate: DateTime
+): Boolean = setUserEmojiStatus(
+    userId,
+    customEmojiId,
+    expirationDate.toTelegramDate()
+)
+
+public suspend fun TelegramBot.setUserEmojiStatus(
+    user: User,
+    customEmojiId: CustomEmojiId,
+    expirationDate: DateTime
+): Boolean = setUserEmojiStatus(
+    user.id,
+    customEmojiId,
+    expirationDate
+)

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/verifications/VerifyChat.kt

@@ -0,0 +1,39 @@
+package dev.inmo.tgbotapi.extensions.api.verifications
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.verifications.VerifyChat
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chatIdField
+import dev.inmo.tgbotapi.types.customDescriptionField
+import kotlinx.serialization.SerialName
+
+public suspend fun TelegramBot.verifyChat(
+    chatId: ChatIdentifier,
+    description: String? = null
+): Boolean = execute(
+    VerifyChat(
+        chatId = chatId,
+        description = description
+    )
+)
+
+/**
+ * This method may call [verifyUser] in case when [chat] is [PrivateChat]
+ */
+public suspend fun TelegramBot.verifyChat(
+    chat: Chat,
+    description: String? = null
+): Boolean = when (chat) {
+    is PrivateChat -> verifyUser(
+        chat = chat,
+        description = description
+    )
+    is UnknownExtendedChat,
+    is UnknownChatType,
+    is BusinessChat,
+    is PublicChat -> verifyChat(
+        chatId = chat.id,
+        description = description
+    )
+}

tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/verifications/VerifyUser.kt

@@ -0,0 +1,26 @@
+package dev.inmo.tgbotapi.extensions.api.verifications
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.verifications.VerifyChat
+import dev.inmo.tgbotapi.requests.verifications.VerifyUser
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.Chat
+import kotlinx.serialization.SerialName
+
+public suspend fun TelegramBot.verifyUser(
+    userId: UserId,
+    description: String? = null
+): Boolean = execute(
+    VerifyUser(
+        userId = userId,
+        description = description
+    )
+)
+
+public suspend fun TelegramBot.verifyUser(
+    chat: Chat,
+    description: String? = null
+): Boolean = verifyUser(
+    userId = chat.id.toChatId(),
+    description = description
+)

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/CombinedSubcontextInitialAction.kt

@@ -6,6 +6,13 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 
 /**
  * Contains [SubAction]s which will be used in [subcontextInitialAction] in order they has been passed in [subactions].
+ *
+ * Its [subcontextInitialAction] will iterate over incoming [subactions] until all will be completed successfully OR
+ * none will be successful during round of running:
+ *
+ * * Run all
+ * * Exclude from current running successful items
+ * * Do again if there are some items to run
  */
 class CombinedSubcontextInitialAction(
     val subactions: List<SubAction>,
@@ -25,14 +32,30 @@ class CombinedSubcontextInitialAction(
         }
     }
     val subcontextInitialAction: CustomBehaviourContextAndTypeReceiver<BehaviourContext, Unit, Update> = { update ->
-        subactions.forEach { subaction ->
-            with(subaction) {
-                runCatching {
-                    invoke(update)
-                }.onFailure {
-                    logger.error("Unable to execute $subaction for update $update", it)
+        val leftSubActions = subactions.toMutableSet()
+        val successSubActions = mutableSetOf<SubAction>()
+        while (leftSubActions.isNotEmpty()) {
+            leftSubActions.forEach { subaction ->
+                with(subaction) {
+                    runCatching {
+                        invoke(update)
+                    }.onFailure {
+                        logger.error(it) {
+                            "Unable to execute $subaction for update $update. Will try on next round"
+                        }
+                    }.onSuccess {
+                        successSubActions.add(subaction)
+                    }
                 }
             }
+            leftSubActions.removeAll(successSubActions)
+            if (successSubActions.isEmpty()) {
+                logger.error {
+                    "Some SubActions have been unable to complete successfully:${leftSubActions.joinToString("\n") { it.toString() }}"
+                }
+                break
+            }
+            successSubActions.clear()
         }
     }
 }

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

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import korlibs.time.TimeSpan
+
+interface SubscriptionInfo : SubscriptionPeriodInfo {
+    val subscriptionPrice: UInt?
+}

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

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import korlibs.time.TimeSpan
+
+interface SubscriptionPeriodInfo {
+    val subscriptionPeriod: TimeSpan?
+}

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

@@ -9,17 +9,14 @@ import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.requests.GetUpdatesRequest
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
-import dev.inmo.tgbotapi.types.message.textsources.pre
 import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.timeout
 import io.ktor.client.request.*
-import io.ktor.client.request.forms.*
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.content.*
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.collections.set
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink.kt

@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.requests.chat.invite_links
 
+import dev.inmo.tgbotapi.abstracts.types.SubscriptionInfo
+import dev.inmo.tgbotapi.abstracts.types.SubscriptionPeriodInfo
 import korlibs.time.DateTime
 import dev.inmo.tgbotapi.requests.chat.abstracts.*
 import dev.inmo.tgbotapi.types.*
@@ -15,9 +17,9 @@ sealed interface CreateChatInviteLink<R : SecondaryChatInviteLink> : EditChatInv
 
     override fun method(): String = "createChatInviteLink"
 
-    sealed interface Subscription : CreateChatInviteLink<ChatInviteLinkUnlimited> {
-        val subscriptionPeriod: TimeSpan
-        val subscriptionPrice: UInt
+    sealed interface Subscription : CreateChatInviteLink<ChatInviteLinkUnlimited>, SubscriptionInfo {
+        override val subscriptionPeriod: TimeSpan
+        override val subscriptionPrice: UInt
 
         override fun method(): String = "createChatSubscriptionInviteLink"
     }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/payments/EditUserStarSubscription.kt

@@ -0,0 +1,32 @@
+package dev.inmo.tgbotapi.requests.edit.payments
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.isCanceledField
+import dev.inmo.tgbotapi.types.payments.abstracts.TelegramPaymentChargeId
+import dev.inmo.tgbotapi.types.telegramPaymentChargeIdField
+import dev.inmo.tgbotapi.types.userIdField
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class EditUserStarSubscription(
+    @SerialName(userIdField)
+    val userId: UserId,
+    @SerialName(telegramPaymentChargeIdField)
+    val telegramPaymentChargeId: TelegramPaymentChargeId,
+    @SerialName(isCanceledField)
+    val isCanceled: Boolean
+) : SimpleRequest<Boolean> {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "editUserStarSubscription"
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/gifts/GetAvailableGifts.kt

@@ -0,0 +1,17 @@
+package dev.inmo.tgbotapi.requests.gifts
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.gifts.Gifts
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+
+@Serializable
+data object GetAvailableGifts : SimpleRequest<Gifts> {
+    override fun method(): String = "getAvailableGifts"
+
+    override val resultDeserializer: DeserializationStrategy<Gifts>
+        get() = Gifts.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/gifts/SendGift.kt

@@ -0,0 +1,75 @@
+package dev.inmo.tgbotapi.requests.gifts
+
+import dev.inmo.tgbotapi.abstracts.TextedOutput
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.message.ParseMode
+import dev.inmo.tgbotapi.types.message.RawMessageEntity
+import dev.inmo.tgbotapi.types.message.asTextSources
+import dev.inmo.tgbotapi.types.message.textsources.TextSource
+import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
+import dev.inmo.tgbotapi.types.message.toRawMessageEntities
+import dev.inmo.tgbotapi.utils.extensions.makeSourceString
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SendGift internal constructor(
+    @SerialName(userIdField)
+    val userId: UserId,
+    @SerialName(giftIdField)
+    val giftId: GiftId,
+    @SerialName(textField)
+    override val text: String,
+    @SerialName(textParseModeField)
+    override val parseMode: ParseMode?,
+    @SerialName(textEntitiesField)
+    private val rawEntities: List<RawMessageEntity>? = null,
+    @SerialName(payToUpgradeField)
+    val upgradableToUnique: Boolean = false
+) : SimpleRequest<Boolean>, TextedOutput {
+    override val textSources: TextSourcesList? by lazy {
+        rawEntities ?.asTextSources(text)
+    }
+
+    override fun method(): String = "sendGift"
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+
+    constructor(
+        userId: UserId,
+        giftId: GiftId,
+        text: String,
+        parseMode: ParseMode?,
+        upgradableToUnique: Boolean = false
+    ) : this(
+        userId = userId,
+        giftId = giftId,
+        text = text,
+        parseMode = parseMode,
+        rawEntities = null,
+        upgradableToUnique = upgradableToUnique
+    )
+
+    constructor(
+        userId: UserId,
+        giftId: GiftId,
+        textSources: TextSourcesList,
+        upgradableToUnique: Boolean = false,
+    ) : this(
+        userId = userId,
+        giftId = giftId,
+        text = textSources.makeSourceString(),
+        parseMode = null,
+        rawEntities = textSources.toRawMessageEntities(),
+        upgradableToUnique = upgradableToUnique
+    )
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/inline/SavePreparedInlineMessage.kt

@@ -0,0 +1,35 @@
+package dev.inmo.tgbotapi.requests.inline
+
+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.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer
+import dev.inmo.tgbotapi.types.InlineQueries.prepared.PreparedInlineMessage
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+
+@Serializable
+data class SavePreparedInlineMessage(
+    @SerialName(userIdField)
+    val userId: UserId,
+    @Serializable(InlineQueryResultSerializer::class)
+    @SerialName(resultField)
+    val result: InlineQueryResult,
+    @SerialName(allowUserChatsField)
+    val allowSendToUsers: Boolean = false,
+    @SerialName(allowBotChatsField)
+    val allowSendToBots: Boolean = false,
+    @SerialName(allowGroupChatsField)
+    val allowSendToGroups: Boolean = false,
+    @SerialName(allowChannelChatsField)
+    val allowSendToChannels: Boolean = false,
+) : SimpleRequest<PreparedInlineMessage> {
+    override fun method(): String = "savePreparedInlineMessage"
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+    override val resultDeserializer: DeserializationStrategy<PreparedInlineMessage>
+        get() = PreparedInlineMessage.serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/CreateInvoiceLink.kt

@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.requests.send.payments
 import dev.inmo.tgbotapi.abstracts.CommonSendInvoiceData
 import dev.inmo.tgbotapi.abstracts.types.*
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.InvoiceContent
@@ -12,6 +12,8 @@ import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.LabeledPricesSerializer
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.payments.abstracts.XTR
+import dev.inmo.tgbotapi.utils.TimeSpanAsSecondsSerializer
+import korlibs.time.TimeSpan
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
@@ -30,9 +32,14 @@ data class CreateInvoiceLink(
     override val providerToken: String?,
     @SerialName(currencyField)
     override val currency: Currency,
+    @SerialName(businessConnectionIdField)
+    override val businessConnectionId: BusinessConnectionId? = null,
     @Serializable(LabeledPricesSerializer::class)
     @SerialName(pricesField)
     override val prices: List<LabeledPrice>,
+    @SerialName(subscriptionPeriodField)
+    @Serializable(TimeSpanAsSecondsSerializer::class)
+    override val subscriptionPeriod: TimeSpan? = null,
     @SerialName(maxTipAmountField)
     override val maxTipAmount: Int? = null,
     @SerialName(suggestedTipAmountsField)
@@ -53,7 +60,7 @@ data class CreateInvoiceLink(
     override val shouldSendEmailToProvider: Boolean = false,
     @SerialName(priceDependOnShipAddressField)
     override val priceDependOnShipAddress: Boolean = false
-) : CommonSendInvoiceData, SimpleRequest<String> {
+) : CommonSendInvoiceData, SimpleRequest<String>, WithOptionalBusinessConnectionId, SubscriptionPeriodInfo {
     override fun method(): String = "createInvoiceLink"
     override val resultDeserializer: DeserializationStrategy<String>
         get() = String.serializer()
@@ -137,4 +144,8 @@ data class CreateInvoiceLink(
         photoWidth = null
         photoHeight = null
     }
+
+    companion object {
+        const val DEFAULT: Seconds = 2592000 // 30 days
+    }
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/set/SetUserEmojiStatus.kt

@@ -0,0 +1,28 @@
+package dev.inmo.tgbotapi.requests.set
+
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+@Serializable
+data class SetUserEmojiStatus(
+    @SerialName(userIdField)
+    val userId: UserId,
+    @SerialName(emojiStatusCustomEmojiIdField)
+    val customEmojiId: CustomEmojiId,
+    @Serializable(TelegramDateSerializer::class)
+    @SerialName(emojiStatusExpirationDateField)
+    val expirationDate: TelegramDate? = null
+) : SimpleRequest<Boolean> {
+    override fun method(): String = "setUserEmojiStatus"
+
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/verifications/RemoveChatVerification.kt

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.verifications
+
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+
+@Serializable
+data class RemoveChatVerification(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+): ChatRequest, SimpleRequest<Boolean> {
+    override fun method(): String = "removeChatVerification"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/verifications/RemoveUserVerification.kt

@@ -0,0 +1,23 @@
+package dev.inmo.tgbotapi.requests.verifications
+
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+
+@Serializable
+data class RemoveUserVerification(
+    @SerialName(userIdField)
+    val userId: UserId,
+): SimpleRequest<Boolean> {
+    override fun method(): String = "removeUserVerification"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/verifications/VerifyChat.kt

@@ -0,0 +1,28 @@
+package dev.inmo.tgbotapi.requests.verifications
+
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.chatIdField
+import dev.inmo.tgbotapi.types.customDescriptionField
+import dev.inmo.tgbotapi.types.descriptionField
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+
+@Serializable
+data class VerifyChat(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(customDescriptionField)
+    val description: String? = null
+): ChatRequest, SimpleRequest<Boolean> {
+    override fun method(): String = "verifyChat"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/verifications/VerifyUser.kt

@@ -0,0 +1,25 @@
+package dev.inmo.tgbotapi.requests.verifications
+
+import dev.inmo.tgbotapi.abstracts.types.ChatRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.builtins.serializer
+
+
+@Serializable
+data class VerifyUser(
+    @SerialName(userIdField)
+    val userId: UserId,
+    @SerialName(customDescriptionField)
+    val description: String? = null
+): SimpleRequest<Boolean> {
+    override fun method(): String = "verifyUser"
+    override val resultDeserializer: DeserializationStrategy<Boolean>
+        get() = Boolean.serializer()
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+}

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

@@ -2,8 +2,12 @@ package dev.inmo.tgbotapi.types
 
 import korlibs.time.DateTime
 import dev.inmo.tgbotapi.abstracts.WithUser
+import dev.inmo.tgbotapi.abstracts.types.SubscriptionInfo
+import dev.inmo.tgbotapi.abstracts.types.SubscriptionPeriodInfo
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.utils.RiskFeature
+import dev.inmo.tgbotapi.utils.TimeSpanAsSecondsSerializer
+import korlibs.time.TimeSpan
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
@@ -64,7 +68,7 @@ sealed interface ChatInviteLink : WithUser {
  * Base interface for all [ChatInviteLink]s which are NOT [PrimaryInviteLink]
  */
 @Serializable(ChatInviteLinkSerializer::class)
-sealed interface SecondaryChatInviteLink : ChatInviteLink {
+sealed interface SecondaryChatInviteLink : ChatInviteLink, SubscriptionInfo {
     override val isPrimary: Boolean
         get() = false
 }
@@ -108,7 +112,12 @@ data class ChatInviteLinkWithJoinRequest(
     @SerialName(isRevokedField)
     override val isRevoked: Boolean = false,
     @SerialName(expireDateField)
-    private val expireDate: TelegramDate? = null
+    private val expireDate: TelegramDate? = null,
+    @SerialName(subscriptionPeriodField)
+    @Serializable(TimeSpanAsSecondsSerializer::class)
+    override val subscriptionPeriod: TimeSpan? = null,
+    @SerialName(subscriptionPriceField)
+    override val subscriptionPrice: UInt? = null
 ) : SecondaryChatInviteLink {
     override val expirationDateTime: DateTime?
         get() = expireDate ?.asDate
@@ -131,6 +140,11 @@ data class ChatInviteLinkWithLimitedMembers(
     override val isRevoked: Boolean = false,
     @SerialName(expireDateField)
     private val expireDate: TelegramDate? = null,
+    @SerialName(subscriptionPeriodField)
+    @Serializable(TimeSpanAsSecondsSerializer::class)
+    override val subscriptionPeriod: TimeSpan? = null,
+    @SerialName(subscriptionPriceField)
+    override val subscriptionPrice: UInt? = null
 ) : SecondaryChatInviteLink {
     override val expirationDateTime: DateTime?
         get() = expireDate ?.asDate
@@ -152,6 +166,11 @@ data class ChatInviteLinkUnlimited(
     override val isRevoked: Boolean = false,
     @SerialName(expireDateField)
     private val expireDate: TelegramDate? = null,
+    @SerialName(subscriptionPeriodField)
+    @Serializable(TimeSpanAsSecondsSerializer::class)
+    override val subscriptionPeriod: TimeSpan? = null,
+    @SerialName(subscriptionPriceField)
+    override val subscriptionPrice: UInt? = null
 ) : SecondaryChatInviteLink {
     override val expirationDateTime: DateTime?
         get() = expireDate ?.asDate

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

@@ -34,6 +34,18 @@ value class PaidMediaPayload(val string: String) {
     }
 }
 
+@Serializable
+@JvmInline
+value class GiftId(
+    val string: String
+)
+
+@Serializable
+@JvmInline
+value class PreparedMessageId(
+    val string: String
+)
+
 val usernameRegex = Regex("@[\\w\\d_]+")
 
 val degreesLimit = 1 .. 360
@@ -190,6 +202,7 @@ const val maskPositionField = "mask_position"
 const val phoneNumberField = "phone_number"
 const val userIdField = "user_id"
 const val userIdsField = "user_ids"
+const val giftIdField = "gift_id"
 const val onlyIfBannedField = "only_if_banned"
 const val containsMasksField = "contains_masks"
 const val resultIdField = "result_id"
@@ -414,6 +427,7 @@ const val emojiField = "emoji"
 const val emojisField = "emojis"
 const val titleField = "title"
 const val descriptionField = "description"
+const val customDescriptionField = "custom_description"
 const val shortDescriptionField = "short_description"
 const val performerField = "performer"
 const val durationField = "duration"
@@ -454,6 +468,7 @@ const val actionField = "action"
 const val positionField = "position"
 const val labelField = "label"
 const val amountField = "amount"
+const val nanostarAmountField = "nanostar_amount"
 const val pricesField = "prices"
 const val payloadField = "payload"
 const val vcardField = "vcard"
@@ -472,6 +487,8 @@ const val creatorField = "creator"
 const val subscriptionPeriodField = "subscription_period"
 const val subscriptionPriceField = "subscription_price"
 const val copyTextField = "copy_text"
+const val giftField = "gift"
+const val giftsField = "gifts"
 
 const val pointField = "point"
 const val xShiftField = "x_shift"
@@ -504,6 +521,11 @@ const val startParameterField = "start_parameter"
 const val totalAmountField = "total_amount"
 const val invoicePayloadField = "invoice_payload"
 const val requestCountField = "request_count"
+const val sponsorUserField = "sponsor_user"
+const val affiliateUserField = "affiliate_user"
+const val affiliateChatField = "affiliate_chat"
+const val commissionPerMilleField = "commission_per_mille"
+const val affiliateField = "affiliate"
 const val paidMediaPayloadField = "paid_media_payload"
 const val shippingOptionIdField = "shipping_option_id"
 const val shippingQueryIdField = "shipping_query_id"
@@ -512,6 +534,7 @@ const val shippingOptionsField = "shipping_options"
 const val countryCodeField = "country_code"
 const val countryCodesField = "country_codes"
 const val totalCountField = "total_count"
+const val remainingCountField = "remaining_count"
 const val stateField = "state"
 const val cityField = "city"
 const val firstStreetLineField = "street_line1"
@@ -519,7 +542,11 @@ const val secondStreetLineField = "street_line2"
 const val postCodeField = "post_code"
 const val shippingAddressField = "shipping_address"
 const val orderInfoField = "order_info"
+const val subscriptionExpirationDateField = "subscription_expiration_date"
+const val isRecurringField = "is_recurring"
+const val isFirstRecurringField = "is_first_recurring"
 const val telegramPaymentChargeIdField = "telegram_payment_charge_id"
+const val isCanceledField = "is_canceled"
 const val providerPaymentChargeIdField = "provider_payment_charge_id"
 const val providerTokenField = "provider_token"
 const val providerDataField = "provider_data"
@@ -628,6 +655,8 @@ const val giveawayMessageField = "giveaway_message"
 const val wasRefundedField = "was_refunded"
 const val isManualField = "is_manual"
 const val starCountField = "star_count"
+const val upgradeStarCountField = "upgrade_star_count"
+const val payToUpgradeField = "pay_for_upgrade"
 const val paidMediaField = "paid_media"
 
 const val businessConnectionIdField = "business_connection_id"

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

@@ -19,8 +19,6 @@ class InlineQueryResultArticle(
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(urlField)
     override val url: String? = null,
-    @SerialName(hideUrlField)
-    val hideUrl: Boolean? = null,
     @SerialName(descriptionField)
     override val description: String? = null,
     @SerialName(thumbnailUrlField)
@@ -36,4 +34,31 @@ class InlineQueryResultArticle(
     WithInputMessageContentInlineQueryResult,
     UrlInlineQueryResult {
     override val type: String = "article"
+    @Deprecated("Field hide_url has been deprecated in Bot API 8.2. Use empty url instead")
+    val hideUrl: Boolean
+        get() = url != null && url.isEmpty()
+
+    @Deprecated("Field hide_url has been deprecated in Bot API 8.2. Use empty url instead")
+    constructor(
+        id: InlineQueryId,
+        title: String,
+        inputMessageContent: InputMessageContent,
+        replyMarkup: InlineKeyboardMarkup? = null,
+        url: String? = null,
+        hideUrl: Boolean?,
+        description: String? = null,
+        thumbnailUrl: String? = null,
+        thumbnailWidth: Int? = null,
+        thumbnailHeight: Int? = null
+    ) : this(
+        id = id,
+        title = title,
+        inputMessageContent = inputMessageContent,
+        replyMarkup = replyMarkup,
+        url = url,
+        description = description,
+        thumbnailUrl = thumbnailUrl,
+        thumbnailWidth = thumbnailWidth,
+        thumbnailHeight = thumbnailHeight
+    )
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/InlineQueries/prepared/PreparedInlineMessage.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.types.InlineQueries.prepared
+
+import dev.inmo.tgbotapi.types.PreparedMessageId
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.expirationDateField
+import dev.inmo.tgbotapi.types.idField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PreparedInlineMessage(
+    @SerialName(idField)
+    val id: PreparedMessageId,
+    @SerialName(expirationDateField)
+    val expirationDate: TelegramDate,
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/gifts/Gift.kt

@@ -0,0 +1,102 @@
+package dev.inmo.tgbotapi.types.gifts
+
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.files.Sticker
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable(Gift.Companion::class)
+sealed interface Gift {
+    val id: GiftId
+    val sticker: Sticker
+    val starCount: Int
+    val totalCount: Int?
+    val upgradeStarCount: Int?
+    val remainingCount: Int?
+
+    @Serializable
+    data class Unlimited(
+        @SerialName(idField)
+        override val id: GiftId,
+        @SerialName(stickerField)
+        override val sticker: Sticker,
+        @SerialName(starCountField)
+        override val starCount: Int,
+        @SerialName(upgradeStarCountField)
+        override val upgradeStarCount: Int? = null
+    ) : Gift {
+        override val totalCount: Int?
+            get() = null
+        override val remainingCount: Int?
+            get() = null
+    }
+
+    @Serializable
+    data class Limited(
+        @SerialName(idField)
+        override val id: GiftId,
+        @SerialName(stickerField)
+        override val sticker: Sticker,
+        @SerialName(starCountField)
+        override val starCount: Int,
+        @SerialName(totalCountField)
+        override val totalCount: Int,
+        @SerialName(remainingCountField)
+        override val remainingCount: Int,
+        @SerialName(upgradeStarCountField)
+        override val upgradeStarCount: Int? = null,
+    ) : Gift
+
+    companion object : KSerializer<Gift> {
+        @Serializable
+        private data class GiftSurrogate(
+            val id: GiftId,
+            val sticker: Sticker,
+            val star_count: Int,
+            val total_count: Int? = null,
+            val remaining_count: Int? = null,
+            val upgrade_star_count: Int? = null,
+        )
+
+        override val descriptor: SerialDescriptor
+            get() = GiftSurrogate.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Gift {
+            val surrogate = GiftSurrogate.serializer().deserialize(decoder)
+
+            return if (surrogate.total_count != null && surrogate.remaining_count != null) {
+                Limited(
+                    id = surrogate.id,
+                    sticker = surrogate.sticker,
+                    starCount = surrogate.star_count,
+                    totalCount = surrogate.total_count,
+                    remainingCount = surrogate.remaining_count,
+                    upgradeStarCount = surrogate.upgrade_star_count,
+                )
+            } else {
+                Unlimited(
+                    id = surrogate.id,
+                    sticker = surrogate.sticker,
+                    starCount = surrogate.star_count,
+                    upgradeStarCount = surrogate.upgrade_star_count,
+                )
+            }
+        }
+
+        override fun serialize(encoder: Encoder, value: Gift) {
+            val surrogate = GiftSurrogate(
+                id = value.id,
+                sticker = value.sticker,
+                star_count = value.starCount,
+                total_count = value.totalCount,
+                remaining_count = value.remainingCount,
+                upgrade_star_count = value.upgradeStarCount
+            )
+            GiftSurrogate.serializer().serialize(encoder, surrogate)
+        }
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/gifts/Gifts.kt

@@ -0,0 +1,11 @@
+package dev.inmo.tgbotapi.types.gifts
+
+import dev.inmo.tgbotapi.types.giftsField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Gifts(
+    @SerialName(giftsField)
+    val gifts: List<Gift>
+)

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

@@ -1,13 +1,10 @@
 package dev.inmo.tgbotapi.types.message
 
 import dev.inmo.micro_utils.common.Warning
-import dev.inmo.micro_utils.serialization.mapper.MapperSerializer
 import dev.inmo.tgbotapi.types.CustomEmojiId
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.textsources.*
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.ListSerializer
 
 @Serializable
 @Warning("This thing is subject of changes. Library do not guarantee stability of this class")
@@ -102,7 +99,7 @@ internal fun List<Pair<Int, TextSource>>.fillWithRegulars(source: String): TextS
     for (i in indices) {
         val (offset, textSource) = get(i)
         if (offset - index > 0) {
-            result.add(regular(source.substring(index, offset)))
+            result.add(regularTextSource(source.substring(index, offset)))
             index = offset
         }
         result.add(textSource)
@@ -110,7 +107,7 @@ internal fun List<Pair<Int, TextSource>>.fillWithRegulars(source: String): TextS
     }
 
     if (index != source.length) {
-        result.add(regular(source.substring(index, source.length)))
+        result.add(regularTextSource(source.substring(index, source.length)))
     }
 
     return result
@@ -127,7 +124,7 @@ private fun createTextSources(
     val resultList = mutableListOf<Pair<Int, TextSource>>()
 
     while (mutableEntities.isNotEmpty()) {
-        var parent = mutableEntities.removeFirst()
+        var parent = mutableEntities.removeAt(0)
         val subentities = mutableListOf<RawMessageEntity>()
         val toAddCutted = mutableListOf<RawMessageEntity>()
         while (mutableEntities.isNotEmpty()) {

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see blockquote
+ * @see blockquoteTextSource
  */
 @Serializable
 data class BlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class BlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
     override val html: String by lazy { blockquoteHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun blockquote(parts: TextSourcesList) = BlockquoteTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun blockquote(vararg parts: TextSource) = blockquote(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun blockquote(text: String) = blockquote(regular(text))
+inline fun blockquoteTextSource(parts: TextSourcesList) = BlockquoteTextSource(parts.makeString(), parts)
+inline fun blockquoteTextSource(vararg parts: TextSource) = blockquoteTextSource(parts.toList())
+inline fun blockquoteTextSource(text: String) = blockquoteTextSource(regularTextSource(text))

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see bold
+ * @see boldTextSource
  */
 @Serializable
 data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
     override val html: String by lazy { boldHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun bold(parts: TextSourcesList) = BoldTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun bold(vararg parts: TextSource) = bold(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun bold(text: String) = bold(regular(text))
+inline fun boldTextSource(parts: TextSourcesList) = BoldTextSource(parts.makeString(), parts)
+inline fun boldTextSource(vararg parts: TextSource) = boldTextSource(parts.toList())
+inline fun boldTextSource(text: String) = boldTextSource(regularTextSource(text))

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

@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see botCommand
+ * @see botCommandTextSource
  */
 @Serializable
 data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -33,8 +33,6 @@ data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
 /**
  * @param command Without leading "/"
  */
-@Suppress("NOTHING_TO_INLINE")
-inline fun botCommand(command: String) = BotCommandTextSource("/$command")
+inline fun botCommandTextSource(command: String) = BotCommandTextSource("/$command")
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun botCommand(botCommand: BotCommand) = botCommand(botCommand.command)
+inline fun botCommandTextSource(botCommand: BotCommand) = botCommandTextSource(botCommand.command)

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

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see cashTag
+ * @see cashTagTextSource
  */
 @Serializable
 data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -25,9 +25,6 @@ data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     override val html: String by lazy { cashTagHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun cashTag(parts: TextSourcesList) = CashTagTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun cashTag(vararg parts: TextSource) = cashTag(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun cashTag(tag: String) = cashTag(regular(tag))
+inline fun cashTagTextSource(parts: TextSourcesList) = CashTagTextSource(parts.makeString(), parts)
+inline fun cashTagTextSource(vararg parts: TextSource) = cashTagTextSource(parts.toList())
+inline fun cashTagTextSource(tag: String) = cashTagTextSource(regularTextSource(tag))

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see code
+ * @see codeTextSource
  */
 @Serializable
 data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -16,5 +16,4 @@ data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
     override val html: String by lazy { source.codeHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun code(code: String) = CodeTextSource(code)
+inline fun codeTextSource(code: String) = CodeTextSource(code)

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

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see customEmoji
+ * @see customEmojiTextSource
  */
 @Serializable
 data class CustomEmojiTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -20,12 +20,10 @@ data class CustomEmojiTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
     override val html: String by lazy { source.customEmojiHTML(customEmojiId) }
 }
 
-@Suppress("NOTHING_TO_INLINE", "EXPERIMENTAL_API_USAGE")
-inline fun customEmoji(emojiId: CustomEmojiId, parts: TextSourcesList) = CustomEmojiTextSource(parts.makeString(), emojiId, parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun customEmoji(emojiId: CustomEmojiId, vararg parts: TextSource) = customEmoji(emojiId, parts.toList())
+@Suppress("EXPERIMENTAL_API_USAGE")
+inline fun customEmojiTextSource(emojiId: CustomEmojiId, parts: TextSourcesList) = CustomEmojiTextSource(parts.makeString(), emojiId, parts)
+inline fun customEmojiTextSource(emojiId: CustomEmojiId, vararg parts: TextSource) = customEmojiTextSource(emojiId, parts.toList())
 /**
  * Without sharp (#)
  */
-@Suppress("NOTHING_TO_INLINE")
-inline fun customEmoji(emojiId: CustomEmojiId, text: String) = customEmoji(emojiId, regular(text))
+inline fun customEmojiTextSource(emojiId: CustomEmojiId, text: String) = customEmojiTextSource(emojiId, regularTextSource(text))

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see email
+ * @see emailTextSource
  */
 @Serializable
 data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor)
     override val html: String by lazy { emailHTML(source) }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun email(parts: TextSourcesList) = EMailTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun email(vararg parts: TextSource) = email(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun email(emailAddress: String) = email(regular(emailAddress))
+inline fun emailTextSource(parts: TextSourcesList) = EMailTextSource(parts.makeString(), parts)
+inline fun emailTextSource(vararg parts: TextSource) = emailTextSource(parts.toList())
+inline fun emailTextSource(emailAddress: String) = emailTextSource(regularTextSource(emailAddress))

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see expandableBlockquote
+ * @see expandableBlockquoteTextSource
  */
 @Serializable
 data class ExpandableBlockquoteTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class ExpandableBlockquoteTextSource @RiskFeature(DirectInvocationOfTextSou
     override val html: String by lazy { expandableBlockquoteHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun expandableBlockquote(parts: TextSourcesList) = ExpandableBlockquoteTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun expandableBlockquote(vararg parts: TextSource) = expandableBlockquote(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun expandableBlockquote(text: String) = expandableBlockquote(regular(text))
+inline fun expandableBlockquoteTextSource(parts: TextSourcesList) = ExpandableBlockquoteTextSource(parts.makeString(), parts)
+inline fun expandableBlockquoteTextSource(vararg parts: TextSource) = expandableBlockquoteTextSource(parts.toList())
+inline fun expandableBlockquoteTextSource(text: String) = expandableBlockquoteTextSource(regularTextSource(text))

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

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see hashtag
+ * @see hashtagTextSource
  */
 @Serializable
 data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -32,12 +32,10 @@ data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     }
 }
 
-@Suppress("NOTHING_TO_INLINE", "EXPERIMENTAL_API_USAGE")
-inline fun hashtag(parts: TextSourcesList) = (regular("#") + parts).let { HashTagTextSource(it.makeString(), it) }
-@Suppress("NOTHING_TO_INLINE")
-inline fun hashtag(vararg parts: TextSource) = hashtag(parts.toList())
+@Suppress("EXPERIMENTAL_API_USAGE")
+inline fun hashtagTextSource(parts: TextSourcesList) = (regularTextSource("#") + parts).let { HashTagTextSource(it.makeString(), it) }
+inline fun hashtagTextSource(vararg parts: TextSource) = hashtagTextSource(parts.toList())
 /**
  * Without sharp (#)
  */
-@Suppress("NOTHING_TO_INLINE")
-inline fun hashtag(hashtag: String) = hashtag(regular(hashtag))
+inline fun hashtagTextSource(hashtag: String) = hashtagTextSource(regularTextSource(hashtag))

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see italic
+ * @see italicTextSource
  */
 @Serializable
 data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,10 +18,7 @@ data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor
     override val html: String by lazy { italicHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun italic(parts: TextSourcesList) = ItalicTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun italic(vararg parts: TextSource) = italic(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun italic(text: String) = italic(regular(text))
+inline fun italicTextSource(parts: TextSourcesList) = ItalicTextSource(parts.makeString(), parts)
+inline fun italicTextSource(vararg parts: TextSource) = italicTextSource(parts.toList())
+inline fun italicTextSource(text: String) = italicTextSource(regularTextSource(text))
 

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

@@ -14,7 +14,7 @@ private val String.withoutCommercialAt
     }
 
 /**
- * @see mention
+ * @see mentionTextSource
  */
 @Serializable
 data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -33,17 +33,13 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(parts: TextSourcesList) = (regular("@") + parts).let { MentionTextSource(it.makeString(), it) }
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(vararg parts: TextSource) = mention(parts.toList())
+inline fun mentionTextSource(parts: TextSourcesList) = (regularTextSource("@") + parts).let { MentionTextSource(it.makeString(), it) }
+inline fun mentionTextSource(vararg parts: TextSource) = mentionTextSource(parts.toList())
 
 /**
  * Without leading "@"
  */
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(whoToMention: String) = mention(regular(whoToMention))
+inline fun mentionTextSource(whoToMention: String) = mentionTextSource(regularTextSource(whoToMention))
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(whoToMention: Username) = mention(whoToMention.full.dropWhile { it == '@' })
+inline fun mentionTextSource(whoToMention: Username) = mentionTextSource(whoToMention.full.dropWhile { it == '@' })
 

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see phone
+ * @see phoneTextSource
  */
 @Serializable
 data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,10 +18,7 @@ data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
     override val html: String by lazy { phoneHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun phone(parts: TextSourcesList) = PhoneNumberTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun phone(vararg parts: TextSource) = phone(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun phone(number: String) = phone(regular(number))
+inline fun phoneTextSource(parts: TextSourcesList) = PhoneNumberTextSource(parts.makeString(), parts)
+inline fun phoneTextSource(vararg parts: TextSource) = phoneTextSource(parts.toList())
+inline fun phoneTextSource(number: String) = phoneTextSource(regularTextSource(number))
 

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see pre
+ * @see preTextSource
  */
 @Serializable
 data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -17,6 +17,5 @@ data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) c
     override val html: String by lazy { source.preHTML(language) }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun pre(code: String, language: String? = null) = PreTextSource(code, language)
+inline fun preTextSource(code: String, language: String? = null) = PreTextSource(code, language)
 

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see regular
+ * @see regularTextSource
  */
 @Serializable
 data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -16,8 +16,6 @@ data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     override val html: String by lazy { source.regularHtml() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun regular(text: String) = RegularTextSource(text)
+inline fun regularTextSource(text: String) = RegularTextSource(text)
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun regularln(text: String) = regular("$text\n")
+inline fun regularTextSourceLn(text: String) = regularTextSource("$text\n")

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see italic
+ * @see italicTextSource
  */
 @Serializable
 data class SpoilerTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,10 +18,7 @@ data class SpoilerTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     override val html: String by lazy { spoilerHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun spoiler(parts: TextSourcesList) = SpoilerTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun spoiler(vararg parts: TextSource) = spoiler(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun spoiler(text: String) = spoiler(regular(text))
+inline fun spoilerTextSource(parts: TextSourcesList) = SpoilerTextSource(parts.makeString(), parts)
+inline fun spoilerTextSource(vararg parts: TextSource) = spoilerTextSource(parts.toList())
+inline fun spoilerTextSource(text: String) = spoilerTextSource(regularTextSource(text))
 

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see strikethrough
+ * @see strikethroughTextSource
  */
 @Serializable
 data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceCons
     override val markdown: String by lazy { source.strikethroughMarkdown() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun strikethrough(parts: TextSourcesList) = StrikethroughTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun strikethrough(vararg parts: TextSource) = strikethrough(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun strikethrough(text: String) = strikethrough(regular(text))
+inline fun strikethroughTextSource(parts: TextSourcesList) = StrikethroughTextSource(parts.makeString(), parts)
+inline fun strikethroughTextSource(vararg parts: TextSource) = strikethroughTextSource(parts.toList())
+inline fun strikethroughTextSource(text: String) = strikethroughTextSource(regularTextSource(text))

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see link
+ * @see linkTextSource
  */
 @Serializable
 data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -17,5 +17,4 @@ data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstruct
     override val html: String by lazy { source.linkHTML(url) }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun link(text: String, url: String) = TextLinkTextSource(text, url)
+inline fun linkTextSource(text: String, url: String) = TextLinkTextSource(text, url)

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

@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see mention
+ * @see mentionTextSource
  */
 @Serializable
 data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -22,34 +22,21 @@ data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstr
     override val html: String by lazy { textMentionHTML(user.id) }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(parts: TextSourcesList, user: User) = TextMentionTextSource(parts.makeString(), user, parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun User.mention(parts: TextSourcesList) = mention(parts, this)
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(parts: TextSourcesList, userId: UserId) = mention(parts, CommonUser(userId, ""))
-@Suppress("NOTHING_TO_INLINE")
-inline fun UserId.mention(parts: TextSourcesList) = mention(parts, this)
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(parts: TextSourcesList, id: RawChatId) = mention(parts, UserId(id))
-@Suppress("NOTHING_TO_INLINE")
-inline fun RawChatId.mention(parts: TextSourcesList) = mention(parts, this)
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(user: User, vararg parts: TextSource) = mention(
+inline fun mentionTextSource(parts: TextSourcesList, user: User) = TextMentionTextSource(parts.makeString(), user, parts)
+inline fun User.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
+inline fun mentionTextSource(parts: TextSourcesList, userId: UserId) = mentionTextSource(parts, CommonUser(userId, ""))
+inline fun UserId.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
+inline fun mentionTextSource(parts: TextSourcesList, id: RawChatId) = mentionTextSource(parts, UserId(id))
+inline fun RawChatId.mentionTextSource(parts: TextSourcesList) = mentionTextSource(parts, this)
+inline fun mentionTextSource(user: User, vararg parts: TextSource) = mentionTextSource(
     textSourcesOrElseTextSource(parts.toList()) {
         RegularTextSource("${user.lastName} ${user.firstName}")
     },
     user
 )
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(text: String, user: User) = mention(user, regular(text))
-@Suppress("NOTHING_TO_INLINE")
-inline fun User.mention(text: String) = mention(this, regular(text))
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(text: String, userId: UserId) = mention(text, CommonUser(userId, ""))
-@Suppress("NOTHING_TO_INLINE")
-inline fun UserId.mention(text: String) = mention(text, this)
-@Suppress("NOTHING_TO_INLINE")
-inline fun mention(text: String, id: RawChatId) = mention(text, UserId(id))
-@Suppress("NOTHING_TO_INLINE")
-inline fun RawChatId.mention(text: String) = mention(text, this)
+inline fun mentionTextSource(text: String, user: User) = mentionTextSource(user, regularTextSource(text))
+inline fun User.mentionTextSource(text: String) = mentionTextSource(this, regularTextSource(text))
+inline fun mentionTextSource(text: String, userId: UserId) = mentionTextSource(text, CommonUser(userId, ""))
+inline fun UserId.mentionTextSource(text: String) = mentionTextSource(text, this)
+inline fun mentionTextSource(text: String, id: RawChatId) = mentionTextSource(text, UserId(id))
+inline fun RawChatId.mentionTextSource(text: String) = mentionTextSource(text, this)

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

@@ -26,7 +26,7 @@ operator fun TextSource.plus(other: TextSource) = when {
     this is RegularTextSource && other is RegularTextSource -> listOf(RegularTextSource(source + other.source))
     else -> listOf(this, other)
 }
-operator fun TextSource.plus(text: String) = this + regular(text)
+operator fun TextSource.plus(text: String) = this + regularTextSource(text)
 operator fun List<TextSource>.plus(text: String): List<TextSource> {
     val newList = mutableListOf<TextSource>()
 
@@ -36,7 +36,7 @@ operator fun List<TextSource>.plus(text: String): List<TextSource> {
 
     val sublist = lastOrNull() ?.let {
         it + text
-    } ?: listOf(regular(text))
+    } ?: listOf(regularTextSource(text))
 
     newList.addAll(sublist)
 
@@ -101,7 +101,6 @@ fun List<TextSource>.splitForCaption(): List<List<TextSource>> {
 /**
  * This method will prepare [TextSource]s list for messages with [textLength]
  */
-@Suppress("NOTHING_TO_INLINE")
 inline fun List<TextSource>.splitForText(): List<List<TextSource>> = splitForMessage(textLength)
 
 fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null): List<List<TextSource>> = splitForMessage(limit, numberOfParts)
@@ -115,5 +114,4 @@ fun List<TextSource>.separateForCaption(): List<List<TextSource>> = splitForCapt
 /**
  * This method will prepare [TextSource]s list for messages with [textLength]
  */
-@Suppress("NOTHING_TO_INLINE")
 inline fun List<TextSource>.separateForText(): List<List<TextSource>> = splitForText()

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

@@ -5,7 +5,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see link
+ * @see linkTextSource
  */
 @Serializable
 data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -16,5 +16,4 @@ data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) c
     override val html: String by lazy { source.linkHTML(source) }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun link(url: String) = URLTextSource(url)
+inline fun linkTextSource(url: String) = URLTextSource(url)

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

@@ -6,7 +6,7 @@ import dev.inmo.tgbotapi.utils.internal.*
 import kotlinx.serialization.Serializable
 
 /**
- * @see underline
+ * @see underlineTextSource
  */
 @Serializable
 data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
@@ -18,9 +18,6 @@ data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstruc
     override val html: String by lazy { underlineHTML() }
 }
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun underline(parts: TextSourcesList) = UnderlineTextSource(parts.makeString(), parts)
-@Suppress("NOTHING_TO_INLINE")
-inline fun underline(vararg parts: TextSource) = underline(parts.toList())
-@Suppress("NOTHING_TO_INLINE")
-inline fun underline(text: String) = underline(regular(text))
+inline fun underlineTextSource(parts: TextSourcesList) = UnderlineTextSource(parts.makeString(), parts)
+inline fun underlineTextSource(vararg parts: TextSource) = underlineTextSource(parts.toList())
+inline fun underlineTextSource(text: String) = underlineTextSource(regularTextSource(text))

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/AffiliateInfo.kt

@@ -0,0 +1,24 @@
+package dev.inmo.tgbotapi.types.payments
+
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.PreviewBot
+import dev.inmo.tgbotapi.types.chat.PreviewChat
+import dev.inmo.tgbotapi.types.chat.PreviewUser
+import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.types.payments.abstracts.Amounted
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AffiliateInfo(
+    @SerialName(commissionPerMilleField)
+    val commissionPerMille: Int,
+    @SerialName(amountField)
+    override val amount: Long,
+    @SerialName(nanostarAmountField)
+    val nanostarAmount: Long,
+    @SerialName(affiliateUserField)
+    val affiliateUser: User? = null,
+    @SerialName(affiliateChatField)
+    val affiliateChat: PreviewChat? = null,
+) : Amounted

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/RecurringInfo.kt

@@ -0,0 +1,15 @@
+package dev.inmo.tgbotapi.types.payments
+
+import dev.inmo.tgbotapi.types.TelegramDate
+import dev.inmo.tgbotapi.types.isFirstRecurringField
+import dev.inmo.tgbotapi.types.subscriptionExpirationDateField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecurringInfo(
+    @SerialName(subscriptionExpirationDateField)
+    val subscriptionExpirationDate: TelegramDate,
+    @SerialName(isFirstRecurringField)
+    val firstSubscriptionPeriod: Boolean
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/SuccessfulPayment.kt

@@ -13,6 +13,12 @@ data class SuccessfulPayment(
     override val amount: Long,
     @SerialName(invoicePayloadField)
     val invoicePayload: String,
+    @SerialName(subscriptionExpirationDateField)
+    val subscriptionExpirationDate: TelegramDate? = null,
+    @SerialName(isRecurringField)
+    val isSubscriptionPayment: Boolean? = null,
+    @SerialName(isFirstRecurringField)
+    val isFirstPeriodPayment: Boolean? = null,
     @SerialName(telegramPaymentChargeIdField)
     val telegramPaymentChargeId: TelegramPaymentChargeId,
     @SerialName(providerPaymentChargeIdField)
@@ -21,4 +27,15 @@ data class SuccessfulPayment(
     val shippingOptionId: String? = null,
     @SerialName(orderInfoField)
     val orderInfo: OrderInfo? = null
-) : Amounted, Currencied
+) : Amounted, Currencied {
+    val recurringInfo: RecurringInfo? by lazy {
+        if (isSubscriptionPayment == true && subscriptionExpirationDate != null) {
+            RecurringInfo(
+                subscriptionExpirationDate,
+                isFirstPeriodPayment == true,
+            )
+        } else {
+            null
+        }
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/stars/StarTransaction.kt

@@ -2,6 +2,7 @@ package dev.inmo.tgbotapi.types.payments.stars
 
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.PreviewUser
+import dev.inmo.tgbotapi.types.payments.abstracts.Amounted
 import dev.inmo.tgbotapi.utils.decodeDataAndJson
 import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
 import kotlinx.serialization.KSerializer
@@ -16,9 +17,9 @@ import kotlinx.serialization.json.JsonElement
 @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
 @Serializable(StarTransaction.Companion::class)
 @ClassCastsIncluded
-sealed interface StarTransaction {
+sealed interface StarTransaction : Amounted {
     val id: StarTransactionId
-    val amount: Int
+    val nanostarAmount: Int
     val date: TelegramDate
     val partner: TransactionPartner
     val source: TransactionPartner?
@@ -29,7 +30,9 @@ sealed interface StarTransaction {
         @SerialName(idField)
         override val id: StarTransactionId,
         @SerialName(amountField)
-        override val amount: Int,
+        override val amount: Long,
+        @SerialName(nanostarAmountField)
+        override val nanostarAmount: Int,
         @SerialName(dateField)
         override val date: TelegramDate,
         @SerialName(sourceField)
@@ -47,7 +50,9 @@ sealed interface StarTransaction {
         @SerialName(idField)
         override val id: StarTransactionId,
         @SerialName(amountField)
-        override val amount: Int,
+        override val amount: Long,
+        @SerialName(nanostarAmountField)
+        override val nanostarAmount: Int,
         @SerialName(dateField)
         override val date: TelegramDate,
         @SerialName(receiverField)
@@ -64,7 +69,9 @@ sealed interface StarTransaction {
     data class Unknown(
         @SerialName(idField)
         override val id: StarTransactionId,
-        override val amount: Int,
+        override val amount: Long,
+        @SerialName(nanostarAmountField)
+        override val nanostarAmount: Int,
         override val date: TelegramDate,
         override val source: TransactionPartner?,
         override val receiver: TransactionPartner?,
@@ -78,7 +85,9 @@ sealed interface StarTransaction {
         @Serializable
         private data class Surrogate(
             val id: StarTransactionId,
-            val amount: Int,
+            val amount: Long,
+            @SerialName(nanostarAmountField)
+            val nanostarAmount: Int,
             val date: TelegramDate,
             val source: TransactionPartner? = null,
             val receiver: TransactionPartner? = null,
@@ -94,6 +103,7 @@ sealed interface StarTransaction {
                 Unknown(
                     id = data.id,
                     amount = data.amount,
+                    nanostarAmount = data.nanostarAmount,
                     date = data.date,
                     source = data.source,
                     receiver = data.receiver,
@@ -104,12 +114,14 @@ sealed interface StarTransaction {
                 data.source != null -> Incoming(
                     id = data.id,
                     amount = data.amount,
+                    nanostarAmount = data.nanostarAmount,
                     date = data.date,
                     partner = data.source
                 )
                 data.receiver != null -> Outgoing(
                     id = data.id,
                     amount = data.amount,
+                    nanostarAmount = data.nanostarAmount,
                     date = data.date,
                     partner = data.receiver
                 )
@@ -126,6 +138,7 @@ sealed interface StarTransaction {
             val surrogate = Surrogate(
                 id = value.id,
                 amount = value.amount,
+                nanostarAmount = value.nanostarAmount,
                 date = value.date,
                 source = value.source,
                 receiver = value.receiver,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/payments/stars/TransactionPartner.kt

@@ -2,11 +2,17 @@
 
 package dev.inmo.tgbotapi.types.payments.stars
 
+import dev.inmo.tgbotapi.abstracts.types.SubscriptionPeriodInfo
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.PreviewBot
 import dev.inmo.tgbotapi.types.chat.PreviewUser
+import dev.inmo.tgbotapi.types.gifts.Gift
 import dev.inmo.tgbotapi.types.message.payments.PaidMedia
+import dev.inmo.tgbotapi.types.payments.AffiliateInfo
+import dev.inmo.tgbotapi.utils.TimeSpanAsSecondsSerializer
 import dev.inmo.tgbotapi.utils.decodeDataAndJson
 import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
+import korlibs.time.TimeSpan
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
@@ -40,13 +46,20 @@ sealed interface TransactionPartner {
     data class User(
         @SerialName(userField)
         val user: PreviewUser,
+        @SerialName(affiliateField)
+        val affiliate: AffiliateInfo? = null,
         @SerialName(invoicePayloadField)
         val invoicePayload: InvoicePayload? = null,
+        @SerialName(subscriptionPeriodField)
+        @Serializable(TimeSpanAsSecondsSerializer::class)
+        override val subscriptionPeriod: TimeSpan? = null,
         @SerialName(paidMediaField)
         val paidMedia: List<PaidMedia>? = null,
         @SerialName(paidMediaPayloadField)
-        val paidMediaPayload: PaidMediaPayload? = null
-    ) : TransactionPartner {
+        val paidMediaPayload: PaidMediaPayload? = null,
+        @SerialName(giftField)
+        val gift: Gift? = null
+    ) : TransactionPartner, SubscriptionPeriodInfo {
         @EncodeDefault
         override val type: String = Companion.type
 
@@ -71,6 +84,24 @@ sealed interface TransactionPartner {
         }
     }
 
+    /**
+     * Represents [TransactionPartnerAffiliateProgram](https://core.telegram.org/bots/api#transactionpartneraffiliateprogram)
+     */
+    @Serializable(TransactionPartner.Companion::class)
+    data class AffiliateProgram(
+        @SerialName(sponsorUserField)
+        val sponsorUser: PreviewBot?,
+        @SerialName(commissionPerMilleField)
+        val commissionPerMille: Int,
+    ) : TransactionPartner {
+        @EncodeDefault
+        override val type: String = Companion.type
+
+        companion object {
+            const val type: String = "affiliate_program"
+        }
+    }
+
     @Serializable(TransactionPartner.Companion::class)
     data object Ads : TransactionPartner {
         @EncodeDefault
@@ -95,8 +126,17 @@ sealed interface TransactionPartner {
             val type: String,
             val withdrawal_state: RevenueWithdrawalState? = null,
             val user: PreviewUser? = null,
+            val affiliate: AffiliateInfo? = null,
             val invoice_payload: InvoicePayload? = null,
-            val request_count: Int? = null
+            @Serializable(TimeSpanAsSecondsSerializer::class)
+            val subscription_period: TimeSpan? = null,
+            val paid_media: List<PaidMedia>? = null,
+            val paid_media_payload: PaidMediaPayload? = null,
+            val gift: Gift? = null,
+            val request_count: Int? = null,
+            val sponsor_user: PreviewBot? = null,
+            val commission_per_mille: Int? = null,
+            val invoicePayload: InvoicePayload? = null
         )
 
         override val descriptor: SerialDescriptor
@@ -108,35 +148,63 @@ sealed interface TransactionPartner {
             val unknown by lazy {
                 Unknown(data.type, json)
             }
-            return when (data.type) {
-                Other.type -> Other
-                User.type -> User(
-                    data.user ?: return unknown,
-                )
-                TelegramAPI.type -> TelegramAPI(
-                    data.request_count ?: return unknown,
-                )
-                Ads.type -> Ads
-                Fragment.type -> Fragment(
-                    data.withdrawal_state ?: return unknown,
-                )
-                else -> unknown
+            return with(data) {
+                when (data.type) {
+                    Other.type -> Other
+                    User.type -> User(
+                        user = user ?: return unknown,
+                        affiliate = affiliate,
+                        invoicePayload = invoice_payload,
+                        subscriptionPeriod = subscription_period,
+                        paidMedia = paid_media,
+                        paidMediaPayload = paid_media_payload,
+                        gift = gift
+                    )
+                    TelegramAPI.type -> TelegramAPI(
+                        data.request_count ?: return unknown,
+                    )
+                    Ads.type -> Ads
+                    Fragment.type -> Fragment(
+                        data.withdrawal_state ?: return unknown,
+                    )
+                    AffiliateProgram.type -> AffiliateProgram(
+                        data.sponsor_user,
+                        data.commission_per_mille ?: return unknown,
+                    )
+                    else -> unknown
+                }
             }
         }
 
         override fun serialize(encoder: Encoder, value: TransactionPartner) {
-            val surrogate = when (value) {
-                Other -> Surrogate(value.type)
-                Ads -> Surrogate(value.type)
-                is User -> Surrogate(value.type, user = value.user)
-                is TelegramAPI -> Surrogate(value.type, request_count = value.requestCount)
-                is Fragment -> Surrogate(
-                    value.type,
-                    value.withdrawalState
-                )
-                is Unknown -> value.raw ?.let {
-                    return JsonElement.serializer().serialize(encoder, it)
-                } ?: Surrogate(value.type)
+            val surrogate = with (value) {
+                when (this) {
+                    Other -> Surrogate(type = value.type)
+                    Ads -> Surrogate(type = value.type)
+                    is User -> Surrogate(
+                        type = value.type,
+                        user = user,
+                        affiliate = affiliate,
+                        invoice_payload = invoicePayload,
+                        subscription_period = subscriptionPeriod,
+                        paid_media = paidMedia,
+                        paid_media_payload = paidMediaPayload,
+                        gift = gift
+                    )
+                    is TelegramAPI -> Surrogate(type = value.type, request_count = requestCount)
+                    is Fragment -> Surrogate(
+                        type = value.type,
+                        withdrawal_state = withdrawalState
+                    )
+                    is AffiliateProgram -> Surrogate(
+                        type = value.type,
+                        sponsor_user = sponsorUser,
+                        commission_per_mille = commissionPerMille
+                    )
+                    is Unknown -> raw ?.let {
+                        return JsonElement.serializer().serialize(encoder, it)
+                    } ?: Surrogate(type = value.type)
+                }
             }
 
             Surrogate.serializer().serialize(encoder, surrogate)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/EntitiesBuilder.kt

@@ -5,14 +5,15 @@ package dev.inmo.tgbotapi.utils
 import dev.inmo.micro_utils.common.joinTo
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.CustomEmojiId
+import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.textsources.*
 
 typealias EntitiesBuilderBody = EntitiesBuilder.() -> Unit
-val newLine = regular("\n")
+val newLine = regularTextSource("\n")
 
 inline fun buildEntities(separator: TextSource? = null, init: EntitiesBuilderBody): TextSourcesList = EntitiesBuilder(separator).apply(init).build()
-inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regular(separator), init)
+inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regularTextSource(separator), init)
 
 /**
  * This builder can be used to provide building of [TextSource]s [List]
@@ -50,7 +51,7 @@ class EntitiesBuilder(
     operator fun invoke(vararg source: TextSource) = addAll(source.toList())
 
     operator fun String.unaryPlus(): EntitiesBuilder {
-        add(dev.inmo.tgbotapi.types.message.textsources.regular(this))
+        add(dev.inmo.tgbotapi.types.message.textsources.regularTextSource(this))
         return this@EntitiesBuilder
     }
 
@@ -67,18 +68,18 @@ class EntitiesBuilder(
 }
 
 /**
- * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
+ * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
  */
-inline fun EntitiesBuilder.bold(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.bold(parts))
+inline fun EntitiesBuilder.bold(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(parts))
 /**
  * Version of [EntitiesBuilder.bold] with new line at the end
  */
 inline fun EntitiesBuilder.boldln(parts: TextSourcesList) = bold(parts) + newLine
 /**
- * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold].
+ * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.bold(
+inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -87,35 +88,35 @@ inline fun EntitiesBuilder.bold(noinline init: EntitiesBuilderBody) = add(dev.in
  */
 inline fun EntitiesBuilder.boldln(noinline init: EntitiesBuilderBody) = bold(init) + newLine
 /**
- * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
+ * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
  */
-inline fun EntitiesBuilder.bold(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.bold(*parts))
+inline fun EntitiesBuilder.bold(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.bold] with new line at the end
  */
 inline fun EntitiesBuilder.boldln(vararg parts: TextSource) = bold(*parts) + newLine
 /**
- * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.bold]
+ * Add bold using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.boldTextSource]
  */
-inline fun EntitiesBuilder.bold(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.bold(text))
+inline fun EntitiesBuilder.bold(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.boldTextSource(text))
 /**
  * Version of [EntitiesBuilder.bold] with new line at the end
  */
 inline fun EntitiesBuilder.boldln(text: String) = bold(text) + newLine
 
 /**
- * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
+ * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
  */
-inline fun EntitiesBuilder.blockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(parts))
+inline fun EntitiesBuilder.blockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(parts))
 /**
  * Version of [EntitiesBuilder.blockquote] with new line at the end
  */
 inline fun EntitiesBuilder.blockquoteln(parts: TextSourcesList) = blockquote(parts) + newLine
 /**
- * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote].
+ * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(
+inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -124,17 +125,17 @@ inline fun EntitiesBuilder.blockquote(noinline init: EntitiesBuilderBody) = add(
  */
 inline fun EntitiesBuilder.blockquoteln(noinline init: EntitiesBuilderBody) = blockquote(init) + newLine
 /**
- * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
+ * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
  */
-inline fun EntitiesBuilder.blockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(*parts))
+inline fun EntitiesBuilder.blockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.blockquote] with new line at the end
  */
 inline fun EntitiesBuilder.blockquoteln(vararg parts: TextSource) = blockquote(*parts) + newLine
 /**
- * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
+ * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
  */
-inline fun EntitiesBuilder.blockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.blockquote(text))
+inline fun EntitiesBuilder.blockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource(text))
 /**
  * Version of [EntitiesBuilder.blockquote] with new line at the end
  */
@@ -142,18 +143,18 @@ inline fun EntitiesBuilder.blockquoteln(text: String) = blockquote(text) + newLi
 
 
 /**
- * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquote]
+ * Add blockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.blockquoteTextSource]
  */
-inline fun EntitiesBuilder.expandableBlockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(parts))
+inline fun EntitiesBuilder.expandableBlockquote(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(parts))
 /**
  * Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
  */
 inline fun EntitiesBuilder.expandableBlockquoteln(parts: TextSourcesList) = expandableBlockquote(parts) + newLine
 /**
- * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote].
+ * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(
+inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -162,35 +163,35 @@ inline fun EntitiesBuilder.expandableBlockquote(noinline init: EntitiesBuilderBo
  */
 inline fun EntitiesBuilder.expandableBlockquoteln(noinline init: EntitiesBuilderBody) = expandableBlockquote(init) + newLine
 /**
- * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote]
+ * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource]
  */
-inline fun EntitiesBuilder.expandableBlockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(*parts))
+inline fun EntitiesBuilder.expandableBlockquote(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
  */
 inline fun EntitiesBuilder.expandableBlockquoteln(vararg parts: TextSource) = expandableBlockquote(*parts) + newLine
 /**
- * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote]
+ * Add expandableBlockquote using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource]
  */
-inline fun EntitiesBuilder.expandableBlockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquote(text))
+inline fun EntitiesBuilder.expandableBlockquote(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.expandableBlockquoteTextSource(text))
 /**
  * Version of [EntitiesBuilder.expandableBlockquote] with new line at the end
  */
 inline fun EntitiesBuilder.expandableBlockquoteln(text: String) = expandableBlockquote(text) + newLine
 
 /**
- * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
+ * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
  */
-inline fun EntitiesBuilder.spoiler(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(parts))
+inline fun EntitiesBuilder.spoiler(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(parts))
 /**
  * Version of [EntitiesBuilder.spoiler] with new line at the end
  */
 inline fun EntitiesBuilder.spoilerln(parts: TextSourcesList) = spoiler(parts) + newLine
 /**
- * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler].
+ * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(
+inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -199,17 +200,17 @@ inline fun EntitiesBuilder.spoiler(noinline init: EntitiesBuilderBody) = add(dev
  */
 inline fun EntitiesBuilder.spoilerln(noinline init: EntitiesBuilderBody) = spoiler(init) + newLine
 /**
- * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
+ * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
  */
-inline fun EntitiesBuilder.spoiler(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(*parts))
+inline fun EntitiesBuilder.spoiler(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.spoiler] with new line at the end
  */
 inline fun EntitiesBuilder.spoilerln(vararg parts: TextSource) = spoiler(*parts) + newLine
 /**
- * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoiler]
+ * Add spoiler using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource]
  */
-inline fun EntitiesBuilder.spoiler(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.spoiler(text))
+inline fun EntitiesBuilder.spoiler(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.spoilerTextSource(text))
 /**
  * Version of [EntitiesBuilder.spoiler] with new line at the end
  */
@@ -217,17 +218,17 @@ inline fun EntitiesBuilder.spoilerln(text: String) = spoiler(text) + newLine
 
 
 /**
- * Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommand]
+ * Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource]
  */
-inline fun EntitiesBuilder.botCommand(command: String) = add(dev.inmo.tgbotapi.types.message.textsources.botCommand(command))
+inline fun EntitiesBuilder.botCommand(command: String) = add(dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource(command))
 /**
  * Version of [EntitiesBuilder.botCommand] with new line at the end
  */
 inline fun EntitiesBuilder.botCommandln(command: String) = botCommand(command) + newLine
 /**
- * Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommand]
+ * Add botCommand using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource]
  */
-inline fun EntitiesBuilder.botCommand(botCommand: BotCommand) = add(dev.inmo.tgbotapi.types.message.textsources.botCommand(botCommand))
+inline fun EntitiesBuilder.botCommand(botCommand: BotCommand) = add(dev.inmo.tgbotapi.types.message.textsources.botCommandTextSource(botCommand))
 /**
  * Version of [EntitiesBuilder.botCommand] with new line at the end
  */
@@ -236,18 +237,18 @@ inline fun EntitiesBuilder.botCommandln(botCommand: BotCommand) = botCommand(bot
 
 
 /**
- * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
+ * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
  */
-inline fun EntitiesBuilder.cashTag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(parts))
+inline fun EntitiesBuilder.cashTag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(parts))
 /**
  * Version of [EntitiesBuilder.cashTag] with new line at the end
  */
 inline fun EntitiesBuilder.cashTagln(parts: TextSourcesList) = cashTag(parts) + newLine
 /**
- * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag].
+ * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(
+inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -256,17 +257,17 @@ inline fun EntitiesBuilder.cashTag(noinline init: EntitiesBuilderBody) = add(dev
  */
 inline fun EntitiesBuilder.cashTagln(noinline init: EntitiesBuilderBody) = cashTag(init) + newLine
 /**
- * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
+ * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
  */
-inline fun EntitiesBuilder.cashTag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(*parts))
+inline fun EntitiesBuilder.cashTag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.cashTag] with new line at the end
  */
 inline fun EntitiesBuilder.cashTagln(vararg parts: TextSource) = cashTag(*parts) + newLine
 /**
- * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTag]
+ * Add cashTag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource]
  */
-inline fun EntitiesBuilder.cashTag(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.cashTag(text))
+inline fun EntitiesBuilder.cashTag(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.cashTagTextSource(text))
 /**
  * Version of [EntitiesBuilder.cashTag] with new line at the end
  */
@@ -274,9 +275,9 @@ inline fun EntitiesBuilder.cashTagln(text: String) = cashTag(text) + newLine
 
 
 /**
- * Add code using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.code]
+ * Add code using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.codeTextSource]
  */
-inline fun EntitiesBuilder.code(code: String) = add(dev.inmo.tgbotapi.types.message.textsources.code(code))
+inline fun EntitiesBuilder.code(code: String) = add(dev.inmo.tgbotapi.types.message.textsources.codeTextSource(code))
 /**
  * Version of [EntitiesBuilder.code] with new line at the end
  */
@@ -284,18 +285,18 @@ inline fun EntitiesBuilder.codeln(code: String) = code(code) + newLine
 
 
 /**
- * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
+ * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
  */
-inline fun EntitiesBuilder.email(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.email(parts))
+inline fun EntitiesBuilder.email(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(parts))
 /**
  * Version of [EntitiesBuilder.email] with new line at the end
  */
 inline fun EntitiesBuilder.emailln(parts: TextSourcesList) = email(parts) + newLine
 /**
- * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email].
+ * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.email(
+inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -304,17 +305,17 @@ inline fun EntitiesBuilder.email(noinline init: EntitiesBuilderBody) = add(dev.i
  */
 inline fun EntitiesBuilder.emailln(noinline init: EntitiesBuilderBody) = email(init) + newLine
 /**
- * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
+ * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
  */
-inline fun EntitiesBuilder.email(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.email(*parts))
+inline fun EntitiesBuilder.email(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.email] with new line at the end
  */
 inline fun EntitiesBuilder.emailln(vararg parts: TextSource) = email(*parts) + newLine
 /**
- * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.email]
+ * Add email using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.emailTextSource]
  */
-inline fun EntitiesBuilder.email(emailAddress: String) = add(dev.inmo.tgbotapi.types.message.textsources.email(emailAddress))
+inline fun EntitiesBuilder.email(emailAddress: String) = add(dev.inmo.tgbotapi.types.message.textsources.emailTextSource(emailAddress))
 /**
  * Version of [EntitiesBuilder.email] with new line at the end
  */
@@ -322,18 +323,18 @@ inline fun EntitiesBuilder.emailln(emailAddress: String) = email(emailAddress) +
 
 
 /**
- * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
+ * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
  */
-inline fun EntitiesBuilder.hashtag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(parts))
+inline fun EntitiesBuilder.hashtag(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(parts))
 /**
  * Version of [EntitiesBuilder.hashtag] with new line at the end
  */
 inline fun EntitiesBuilder.hashtagln(parts: TextSourcesList) = hashtag(parts) + newLine
 /**
- * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag].
+ * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(
+inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -342,17 +343,17 @@ inline fun EntitiesBuilder.hashtag(noinline init: EntitiesBuilderBody) = add(dev
  */
 inline fun EntitiesBuilder.hashtagln(noinline init: EntitiesBuilderBody) = hashtag(init) + newLine
 /**
- * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
+ * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
  */
-inline fun EntitiesBuilder.hashtag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(*parts))
+inline fun EntitiesBuilder.hashtag(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.hashtag] with new line at the end
  */
 inline fun EntitiesBuilder.hashtagln(vararg parts: TextSource) = hashtag(*parts) + newLine
 /**
- * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtag]
+ * Add hashtag using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource]
  */
-inline fun EntitiesBuilder.hashtag(hashtag: String) = add(dev.inmo.tgbotapi.types.message.textsources.hashtag(hashtag))
+inline fun EntitiesBuilder.hashtag(hashtag: String) = add(dev.inmo.tgbotapi.types.message.textsources.hashtagTextSource(hashtag))
 /**
  * Version of [EntitiesBuilder.hashtag] with new line at the end
  */
@@ -360,18 +361,18 @@ inline fun EntitiesBuilder.hashtagln(hashtag: String) = hashtag(hashtag) + newLi
 
 
 /**
- * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
+ * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
  */
-inline fun EntitiesBuilder.italic(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.italic(parts))
+inline fun EntitiesBuilder.italic(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(parts))
 /**
  * Version of [EntitiesBuilder.italic] with new line at the end
  */
 inline fun EntitiesBuilder.italicln(parts: TextSourcesList) = italic(parts) + newLine
 /**
- * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic].
+ * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.italic(
+inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -380,17 +381,17 @@ inline fun EntitiesBuilder.italic(noinline init: EntitiesBuilderBody) = add(dev.
  */
 inline fun EntitiesBuilder.italicln(noinline init: EntitiesBuilderBody) = italic(init) + newLine
 /**
- * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
+ * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
  */
-inline fun EntitiesBuilder.italic(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.italic(*parts))
+inline fun EntitiesBuilder.italic(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.italic] with new line at the end
  */
 inline fun EntitiesBuilder.italicln(vararg parts: TextSource) = italic(*parts) + newLine
 /**
- * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italic]
+ * Add italic using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.italicTextSource]
  */
-inline fun EntitiesBuilder.italic(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.italic(text))
+inline fun EntitiesBuilder.italic(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.italicTextSource(text))
 /**
  * Version of [EntitiesBuilder.italic] with new line at the end
  */
@@ -398,18 +399,18 @@ inline fun EntitiesBuilder.italicln(text: String) = italic(text) + newLine
 
 
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
  */
-inline fun EntitiesBuilder.mention(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.mention(parts))
+inline fun EntitiesBuilder.mention(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
 inline fun EntitiesBuilder.mentionln(parts: TextSourcesList) = mention(parts) + newLine
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention].
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.mention(
+inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -418,25 +419,25 @@ inline fun EntitiesBuilder.mention(noinline init: EntitiesBuilderBody) = add(dev
  */
 inline fun EntitiesBuilder.mentionln(noinline init: EntitiesBuilderBody) = mention(init) + newLine
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
  */
-inline fun EntitiesBuilder.mention(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.mention(*parts))
+inline fun EntitiesBuilder.mention(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
 inline fun EntitiesBuilder.mentionln(vararg parts: TextSource) = mention(*parts) + newLine
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
  */
-inline fun EntitiesBuilder.mention(whoToMention: String) = add(dev.inmo.tgbotapi.types.message.textsources.mention(whoToMention))
+inline fun EntitiesBuilder.mention(whoToMention: String) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(whoToMention))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
 inline fun EntitiesBuilder.mentionln(whoToMention: String) = mention(whoToMention) + newLine
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
  */
-inline fun EntitiesBuilder.mention(parts: TextSourcesList, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mention(parts, user))
+inline fun EntitiesBuilder.mention(parts: TextSourcesList, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts, user))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
@@ -444,34 +445,59 @@ inline fun EntitiesBuilder.mentionln(parts: TextSourcesList, user: User) = menti
 inline fun EntitiesBuilder.mention(
     user: User,
     vararg parts: TextSource
-) = add(dev.inmo.tgbotapi.types.message.textsources.mention(user, *parts))
+) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(user, *parts))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
 inline fun EntitiesBuilder.mentionln(user: User, vararg parts: TextSource) = mention(user, *parts) + newLine
 /**
- * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mention]
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
  */
-inline fun EntitiesBuilder.mention(text: String, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mention(text, user))
+inline fun EntitiesBuilder.mention(text: String, user: User) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(text, user))
 /**
  * Version of [EntitiesBuilder.mention] with new line at the end
  */
 inline fun EntitiesBuilder.mentionln(text: String, user: User) = mention(text, user) + newLine
 
+/**
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
+ */
+inline fun EntitiesBuilder.mention(parts: TextSourcesList, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(parts, userId))
+/**
+ * Version of [EntitiesBuilder.mention] with new line at the end
+ */
+inline fun EntitiesBuilder.mentionln(parts: TextSourcesList, userId: UserId) = mention(parts, userId) + newLine
+inline fun EntitiesBuilder.mention(
+    userId: UserId,
+    vararg parts: TextSource
+) = mention(parts.toList(), userId)
+/**
+ * Version of [EntitiesBuilder.mention] with new line at the end
+ */
+inline fun EntitiesBuilder.mentionln(userId: UserId, vararg parts: TextSource) = mention(userId, *parts) + newLine
+/**
+ * Add mention using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.mentionTextSource]
+ */
+inline fun EntitiesBuilder.mention(text: String, userId: UserId) = add(dev.inmo.tgbotapi.types.message.textsources.mentionTextSource(text, userId))
+/**
+ * Version of [EntitiesBuilder.mention] with new line at the end
+ */
+inline fun EntitiesBuilder.mentionln(text: String, userId: UserId) = mention(text, userId) + newLine
+
 
 /**
- * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
+ * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
  */
-inline fun EntitiesBuilder.phone(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.phone(parts))
+inline fun EntitiesBuilder.phone(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(parts))
 /**
  * Version of [EntitiesBuilder.phone] with new line at the end
  */
 inline fun EntitiesBuilder.phoneln(parts: TextSourcesList) = phone(parts) + newLine
 /**
- * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone].
+ * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.phone(
+inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -480,17 +506,17 @@ inline fun EntitiesBuilder.phone(noinline init: EntitiesBuilderBody) = add(dev.i
  */
 inline fun EntitiesBuilder.phoneln(noinline init: EntitiesBuilderBody) = phone(init) + newLine
 /**
- * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
+ * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
  */
-inline fun EntitiesBuilder.phone(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.phone(*parts))
+inline fun EntitiesBuilder.phone(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.phone] with new line at the end
  */
 inline fun EntitiesBuilder.phoneln(vararg parts: TextSource) = phone(*parts) + newLine
 /**
- * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phone]
+ * Add phone using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.phoneTextSource]
  */
-inline fun EntitiesBuilder.phone(number: String) = add(dev.inmo.tgbotapi.types.message.textsources.phone(number))
+inline fun EntitiesBuilder.phone(number: String) = add(dev.inmo.tgbotapi.types.message.textsources.phoneTextSource(number))
 /**
  * Version of [EntitiesBuilder.phone] with new line at the end
  */
@@ -498,24 +524,24 @@ inline fun EntitiesBuilder.phoneln(number: String) = phone(number) + newLine
 
 
 /**
- * Add pre using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.pre]
+ * Add pre using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.preTextSource]
  */
-inline fun EntitiesBuilder.pre(code: String, language: String?) = add(dev.inmo.tgbotapi.types.message.textsources.pre(code, language))
+inline fun EntitiesBuilder.pre(code: String, language: String?) = add(dev.inmo.tgbotapi.types.message.textsources.preTextSource(code, language))
 /**
  * Version of [EntitiesBuilder.pre] with new line at the end
  */
 inline fun EntitiesBuilder.preln(code: String, language: String?) = pre(code, language) + newLine
 
 /**
- * Will add simple [dev.inmo.tgbotapi.types.message.textsources.regular] [TextSource]
+ * Will add simple [dev.inmo.tgbotapi.types.message.textsources.regularTextSource] [TextSource]
  *
  * @see RegularTextSource
  * @see dev.inmo.tgbotapi.extensions.utils.formatting.regularln
  */
 inline fun EntitiesBuilder.regular(text: String) =
-    add(dev.inmo.tgbotapi.types.message.textsources.regular(text))
+    add(dev.inmo.tgbotapi.types.message.textsources.regularTextSource(text))
 /**
- * Will add simple [dev.inmo.tgbotapi.types.message.textsources.regular] [TextSource] and "\n" at the end
+ * Will add simple [dev.inmo.tgbotapi.types.message.textsources.regularTextSource] [TextSource] and "\n" at the end
  *
  * @see RegularTextSource
  * @see dev.inmo.tgbotapi.extensions.utils.formatting.regular
@@ -524,18 +550,18 @@ inline fun EntitiesBuilder.regularln(text: String) = regular(text) + newLine
 
 
 /**
- * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
+ * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
  */
-inline fun EntitiesBuilder.strikethrough(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(parts))
+inline fun EntitiesBuilder.strikethrough(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(parts))
 /**
  * Version of [EntitiesBuilder.strikethrough] with new line at the end
  */
 inline fun EntitiesBuilder.strikethroughln(parts: TextSourcesList) = strikethrough(parts) + newLine
 /**
- * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough].
+ * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(
+inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -544,17 +570,17 @@ inline fun EntitiesBuilder.strikethrough(noinline init: EntitiesBuilderBody) = a
  */
 inline fun EntitiesBuilder.strikethroughln(noinline init: EntitiesBuilderBody) = strikethrough(init) + newLine
 /**
- * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
+ * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
  */
-inline fun EntitiesBuilder.strikethrough(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(*parts))
+inline fun EntitiesBuilder.strikethrough(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.strikethrough] with new line at the end
  */
 inline fun EntitiesBuilder.strikethroughln(vararg parts: TextSource) = strikethrough(*parts) + newLine
 /**
- * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethrough]
+ * Add strikethrough using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource]
  */
-inline fun EntitiesBuilder.strikethrough(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.strikethrough(text))
+inline fun EntitiesBuilder.strikethrough(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.strikethroughTextSource(text))
 /**
  * Version of [EntitiesBuilder.strikethrough] with new line at the end
  */
@@ -562,17 +588,17 @@ inline fun EntitiesBuilder.strikethroughln(text: String) = strikethrough(text) +
 
 
 /**
- * Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.link]
+ * Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.linkTextSource]
  */
-inline fun EntitiesBuilder.link(text: String, url: String) = add(dev.inmo.tgbotapi.types.message.textsources.link(text, url))
+inline fun EntitiesBuilder.link(text: String, url: String) = add(dev.inmo.tgbotapi.types.message.textsources.linkTextSource(text, url))
 /**
  * Version of [EntitiesBuilder.link] with new line at the end
  */
 inline fun EntitiesBuilder.linkln(text: String, url: String) = link(text, url) + newLine
 /**
- * Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.link]
+ * Add link using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.linkTextSource]
  */
-inline fun EntitiesBuilder.link(url: String) = add(dev.inmo.tgbotapi.types.message.textsources.link(url))
+inline fun EntitiesBuilder.link(url: String) = add(dev.inmo.tgbotapi.types.message.textsources.linkTextSource(url))
 /**
  * Version of [EntitiesBuilder.link] with new line at the end
  */
@@ -580,18 +606,18 @@ inline fun EntitiesBuilder.linkln(url: String) = link(url) + newLine
 
 
 /**
- * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
+ * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
  */
-inline fun EntitiesBuilder.underline(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.underline(parts))
+inline fun EntitiesBuilder.underline(parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(parts))
 /**
  * Version of [EntitiesBuilder.underline] with new line at the end
  */
 inline fun EntitiesBuilder.underlineln(parts: TextSourcesList) = underline(parts) + newLine
 /**
- * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline].
+ * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.underline(
+inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(
     buildEntities(separator, init)
 ))
 /**
@@ -600,17 +626,17 @@ inline fun EntitiesBuilder.underline(noinline init: EntitiesBuilderBody) = add(d
  */
 inline fun EntitiesBuilder.underlineln(noinline init: EntitiesBuilderBody) = underline(init) + newLine
 /**
- * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
+ * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
  */
-inline fun EntitiesBuilder.underline(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.underline(*parts))
+inline fun EntitiesBuilder.underline(vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(*parts))
 /**
  * Version of [EntitiesBuilder.underline] with new line at the end
  */
 inline fun EntitiesBuilder.underlineln(vararg parts: TextSource) = underline(*parts) + newLine
 /**
- * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underline]
+ * Add underline using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.underlineTextSource]
  */
-inline fun EntitiesBuilder.underline(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.underline(text))
+inline fun EntitiesBuilder.underline(text: String) = add(dev.inmo.tgbotapi.types.message.textsources.underlineTextSource(text))
 /**
  * Version of [EntitiesBuilder.underline] with new line at the end
  */
@@ -618,35 +644,35 @@ inline fun EntitiesBuilder.underlineln(text: String) = underline(text) + newLine
 
 
 /**
- * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
+ * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
  */
-inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, parts))
+inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, parts: TextSourcesList) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, parts))
 /**
  * Version of [EntitiesBuilder.customEmoji] with new line at the end
  */
 inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, parts: TextSourcesList) = customEmoji(customEmojiId, parts) + newLine
 /**
- * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji].
+ * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource].
  * Will reuse separator config from [buildEntities]
  */
-inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, buildEntities(separator, init)))
+inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, buildEntities(separator, init)))
 /**
  * Version of [EntitiesBuilder.customEmoji] with new line at the end.
  * Will reuse separator config from [buildEntities]
  */
 inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, noinline init: EntitiesBuilderBody) = customEmoji(customEmojiId, init) + newLine
 /**
- * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
+ * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
  */
-inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, *parts))
+inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, vararg parts: TextSource) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, *parts))
 /**
  * Version of [EntitiesBuilder.customEmoji] with new line at the end
  */
 inline fun EntitiesBuilder.customEmojiln(customEmojiId: CustomEmojiId, vararg parts: TextSource) = customEmoji(customEmojiId, *parts) + newLine
 /**
- * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmoji]
+ * Add customEmoji using [EntitiesBuilder.add] with [dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource]
  */
-inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, text: String) = add(dev.inmo.tgbotapi.types.message.textsources.customEmoji(customEmojiId, text))
+inline fun EntitiesBuilder.customEmoji(customEmojiId: CustomEmojiId, text: String) = add(dev.inmo.tgbotapi.types.message.textsources.customEmojiTextSource(customEmojiId, text))
 /**
  * Version of [EntitiesBuilder.customEmoji] with new line at the end
  */

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/PrivateChatToUser.kt

@@ -0,0 +1,21 @@
+package dev.inmo.tgbotapi.utils
+
+import dev.inmo.tgbotapi.types.chat.*
+
+/**
+ * Trying to convert current [PrivateChat] to [User]
+ *
+ * * If [this] actually is [User] or some [Bot], will return this as is
+ * * If [this] is some [PreviewPrivateChat], will create new [CommonUser]
+ *
+ * !!!WARNING!!! The returned [User] CAN BE NOT EQUAL to user from some
+ * [dev.inmo.tgbotapi.types.message.abstracts.ContentMessage] due to absence of some fields (like premium flag or
+ * language)
+ */
+fun PrivateChat.toUser(): User = when (this) {
+    is ExtendedPrivateChatImpl -> CommonUser(id, firstName, lastName, username)
+    is CommonUser -> this
+    is CommonBot -> this
+    is PrivateChatImpl -> CommonUser(id, firstName, lastName, username)
+    is ExtendedBot -> this
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/crypto/Ed25519TelegramKeys.kt

@@ -0,0 +1,6 @@
+package dev.inmo.tgbotapi.utils.crypto
+
+object Ed25519TelegramKeys {
+    const val TestEnvironment = "40055058a4ee38156a06562e52eece92a771bcd8346a8c4615cb7376eddf72ec" // hex
+    const val Production = "e7bf03a2fa4602af4580703d88dda5bb59f32ed8b02a56c187fe7d34caed242d" // hex
+}

tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt

@@ -39,24 +39,24 @@ class StringFormattingTests {
 
     @Test
     fun testThatCreatingOfStringWithSimpleDSLWorksCorrectly() {
-        val sources: TextSourcesList = regular("It (is?) ") +
-            bold(italic("is") +
+        val sources: TextSourcesList = regularTextSource("It (is?) ") +
+            boldTextSource(italicTextSource("is") +
                 " " +
-                strikethrough(underline("simple"))) +
+                strikethroughTextSource(underlineTextSource("simple"))) +
                 " " +
-                spoiler("hello world") +
+                spoilerTextSource("hello world") +
                 " with " +
-                hashtag("tag@sample") +
+                hashtagTextSource("tag@sample") +
                 " and " +
-                mention("mention") +
+                mentionTextSource("mention") +
                 ". Start of blockquote: " +
-                blockquote(
+                blockquoteTextSource(
                     "Block quotation started\n" +
                         "Block quotation continued\n" +
                         "The last line of the block quotation"
                 ) +
                 "\n. Start of expandable blockquote: " +
-                expandableBlockquote(
+                expandableBlockquoteTextSource(
                     "Block quotation started\n" +
                         "Block quotation continued\n" +
                         "The last line of the block quotation"

tgbotapi.utils/api/tgbotapi.utils.api

@@ -1069,6 +1069,8 @@ public final class dev/inmo/tgbotapi/extensions/utils/ClassCastsNewKt {
 	public static final fun administratorChatMemberOrThrow (Ldev/inmo/tgbotapi/abstracts/OptionallyWithUser;)Ldev/inmo/tgbotapi/types/chat/member/AdministratorChatMember;
 	public static final fun adsOrNull (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;)Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner$Ads;
 	public static final fun adsOrThrow (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;)Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner$Ads;
+	public static final fun affiliateProgramOrNull (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;)Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner$AffiliateProgram;
+	public static final fun affiliateProgramOrThrow (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;)Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner$AffiliateProgram;
 	public static final fun animatedStickerOrNull (Ldev/inmo/tgbotapi/types/files/TelegramMediaFile;)Ldev/inmo/tgbotapi/types/files/AnimatedSticker;
 	public static final fun animatedStickerOrThrow (Ldev/inmo/tgbotapi/types/files/TelegramMediaFile;)Ldev/inmo/tgbotapi/types/files/AnimatedSticker;
 	public static final fun animationContentOrNull (Ldev/inmo/tgbotapi/types/message/content/ResendableContent;)Ldev/inmo/tgbotapi/types/message/content/AnimationContent;
@@ -1479,6 +1481,7 @@ public final class dev/inmo/tgbotapi/extensions/utils/ClassCastsNewKt {
 	public static final fun ifAddressSecureValue (Ldev/inmo/tgbotapi/types/passport/decrypted/abstracts/SecureValue;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun ifAdministratorChatMember (Ldev/inmo/tgbotapi/abstracts/OptionallyWithUser;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun ifAds (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun ifAffiliateProgram (Ldev/inmo/tgbotapi/types/payments/stars/TransactionPartner;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun ifAnimatedSticker (Ldev/inmo/tgbotapi/types/files/TelegramMediaFile;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun ifAnimationContent (Ldev/inmo/tgbotapi/types/message/content/ResendableContent;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun ifAnimationFile (Ldev/inmo/tgbotapi/types/files/TelegramMediaFile;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
@@ -2740,7 +2743,6 @@ public synthetic class dev/inmo/tgbotapi/extensions/utils/SlotMachineResult$$ser
 	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/SlotMachineResult;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
 public final class dev/inmo/tgbotapi/extensions/utils/SlotMachineResult$Companion {
@@ -3021,7 +3023,6 @@ public synthetic class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Fours
 	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
 public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Foursquare$Companion {
@@ -3061,7 +3062,6 @@ public synthetic class dev/inmo/tgbotapi/extensions/utils/extensions/venue/Googl
 	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace;)V
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
 public final class dev/inmo/tgbotapi/extensions/utils/extensions/venue/GooglePlace$Companion {

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCastsNew.kt

@@ -5330,6 +5330,16 @@ public inline fun TransactionPartner.adsOrThrow(): TransactionPartner.Ads = this
 public inline fun <T> TransactionPartner.ifAds(block: (TransactionPartner.Ads) -> T): T? =
     adsOrNull() ?.let(block)
 
+public inline fun TransactionPartner.affiliateProgramOrNull(): TransactionPartner.AffiliateProgram?
+    = this as? dev.inmo.tgbotapi.types.payments.stars.TransactionPartner.AffiliateProgram
+
+public inline fun TransactionPartner.affiliateProgramOrThrow(): TransactionPartner.AffiliateProgram
+    = this as dev.inmo.tgbotapi.types.payments.stars.TransactionPartner.AffiliateProgram
+
+public inline fun <T>
+    TransactionPartner.ifAffiliateProgram(block: (TransactionPartner.AffiliateProgram) -> T): T? =
+    affiliateProgramOrNull() ?.let(block)
+
 public inline fun TransactionPartner.fragmentOrNull(): TransactionPartner.Fragment? = this as?
     dev.inmo.tgbotapi.types.payments.stars.TransactionPartner.Fragment
 

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt

@@ -9,12 +9,14 @@ import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.LocationChosenIn
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.chat.PrivateChat
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.queries.callback.*
 import dev.inmo.tgbotapi.types.update.*
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.utils.PreviewFeature
+import dev.inmo.tgbotapi.utils.toUser
 
 fun CallbackQuery.sourceChat() = when (this) {
     is InlineMessageIdDataCallbackQuery -> null
@@ -86,9 +88,13 @@ fun Update.sourceChatWithConverters(
 @PreviewFeature
 fun Update.sourceChat(): Chat? = sourceChatWithConverters()
 
+/**
+ * Trying to get the user from [Update]. In some cases it can be the user without actual fields like
+ * [dev.inmo.tgbotapi.types.chat.CommonUser.isPremium] due to in these cases will be used [toUser] cast
+ */
 @PreviewFeature
 fun Update.sourceUser(): User? = when (val data = data) {
     is FromUser -> data.from
     is WithUser -> data.user
-    else -> sourceChat()?.asUser()
+    else -> sourceChat() ?.asUser() ?: ((sourceChat() as? PrivateChat) ?.toUser())
 }

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.extensions.utils.formatting
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.*
 import dev.inmo.tgbotapi.types.message.abstracts.Message
-import dev.inmo.tgbotapi.types.message.textsources.link
+import dev.inmo.tgbotapi.types.message.textsources.linkTextSource
 import io.ktor.http.encodeURLQueryComponent
 
 
@@ -115,4 +115,4 @@ val Chat.chatLink: String?
 private const val stickerSetAddingLinkPrefix = "$internalLinkBeginning/addstickers"
 
 val StickerSetName.stickerSetLink
-    get() = link(string, "$stickerSetAddingLinkPrefix/$this")
+    get() = linkTextSource(string, "$stickerSetAddingLinkPrefix/$this")

tgbotapi.webapps/.templates/generator.kts

@@ -0,0 +1,260 @@
+#!/usr/bin/env kotlin
+/**
+ * Generates files and folders as they have been put in the folder. Envs uses common syntax, but
+ * values may contains {{${'$'}sampleVariable}} parts, where {{${'$'}sampleVariable}} will be replaced with variable value.
+ * Example:
+ *
+ * .env:
+ * sampleVariable=${'$'}prompt # require request from command line
+ *         sampleVariable2=just some value
+ * sampleVariable3=${'$'}{sampleVariable}.${'$'}{sampleVariable2}
+ *
+ * Result variables:
+ * sampleVariable=your input in console # lets imagine you typed it
+ * sampleVariable2=just some value
+ * sampleVariable3=your input in console.just some value
+ *
+ * To use these variables in template, you will need to write {{${'$'}sampleVariable}}.
+ * You may use it in text of files as well as in files/folders names.
+ *
+ * Usage: kotlin generator.kts [args] folders...
+ * Args:
+ * -e, --env: Path to file with args for generation; Use "${'$'}prompt" as values to read variable value from console
+ * -o, --outputFolder: Folder where templates should be used. Folder of calling by default
+ *         folders: Folders-templates
+ * -s, --skip: Skip variables setup
+ * -a, --args: Pass several for several args. Use with syntax `--args a=b` or `-a a=b` to set variable with key `a` to value `b`
+ * -v, --verbose: Show more verbose output
+ */
+import java.io.File
+
+val console = System.console()
+
+var envFile: File? = null
+var outputFolder: File = File("./") // current folder by default
+val templatesFolders = mutableListOf<File>()
+var extensions: List<String>? = null
+var skipPrompts: Boolean = false
+val commandLineArgs = mutableMapOf<String, String>()
+val globalEnvs = System.getenv().toMutableMap()
+var verboseMode: Boolean = false
+
+if (args.any { it == "-v" || it == "--verbose" }) {
+    println(args.joinToString("\n"))
+}
+
+fun String.replaceWithVariables(envs: Map<String, String>): String {
+    var currentString = this
+    var changed = false
+
+    do {
+        changed = false
+        envs.forEach { (k, v) ->
+            val previousString = currentString
+            currentString = currentString.replace("{{$${k}}}", v)
+            changed = changed || currentString != previousString
+        }
+    } while (changed)
+
+    return currentString
+}
+
+fun requestVariable(variableName: String, defaultValue: String?): String {
+    console.printf("Enter value for variable $variableName${defaultValue ?.let { " [$it]" } ?: ""}: ")
+    return console.readLine().ifEmpty { defaultValue } ?: ""
+}
+
+fun readEnvs(content: String, presets: Map<String, String>?): Map<String, String> {
+    val initialEnvs = mutableMapOf<String, String>()
+    val contentAsMap = mutableMapOf<String, String>()
+    content.split("\n").forEach {
+        val withoutComment = it.replace(Regex("\\#.*"), "")
+
+        runCatching {
+            val (key, value) = withoutComment.split("=")
+
+            contentAsMap[key] = value
+        }
+    }
+
+    if (skipPrompts) {
+        initialEnvs.putAll(
+            contentAsMap + (presets ?: emptyMap()) + globalEnvs + commandLineArgs
+        )
+    } else {
+        contentAsMap.forEach { (key, value) ->
+            val existsValue = presets ?.get(key) ?: commandLineArgs[key] ?: globalEnvs[key]
+            initialEnvs[key] = when {
+                value == "\$prompt" -> requestVariable(key, existsValue)
+                else -> requestVariable(key, value.replaceWithVariables(initialEnvs))
+            }
+        }
+    }
+    var i = 0
+    val readEnvs = initialEnvs.toMutableMap()
+    while (i < readEnvs.size) {
+        val key = readEnvs.keys.elementAt(i)
+        val currentValue = readEnvs.getValue(key)
+        val withReplaced = currentValue.replaceWithVariables(readEnvs)
+        var changed = false
+        if (withReplaced != currentValue) {
+            i = 0
+            readEnvs[key] = withReplaced
+        } else {
+            i++
+        }
+    }
+    return (presets ?: emptyMap()) + readEnvs
+}
+
+val realArgs = args.map { sourceArg ->
+    if (sourceArg.startsWith("\"") && sourceArg.endsWith("\"")) {
+        sourceArg.removePrefix("\"").removeSuffix("\"")
+    } else {
+        sourceArg
+    }
+}
+
+fun readParameters() {
+    var i = 0
+    while (i < realArgs.size) {
+        val arg = realArgs[i]
+        when (arg) {
+            "--env",
+            "-e" -> {
+                i++
+                envFile = File(realArgs[i])
+            }
+            "--skip",
+            "-s" -> {
+                skipPrompts = true
+            }
+            "--extensions",
+            "-ex" -> {
+                i++
+                extensions = realArgs[i].split(",")
+            }
+            "--outputFolder",
+            "-o" -> {
+                i++
+                outputFolder = File(realArgs[i])
+            }
+            "--verbose",
+            "-v" -> {
+                verboseMode = true
+            }
+            "--args",
+            "-a" -> {
+                i++
+                val subarg = realArgs[i]
+                val key = subarg.takeWhile { it != '=' }
+                val value = subarg.dropWhile { it != '=' }.removePrefix("=")
+                if (verboseMode) {
+                    println("Argument $key=$value")
+                }
+                commandLineArgs[key] = value
+            }
+            "--help",
+            "-h" -> {
+                println("""
+                    Generates files and folders as the have been put in the folder. Envs uses common syntax, but
+                    values may contains {{${'$'}sampleVariable}} parts, where {{${'$'}sampleVariable}} will be replaced with variable value.
+                    Example:
+                    
+                    .env:
+                    sampleVariable=${'$'}prompt # require request from command line
+                    sampleVariable2=just some value
+                    sampleVariable3=${'$'}{sampleVariable}.${'$'}{sampleVariable2}
+                    
+                    Result variables:
+                    sampleVariable=your input in console # lets imagine you typed it
+                    sampleVariable2=just some value
+                    sampleVariable3=your input in console.just some value
+                    
+                    To use these variables in template, you will need to write {{${'$'}sampleVariable}}.
+                    You may use it in text of files as well as in files/folders names.
+                    
+                    Usage: kotlin generator.kts [args] folders...
+                    Args:
+                        -e, --env: Path to file with args for generation; Use "${'$'}prompt" as values to read variable value from console
+                        -o, --outputFolder: Folder where templates should be used. Folder of calling by default
+                        folders: Folders-templates
+                        -s, --skip: Skip variables setup
+                        -a, --args: Pass several for several args. Use with syntax `--args a=b` or `-a a=b` to set variable with key `a` to value `b`
+                """.trimIndent())
+                Runtime.getRuntime().exit(0)
+            }
+            else -> {
+                println(arg)
+                val potentialFile = File(arg)
+                println("Potential file/folder as template: ${potentialFile.absolutePath}")
+                runCatching {
+                    if (potentialFile.exists()) {
+                        println("Adding file/folder as template: ${potentialFile.absolutePath}")
+                        templatesFolders.add(potentialFile)
+                    }
+                }.onFailure { e ->
+                    println("Unable to use folder $arg as template folder")
+                    e.printStackTrace()
+                }
+            }
+        }
+        i++
+    }
+}
+
+readParameters()
+
+val envs: MutableMap<String, String> = (envFile ?.let { readEnvs(it.readText(), null) } ?: (globalEnvs + commandLineArgs)).toMutableMap()
+
+println(
+    """
+    Result environments:
+        ${envs.toList().joinToString("\n        ") { (k, v) -> "$k=$v" }}
+    Result extensions:
+        ${extensions ?.joinToString()}
+    Input folders:
+        ${templatesFolders.joinToString("\n        ") { it.absolutePath }}
+    Output folder:
+        ${outputFolder.absolutePath}
+    """.trimIndent()
+)
+
+fun File.handleTemplate(targetFolder: File, envs: Map<String, String>) {
+    println("Handling $absolutePath")
+    val localEnvs = File(absolutePath, ".env").takeIf { it.exists() } ?.let {
+        println("Reading .env in ${absolutePath}")
+        readEnvs(it.readText(), envs)
+    } ?: envs
+    println(
+        """
+    Local environments:
+        ${localEnvs.toList().joinToString("\n        ") { (k, v) -> "$k=$v" }}
+    """.trimIndent()
+    )
+    val newName = name.replaceWithVariables(localEnvs)
+    println("New name $newName")
+    when {
+        !exists() -> return
+        isFile -> {
+            val content = useLines {
+                it.map { it.replaceWithVariables(localEnvs) }.toList()
+            }.joinToString("\n")
+            val targetFile = File(targetFolder, newName)
+            targetFile.writeText(content)
+            println("Target file: ${targetFile.absolutePath}")
+        }
+        else -> {
+            val folder = File(targetFolder, newName)
+            println("Target folder: ${folder.absolutePath}")
+            folder.mkdirs()
+            listFiles() ?.forEach { fileOrFolder ->
+                fileOrFolder.handleTemplate(folder, localEnvs)
+            }
+        }
+    }
+}
+
+templatesFolders.forEach { folderOrFile ->
+    folderOrFile.handleTemplate(outputFolder, envs)
+}

tgbotapi.webapps/.templates/{{$subpackage}}/EventType{{$event_name_uppercase}}.kt

@@ -0,0 +1 @@
+data object {{$event_name_uppercase}} : EventType("{{$event_name}}")

tgbotapi.webapps/.templates/{{$subpackage}}/WebApp{{$event_name_uppercase}}.kt

@@ -0,0 +1,2 @@
+@JsName("onEvent")
+internal fun on{{$event_name_uppercase}}(type: String, callback: ({{$callback_args}}) -> Unit)

tgbotapi.webapps/.templates/{{$subpackage}}/{{$event_name_uppercase}}.kt

@@ -0,0 +1,22 @@
+// Part for callback typealias
+
+typealias {{$callback_typealias_name}} = WebApp.({{$callback_args}}) -> Unit
+
+// Part for outside of WebApp
+
+/**
+ * @return The callback which should be used in case you want to turn off events handling
+ */
+fun WebApp.onEvent(type: EventType.{{$event_name_uppercase}}, eventHandler: {{$callback_typealias_name}}) = { {{$callback_args_definitions}} ->
+    eventHandler(js("this").unsafeCast<WebApp>(), {{$callback_args_names}})
+}.also {
+    on{{$event_name_uppercase}}(
+        type.typeName,
+        callback = it
+    )
+}
+
+/**
+ * @return The callback which should be used in case you want to turn off events handling
+ */
+fun WebApp.on{{$event_name_uppercase}}(eventHandler: {{$callback_typealias_name}}) = onEvent(EventType.{{$event_name_uppercase}}, eventHandler)

tgbotapi.webapps/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
     id "org.jetbrains.dokka"
+    id "com.google.devtools.ksp"
 }
 
 project.description = "Web App bindings for the Telegram Web Apps API"
@@ -14,7 +15,15 @@ kotlin {
         commonMain {
             dependencies {
                 api project(":tgbotapi.core")
+                api libs.microutils.ksp.sealed
             }
         }
     }
 }
+
+dependencies {
+    add("kspJs", libs.microutils.ksp.sealed.generator)
+}
+
+ksp {}
+

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/ContentSafeAreaInset.kt

@@ -0,0 +1,3 @@
+package dev.inmo.tgbotapi.webapps
+
+external interface ContentSafeAreaInset : SafeAreaInset {}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/DownloadFileParams.kt

@@ -0,0 +1,16 @@
+package dev.inmo.tgbotapi.webapps
+
+import kotlin.js.json
+
+external interface DownloadFileParams {
+    val url: String
+    @JsName("file_name")
+    val fileName: String
+}
+fun DownloadFileParams(
+    url: String,
+    fileName: String
+) = json(
+    "url" to url,
+    "file_name" to fileName
+).unsafeCast<DownloadFileParams>()

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/EmojiStatusParams.kt

@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.webapps
+
+import dev.inmo.tgbotapi.types.Seconds
+import kotlin.js.json
+
+external interface EmojiStatusParams {
+    val duration: Seconds?
+}
+fun EmojiStatusParams(
+    duration: Seconds
+): EmojiStatusParams = json(
+    "duration" to duration
+).unsafeCast<EmojiStatusParams>()

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/EventHandler.kt

@@ -3,11 +3,3 @@ package dev.inmo.tgbotapi.webapps
 import dev.inmo.tgbotapi.webapps.invoice.InvoiceClosedInfo
 
 typealias EventHandler = WebApp.() -> Unit
-typealias ViewportChangedEventHandler = WebApp.(ViewportChangedData) -> Unit
-typealias InvoiceClosedEventHandler = WebApp.(InvoiceClosedInfo) -> Unit
-typealias PopupClosedEventHandler = WebApp.(String?) -> Unit
-typealias QRTextReceivedEventHandler = WebApp.(String) -> Boolean
-typealias TextReceivedEventHandler = WebApp.(String) -> Unit
-typealias WriteAccessRequestedHandler = WebApp.(Boolean) -> Unit
-typealias ContactRequestedHandler = WebApp.(Boolean) -> Unit
-typealias onScanQRPopupClosedHandler = WebApp.() -> Unit

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/EventType.kt

@@ -1,17 +1,53 @@
 package dev.inmo.tgbotapi.webapps
 
+import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
+
+@GenerateSealedWorkaround
 sealed class EventType(val typeName: String) {
+    data object EmojiStatusAccessRequested : EventType("emojiStatusAccessRequested")
+    data object AccelerometerChanged : EventType("accelerometerChanged")
+    data object DeviceOrientationStarted : EventType("deviceOrientationStarted")
+    data object EmojiStatusFailed : EventType("emojiStatusFailed")
+    data object Activated : EventType("activated")
+    data object ShareMessageSent : EventType("shareMessageSent")
+    data object LocationManagerUpdated : EventType("locationManagerUpdated")
+    data object BiometricTokenUpdated : EventType("biometricTokenUpdated")
+    data object DeviceOrientationFailed : EventType("deviceOrientationFailed")
+    data object SafeAreaChanged : EventType("safeAreaChanged")
+    data object WriteAccessRequested : EventType("writeAccessRequested")
+    data object ContentSafeAreaChanged : EventType("contentSafeAreaChanged")
+    data object AccelerometerStarted : EventType("accelerometerStarted")
+    data object AccelerometerStopped : EventType("accelerometerStopped")
+    data object PopupClosed : EventType("popupClosed")
+    data object GyroscopeStopped : EventType("gyroscopeStopped")
+    data object BackButtonClicked : EventType("backButtonClicked")
+    data object HomeScreenAdded : EventType("homeScreenAdded")
+    data object ShareMessageFailed : EventType("shareMessageFailed")
     data object ThemeChanged : EventType("themeChanged")
+    data object BiometricManagerUpdated : EventType("biometricManagerUpdated")
+    data object ScanQrPopupClosed : EventType("scanQrPopupClosed")
+    data object BiometricAuthRequested : EventType("biometricAuthRequested")
+    data object HomeScreenChecked : EventType("homeScreenChecked")
+    data object LocationRequested : EventType("locationRequested")
+    data object SecondaryButtonClicked : EventType("secondaryButtonClicked")
+    data object QrTextReceived : EventType("qrTextReceived")
+    data object EmojiStatusSet : EventType("emojiStatusSet")
+    data object FullscreenFailed : EventType("fullscreenFailed")
+    data object GyroscopeFailed : EventType("gyroscopeFailed")
+    data object SettingsButtonClicked : EventType("settingsButtonClicked")
+    data object Deactivated : EventType("deactivated")
+    data object DeviceOrientationStopped : EventType("deviceOrientationStopped")
+    data object FullscreenChanged : EventType("fullscreenChanged")
     data object ViewportChanged : EventType("viewportChanged")
     data object MainButtonClicked : EventType("mainButtonClicked")
-    data object SecondaryButtonClicked : EventType("secondaryButtonClicked")
-    data object BackButtonClicked : EventType("backButtonClicked")
-    data object SettingsButtonClicked : EventType("settingsButtonClicked")
-    data object InvoiceClosed : EventType("invoiceClosed")
-    data object PopupClosed : EventType("popupClosed")
-    data object QRTextReceived : EventType("qrTextReceived")
+    data object AccelerometerFailed : EventType("accelerometerFailed")
     data object ClipboardTextReceived : EventType("clipboardTextReceived")
-    data object WriteAccessRequested : EventType("writeAccessRequested")
+    data object FileDownloadRequested : EventType("fileDownloadRequested")
     data object ContactRequested : EventType("contactRequested")
-    data object ScanQRPopupClosed : EventType("scanQrPopupClosed")
+    data object InvoiceClosed : EventType("invoiceClosed")
+    data object GyroscopeStarted : EventType("gyroscopeStarted")
+    data object GyroscopeChanged : EventType("gyroscopeChanged")
+    data object DeviceOrientationChanged : EventType("deviceOrientationChanged")
+
+    companion object
 }

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/EventTypeSealedWorkaround.kt

@@ -0,0 +1,53 @@
+// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
+// TO REGENERATE IT JUST DELETE FILE
+// ORIGINAL FILE: EventType.kt
+package dev.inmo.tgbotapi.webapps
+
+import kotlin.collections.Set
+
+private val values: Set<EventType> = setOf(EventType.EmojiStatusAccessRequested,
+    EventType.AccelerometerChanged,
+    EventType.DeviceOrientationStarted,
+    EventType.EmojiStatusFailed,
+    EventType.Activated,
+    EventType.ShareMessageSent,
+    EventType.LocationManagerUpdated,
+    EventType.BiometricTokenUpdated,
+    EventType.DeviceOrientationFailed,
+    EventType.SafeAreaChanged,
+    EventType.WriteAccessRequested,
+    EventType.ContentSafeAreaChanged,
+    EventType.AccelerometerStarted,
+    EventType.AccelerometerStopped,
+    EventType.PopupClosed,
+    EventType.GyroscopeStopped,
+    EventType.BackButtonClicked,
+    EventType.HomeScreenAdded,
+    EventType.ShareMessageFailed,
+    EventType.ThemeChanged,
+    EventType.BiometricManagerUpdated,
+    EventType.ScanQrPopupClosed,
+    EventType.BiometricAuthRequested,
+    EventType.HomeScreenChecked,
+    EventType.LocationRequested,
+    EventType.SecondaryButtonClicked,
+    EventType.QrTextReceived,
+    EventType.EmojiStatusSet,
+    EventType.FullscreenFailed,
+    EventType.GyroscopeFailed,
+    EventType.SettingsButtonClicked,
+    EventType.Deactivated,
+    EventType.DeviceOrientationStopped,
+    EventType.FullscreenChanged,
+    EventType.ViewportChanged,
+    EventType.MainButtonClicked,
+    EventType.AccelerometerFailed,
+    EventType.ClipboardTextReceived,
+    EventType.FileDownloadRequested,
+    EventType.ContactRequested,
+    EventType.InvoiceClosed,
+    EventType.GyroscopeStarted,
+    EventType.GyroscopeChanged,
+    EventType.DeviceOrientationChanged)
+
+public fun EventType.Companion.values(): Set<EventType> = values

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/HomeScreenStatus.kt

@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.webapps
+
+enum class HomeScreenStatus(val value: String) {
+    Unsupported("unsupported"),
+    Unknown("unknown"),
+    Added("added"),
+    Missed("missed"),
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/RequestStatus.kt

@@ -11,4 +11,13 @@ inline val RequestStatus.isAllowed: Boolean
     get() = status == "allowed"
 
 inline val RequestStatus.isSent: Boolean
+    get() = status == "sent"
+
+inline val dev.inmo.tgbotapi.webapps.args.ArgStatusObject.isCancelled: Boolean
+    get() = status == "cancelled"
+
+inline val dev.inmo.tgbotapi.webapps.args.ArgStatusObject.isAllowed: Boolean
+    get() = status == "allowed"
+
+inline val dev.inmo.tgbotapi.webapps.args.ArgStatusObject.isSent: Boolean
     get() = status == "sent"

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/SafeAreaInset.kt

@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.webapps
+
+external interface SafeAreaInset {
+    val top: Int
+    val bottom: Int
+    val left: Int
+    val right: Int
+}
+

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebApp.kt

@@ -1,10 +1,16 @@
 package dev.inmo.tgbotapi.webapps
 
+import dev.inmo.tgbotapi.types.CustomEmojiId
+import dev.inmo.tgbotapi.types.PreparedMessageId
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import dev.inmo.tgbotapi.webapps.accelerometer.Accelerometer
 import dev.inmo.tgbotapi.webapps.biometric.BiometricManager
 import dev.inmo.tgbotapi.webapps.cloud.CloudStorage
+import dev.inmo.tgbotapi.webapps.gyroscope.Gyroscope
 import dev.inmo.tgbotapi.webapps.haptic.HapticFeedback
 import dev.inmo.tgbotapi.webapps.invoice.InvoiceClosedInfo
+import dev.inmo.tgbotapi.webapps.location.LocationManager
+import dev.inmo.tgbotapi.webapps.orientation.DeviceOrientation
 import dev.inmo.tgbotapi.webapps.popup.*
 import dev.inmo.tgbotapi.webapps.stories.StoryShareParams
 
@@ -52,6 +58,20 @@ external class WebApp {
     fun closeScanQrPopup()
     fun readTextFromClipboard(callback: TextReceivedCallback? = definedExternally)
 
+    val isActive: Boolean
+    val isFullscreen: Boolean
+    val safeAreaInset: SafeAreaInset
+    val contentSafeAreaInset: ContentSafeAreaInset
+    fun requestFullscreen()
+    fun exitFullscreen()
+
+    val isOrientationLocked: Boolean
+    fun lockOrientation()
+    fun unlockOrientation()
+
+    fun addToHomeScreen()
+    fun checkHomeScreenStatus(callback: (HomeScreenStatus) -> Unit = definedExternally)
+
     @JsName("MainButton")
     val mainButton: BottomButton
     @JsName("SecondaryButton")
@@ -69,28 +89,22 @@ external class WebApp {
     @JsName("BiometricManager")
     val biometricManager: BiometricManager
 
+    @JsName("Accelerometer")
+    val accelerometer: Accelerometer
+
+    @JsName("DeviceOrientation")
+    val deviceOrientation: DeviceOrientation
+
+    @JsName("Gyroscope")
+    val gyroscope: Gyroscope
+
+    @JsName("LocationManager")
+    val locationManager: LocationManager
+
     @JsName("SettingsButton")
     val settingsButton: SettingsButton
 
     internal fun onEvent(type: String, callback: () -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithViewportChangedData(type: String, callback: (ViewportChangedData) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithInvoiceClosedInfo(type: String, callback: (InvoiceClosedInfo) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithPopupClosedInfo(type: String, callback: (String?) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithQRTextInfo(type: String, callback: (String) -> Boolean)
-    @JsName("onEvent")
-    internal fun onEventWithTextInfo(type: String, callback: (String) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithWriteAccessRequested(type: String, callback: (RequestStatus) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithContactRequested(type: String, callback: (RequestStatus) -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithSettingsButtonClicked(type: String, callback: () -> Unit)
-    @JsName("onEvent")
-    internal fun onEventWithScanQRPopupClosed(type: String, callback: () -> Unit)
 
     fun offEvent(type: String, callback: () -> Unit)
     @JsName("offEvent")
@@ -111,8 +125,108 @@ external class WebApp {
 
     fun shareToStory(mediaUrl: String, params: StoryShareParams? = definedExternally)
 
+    fun shareMessage(messageId: PreparedMessageId, callback: (Boolean) -> Unit = definedExternally)
+
+    fun setEmojiStatus(customEmojiId: CustomEmojiId, params: EmojiStatusParams = definedExternally, callback: (Boolean) -> Unit = definedExternally)
+    fun requestEmojiStatusAccess(callback: (Boolean) -> Unit = definedExternally)
+
+    fun downloadFile(params: DownloadFileParams, callback: (Boolean) -> Unit = definedExternally)
+
     fun requestWriteAccess(callback: ((Boolean) -> Unit)? = definedExternally)
     fun requestContact(callback: ((Boolean) -> Unit)? = definedExternally)
+
+    // Start of generated part
+
+    @JsName("onEvent")
+    internal fun onEmojiStatusAccessRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgStatusObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onAccelerometerChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onDeviceOrientationStarted(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onEmojiStatusFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onActivated(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onShareMessageSent(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onLocationManagerUpdated(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onBiometricTokenUpdated(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgIsUpdatedObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onDeviceOrientationFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onSafeAreaChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onWriteAccessRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgStatusObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onContentSafeAreaChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onAccelerometerStarted(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onAccelerometerStopped(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onPopupClosed(type: String, callback: (dev.inmo.tgbotapi.webapps.popup.PopupClosedEventArg) -> Unit)
+    @JsName("onEvent")
+    internal fun onGyroscopeStopped(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onBackButtonClicked(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onHomeScreenAdded(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onShareMessageFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onThemeChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onBiometricManagerUpdated(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onScanQrPopupClosed(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onBiometricAuthRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgBiometricAuthRequested) -> Unit)
+    @JsName("onEvent")
+    internal fun onHomeScreenChecked(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgStatusObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onLocationRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgLocationDataObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onSecondaryButtonClicked(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onQrTextReceived(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgDataObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onEmojiStatusSet(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onFullscreenFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onGyroscopeFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onSettingsButtonClicked(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onDeactivated(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onDeviceOrientationStopped(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onFullscreenChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onViewportChanged(type: String, callback: (Boolean) -> Unit)
+    @JsName("onEvent")
+    internal fun onMainButtonClicked(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onAccelerometerFailed(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgErrorObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onClipboardTextReceived(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgDataNullableObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onFileDownloadRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgStatusObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onContactRequested(type: String, callback: (dev.inmo.tgbotapi.webapps.args.ArgStatusObject) -> Unit)
+    @JsName("onEvent")
+    internal fun onInvoiceClosed(type: String, callback: (String, String) -> Unit)
+    @JsName("onEvent")
+    internal fun onGyroscopeStarted(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onGyroscopeChanged(type: String, callback: () -> Unit)
+    @JsName("onEvent")
+    internal fun onDeviceOrientationChanged(type: String, callback: () -> Unit)
+
+    // End of generated part
 }
 
 val WebApp.colorScheme: ColorScheme
@@ -122,178 +236,178 @@ val WebApp.colorScheme: ColorScheme
         else -> ColorScheme.LIGHT
     }
 
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType, eventHandler: EventHandler) = {
-    eventHandler(js("this").unsafeCast<WebApp>())
-}.also {
-    onEvent(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.ViewportChanged, eventHandler: ViewportChangedEventHandler) = { it: ViewportChangedData ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it)
-}.also {
-    onEventWithViewportChangedData(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.InvoiceClosed, eventHandler: InvoiceClosedEventHandler) = { it: InvoiceClosedInfo ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it)
-}.also {
-    onEventWithInvoiceClosedInfo(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.PopupClosed, eventHandler: PopupClosedEventHandler) = { it: String? ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it)
-}.also {
-    onEventWithPopupClosedInfo(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.QRTextReceived, eventHandler: QRTextReceivedEventHandler) = { it: String ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it)
-}.also {
-    onEventWithQRTextInfo(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.ClipboardTextReceived, eventHandler: TextReceivedEventHandler) = { it: String ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it)
-}.also {
-    onEventWithTextInfo(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.WriteAccessRequested, eventHandler: WriteAccessRequestedHandler) = { it: RequestStatus ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it.isAllowed)
-}.also {
-    onEventWithWriteAccessRequested(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.ContactRequested, eventHandler: ContactRequestedHandler) = { it: RequestStatus ->
-    eventHandler(js("this").unsafeCast<WebApp>(), it.isSent)
-}.also {
-    onEventWithContactRequested(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.SettingsButtonClicked, eventHandler: EventHandler) = {
-    eventHandler(js("this").unsafeCast<WebApp>())
-}.also {
-    onEventWithSettingsButtonClicked(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onEvent(type: EventType.ScanQRPopupClosed, eventHandler: EventHandler) = {
-    eventHandler(js("this").unsafeCast<WebApp>())
-}.also {
-    onEventWithScanQRPopupClosed(
-        type.typeName,
-        callback = it
-    )
-}
-
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onThemeChanged(eventHandler: EventHandler) = onEvent(EventType.ThemeChanged, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onMainButtonClicked(eventHandler: EventHandler) = onEvent(EventType.MainButtonClicked, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onSecondaryButtonClicked(eventHandler: EventHandler) = onEvent(EventType.SecondaryButtonClicked, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onViewportChanged(eventHandler: ViewportChangedEventHandler) = onEvent(EventType.ViewportChanged, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onBackButtonClicked(eventHandler: EventHandler) = onEvent(EventType.BackButtonClicked, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onSettingsButtonClicked(eventHandler: EventHandler) = onEvent(EventType.SettingsButtonClicked, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onInvoiceClosed(eventHandler: InvoiceClosedEventHandler) = onEvent(EventType.InvoiceClosed, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onPopupClosed(eventHandler: PopupClosedEventHandler) = onEvent(EventType.PopupClosed, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onQRTextReceived(eventHandler: QRTextReceivedEventHandler) = onEvent(EventType.QRTextReceived, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onClipboardTextReceived(eventHandler: TextReceivedEventHandler) = onEvent(EventType.ClipboardTextReceived, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onWriteAccessRequested(eventHandler: WriteAccessRequestedHandler) = onEvent(EventType.WriteAccessRequested, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onContactRequested(eventHandler: ContactRequestedHandler) = onEvent(EventType.ContactRequested, eventHandler)
-/**
- * @return The callback which should be used in case you want to turn off events handling
- */
-fun WebApp.onScanQRPopupClosed(eventHandler: onScanQRPopupClosedHandler) = onEvent(EventType.ScanQRPopupClosed, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType, eventHandler: EventHandler) = {
+//    eventHandler(js("this").unsafeCast<WebApp>())
+//}.also {
+//    onEvent(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.ViewportChanged, eventHandler: ViewportChangedEventHandler) = { it: ViewportChangedData ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it)
+//}.also {
+//    onEventWithViewportChangedData(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.InvoiceClosed, eventHandler: InvoiceClosedEventHandler) = { it: InvoiceClosedInfo ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it)
+//}.also {
+//    onEventWithInvoiceClosedInfo(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.PopupClosed, eventHandler: PopupClosedEventHandler) = { it: String? ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it)
+//}.also {
+//    onEventWithPopupClosedInfo(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.QRTextReceived, eventHandler: QRTextReceivedEventHandler) = { it: String ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it)
+//}.also {
+//    onEventWithQRTextInfo(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.ClipboardTextReceived, eventHandler: TextReceivedEventHandler) = { it: String ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it)
+//}.also {
+//    onEventWithTextInfo(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.WriteAccessRequested, eventHandler: WriteAccessRequestedHandler) = { it: RequestStatus ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it.isAllowed)
+//}.also {
+//    onEventWithWriteAccessRequested(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.ContactRequested, eventHandler: ContactRequestedHandler) = { it: RequestStatus ->
+//    eventHandler(js("this").unsafeCast<WebApp>(), it.isSent)
+//}.also {
+//    onEventWithContactRequested(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.SettingsButtonClicked, eventHandler: EventHandler) = {
+//    eventHandler(js("this").unsafeCast<WebApp>())
+//}.also {
+//    onEventWithSettingsButtonClicked(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onEvent(type: EventType.ScanQRPopupClosed, eventHandler: EventHandler) = {
+//    eventHandler(js("this").unsafeCast<WebApp>())
+//}.also {
+//    onEventWithScanQRPopupClosed(
+//        type.typeName,
+//        callback = it
+//    )
+//}
+//
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onThemeChanged(eventHandler: EventHandler) = onEvent(EventType.ThemeChanged, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onMainButtonClicked(eventHandler: EventHandler) = onEvent(EventType.MainButtonClicked, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onSecondaryButtonClicked(eventHandler: EventHandler) = onEvent(EventType.SecondaryButtonClicked, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onViewportChanged(eventHandler: ViewportChangedEventHandler) = onEvent(EventType.ViewportChanged, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onBackButtonClicked(eventHandler: EventHandler) = onEvent(EventType.BackButtonClicked, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onSettingsButtonClicked(eventHandler: EventHandler) = onEvent(EventType.SettingsButtonClicked, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onInvoiceClosed(eventHandler: InvoiceClosedEventHandler) = onEvent(EventType.InvoiceClosed, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onPopupClosed(eventHandler: PopupClosedEventHandler) = onEvent(EventType.PopupClosed, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onQRTextReceived(eventHandler: QRTextReceivedEventHandler) = onEvent(EventType.QRTextReceived, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onClipboardTextReceived(eventHandler: TextReceivedEventHandler) = onEvent(EventType.ClipboardTextReceived, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onWriteAccessRequested(eventHandler: WriteAccessRequestedHandler) = onEvent(EventType.WriteAccessRequested, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onContactRequested(eventHandler: ContactRequestedHandler) = onEvent(EventType.ContactRequested, eventHandler)
+///**
+// * @return The callback which should be used in case you want to turn off events handling
+// */
+//fun WebApp.onScanQRPopupClosed(eventHandler: onScanQRPopupClosedHandler) = onEvent(EventType.ScanQRPopupClosed, eventHandler)
 
 fun WebApp.isInitDataSafe(botToken: String) = TelegramAPIUrlsKeeper(botToken).checkWebAppData(
     initData,

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppInitData.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.webapps
 
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.ChatType
 
 external interface WebAppInitData {
     @JsName("query_id")
@@ -9,6 +10,14 @@ external interface WebAppInitData {
     val user: WebAppUser?
     val receiver: WebAppUser?
 
+    val chat: WebAppChat?
+
+    @JsName("chat_type")
+    val chatType: ChatType?
+
+    @JsName("chat_instance")
+    val chatInstance: String?
+
     @JsName("start_param")
     val startParam: String?
 
@@ -16,9 +25,9 @@ external interface WebAppInitData {
     val authDate: MilliSeconds
 
     @JsName("can_send_after")
-    val canSendAfter: MilliSeconds
-
-    val chat: WebAppChat
+    val canSendAfter: MilliSeconds?
 
     val hash: String
+
+    val signature: String
 }

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/accelerometer/Accelerometer.kt

@@ -0,0 +1,12 @@
+package dev.inmo.tgbotapi.webapps.accelerometer
+
+external interface Accelerometer {
+    val isStarted: Boolean
+    val x: Double
+    val y: Double
+    val z: Double
+
+    fun start(params: AccelerometerStartParams, callback: (Boolean) -> Unit = definedExternally)
+    fun stop(callback: (Boolean) -> Unit)
+}
+

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/accelerometer/AccelerometerStartParams.kt

@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.webapps.accelerometer
+
+import dev.inmo.tgbotapi.types.MilliSeconds
+import kotlin.js.json
+
+external interface AccelerometerStartParams {
+    @JsName("refresh_rate")
+    val refreshRate: MilliSeconds
+}
+
+fun AccelerometerStartParams(refreshRate: MilliSeconds = 1000): AccelerometerStartParams = json(
+    "refresh_rate" to refreshRate
+).unsafeCast<AccelerometerStartParams>()

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgBiometricAuthRequested.kt

@@ -0,0 +1,4 @@
+package dev.inmo.tgbotapi.webapps.args
+
+interface ArgBiometricAuthRequested : ArgBiometricTokenNullableObject, ArgIsAuthenticatedObject {
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgBiometricTokenNullableObject.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.webapps.args
+
+external interface ArgBiometricTokenNullableObject {
+    val biometricToken: String?
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgDataNullableObject.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.webapps.args
+
+external interface ArgDataNullableObject {
+    val data: String?
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgDataObject.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.webapps.args
+
+external interface ArgDataObject : ArgDataNullableObject {
+    override val data: String
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgErrorObject.kt

@@ -0,0 +1,32 @@
+package dev.inmo.tgbotapi.webapps.args
+
+interface ArgErrorObject {
+    val error: String
+}
+
+val ArgErrorObject.isUnsupported
+    get() = error.uppercase() == "UNSUPPORTED"
+
+val ArgErrorObject.isAlreadyFullscreen
+    get() = error.uppercase() == "ALREADY_FULLSCREEN"
+
+val ArgErrorObject.isAMessageExpired
+    get() = error.uppercase() == "MESSAGE_EXPIRED"
+
+val ArgErrorObject.isMessageSendFailed
+    get() = error.uppercase() == "MESSAGE_SEND_FAILED"
+
+val ArgErrorObject.isUserDeclined
+    get() = error.uppercase() == "USER_DECLINED"
+
+val ArgErrorObject.isSuggestedEmojiInvalid
+    get() = error.uppercase() == "SUGGESTED_EMOJI_INVALID"
+
+val ArgErrorObject.isDurationInvalid
+    get() = error.uppercase() == "DURATION_INVALID"
+
+val ArgErrorObject.isServerError
+    get() = error.uppercase() == "SERVER_ERROR"
+
+val ArgErrorObject.isUnknownError
+    get() = error.uppercase() == "UNKNOWN_ERROR"

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgIsAuthenticatedObject.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.webapps.args
+
+interface ArgIsAuthenticatedObject {
+    val isAuthenticated: Boolean
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgIsUpdatedObject.kt

@@ -0,0 +1,5 @@
+package dev.inmo.tgbotapi.webapps.args
+
+interface ArgIsUpdatedObject {
+    val isUpdated: Boolean
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgLocationDataObject.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.webapps.args
+
+import dev.inmo.tgbotapi.webapps.location.LocationData
+
+interface ArgLocationDataObject {
+    val locationData: LocationData
+}

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/args/ArgStatusObject.kt

@@ -0,0 +1,26 @@
+package dev.inmo.tgbotapi.webapps.args
+
+external interface ArgStatusObject {
+    val status: String
+}
+
+val ArgStatusObject.isUnsupported
+    get() = status.lowercase() == "unsupported"
+
+val ArgStatusObject.isUnknown
+    get() = status.lowercase() == "unknown"
+
+val ArgStatusObject.isAdded
+    get() = status.lowercase() == "added"
+
+val ArgStatusObject.isMissed
+    get() = status.lowercase() == "missed"
+
+val ArgStatusObject.isAllowed
+    get() = status.lowercase() == "allowed"
+
+val ArgStatusObject.isDownloading
+    get() = status.lowercase() == "downloading"
+
+val ArgStatusObject.isCancelled
+    get() = status.lowercase() == "cancelled"

tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/cloud/CloudStorage.kt

@@ -18,11 +18,11 @@ external interface CloudStorage {
     ): CloudStorage
     fun removeItem(
         key: CloudStorageKey,
-        callback: (e: Any?, success: Boolean?) -> Unit
+        callback: (e: Any?, success: Boolean?) -> Unit = definedExternally
     ): CloudStorage
     fun removeItems(
         key: Array<CloudStorageKey>,
-        callback: (e: Any?, success: Boolean?) -> Unit
+        callback: (e: Any?, success: Boolean?) -> Unit = definedExternally
     ): CloudStorage
     fun getKeys(
         callback: (e: Any?, success: Array<CloudStorageKey>?) -> Unit
@@ -80,24 +80,24 @@ fun CloudStorage.get(
 
 fun CloudStorage.remove(
     key: CloudStorageKey,
-    callback: (result: Result<Boolean>) -> Unit
+    callback: (result: Result<Boolean>) -> Unit = {}
 ) = removeItem(key) { e, v -> callback(resultsToResult(e, v)) }
 
 fun CloudStorage.remove(
     key: String,
-    callback: (result: Result<Boolean>) -> Unit
+    callback: (result: Result<Boolean>) -> Unit = {}
 ) = remove(CloudStorageKey(key), callback)
 
 fun CloudStorage.remove(
     keys: Array<CloudStorageKey>,
-    callback: (result: Result<Boolean>) -> Unit
+    callback: (result: Result<Boolean>) -> Unit = {}
 ) = removeItems(
     keys
 ) { e, v -> callback(resultsToResult(e, v)) }
 
 fun CloudStorage.remove(
     keys: Array<String>,
-    callback: (result: Result<Boolean>) -> Unit
+    callback: (result: Result<Boolean>) -> Unit = {}
 ) = remove(
     Array(keys.size) {
         CloudStorageKey(keys[it])
@@ -109,7 +109,7 @@ fun CloudStorage.remove(
     key: String,
     key2: String,
     vararg otherKeys: String,
-    callback: (result: Result<Boolean>) -> Unit
+    callback: (result: Result<Boolean>) -> Unit = {}
 ) = remove(
     arrayOf(key, key2) + otherKeys,
     callback