filling of changelog and renaming of new function makeLink -> makeUsernameLink

0.30.5

CHANGELOG.md

@@ -1,5 +1,86 @@
 # TelegramBotAPI changelog
 
+## 0.30.6
+
+* `Core`
+    * `TextSource` properties has been renamed:
+        * `asMarkdownSource` -> `markdown`
+        * `asMarkdownV2Source` -> `markdownV2`
+        * `asHtmlSource` -> `html`
+    * `PrivateChat` override `id` property with type `UserId`
+    * Several new extensions and functions in links creation:
+        * New function `makeUsernameLink` with parameter `String`
+            * New extension `Username#link` and function `makeLink(Username)`
+        * Function `makeLinkToMessage` now able to get any type of chat
+            * New extension `Message#link`
+        * Old functions `makeLinkToAddStickerSet...` has been deprecated:
+            * `makeLinkToAddStickerSet`
+            * `makeLinkToAddStickerSetInMarkdownV2`
+            * `makeLinkToAddStickerSetInMarkdown`
+            * `makeLinkToAddStickerSetInHtml`
+
+## 0.30.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.3` -> `0.4.0`
+* `Core`:
+    * Mechanism of `ChatMember` serialization has been changed
+        * Since this version any `ChatMember` can be serialized (even outside in case it marked by `@Serializable`)
+        * Since this version any `ChatMember` (included in this project) can be deserialized in common way
+    * `User` property `id` has changed its type: now it is `UserId` (under the hood it is the same as `ChatId`)
+
+## 0.30.4
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.1` -> `0.3.3`
+* `Core`:
+    * `MultilevelTextSource#textSources` has been safely renamed to `subsources`
+    * `TextContent#fullEntitiesList` has been deprecated
+    * Now `TextContent` implements `TextedInput`
+        * `TextContent#entities` has been deprecated
+    * `GroupEventMessage` now overrides `chatEvent` with type `GroupEvent`
+    * `SupergroupEventMessage` now overrides `chatEvent` with type `SupergroupEvent`
+    * Any `ChatEventMessage` now have generic type of its `chatEvent` (just like messages)
+* `Utils`:
+    * Old extensions related to chat events are deprecated:
+        * `Flow<ChatEventMessage<*>>#divideBySource`
+        * `Flow<ChatEventMessage<*>>#onlyChannelEvents`
+        * `Flow<ChatEventMessage<*>>#onlyGroupEvents`
+        * `Flow<ChatEventMessage<*>>#onlySupergroupEvents`
+    * A lot of extensions for `Flow<ChatEventMessage>` has been added:
+        * `FlowsUpdatesFilter#events`
+        * `FlowsUpdatesFilter#channelEvents`
+        * `FlowsUpdatesFilter#groupEvents`
+        * `FlowsUpdatesFilter#supergroupEvents`
+        * And a lot of other filters with specific types
+
+## 0.30.3
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.0` -> `0.3.1`
+* `Core`:
+    * New type of requests exceptions `TooMuchRequestsException`. In fact it will be rare case when you will get this
+    exception
+    * `EmptyLimiter` has been renamed to `ExceptionsOnlyLimiter` and currently will stop requests after
+    `TooMuchRequestsException` happen until retry time is actual
+        * Now `ExceptionsOnlyLimiter` (previously `EmptyLimiter`) is a class
+    * `AbstractRequestCallFactory` currently will not look at the response and wait if it have `RetryAfter` error. New
+    behaviour aimed on delegating of this work to `RequestsLimiter`
+
+## 0.30.2
+
+* `Common`:
+    * `Version`:
+        * `Ktor`: `1.4.1` -> `1.4.2`
+* `Core`:
+    * New sealed class `SetWebhookRequest` which can be used in `SetWebhook` requests
+* `Utils`:
+    * Extensions `setWebhookInfoAndStartListenWebhooks` has been united in one extension with `SetWebhookRequest`
+    incoming parameter
+
 ## 0.30.1
 
 * `Common`:

README.md

@@ -2,7 +2,7 @@
 
 | Common info                           | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/TelegramBotAPI) [Small survey](https://forms.gle/2Hex2ynbHWHhi1KY7)|
 | -------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+| Useful links | [![Chat in Telegram](badges/chat.svg)](https://t.me/InMoTelegramBotAPI) [![Create bot](badges/template.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![KDocs](badges/kdocs.svg)](https://tgbotapi.inmo.dev/docs/index.html) [Examples](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/), [Mini tutorial](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
 | TelegramBotAPI Core status                 | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.core/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.core/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.core) |
 | TelegramBotAPI Extensions status      | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.api/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.api) |
 | TelegramBotAPI Util Extensions status | [![Download](https://api.bintray.com/packages/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/images/download.svg)](https://bintray.com/insanusmokrassar/TelegramBotAPI/tgbotapi.extensions.utils/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi.extensions.utils) |

badges/template.svg

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20">
+    <linearGradient id="b" x2="0" y2="100%">
+        <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+        <stop offset="1" stop-opacity=".1"/>
+    </linearGradient>
+    <clipPath id="a">
+        <rect width="104" height="20" rx="3" fill="#fff"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path fill="#555" d="M0 0h65v20H0z"/>
+        <path fill="#007ec6" d="M35 0h69v20H35z"/>
+        <path fill="url(#b)" d="M0 0h104v20H0z"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110">
+        <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Bot</text>
+        <text x="175" y="140" transform="scale(.1)">Bot</text>
+        <text x="690" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)">Template</text>
+        <text x="690" y="140" transform="scale(.1)">Template</text>
+    </g>
+</svg>

gradle.properties

@@ -10,14 +10,14 @@ kotlin_coroutines_version=1.4.1
 kotlin_serialisation_runtime_version=1.0.1
 klock_version=1.12.1
 uuid_version=0.2.2
-ktor_version=1.4.1
+ktor_version=1.4.2
 
-micro_utils_version=0.3.0
+micro_utils_version=0.4.0
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.30.1
+library_version=0.30.6
 
 gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt

@@ -14,13 +14,23 @@ typealias FullTextSourcesList = List<TextSource>
 typealias FullTextPartsList = List<TextPart>
 
 interface TextSource {
-    val asMarkdownSource: String
-    val asMarkdownV2Source: String
-    val asHtmlSource: String
+    val markdown: String
+    val markdownV2: String
+    val html: String
     val source: String
 
     val asText: String
         get() = source
+
+    @Deprecated("Rename", ReplaceWith("markdown"))
+    val asMarkdownSource: String
+        get() = markdown
+    @Deprecated("Rename", ReplaceWith("markdownV2"))
+    val asMarkdownV2Source: String
+        get() = markdownV2
+    @Deprecated("Rename", ReplaceWith("html"))
+    val asHtmlSource: String
+        get() = html
 }
 
 @Suppress("NOTHING_TO_INLINE")
@@ -36,7 +46,10 @@ interface MultilevelTextSource : TextSource {
     @Deprecated("Will be removed in near major release")
     val textParts: List<TextPart>
         get() = textParts(0)
+    val subsources: List<TextSource>
+    @Deprecated("Will be removed in near major release", ReplaceWith("subsources"))
     val textSources: List<TextSource>
+        get() = subsources
 }
 
 data class TextPart(
@@ -46,7 +59,7 @@ data class TextPart(
 
 fun List<TextPart>.justTextSources() = map { it.source }
 fun List<TextSource>.makeString() = joinToString("") { it.source }
-internal fun MultilevelTextSource.textParts(offset: Int): List<TextPart> = textSources.toTextParts(offset)
+internal fun MultilevelTextSource.textParts(offset: Int): List<TextPart> = subsources.toTextParts(offset)
 fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null): List<List<TextSource>> {
     if (isEmpty()) {
         return emptyList()

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

@@ -4,8 +4,7 @@ import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.BaseRequestsExecutor
 import dev.inmo.tgbotapi.bot.Ktor.base.*
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
-import dev.inmo.tgbotapi.bot.settings.limiters.EmptyLimiter
-import dev.inmo.tgbotapi.bot.settings.limiters.RequestLimiter
+import dev.inmo.tgbotapi.bot.settings.limiters.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.Response
 import dev.inmo.tgbotapi.utils.*
@@ -19,7 +18,7 @@ class KtorRequestsExecutor(
     client: HttpClient = HttpClient(),
     callsFactories: List<KtorCallFactory> = emptyList(),
     excludeDefaultFactories: Boolean = false,
-    private val requestsLimiter: RequestLimiter = EmptyLimiter,
+    private val requestsLimiter: RequestLimiter = ExceptionsOnlyLimiter(),
     private val jsonFormatter: Json = nonstrictJsonFormat
 ) : BaseRequestsExecutor(telegramAPIUrlsKeeper) {
     private val callsFactories: List<KtorCallFactory> = callsFactories.run {

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

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.bot.Ktor.base
 
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.Ktor.KtorCallFactory
 import dev.inmo.tgbotapi.bot.exceptions.newRequestException
 import dev.inmo.tgbotapi.requests.GetUpdates
@@ -51,23 +52,17 @@ abstract class AbstractRequestCallFactory : KtorCallFactory {
             val content = response.receive<String>()
             val responseObject = jsonFormatter.decodeFromString(Response.serializer(), content)
 
-            return (responseObject.result?.let {
-                jsonFormatter.decodeFromJsonElement(request.resultDeserializer, it)
-            } ?: responseObject.parameters?.let {
-                val error = it.error
-                if (error is RetryAfterError) {
-                    delay(error.leftToRetry)
-                    makeCall(client, urlsKeeper, request, jsonFormatter)
-                } else {
-                    null
-                }
-            } ?: response.let {
-                throw newRequestException(
-                    responseObject,
-                    content,
-                    "Can't get result object from $content"
-                )
-            })
+            return safely {
+                (responseObject.result?.let {
+                    jsonFormatter.decodeFromJsonElement(request.resultDeserializer, it)
+                } ?: response.let {
+                    throw newRequestException(
+                        responseObject,
+                        content,
+                        "Can't get result object from $content"
+                    )
+                })
+            }
         }
     }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/exceptions/RequestException.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.bot.exceptions
 
-import dev.inmo.tgbotapi.types.Response
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.types.*
 import io.ktor.utils.io.errors.IOException
 
 fun newRequestException(
@@ -16,6 +17,13 @@ fun newRequestException(
         description == "Unauthorized" -> UnauthorizedException(response, plainAnswer, message, cause)
         description.contains("PHOTO_INVALID_DIMENSIONS") -> InvalidPhotoDimensionsException(response, plainAnswer, message, cause)
         description.contains("wrong file identifier") -> WrongFileIdentifierException(response, plainAnswer, message, cause)
+        description.contains("Too Many Requests") -> TooMuchRequestsException(
+            (response.parameters ?.error as? RetryAfterError) ?: RetryAfterError(60, DateTime.now().unixMillisLong),
+            response,
+            plainAnswer,
+            message,
+            cause
+        )
         else -> null
     }
 } ?: CommonRequestException(response, plainAnswer, message, cause)
@@ -49,3 +57,6 @@ class InvalidPhotoDimensionsException(response: Response, plainAnswer: String, m
 
 class WrongFileIdentifierException(response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
     RequestException(response, plainAnswer, message, cause)
+
+class TooMuchRequestsException(val retryAfter: RetryAfterError, response: Response, plainAnswer: String, message: String?, cause: Throwable?) :
+    RequestException(response, plainAnswer, message, cause)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/EmptyLimiter.kt

@@ -1,5 +0,0 @@
-package dev.inmo.tgbotapi.bot.settings.limiters
-
-object EmptyLimiter : RequestLimiter {
-    override suspend fun <T> limit(block: suspend () -> T): T = block()
-}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/settings/limiters/ExceptionsOnlyLimiter.kt

@@ -0,0 +1,65 @@
+package dev.inmo.tgbotapi.bot.settings.limiters
+
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.tgbotapi.bot.exceptions.TooMuchRequestsException
+import dev.inmo.tgbotapi.types.*
+import io.ktor.client.features.ClientRequestException
+import io.ktor.http.HttpStatusCode
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.*
+
+/**
+ * This limiter will limit requests only after getting a [RetryAfterError] or [ClientRequestException] with
+ * [HttpStatusCode.TooManyRequests] status code. Important thing is that in case if some of block has been blocked, all
+ * the others will wait until it will be possible to be called
+ *
+ * @param defaultTooManyRequestsDelay This parameter will be used in case of getting [ClientRequestException] with
+ * [HttpStatusCode.TooManyRequests] as a parameter for delay like it would be [TooMuchRequestsException]. The reason of
+ * it is that in [ClientRequestException] there is no information about required delay between requests
+ */
+class ExceptionsOnlyLimiter(
+    private val defaultTooManyRequestsDelay: MilliSeconds = 1000L
+) : RequestLimiter {
+    private val lockState = MutableStateFlow(false)
+    private suspend fun lock(timeMillis: MilliSeconds) {
+        try {
+            safely {
+                lockState.emit(true)
+                delay(timeMillis)
+            }
+        } finally {
+            lockState.emit(false)
+        }
+    }
+
+    override suspend fun <T> limit(block: suspend () -> T): T {
+        while (true) {
+            lockState.first { !it }
+            val result = safely({
+                when (it) {
+                    is TooMuchRequestsException -> {
+                        lock(it.retryAfter.leftToRetry)
+                        Result.failure(it)
+                    }
+                    is ClientRequestException -> {
+                        if (it.response.status == HttpStatusCode.TooManyRequests) {
+                            lock(defaultTooManyRequestsDelay)
+                        } else {
+                            throw it
+                        }
+                        Result.failure(it)
+                    }
+                    else -> throw it
+                }
+            }) {
+                Result.success(block())
+            }
+            if (result.isSuccess) {
+                return result.getOrNull()!!
+            }
+        }
+    }
+}
+
+@Deprecated("Renamed", ReplaceWith("ExceptionsOnlyLimiter", "dev.inmo.tgbotapi.bot.settings.limiters.ExceptionsOnlyLimiter"))
+typealias EmptyLimiter = ExceptionsOnlyLimiter

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

@@ -4,13 +4,13 @@ import dev.inmo.tgbotapi.CommonAbstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMemberSerializerWithoutDeserialization
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMemberSerializer
 import dev.inmo.tgbotapi.types.chatIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 
 private val chatMembersListSerializer = ListSerializer(
-    AdministratorChatMemberSerializerWithoutDeserialization
+    AdministratorChatMemberSerializer
 )
 
 @Serializable

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

@@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.requests.chat.members
 import dev.inmo.tgbotapi.requests.chat.abstracts.ChatMemberRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMemberDeserializationStrategy
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMemberSerializer
 import kotlinx.serialization.*
 
 @Serializable
@@ -15,7 +15,7 @@ data class GetChatMember(
 ) : ChatMemberRequest<ChatMember> {
     override fun method(): String = "getChatMember"
     override val resultDeserializer: DeserializationStrategy<ChatMember>
-        get() = ChatMemberDeserializationStrategy
+        get() = ChatMemberSerializer
     override val requestSerializer: SerializationStrategy<*>
         get() = serializer()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/webhook/SetWebhook.kt

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.requests.webhook
 
 import dev.inmo.tgbotapi.requests.abstracts.*
-import dev.inmo.tgbotapi.requests.send.media.base.DataRequest
-import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
+import dev.inmo.tgbotapi.requests.send.media.base.*
 import dev.inmo.tgbotapi.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
@@ -13,14 +12,15 @@ private fun correctWebhookUrl(sourceUrl: String) = if (sourceUrl.contains("://")
     "https://$sourceUrl"
 }
 
-fun SetWebhook(
+sealed class SetWebhookRequest : Request<Boolean>
+class MultipartSetWebhookRequest(
     url: String,
     certificate: MultipartFile,
     ipAddress: String? = null,
     maxAllowedConnections: Int? = null,
     allowedUpdates: List<String>? = null,
     dropPendingUpdates: Boolean? = null
-): MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean> = MultipartRequestImpl(
+) : SetWebhookRequest(), MultipartRequest<Boolean> by MultipartRequestImpl(
     SetWebhook(
         correctWebhookUrl(url),
         null as String?,
@@ -32,6 +32,22 @@ fun SetWebhook(
     mapOf(certificateField to certificate)
 )
 
+fun SetWebhook(
+    url: String,
+    certificate: MultipartFile,
+    ipAddress: String? = null,
+    maxAllowedConnections: Int? = null,
+    allowedUpdates: List<String>? = null,
+    dropPendingUpdates: Boolean? = null
+): MultipartSetWebhookRequest = MultipartSetWebhookRequest(
+    correctWebhookUrl(url),
+    certificate,
+    ipAddress,
+    maxAllowedConnections,
+    allowedUpdates,
+    dropPendingUpdates
+)
+
 fun SetWebhook(
     url: String,
     certificate: FileId,
@@ -63,7 +79,7 @@ fun SetWebhook(
     maxAllowedConnections: Int? = null,
     allowedUpdates: List<String>? = null,
     dropPendingUpdates: Boolean? = null
-): Request<Boolean> = when (certificate) {
+) = when (certificate) {
     is MultipartFile -> SetWebhook(correctWebhookUrl(url), certificate as MultipartFile, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
     is FileId -> SetWebhook(correctWebhookUrl(url), certificate as FileId, ipAddress, maxAllowedConnections, allowedUpdates, dropPendingUpdates)
 }
@@ -82,7 +98,7 @@ fun SetWebhook(
     maxAllowedConnections: Int? = null,
     allowedUpdates: List<String>? = null,
     dropPendingUpdates: Boolean? = null
-): Request<Boolean> = SetWebhook(
+) = SetWebhook(
     correctWebhookUrl(url),
     null,
     ipAddress,
@@ -112,7 +128,7 @@ data class SetWebhook internal constructor(
     val allowedUpdates: List<String>? = null,
     @SerialName(dropPendingUpdatesField)
     val dropPendingUpdates: Boolean? = null
-) : DataRequest<Boolean> {
+) : SetWebhookRequest(), DataRequest<Boolean> {
     override fun method(): String = "setWebhook"
     override val resultDeserializer: DeserializationStrategy<Boolean>
         get() = Boolean.serializer()

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

@@ -1,19 +1,37 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class AdministratorChatMemberImpl(
+    @SerialName(userField)
     override val user: User,
-    override val canBeEdited: Boolean,
-    override val canChangeInfo: Boolean,
-    override val canPostMessages: Boolean,
-    override val canEditMessages: Boolean,
-    override val canRemoveMessages: Boolean,
-    override val canInviteUsers: Boolean,
-    override val canRestrictMembers: Boolean,
-    override val canPinMessages: Boolean,
-    override val canPromoteMembers: Boolean,
-    override val isAnonymous: Boolean,
-    override val customTitle: String?
-) : AdministratorChatMember
+    @SerialName(canBeEditedField)
+    override val canBeEdited: Boolean = false,
+    @SerialName(canChangeInfoField)
+    override val canChangeInfo: Boolean = false,
+    @SerialName(canPostMessagesField)
+    override val canPostMessages: Boolean = false,
+    @SerialName(canEditMessagesField)
+    override val canEditMessages: Boolean = false,
+    @SerialName(canDeleteMessagesField)
+    override val canRemoveMessages: Boolean = false,
+    @SerialName(canInviteUsersField)
+    override val canInviteUsers: Boolean = false,
+    @SerialName(canRestrictMembersField)
+    override val canRestrictMembers: Boolean = false,
+    @SerialName(canPinMessagesField)
+    override val canPinMessages: Boolean = false,
+    @SerialName(canPromoteMembersField)
+    override val canPromoteMembers: Boolean = false,
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = false,
+    @SerialName(customTitleField)
+    override val customTitle: String? = null
+) : AdministratorChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "administrator"
+}

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

@@ -1,20 +1,36 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class CreatorChatMember(
     override val user: User,
-    override val isAnonymous: Boolean,
-    override val customTitle: String?
+    @SerialName(isAnonymousField)
+    override val isAnonymous: Boolean = false,
+    @SerialName(customTitleField)
+    override val customTitle: String? = null
 ) : AdministratorChatMember {
+    @Transient
     override val canBeEdited: Boolean = true
+    @Transient
     override val canChangeInfo: Boolean = true
+    @Transient
     override val canPostMessages: Boolean = true
+    @Transient
     override val canEditMessages: Boolean = true
+    @Transient
     override val canRemoveMessages: Boolean = true
+    @Transient
     override val canInviteUsers: Boolean = true
+    @Transient
     override val canRestrictMembers: Boolean = true
+    @Transient
     override val canPinMessages: Boolean = true
+    @Transient
     override val canPromoteMembers: Boolean = true
+    @SerialName(statusField)
+    @Required
+    private val type: String = "creator"
 }

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

@@ -1,10 +1,17 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class KickedChatMember(
+    @SerialName(userField)
     override val user: User,
-    override val untilDate: TelegramDate?
-) : BannedChatMember
+    @SerialName(untilDateField)
+    override val untilDate: TelegramDate? = null
+) : BannedChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "kicked"
+}

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

@@ -1,7 +1,12 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
-data class LeftChatMember(override val user: User) :
-    ChatMember
+@Serializable
+data class LeftChatMember(@SerialName(userField) override val user: User) : ChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "left"
+}

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

@@ -1,7 +1,12 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
-data class MemberChatMember(override val user: User) :
-    ChatMember
+@Serializable
+data class MemberChatMember(@SerialName(userField) override val user: User) : ChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "member"
+}

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

@@ -1,87 +0,0 @@
-package dev.inmo.tgbotapi.types.ChatMember
-
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-internal data class RawChatMember(
-    val user: User,
-    private val status: String,
-    private val until_date: TelegramDate? = null,
-    @SerialName(canBeEditedField)
-    private val canBeEdited: Boolean = false,
-    @SerialName(canChangeInfoField)
-    private val canChangeInfo: Boolean = false,
-    @SerialName(canPostMessagesField)
-    private val canPostMessages: Boolean = false,
-    @SerialName(canEditMessagesField)
-    private val canEditMessages: Boolean = false,
-    @SerialName(canDeleteMessagesField)
-    private val canDeleteMessages: Boolean = false,
-    @SerialName(canInviteUsersField)
-    private val canInviteUsers: Boolean = false,
-    @SerialName(canRestrictMembersField)
-    private val canRestrictMembers: Boolean = false,
-    @SerialName(canPinMessagesField)
-    private val canPinMessages: Boolean = false,
-    @SerialName(canPromoteMembersField)
-    private val canPromoteMembers: Boolean = false,
-    @SerialName(isMemberField)
-    private val isMember: Boolean = false,
-    @SerialName(canSendMessagesField)
-    private val canSendMessages: Boolean = false,
-    @SerialName(canSendMediaMessagesField)
-    private val canSendMediaMessages: Boolean = false,
-    @SerialName(canSendPollsField)
-    private val canSendPolls: Boolean = false,
-    @SerialName(canSendOtherMessagesField)
-    private val canSendOtherMessages: Boolean = false,
-    @SerialName(canAddWebPagePreviewsField)
-    private val canAddWebPagePreviews: Boolean = false,
-    @SerialName(isAnonymousField)
-    private val isAnonymous: Boolean = false,
-    @SerialName(customTitleField)
-    private val customTitle: String? = null
-) {
-    val asChatMember: ChatMember by lazy {
-        when (status) {
-            "creator" -> CreatorChatMember(user, isAnonymous, customTitle)
-            "administrator" -> AdministratorChatMemberImpl(
-                user,
-                canBeEdited,
-                canChangeInfo,
-                canPostMessages,
-                canEditMessages,
-                canDeleteMessages,
-                canInviteUsers,
-                canRestrictMembers,
-                canPinMessages,
-                canPromoteMembers,
-                isAnonymous,
-                customTitle
-            )
-            "member" -> MemberChatMember(user)
-            "restricted" -> RestrictedChatMember(
-                user,
-                until_date,
-                isMember,
-                canSendMessages,
-                canSendMediaMessages,
-                canSendPolls,
-                canSendOtherMessages,
-                canAddWebPagePreviews,
-                canChangeInfo,
-                canInviteUsers,
-                canPinMessages
-            )
-            "left" -> LeftChatMember(user)
-            "kicked" -> KickedChatMember(
-                user,
-                until_date
-            )
-            else -> throw IllegalStateException("Can't understand type of user: $status")
-        }
-    }
-}

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

@@ -1,20 +1,36 @@
 package dev.inmo.tgbotapi.types.ChatMember
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.BannedChatMember
 import dev.inmo.tgbotapi.types.ChatMember.abstracts.SpecialRightsChatMember
-import dev.inmo.tgbotapi.types.TelegramDate
-import dev.inmo.tgbotapi.types.User
+import kotlinx.serialization.*
 
+@Serializable
 data class RestrictedChatMember(
+    @SerialName(userField)
     override val user: User,
-    override val untilDate: TelegramDate?,
-    val isMember: Boolean,
-    val canSendMessages: Boolean,
-    val canSendMediaMessages: Boolean,
-    val canSendPolls: Boolean,
-    val canSendOtherMessages: Boolean,
-    val canAddWebpagePreviews: Boolean,
-    override val canChangeInfo: Boolean,
-    override val canInviteUsers: Boolean,
-    override val canPinMessages: Boolean
-) : BannedChatMember, SpecialRightsChatMember
+    @SerialName(untilDateField)
+    override val untilDate: TelegramDate? = null,
+    @SerialName(isMemberField)
+    val isMember: Boolean = false,
+    @SerialName(canSendMessagesField)
+    val canSendMessages: Boolean = false,
+    @SerialName(canSendMediaMessagesField)
+    val canSendMediaMessages: Boolean = false,
+    @SerialName(canSendPollsField)
+    val canSendPolls: Boolean = false,
+    @SerialName(canSendOtherMessagesField)
+    val canSendOtherMessages: Boolean = false,
+    @SerialName(canAddWebPagePreviewsField)
+    val canAddWebpagePreviews: Boolean = false,
+    @SerialName(canChangeInfoField)
+    override val canChangeInfo: Boolean = false,
+    @SerialName(canInviteUsersField)
+    override val canInviteUsers: Boolean = false,
+    @SerialName(canPinMessagesField)
+    override val canPinMessages: Boolean = false
+) : BannedChatMember, SpecialRightsChatMember {
+    @SerialName(statusField)
+    @Required
+    private val type: String = "restricted"
+}

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

@@ -1,5 +1,11 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable(AdministratorChatMemberSerializer::class)
 interface AdministratorChatMember : SpecialRightsChatMember {
     val canBeEdited: Boolean
     val canPostMessages: Boolean
@@ -9,4 +15,12 @@ interface AdministratorChatMember : SpecialRightsChatMember {
     val canPromoteMembers: Boolean
     val isAnonymous: Boolean
     val customTitle: String?
-}
+}
+
+@Serializer(AdministratorChatMember::class)
+internal object AdministratorChatMemberSerializer : KSerializer<AdministratorChatMember> {
+    override val descriptor: SerialDescriptor = ChatMemberSerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): AdministratorChatMember = ChatMemberSerializer.deserialize(decoder) as AdministratorChatMember
+    override fun serialize(encoder: Encoder, value: AdministratorChatMember) = ChatMemberSerializer.serialize(encoder, value)
+}

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

@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
 import dev.inmo.tgbotapi.CommonAbstracts.types.UntilDate
+import kotlinx.serialization.Serializable
 
+@Serializable(ChatMemberSerializer::class)
 interface BannedChatMember : ChatMember, UntilDate

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

@@ -1,27 +1,46 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
-import dev.inmo.tgbotapi.types.ChatMember.RawChatMember
+import dev.inmo.tgbotapi.types.ChatMember.*
 import dev.inmo.tgbotapi.types.User
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.KSerializer
+import dev.inmo.tgbotapi.types.statusField
+import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonPrimitive
 
+@Serializable(ChatMemberSerializer::class)
 interface ChatMember {
     val user: User
 }
 
-internal object AdministratorChatMemberSerializerWithoutDeserialization : KSerializer<AdministratorChatMember> {
-    override val descriptor: SerialDescriptor = ChatMemberDeserializationStrategy.descriptor
+@Serializer(ChatMember::class)
+internal object ChatMemberSerializer : KSerializer<ChatMember> {
+    override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
 
-    override fun deserialize(decoder: Decoder): AdministratorChatMember
-        = ChatMemberDeserializationStrategy.deserialize(decoder) as AdministratorChatMember
-    override fun serialize(encoder: Encoder, value: AdministratorChatMember) = throw UnsupportedOperationException()
-}
-
-internal object ChatMemberDeserializationStrategy : DeserializationStrategy<ChatMember> {
-    override val descriptor: SerialDescriptor = RawChatMember.serializer().descriptor
-
-    override fun deserialize(decoder: Decoder): ChatMember = RawChatMember.serializer().deserialize(decoder).asChatMember
+    override fun deserialize(decoder: Decoder): ChatMember {
+        val json = JsonObject.serializer().deserialize(decoder)
+        return when (json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")) {
+            "creator" -> nonstrictJsonFormat.decodeFromJsonElement(CreatorChatMember.serializer(), json)
+            "administrator" -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json)
+            "member" -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMember.serializer(), json)
+            "restricted" -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json)
+            "left" -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMember.serializer(), json)
+            "kicked" -> nonstrictJsonFormat.decodeFromJsonElement(KickedChatMember.serializer(), json)
+            else -> error("Unknown type of chat member in json: $json")
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: ChatMember) {
+        when (value) {
+            is CreatorChatMember -> CreatorChatMember.serializer()
+            is AdministratorChatMemberImpl -> AdministratorChatMemberImpl.serializer()
+            is MemberChatMember -> MemberChatMember.serializer()
+            is RestrictedChatMember -> RestrictedChatMember.serializer()
+            is LeftChatMember -> LeftChatMember.serializer()
+            is KickedChatMember -> KickedChatMember.serializer()
+        }
+    }
 }

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

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

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

@@ -28,6 +28,7 @@ typealias GooglePlaceId = String
 typealias GooglePlaceType = String
 
 typealias Seconds = Int
+typealias MilliSeconds = Long
 typealias LongSeconds = Long
 
 typealias Meters = Float
@@ -231,6 +232,7 @@ const val canSendPollsField = "can_send_polls"
 const val canAddWebPagePreviewsField = "can_add_web_page_previews"
 const val canSetStickerSetField = "can_set_sticker_set"
 
+const val statusField = "status"
 const val canBeEditedField = "can_be_edited"
 const val canChangeInfoField = "can_change_info"
 const val canPostMessagesField = "can_post_messages"

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.boldMarkdownV2
  */
 data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.boldMarkdown() }
-    override val asMarkdownV2Source: String by lazy { boldMarkdownV2() }
-    override val asHtmlSource: String by lazy { boldHTML() }
+    override val markdown: String by lazy { source.boldMarkdown() }
+    override val markdownV2: String by lazy { boldMarkdownV2() }
+    override val html: String by lazy { boldHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -18,9 +18,9 @@ data class BotCommandTextSource @RiskFeature(DirectInvocationOfTextSourceConstru
         commandRegex.find(source) ?.value ?.substring(1) ?: source.substring(1)// skip first symbol like "/" or "!"
     }
 
-    override val asMarkdownSource: String by lazy { source.commandMarkdown() }
-    override val asMarkdownV2Source: String by lazy { source.commandMarkdownV2() }
-    override val asHtmlSource: String by lazy { source.commandHTML() }
+    override val markdown: String by lazy { source.commandMarkdown() }
+    override val markdownV2: String by lazy { source.commandMarkdownV2() }
+    override val html: String by lazy { source.commandHTML() }
 }
 
 /**

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.cashTagMarkdownV2
  */
 data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.cashTagMarkdown() }
-    override val asMarkdownV2Source: String by lazy { cashTagMarkdownV2() }
-    override val asHtmlSource: String by lazy { cashTagHTML() }
+    override val markdown: String by lazy { source.cashTagMarkdown() }
+    override val markdownV2: String by lazy { cashTagMarkdownV2() }
+    override val html: String by lazy { cashTagHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -13,9 +13,9 @@ import dev.inmo.tgbotapi.utils.internal.codeMarkdownV2
 data class CodeTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String
 ) : TextSource {
-    override val asMarkdownSource: String by lazy { source.codeMarkdown() }
-    override val asMarkdownV2Source: String by lazy { source.codeMarkdownV2() }
-    override val asHtmlSource: String by lazy { source.codeHTML() }
+    override val markdown: String by lazy { source.codeMarkdown() }
+    override val markdownV2: String by lazy { source.codeMarkdownV2() }
+    override val html: String by lazy { source.codeHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.emailMarkdownV2
  */
 data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.emailMarkdown() }
-    override val asMarkdownV2Source: String by lazy { emailMarkdownV2(source) }
-    override val asHtmlSource: String by lazy { emailHTML(source) }
+    override val markdown: String by lazy { source.emailMarkdown() }
+    override val markdownV2: String by lazy { emailMarkdownV2(source) }
+    override val html: String by lazy { emailHTML(source) }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.hashTagMarkdownV2
  */
 data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.hashTagMarkdown() }
-    override val asMarkdownV2Source: String by lazy { hashTagMarkdownV2() }
-    override val asHtmlSource: String by lazy { hashTagHTML() }
+    override val markdown: String by lazy { source.hashTagMarkdown() }
+    override val markdownV2: String by lazy { hashTagMarkdownV2() }
+    override val html: String by lazy { hashTagHTML() }
 
     init {
         if (!source.startsWith("#")) {

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.italicMarkdownV2
  */
 data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.italicMarkdown() }
-    override val asMarkdownV2Source: String by lazy { italicMarkdownV2() }
-    override val asHtmlSource: String by lazy { italicHTML() }
+    override val markdown: String by lazy { source.italicMarkdown() }
+    override val markdownV2: String by lazy { italicMarkdownV2() }
+    override val html: String by lazy { italicHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -18,11 +18,11 @@ private val String.withoutCommercialAt
  */
 data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.mentionMarkdown() }
-    override val asMarkdownV2Source: String by lazy { mentionMarkdownV2() }
-    override val asHtmlSource: String by lazy { mentionHTML() }
+    override val markdown: String by lazy { source.mentionMarkdown() }
+    override val markdownV2: String by lazy { mentionMarkdownV2() }
+    override val html: String by lazy { mentionHTML() }
 
     init {
         if (!source.startsWith("@")) {

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.phoneMarkdownV2
  */
 data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.phoneMarkdown() }
-    override val asMarkdownV2Source: String by lazy { phoneMarkdownV2() }
-    override val asHtmlSource: String by lazy { phoneHTML() }
+    override val markdown: String by lazy { source.phoneMarkdown() }
+    override val markdownV2: String by lazy { phoneMarkdownV2() }
+    override val html: String by lazy { phoneHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -13,9 +13,9 @@ data class PreTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) c
     override val source: String,
     val language: String? = null
 ) : TextSource {
-    override val asMarkdownSource: String by lazy { source.preMarkdown(language) }
-    override val asMarkdownV2Source: String by lazy { source.preMarkdownV2(language) }
-    override val asHtmlSource: String by lazy { source.preHTML(language) }
+    override val markdown: String by lazy { source.preMarkdown(language) }
+    override val markdownV2: String by lazy { source.preMarkdownV2(language) }
+    override val html: String by lazy { source.preHTML(language) }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -12,9 +12,9 @@ import dev.inmo.tgbotapi.utils.internal.regularMarkdownV2
 data class RegularTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String
 ) : TextSource {
-    override val asMarkdownSource: String by lazy { source.regularMarkdown() }
-    override val asMarkdownV2Source: String by lazy { source.regularMarkdownV2() }
-    override val asHtmlSource: String by lazy { source.regularHtml() }
+    override val markdown: String by lazy { source.regularMarkdown() }
+    override val markdownV2: String by lazy { source.regularMarkdownV2() }
+    override val html: String by lazy { source.regularHtml() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdownV2
  */
 data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asHtmlSource: String by lazy { strikethroughHTML() }
-    override val asMarkdownV2Source: String by lazy { strikethroughMarkdownV2() }
-    override val asMarkdownSource: String by lazy { source.strikethroughMarkdown() }
+    override val html: String by lazy { strikethroughHTML() }
+    override val markdownV2: String by lazy { strikethroughMarkdownV2() }
+    override val markdown: String by lazy { source.strikethroughMarkdown() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -13,9 +13,9 @@ data class TextLinkTextSource @RiskFeature(DirectInvocationOfTextSourceConstruct
     override val source: String,
     val url: String
 ) : TextSource {
-    override val asMarkdownSource: String by lazy { source.linkMarkdown(url) }
-    override val asMarkdownV2Source: String by lazy { source.linkMarkdownV2(url) }
-    override val asHtmlSource: String by lazy { source.linkHTML(url) }
+    override val markdown: String by lazy { source.linkMarkdown(url) }
+    override val markdownV2: String by lazy { source.linkMarkdownV2(url) }
+    override val html: String by lazy { source.linkHTML(url) }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -13,11 +13,11 @@ import dev.inmo.tgbotapi.utils.internal.textMentionMarkdownV2
 data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
     val user: User,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.textMentionMarkdown(user.id) }
-    override val asMarkdownV2Source: String by lazy { textMentionMarkdownV2(user.id) }
-    override val asHtmlSource: String by lazy { textMentionHTML(user.id) }
+    override val markdown: String by lazy { source.textMentionMarkdown(user.id) }
+    override val markdownV2: String by lazy { textMentionMarkdownV2(user.id) }
+    override val html: String by lazy { textMentionHTML(user.id) }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -12,9 +12,9 @@ import dev.inmo.tgbotapi.utils.internal.linkMarkdownV2
 data class URLTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String
 ) : TextSource {
-    override val asMarkdownSource: String by lazy { source.linkMarkdown(source) }
-    override val asMarkdownV2Source: String by lazy { source.linkMarkdownV2(source) }
-    override val asHtmlSource: String by lazy { source.linkHTML(source) }
+    override val markdown: String by lazy { source.linkMarkdown(source) }
+    override val markdownV2: String by lazy { source.linkMarkdownV2(source) }
+    override val html: String by lazy { source.linkHTML(source) }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -11,11 +11,11 @@ import dev.inmo.tgbotapi.utils.internal.underlineMarkdownV2
  */
 data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
-    override val asMarkdownSource: String by lazy { source.underlineMarkdown() }
-    override val asMarkdownV2Source: String by lazy { underlineMarkdownV2() }
-    override val asHtmlSource: String by lazy { underlineHTML() }
+    override val markdown: String by lazy { source.underlineMarkdown() }
+    override val markdownV2: String by lazy { underlineMarkdownV2() }
+    override val html: String by lazy { underlineHTML() }
 }
 
 @Suppress("NOTHING_TO_INLINE")

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

@@ -5,7 +5,7 @@ import com.soywiz.klock.DateTime
 sealed class RequestError
 
 data class RetryAfterError(
-    val seconds: Long,
+    val seconds: Seconds,
     val startCountingMillis: Long
 ) : RequestError() {
     val canContinue = (seconds * 1000L) + startCountingMillis

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

@@ -8,7 +8,7 @@ data class ResponseParametersRaw(
     @SerialName("migrate_to_chat_id")
     private val migrateToChatId: ChatId? = null,
     @SerialName("retry_after")
-    private val retryAfter: Long? = null
+    private val retryAfter: Seconds? = null
 ) {
     @Transient
     private val createTime: Long = DateTime.now().unixMillisLong

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

@@ -14,7 +14,7 @@ sealed class User : PrivateChat
 
 @Serializable
 data class CommonUser(
-    override val id: ChatId,
+    override val id: UserId,
     @SerialName(firstNameField)
     override val firstName: String,
     @SerialName(lastNameField)
@@ -35,7 +35,7 @@ sealed class Bot : User() {
 
 @Serializable
 data class CommonBot(
-    override val id: ChatId,
+    override val id: UserId,
     @SerialName(usernameField)
     override val username: Username,
     @SerialName(firstNameField)
@@ -49,7 +49,7 @@ data class CommonBot(
 
 @Serializable
 data class ExtendedBot(
-    override val id: ChatId,
+    override val id: UserId,
     @SerialName(usernameField)
     override val username: Username,
     @SerialName(firstNameField)

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

@@ -1,10 +1,13 @@
 package dev.inmo.tgbotapi.types.chat.abstracts
 
+import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.chat.PreviewChatSerializer
 import kotlinx.serialization.Serializable
 
 @Serializable(PreviewChatSerializer::class)
 interface PrivateChat : Chat, UsernameChat {
+    override val id: UserId
     val firstName: String
     val lastName: String
 }

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

@@ -4,11 +4,12 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
-data class ChannelEventMessage(
+data class ChannelEventMessage<T : ChannelEvent>(
     override val messageId: MessageIdentifier,
     override val chat: ChannelChat,
-    override val chatEvent: ChannelEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : ChatEventMessage
+) : ChatEventMessage<T>

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

@@ -1,3 +1,3 @@
 package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts
 
-interface SupergroupEvent: ChatEvent
+interface SupergroupEvent: GroupEvent

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

@@ -8,12 +8,12 @@ import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
 
 @Deprecated("Renamed", ReplaceWith("CommonGroupEventMessage"))
-typealias GroupEventMessage = CommonGroupEventMessage
+typealias GroupEventMessage = CommonGroupEventMessage<*>
 
-data class CommonGroupEventMessage(
+data class CommonGroupEventMessage<T : GroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
     override val chat: GroupChat,
-    override val chatEvent: GroupEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : GroupEventMessage
+) : GroupEventMessage<T>

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

@@ -4,16 +4,17 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.SupergroupEventMessage
 
 @Deprecated("Renamed", ReplaceWith("CommonSupergroupEventMessage"))
-typealias SupergroupEventMessage = CommonSupergroupEventMessage
+typealias SupergroupEventMessage = CommonSupergroupEventMessage<*>
 
-data class CommonSupergroupEventMessage(
+data class CommonSupergroupEventMessage<T : SupergroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
     override val chat: SupergroupChat,
-    override val chatEvent: SupergroupEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : SupergroupEventMessage
+) : SupergroupEventMessage<T>

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

@@ -38,6 +38,7 @@ data class AnonymousGroupMessageImpl<T : MessageContent>(
 data class CommonGroupMessageImpl<T : MessageContent>(
     override val chat: GroupChat,
     override val messageId: MessageIdentifier,
+    override val user: User,
     override val date: DateTime,
     override val forwardInfo: ForwardInfo?,
     override val editDate: DateTime?,

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

@@ -296,6 +296,7 @@ internal data class RawMessage(
                             null -> CommonGroupMessageImpl(
                                 chat,
                                 messageId,
+                                from ?: error("It is expected that in messages from non anonymous users and channels user must be specified"),
                                 date.asDate,
                                 forwarded,
                                 edit_date ?.asDate,

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

@@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChatEvent
 
-interface ChatEventMessage : Message {
-    val chatEvent: ChatEvent
+interface ChatEventMessage<T : ChatEvent> : Message {
+    val chatEvent: T
 }

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

@@ -1,3 +1,5 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
-interface GroupEventMessage : ChatEventMessage, FromUserMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
+
+interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserMessage

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

@@ -17,4 +17,4 @@ interface AnonymousGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMes
     override val senderChat: GroupChat
         get() = chat
 }
-interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>
+interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>, FromUserMessage

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

@@ -1,3 +1,5 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
-interface SupergroupEventMessage : GroupEventMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
+
+interface SupergroupEventMessage<T : SupergroupEvent> : GroupEventMessage<T>

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

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.message.content
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
@@ -15,13 +14,13 @@ import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 import dev.inmo.tgbotapi.utils.internal.toMarkdownTexts
 
 data class TextContent(
-    val text: String,
-    /**
-     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     * @see [TextContent.fullEntitiesList]
-     */
-    val entities: List<TextPart> = emptyList()
-) : MessageContent {
+    override val text: String,
+    override val textEntities: List<TextPart> = emptyList()
+) : MessageContent, TextedInput {
+    @Deprecated("Has been renamed", ReplaceWith("textEntities"))
+    val entities: List<TextPart>
+        get() = textEntities
+
     override fun createResend(
         chatId: ChatIdentifier,
         disableNotification: Boolean,
@@ -83,4 +82,5 @@ data class TextContent(
  * Convert its [TextContent.entities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
  * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
  */
+@Deprecated("Useless due to the fact that currently every message contains full list of sources")
 fun TextContent.fullEntitiesList(): TextSourcesList = text.fullListOfSubSource(entities).map { it.source }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt

@@ -15,9 +15,9 @@ internal fun createFormattedText(
     val textBuilder = StringBuilder(partLength)
     for (entity in entities) {
         val string = when (mode) {
-            is MarkdownParseMode -> entity.asMarkdownSource
-            is MarkdownV2ParseMode -> entity.asMarkdownV2Source
-            is HTMLParseMode -> entity.asHtmlSource
+            is MarkdownParseMode -> entity.markdown
+            is MarkdownV2ParseMode -> entity.markdownV2
+            is HTMLParseMode -> entity.html
         }
         if (textBuilder.length + string.length > partLength) {
             if (textBuilder.isNotEmpty()) {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt

@@ -73,29 +73,29 @@ internal fun List<TextPart>.shiftSourcesToTheLeft(shiftCount: Int = 1): List<Tex
 }
 
 private fun List<TextSource>.joinSubSourcesMarkdownV2() = joinToString("") {
-    it.asMarkdownV2Source
+    it.markdownV2
 }
 
 private fun List<TextSource>.joinSubSourcesHtml() = joinToString("") {
-    it.asHtmlSource
+    it.html
 }
 
 internal fun MultilevelTextSource.markdownV2Default(
     openControlSymbol: String,
     closeControlSymbol: String = openControlSymbol
-) = "$openControlSymbol${textSources.joinSubSourcesMarkdownV2()}$closeControlSymbol"
+) = "$openControlSymbol${subsources.joinSubSourcesMarkdownV2()}$closeControlSymbol"
 internal fun MultilevelTextSource.htmlDefault(
     openControlSymbol: String,
     closeControlSymbol: String = openControlSymbol
-) = "<$openControlSymbol>${textSources.joinSubSourcesHtml()}</$closeControlSymbol>"
+) = "<$openControlSymbol>${subsources.joinSubSourcesHtml()}</$closeControlSymbol>"
 
 
 internal fun MultilevelTextSource.linkMarkdownV2(
     link: String
-) = "[${textSources.joinSubSourcesMarkdownV2()}](${link.escapeMarkdownV2Link()})"
+) = "[${subsources.joinSubSourcesMarkdownV2()}](${link.escapeMarkdownV2Link()})"
 internal fun MultilevelTextSource.linkHTML(
     link: String
-) = "<a href=\"${link.toHtml()}\">${textSources.joinSubSourcesHtml()}</a>"
+) = "<a href=\"${link.toHtml()}\">${subsources.joinSubSourcesHtml()}</a>"
 
 
 internal fun MultilevelTextSource.optionalPrefix(
@@ -116,8 +116,8 @@ internal fun MultilevelTextSource.boldMarkdownV2(): String = markdownV2Default(m
 internal fun MultilevelTextSource.boldHTML(): String = htmlDefault(htmlBoldControl)
 
 
-internal fun MultilevelTextSource.cashTagMarkdownV2(): String = textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.cashTagHTML(): String = textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.cashTagMarkdownV2(): String = subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.cashTagHTML(): String = subsources.joinSubSourcesHtml()
 
 
 internal fun MultilevelTextSource.italicMarkdownV2(): String = markdownV2Default(markdownItalicControl)
@@ -135,21 +135,21 @@ internal fun MultilevelTextSource.underlineHTML(): String = htmlDefault(htmlUnde
 internal fun MultilevelTextSource.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.link)
 internal fun MultilevelTextSource.textMentionHTML(userId: UserId): String = linkHTML(userId.link)
 
-internal fun MultilevelTextSource.mentionMarkdownV2(): String = optionalPrefix("@") + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.mentionHTML(): String = optionalPrefix("@") + textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.mentionMarkdownV2(): String = optionalPrefix("@") + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.mentionHTML(): String = optionalPrefix("@") + subsources.joinSubSourcesHtml()
 
 
 internal fun MultilevelTextSource.hashTagMarkdownV2(): String = when {
     source.startsWith("\\#") || source.startsWith("#") -> ""
     else -> "\\#"
-} + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.hashTagHTML(): String = optionalPrefix("#") + textSources.joinSubSourcesHtml()
+} + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.hashTagHTML(): String = optionalPrefix("#") + subsources.joinSubSourcesHtml()
 
 
-internal fun MultilevelTextSource.phoneMarkdownV2(): String = textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.phoneHTML(): String = textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.phoneMarkdownV2(): String = subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.phoneHTML(): String = subsources.joinSubSourcesHtml()
 
 
-internal fun MultilevelTextSource.commandMarkdownV2(): String = optionalPrefix("/") + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.commandHTML(): String = optionalPrefix("/") + textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.commandMarkdownV2(): String = optionalPrefix("/") + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.commandHTML(): String = optionalPrefix("/") + subsources.joinSubSourcesHtml()
 

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

@@ -49,8 +49,8 @@ fun List<TextPart>.testTextParts() {
     assertTrue (get(5).source is MentionTextSource)
 
     val boldSource = get(1).source as BoldTextSource
-    assertTrue (boldSource.textSources.first() is ItalicTextSource)
-    assertTrue (boldSource.textSources[1] is RegularTextSource)
-    assertTrue (boldSource.textSources[2] is StrikethroughTextSource)
-    assertTrue ((boldSource.textSources[2] as StrikethroughTextSource).textSources.first() is UnderlineTextSource)
+    assertTrue (boldSource.subsources.first() is ItalicTextSource)
+    assertTrue (boldSource.subsources[1] is RegularTextSource)
+    assertTrue (boldSource.subsources[2] is StrikethroughTextSource)
+    assertTrue ((boldSource.subsources[2] as StrikethroughTextSource).subsources.first() is UnderlineTextSource)
 }

tgbotapi.extensions.api/build.gradle

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

tgbotapi.extensions.utils/build.gradle

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

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt

@@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.extensions.utils.chat_events
 
-import dev.inmo.tgbotapi.types.message.*
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 import kotlin.reflect.KClass
 
-
-fun <T : ChatEventMessage> Flow<ChatEventMessage>.divideBySource(contentType: KClass<T>) = mapNotNull {
+@Deprecated("Refactored, replaced and renamed", ReplaceWith("filterByChatEvent", "dev.inmo.tgbotapi.extensions.utils.shortcuts.filterByChatEvent"))
+fun <T : ChatEventMessage<*>> Flow<ChatEventMessage<*>>.divideBySource(contentType: KClass<T>) = mapNotNull {
     if (contentType.isInstance(it)) {
         @Suppress("UNCHECKED_CAST")
         it as T
@@ -16,6 +16,9 @@ fun <T : ChatEventMessage> Flow<ChatEventMessage>.divideBySource(contentType: KC
     }
 }
 
-fun Flow<ChatEventMessage>.onlyChannelEvents() = divideBySource(ChannelEventMessage::class)
-fun Flow<ChatEventMessage>.onlyGroupEvents() = divideBySource(CommonGroupEventMessage::class)
-fun Flow<ChatEventMessage>.onlySupergroupEvents() = divideBySource(CommonSupergroupEventMessage::class)
+@Deprecated("Replaced and renamed", ReplaceWith("channelEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.channelEvents"))
+fun Flow<ChatEventMessage<*>>.onlyChannelEvents() = channelEvents()
+@Deprecated("Replaced and renamed", ReplaceWith("groupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.groupEvents"))
+fun Flow<ChatEventMessage<*>>.onlyGroupEvents() = groupEvents()
+@Deprecated("Replaced and renamed", ReplaceWith("supergroupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.supergroupEvents"))
+fun Flow<ChatEventMessage<*>>.onlySupergroupEvents() = supergroupEvents()

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

@@ -1,13 +1,19 @@
 package dev.inmo.tgbotapi.extensions.utils.formatting
 
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.MessageEntity.textsources.link
 import dev.inmo.tgbotapi.types.ParseMode.*
-import dev.inmo.tgbotapi.types.chat.abstracts.PrivateChat
-import dev.inmo.tgbotapi.types.chat.abstracts.UsernameChat
-import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedChat
+import dev.inmo.tgbotapi.types.chat.abstracts.*
+import dev.inmo.tgbotapi.types.chat.abstracts.extended.ExtendedPublicChat
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 private const val internalLinkBeginning = "https://t.me"
 
+fun makeUsernameLink(username: String) = "$internalLinkBeginning/$username"
+inline val Username.link
+    get() = makeUsernameLink(username)
+inline fun makeLink(username: Username) = username.link
+
 fun makeLinkToMessage(
     username: String,
     messageId: MessageIdentifier
@@ -24,8 +30,12 @@ fun makeLinkToMessage(
 private val linkIdRedundantPartRegex = Regex("^-100")
 private val usernameBeginSymbolRegex = Regex("^@")
 
+/**
+ * Link which can be used as by any user to get access to [Message]. Returns null in case when there are no
+ * known way to build link (for [PrivateChat]s, for example)
+ */
 fun makeLinkToMessage(
-    chat: ExtendedChat,
+    chat: Chat,
     messageId: MessageIdentifier
 ): String? {
     return when {
@@ -43,8 +53,55 @@ fun makeLinkToMessage(
     }
 }
 
+/**
+ * @see makeLinkToMessage
+ */
+val Message.link: String?
+    get() = makeLinkToMessage(
+        chat,
+        messageId
+    )
+
+/**
+ * Link which can be used as by any user to get access to [Chat]. Returns null in case when there are no
+ * known way to build link
+ */
+val Chat.link: String?
+    get() {
+        if (this is UsernameChat) {
+            username ?.username ?.let { return it }
+        }
+        if (this is ExtendedPublicChat) {
+            inviteLink ?.let { return it }
+        }
+        if (this is PrivateChat) {
+            return id.link
+        }
+        return null
+    }
+
 private const val stickerSetAddingLinkPrefix = "$internalLinkBeginning/addstickers"
 
+val StickerSetName.stickerSetLink
+    get() = link(this, "$stickerSetAddingLinkPrefix/$this")
+
+/**
+ * @return Link for adding of sticker set with name [stickerSetName] with formatting for [MarkdownV2]
+ */
+@Deprecated("Use extension `stickerSetLink` + getting of `asMarkdownV2Source` property")
+fun makeLinkToAddStickerSetInMarkdownV2(
+    stickerSetName: StickerSetName
+) = stickerSetName.stickerSetLink.markdownV2
+/**
+ * @return Link for adding of sticker set with name [stickerSetName] with formatting for [Markdown]
+ */
+@Deprecated("Use extension `stickerSetLink` + getting of `asMarkdownSource` property")
+fun makeLinkToAddStickerSetInMarkdown(stickerSetName: StickerSetName) = stickerSetName.stickerSetLink.markdown
+/**
+ * @return Link for adding of sticker set with name [stickerSetName] with formatting for [HTML]
+ */
+@Deprecated("Use extension `stickerSetLink` + getting of `asHtmlSource` property")
+fun makeLinkToAddStickerSetInHtml(stickerSetName: StickerSetName) = stickerSetName.stickerSetLink.html
 /**
  * Create a link for adding of sticker set with name [stickerSetName]. Was added thanks to user Djaler and based on
  * https://github.com/Djaler/evil-bot/blob/master/src/main/kotlin/com/github/djaler/evilbot/utils/StickerUtils.kt#L6-L8
@@ -53,34 +110,12 @@ private const val stickerSetAddingLinkPrefix = "$internalLinkBeginning/addsticke
  * @see [makeLinkToAddStickerSetInMarkdown]
  * @see [makeLinkToAddStickerSetInHtml]
  */
+@Deprecated("Use extension `stickerSetLink` + getting of required property")
 fun makeLinkToAddStickerSet(
     stickerSetName: StickerSetName,
     parseMode: ParseMode
-) = (stickerSetName to "$stickerSetAddingLinkPrefix/$stickerSetName").link(
-    parseMode
-)
-
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [MarkdownV2]
- */
-fun makeLinkToAddStickerSetInMarkdownV2(stickerSetName: StickerSetName) =
-    makeLinkToAddStickerSet(
-        stickerSetName,
-        MarkdownV2
-    )
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [Markdown]
- */
-fun makeLinkToAddStickerSetInMarkdown(stickerSetName: StickerSetName) =
-    makeLinkToAddStickerSet(
-        stickerSetName,
-        Markdown
-    )
-/**
- * @return Link for adding of sticker set with name [stickerSetName] with formatting for [HTML]
- */
-fun makeLinkToAddStickerSetInHtml(stickerSetName: StickerSetName) =
-    makeLinkToAddStickerSet(
-        stickerSetName,
-        HTML
-    )
+) = when (parseMode) {
+    MarkdownParseMode -> makeLinkToAddStickerSetInMarkdown(stickerSetName)
+    MarkdownV2ParseMode -> makeLinkToAddStickerSetInMarkdownV2(stickerSetName)
+    HTMLParseMode -> makeLinkToAddStickerSetInHtml(stickerSetName)
+}

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

@@ -15,9 +15,9 @@ fun createFormattedText(
     val textBuilder = StringBuilder(partLength)
     for (entity in entities) {
         val string = when (mode) {
-            is MarkdownParseMode -> entity.asMarkdownSource
-            is MarkdownV2ParseMode -> entity.asMarkdownV2Source
-            is HTMLParseMode -> entity.asHtmlSource
+            is MarkdownParseMode -> entity.markdown
+            is MarkdownV2ParseMode -> entity.markdownV2
+            is HTMLParseMode -> entity.html
         }
         if (textBuilder.length + string.length > partLength) {
             if (textBuilder.isNotEmpty()) {

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.extensions.utils.shortcuts
 
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
 import dev.inmo.tgbotapi.extensions.utils.onlyTextContentMessages
 import dev.inmo.tgbotapi.extensions.utils.updates.asContentMessagesFlow
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
@@ -27,7 +28,7 @@ import kotlinx.coroutines.flow.*
 fun <T : ContentMessage<TextContent>> Flow<T>.filterExactCommands(
     commandRegex: Regex
 ) = filter { contentMessage ->
-    (contentMessage.content.fullEntitiesList().singleOrNull() as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
+    (contentMessage.content.textSources.singleOrNull() as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
 }
 
 /**
@@ -46,7 +47,7 @@ fun <T : ContentMessage<TextContent>> Flow<T>.filterExactCommands(
 fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsInsideTextMessages(
     commandRegex: Regex
 ) = filter { contentMessage ->
-    contentMessage.content.fullEntitiesList().any {
+    contentMessage.content.textSources.any {
         (it as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
     }
 }
@@ -70,7 +71,7 @@ fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsInsideTextMessages(
 fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsWithArgs(
     commandRegex: Regex
 ) = mapNotNull { contentMessage ->
-    val allEntities = contentMessage.content.fullEntitiesList()
+    val allEntities = contentMessage.content.textSources
     (allEntities.firstOrNull() as? BotCommandTextSource) ?.let {
         if (commandRegex.matches(it.command)) {
             contentMessage to allEntities.flatMap {

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt

@@ -0,0 +1,98 @@
+@file:Suppress("NOTHING_TO_INLINE", "unused", "EXPERIMENTAL_API_USAGE")
+
+package dev.inmo.tgbotapi.extensions.utils.shortcuts
+
+import dev.inmo.micro_utils.coroutines.plus
+import dev.inmo.tgbotapi.types.message.ChannelEventMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.coroutines.flow.*
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.events(): Flow<ChatEventMessage<*>> {
+    return channelPostFlow.mapNotNull { it.data as? ChatEventMessage<*> } + messageFlow.mapNotNull { it.data as? ChatEventMessage<*> }
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.channelEvents(): Flow<ChannelEventMessage<*>> = channelPostFlow.mapNotNull {
+    it.data as? ChannelEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.groupEvents(): Flow<GroupEventMessage<*>> = messageFlow.mapNotNull {
+    it.data as? GroupEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.supergroupEvents(): Flow<SupergroupEventMessage<*>> = messageFlow.mapNotNull {
+    it.data as? SupergroupEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun <reified T: ChatEvent, reified O: ChatEventMessage<T>> Flow<ChatEventMessage<*>>.filterByChatEvent(): Flow<O> = mapNotNull {
+    if (it.chatEvent is T) it as? O else null
+}
+
+@RiskFeature("Use with caution")
+inline fun <reified T : ChannelEvent> Flow<ChatEventMessage<*>>.filterChannelEvents() = filterByChatEvent<T, ChannelEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : ChannelEvent> FlowsUpdatesFilter.filterChannelEvents() = channelEvents().filterChannelEvents<T>()
+inline fun Flow<ChatEventMessage<*>>.channelCreatedEvents() = filterChannelEvents<ChannelChatCreated>()
+inline fun FlowsUpdatesFilter.channelCreatedEvents() = filterChannelEvents<ChannelChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedChannelPhotoEvents() = filterChannelEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedChannelPhotoEvents() = filterChannelEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newChannelPhotoEvents() = filterChannelEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newChannelPhotoEvents() = filterChannelEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newChannelTitleEvents() = filterChannelEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newChannelTitleEvents() = filterChannelEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newChannelPinnedMessageEvents() = filterChannelEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newChannelPinnedMessageEvents() = filterChannelEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.channelEvents() = filterChannelEvents<ChannelEvent>()
+
+@RiskFeature("Use with caution")
+inline fun <reified T : GroupEvent> Flow<ChatEventMessage<*>>.filterGroupEvents() = filterByChatEvent<T, GroupEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : GroupEvent> FlowsUpdatesFilter.filterGroupEvents() = groupEvents().filterByChatEvent<T, GroupEventMessage<T>>()
+inline fun Flow<ChatEventMessage<*>>.groupCreatedEvents() = filterGroupEvents<GroupChatCreated>()
+inline fun FlowsUpdatesFilter.groupCreatedEvents() = filterGroupEvents<GroupChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedGroupPhotoEvents() = filterGroupEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedGroupPhotoEvents() = filterGroupEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newGroupMembersEvents() = filterGroupEvents<NewChatMembers>()
+inline fun FlowsUpdatesFilter.newGroupMembersEvents() = filterGroupEvents<NewChatMembers>()
+inline fun Flow<ChatEventMessage<*>>.leftGroupMemberEvents() = filterGroupEvents<LeftChatMember>()
+inline fun FlowsUpdatesFilter.leftGroupMemberEvents() = filterGroupEvents<LeftChatMember>()
+inline fun Flow<ChatEventMessage<*>>.newGroupPhotoEvents() = filterGroupEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newGroupPhotoEvents() = filterGroupEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newGroupTitleEvents() = filterGroupEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newGroupTitleEvents() = filterGroupEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newGroupPinnedMessageEvents() = filterGroupEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newGroupPinnedMessageEvents() = filterGroupEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.proximityAlertTriggeredInGroupEvents() = filterGroupEvents<ProximityAlertTriggered>()
+inline fun FlowsUpdatesFilter.proximityAlertTriggeredInGroupEvents() = filterGroupEvents<ProximityAlertTriggered>()
+inline fun Flow<ChatEventMessage<*>>.groupEvents() = filterGroupEvents<GroupEvent>()
+
+
+@RiskFeature("Use with caution")
+inline fun <reified T : SupergroupEvent> Flow<ChatEventMessage<*>>.filterSupergroupEvents() = filterByChatEvent<T, SupergroupEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : SupergroupEvent> FlowsUpdatesFilter.filterSupergroupEvents() = supergroupEvents().filterByChatEvent<T, SupergroupEventMessage<T>>()
+inline fun Flow<ChatEventMessage<*>>.supergroupCreatedEvents() = filterSupergroupEvents<SupergroupChatCreated>()
+inline fun FlowsUpdatesFilter.supergroupCreatedEvents() = filterSupergroupEvents<SupergroupChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedSupergroupPhotoEvents() = filterSupergroupEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedSupergroupPhotoEvents() = filterSupergroupEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupMembersEvents() = filterSupergroupEvents<NewChatMembers>()
+inline fun FlowsUpdatesFilter.newSupergroupMembersEvents() = filterSupergroupEvents<NewChatMembers>()
+inline fun Flow<ChatEventMessage<*>>.leftSupergroupMemberEvents() = filterSupergroupEvents<LeftChatMember>()
+inline fun FlowsUpdatesFilter.leftSupergroupMemberEvents() = filterSupergroupEvents<LeftChatMember>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupPhotoEvents() = filterSupergroupEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newSupergroupPhotoEvents() = filterSupergroupEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupTitleEvents() = filterSupergroupEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newSupergroupTitleEvents() = filterSupergroupEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupPinnedMessageEvents() = filterSupergroupEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newSupergroupPinnedMessageEvents() = filterSupergroupEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.proximityAlertTriggeredInSupergroupEvents() = filterSupergroupEvents<ProximityAlertTriggered>()
+inline fun FlowsUpdatesFilter.proximityAlertTriggeredInSupergroupEvents() = filterSupergroupEvents<ProximityAlertTriggered>()
+inline fun Flow<ChatEventMessage<*>>.supergroupEvents() = filterSupergroupEvents<SupergroupEvent>()

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/SentMessageUpdatesConversations.kt

@@ -19,12 +19,15 @@ fun <T : BaseSentMessageUpdate> Flow<T>.asCommonMessagesFlow() = mapNotNull {
     it.data as? CommonMessage<*>
 }
 
+@Suppress("NOTHING_TO_INLINE")
+inline fun <T : BaseSentMessageUpdate> Flow<T>.chatEvents() = mapNotNull {
+    it.data as? ChatEventMessage<*>
+}
 /**
  * Will map incoming [BaseSentMessageUpdate]s to [ChatEventMessage] from [BaseSentMessageUpdate.data]
  */
-fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = mapNotNull {
-    it.data as? ChatEventMessage
-}
+@Deprecated("Renamed", ReplaceWith("chatEvents", "dev.inmo.tgbotapi.extensions.utils.updates.chatEvents"))
+fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = chatEvents()
 
 /**
  * Will map incoming [BaseSentMessageUpdate]s to [UnknownMessageType] from [BaseSentMessageUpdate.data]

tgbotapi.extensions.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt

@@ -5,10 +5,7 @@ import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.utils.nonstrictJsonFormat
 import dev.inmo.tgbotapi.extensions.utils.updates.flowsUpdatesFilter
-import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.requests.send.media.base.MultipartRequestImpl
-import dev.inmo.tgbotapi.requests.webhook.SetWebhook
+import dev.inmo.tgbotapi.requests.webhook.SetWebhookRequest
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.types.update.abstracts.UpdateDeserializationStrategy
 import dev.inmo.tgbotapi.updateshandlers.*
@@ -67,7 +64,7 @@ fun Route.includeWebhookHandlingInRouteWithFlows(
 )
 
 /**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
+ * Setting up ktor server
  *
  * @param listenPort port which will be listen by bot
  * @param listenRoute address to listen by bot. If null - will be set up in root of host
@@ -119,27 +116,8 @@ fun startListenWebhooks(
     }
 }
 
-private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort: Int,
-    engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: Request<Boolean>,
-    exceptionsHandler: ExceptionHandler<Unit> = {},
-    listenHost: String = "0.0.0.0",
-    listenRoute: String? = null,
-    privateKeyConfig: WebhookPrivateKeyConfig? = null,
-    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
-    block: UpdateReceiver<Update>
-): ApplicationEngine {
-    return try {
-        execute(setWebhookRequest)
-        startListenWebhooks(listenPort, engineFactory, exceptionsHandler, listenHost, listenRoute, privateKeyConfig, scope, block)
-    } catch (e: Exception) {
-        throw e
-    }
-}
-
 /**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
+ * Setting up ktor server, set webhook info via [SetWebhookRequest] request.
  *
  * @param listenPort port which will be listen by bot
  * @param listenRoute address to listen by bot
@@ -153,55 +131,16 @@ private suspend fun RequestsExecutor.internalSetWebhookInfoAndStartListenWebhook
 suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
     listenPort: Int,
     engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: SetWebhook,
+    setWebhookRequest: SetWebhookRequest,
     exceptionsHandler: ExceptionHandler<Unit> = {},
     listenHost: String = "0.0.0.0",
     listenRoute: String = "/",
     privateKeyConfig: WebhookPrivateKeyConfig? = null,
     scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
     block: UpdateReceiver<Update>
-): ApplicationEngine = internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort,
-    engineFactory,
-    setWebhookRequest as Request<Boolean>,
-    exceptionsHandler,
-    listenHost,
-    listenRoute,
-    privateKeyConfig,
-    scope,
-    block
-)
-
-/**
- * Setting up ktor server, set webhook info via [SetWebhook] request.
- *
- * @param listenPort port which will be listen by bot
- * @param listenRoute address to listen by bot
- * @param scope Scope which will be used for
- *
- * @see dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
- * @see UpdatesFilter
- * @see UpdatesFilter.asUpdateReceiver
- */
-@Suppress("unused")
-suspend fun RequestsExecutor.setWebhookInfoAndStartListenWebhooks(
-    listenPort: Int,
-    engineFactory: ApplicationEngineFactory<*, *>,
-    setWebhookRequest: MultipartRequestImpl<SetWebhook, Map<String, MultipartFile>, Boolean>,
-    exceptionsHandler: ExceptionHandler<Unit> = {},
-    listenHost: String = "0.0.0.0",
-    listenRoute: String? = null,
-    privateKeyConfig: WebhookPrivateKeyConfig? = null,
-    scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
-    block: UpdateReceiver<Update>
-): ApplicationEngine = internalSetWebhookInfoAndStartListenWebhooks(
-    listenPort,
-    engineFactory,
-    setWebhookRequest as Request<Boolean>,
-    exceptionsHandler,
-    listenHost,
-    listenRoute,
-    privateKeyConfig,
-    scope,
-    block
-)
+): ApplicationEngine = try {
+    execute(setWebhookRequest)
+    startListenWebhooks(listenPort, engineFactory, exceptionsHandler, listenHost, listenRoute, privateKeyConfig, scope, block)
+} catch (e: Exception) {
+    throw e
+}

tgbotapi/build.gradle

@@ -40,15 +40,9 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-                    api "${project.group}:tgbotapi.core:$library_version"
-                    api "${project.group}:tgbotapi.extensions.api:$library_version"
-                    api "${project.group}:tgbotapi.extensions.utils:$library_version"
-                } else {
-                    api project(":tgbotapi.core")
-                    api project(":tgbotapi.extensions.api")
-                    api project(":tgbotapi.extensions.utils")
-                }
+                api project(":tgbotapi.core")
+                api project(":tgbotapi.extensions.api")
+                api project(":tgbotapi.extensions.utils")
             }
         }
     }