add micro_utils and deprecate old coroutine methods

2020-11-07 13:42:10 +06:00 · 2020-11-07 13:42:10 +06:00 · 1cf7ae7438
parent 311512b5db
commit 1cf7ae7438
44 changed files with 101 additions and 46 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,7 @@
 * `Common`:
    * `Version`:
        * `Coroutine`: `1.4.0` -> `1.4.1`
+        * **NEW** `MicroUtils`: `0.2.7`
 * `Core`:
    * Support of `logOut` method (`LogOut` object as a `Request`)
    * Support of `close` method (`Close` object as a `Request`)
@ -77,6 +78,7 @@
        * `MultilevelTextSource#textParts` has been deprecated. Now each `MultilevelTextSource` have its own
        `textSources` list
    * New dsl for creating of `TextSource` lists
+    * Built-in `handleSafely` and `ExceptionHandler` is deprecated
 * `API`:
    * Extensions `TelegramBot#pinChatMessage` now support any `Chat` and `Message`s from any `Chat`
    * New extensions `TelegramBot#unpinAllChatMessages`
--- a/gradle.properties
+++ b/gradle.properties
@ -12,6 +12,8 @@ klock_version=1.12.1
 uuid_version=0.2.2
 ktor_version=1.4.1

+micro_utils_version=0.2.7
+
 javax_activation_version=1.1.1

 library_group=dev.inmo
--- a/tgbotapi.core/build.gradle
+++ b/tgbotapi.core/build.gradle
@ -47,6 +47,8 @@ kotlin {
                api "com.soywiz.korlibs.klock:klock:$klock_version"
                api "com.benasher44:uuid:$uuid_version"

+                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
+
                api "io.ktor:ktor-client-core:$ktor_version"
            }
        }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Captioned.kt
@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.CommonAbstracts

 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource

 interface Captioned {
    val caption: String?
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Explained.kt
@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.CommonAbstracts

 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource

 interface Explained {
    val explanation: String?
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/Texted.kt
@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.CommonAbstracts

 import dev.inmo.tgbotapi.types.ParseMode.ParseMode
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource

 interface Texted {
    val text: String?
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/KtorRequestsExecutor.kt
@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.bot.Ktor

+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
@ -36,7 +37,7 @@ class KtorRequestsExecutor(
    }

    override suspend fun <T : Any> execute(request: Request<T>): T {
-        return handleSafely(
+        return safely(
            { e ->
                throw if (e is ClientRequestException) {
                    val content = e.response ?.readText() ?: throw e
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/Ktor/base/DownloadFileRequestCallFactory.kt
@ -1,10 +1,10 @@
 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.requests.DownloadFile
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
-import dev.inmo.tgbotapi.utils.handleSafely
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.serialization.json.Json
@ -18,7 +18,7 @@ object DownloadFileRequestCallFactory : KtorCallFactory {
    ): T? = (request as? DownloadFile) ?.let {
        val fullUrl = "${urlsKeeper.fileBaseUrl}/${it.filePath}"

-        return handleSafely {
+        return safely {
            @Suppress("UNCHECKED_CAST")
            client.get<ByteArray>(fullUrl) as T // always ByteArray
        }
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/RawMessageEntity.kt
@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.MessageEntity
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
-import dev.inmo.tgbotapi.utils.shiftSourcesToTheLeft
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.shiftSourcesToTheLeft
 import kotlinx.serialization.Serializable

@Serializable
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BoldTextSource.kt
@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.MessageEntity.toTextParts
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.boldMarkdown
+import dev.inmo.tgbotapi.utils.internal.boldMarkdownV2

 /**
 * @see bold
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/BotCommandTextSource.kt
@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.MessageEntity.removeLeading
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.commandMarkdown
+import dev.inmo.tgbotapi.utils.internal.commandMarkdownV2

 private val commandRegex = Regex("[/!][^@\\s]*")

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CashTagTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.cashTagMarkdown
+import dev.inmo.tgbotapi.utils.internal.cashTagMarkdownV2

 /**
 * @see cashTag
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/CodeTextSource.kt
@ -3,6 +3,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.DirectInvocationOfTextSourceConstructor
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.codeMarkdown
+import dev.inmo.tgbotapi.utils.internal.codeMarkdownV2

 /**
 * @see code
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/EMailTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.emailMarkdown
+import dev.inmo.tgbotapi.utils.internal.emailMarkdownV2

 /**
 * @see email
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/HashTagTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.hashTagMarkdown
+import dev.inmo.tgbotapi.utils.internal.hashTagMarkdownV2

 /**
 * @see hashtag
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/ItalicTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.italicMarkdown
+import dev.inmo.tgbotapi.utils.internal.italicMarkdownV2

 /**
 * @see italic
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt
@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
-import dev.inmo.tgbotapi.types.MessageEntity.removeLeading
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.mentionMarkdown
+import dev.inmo.tgbotapi.utils.internal.mentionMarkdownV2

 private val String.withoutCommercialAt
    get() = if (startsWith("@")) {
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PhoneNumberTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.phoneMarkdown
+import dev.inmo.tgbotapi.utils.internal.phoneMarkdownV2

 /**
 * @see phone
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/PreTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.preMarkdown
+import dev.inmo.tgbotapi.utils.internal.preMarkdownV2

 /**
 * @see pre
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/RegularTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.regularMarkdown
+import dev.inmo.tgbotapi.utils.internal.regularMarkdownV2

 /**
 * @see regular
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/StrikethroughTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdown
+import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdownV2

 /**
 * @see strikethrough
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextLinkTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.linkMarkdown
+import dev.inmo.tgbotapi.utils.internal.linkMarkdownV2

 /**
 * @see link
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/TextMentionTextSource.kt
@ -3,6 +3,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.textMentionMarkdown
+import dev.inmo.tgbotapi.utils.internal.textMentionMarkdownV2

 /**
 * @see mention
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/URLTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.linkMarkdown
+import dev.inmo.tgbotapi.utils.internal.linkMarkdownV2

 /**
 * @see link
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/UnderlineTextSource.kt
@ -2,6 +2,9 @@ package dev.inmo.tgbotapi.types.MessageEntity.textsources

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.underlineMarkdown
+import dev.inmo.tgbotapi.utils.internal.underlineMarkdownV2

 /**
 * @see underline
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
@ -22,7 +22,6 @@ import dev.inmo.tgbotapi.types.payments.Invoice
 import dev.inmo.tgbotapi.types.payments.SuccessfulPayment
 import dev.inmo.tgbotapi.types.polls.Poll
 import dev.inmo.tgbotapi.types.venue.Venue
-import dev.inmo.tgbotapi.utils.fullListOfSubSource
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlin.reflect.KClass
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt
@ -10,7 +10,9 @@ import dev.inmo.tgbotapi.types.ParseMode.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
+import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
+import dev.inmo.tgbotapi.utils.internal.toMarkdownTexts

 data class TextContent(
    val text: String,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AnimationContent.kt
@ -14,8 +14,8 @@ import dev.inmo.tgbotapi.types.files.AnimationFile
 import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
-import dev.inmo.tgbotapi.utils.toMarkdownV2Captions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Captions

 data class AnimationContent(
    override val media: AnimationFile,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/AudioContent.kt
@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.AudioFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.AudioMediaGroupContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class AudioContent(
    override val media: AudioFile,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/DocumentContent.kt
@ -15,7 +15,7 @@ import dev.inmo.tgbotapi.types.files.asDocumentFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.DocumentMediaGroupContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class DocumentContent(
    override val media: DocumentFile,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/PhotoContent.kt
@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaCollectionContent
 import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class PhotoContent(
    override val mediaCollection: Photo,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VideoContent.kt
@ -12,7 +12,7 @@ import dev.inmo.tgbotapi.types.files.VideoFile
 import dev.inmo.tgbotapi.types.files.toInputMediaVideo
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions

 data class VideoContent(
    override val media: VideoFile,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/media/VoiceContent.kt
@ -13,8 +13,8 @@ import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.files.VoiceFile
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
-import dev.inmo.tgbotapi.utils.toHtmlCaptions
-import dev.inmo.tgbotapi.utils.toMarkdownV2Captions
+import dev.inmo.tgbotapi.utils.internal.toHtmlCaptions
+import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Captions

 data class VoiceContent(
    override val media: VoiceFile,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/HandleSafely.kt
@ -1,23 +1,21 @@
 package dev.inmo.tgbotapi.utils

+import dev.inmo.micro_utils.coroutines.ExceptionHandler
+import dev.inmo.micro_utils.coroutines.safely
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.supervisorScope


-typealias ExceptionHandler<T> = suspend (Throwable) -> T
+@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("ExceptionHandler", "dev.inmo.micro_utils.coroutines.ExceptionHandler"))
+typealias ExceptionHandler<T> = ExceptionHandler<T>
 /**
 * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions
 *
 * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this
 * exception will be available for catching
 */
+@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("safely", "dev.inmo.micro_utils.coroutines.safely"))
 suspend inline fun <T> handleSafely(
    noinline onException: ExceptionHandler<T> = { throw it },
    noinline block: suspend CoroutineScope.() -> T
-): T {
-    return try {
-        supervisorScope(block)
-    } catch (e: Throwable) {
-        onException(e)
-    }
-}
+): T = safely(onException, block)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/BaseMessageUpdateToMediaGroupUpdate.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/BaseMessageUpdateToMediaGroupUpdate.kt
@ -1,4 +1,4 @@
-package dev.inmo.tgbotapi.utils
+package dev.inmo.tgbotapi.utils.internal

 import dev.inmo.tgbotapi.types.MediaGroupIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/CaptionAndTextSourcesToText.kt
@ -1,4 +1,4 @@
-package dev.inmo.tgbotapi.utils
+package dev.inmo.tgbotapi.utils.internal

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.*
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt
@ -1,4 +1,4 @@
-package dev.inmo.tgbotapi.utils
+package dev.inmo.tgbotapi.utils.internal

 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/StringFormatting.kt
@ -1,4 +1,4 @@
-package dev.inmo.tgbotapi.utils
+package dev.inmo.tgbotapi.utils.internal

 import dev.inmo.tgbotapi.types.ParseMode.*
 import dev.inmo.tgbotapi.types.UserId
--- a/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
+++ b/tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/StringFormattingTests.kt
@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types.MessageEntity
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
 import dev.inmo.tgbotapi.CommonAbstracts.plus
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.*
 import kotlin.test.Test
 import kotlin.test.assertEquals

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

 import dev.inmo.tgbotapi.CommonAbstracts.justTextSources
-import dev.inmo.tgbotapi.types.MessageEntity.textsources.*
-import dev.inmo.tgbotapi.utils.*
+import dev.inmo.tgbotapi.utils.internal.toHtmlTexts
+import dev.inmo.tgbotapi.utils.internal.toMarkdownV2Texts
 import kotlin.test.*

 class TextPartsCreatingTests {
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/SafelyShortcut.kt
@ -1,16 +1,18 @@
 package dev.inmo.tgbotapi.extensions.utils

+import dev.inmo.micro_utils.coroutines.ExceptionHandler
 import dev.inmo.tgbotapi.utils.*
 import kotlinx.coroutines.CoroutineScope

 /**
- * Shortcut for [handleSafely]. It was created for more comfortable way of handling different things
+ * Shortcut for [dev.inmo.micro_utils.coroutines.safely]. It was created for more comfortable way of handling different things
 */
@PreviewFeature
+@Deprecated("In future will be used typealias from micro_utils", ReplaceWith("safely", "dev.inmo.micro_utils.coroutines.safely"))
 suspend inline fun <T> safely(
    noinline onException: ExceptionHandler<T> = { throw it },
    noinline block: suspend CoroutineScope.() -> T
-): T = handleSafely(
+): T = dev.inmo.micro_utils.coroutines.safely(
    onException,
    block
 )
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/RequestsExecutor.kt
@ -1,15 +1,15 @@
 package dev.inmo.tgbotapi.extensions.utils.shortcuts

+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.utils.handleSafely
 import kotlinx.coroutines.*

 fun <T: Any> RequestsExecutor.executeAsync(
    request: Request<T>,
    scope: CoroutineScope
 ): Deferred<T> = scope.async {
-    handleSafely {
+    safely {
        execute(request)
    }
 }
@ -29,7 +29,7 @@ suspend fun <T: Any> RequestsExecutor.executeUnsafe(
    var leftRetries = retries
    val exceptions = onAllFailed ?.let { mutableListOf<Throwable>() }
    do {
-        return handleSafely(
+        return safely (
            {
                leftRetries--
                delay(retriesDelay)
--- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
+++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt
@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.extensions.utils.updates.retrieving

+import dev.inmo.micro_utils.coroutines.ExceptionHandler
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.bot.exceptions.RequestException
 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
@ -23,7 +25,7 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
    var lastUpdateIdentifier: UpdateIdentifier? = null

    while (isActive) {
-        handleSafely(
+        safely(
            { e ->
                exceptionsHandler ?.invoke(e)
                if (e is RequestException) {
@ -52,7 +54,7 @@ fun RequestsExecutor.startGettingOfUpdatesByLongPolling(
                }
            }

-            handleSafely {
+            safely {
                for (update in updates) {
                    updatesReceiver(update)

--- a/tgbotapi.extensions.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt
+++ b/tgbotapi.extensions.utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/Webhook.kt
@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.extensions.utils.updates.retrieving

+import dev.inmo.micro_utils.coroutines.ExceptionHandler
+import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.tgbotapi.bot.RequestsExecutor
 import dev.inmo.tgbotapi.extensions.utils.nonstrictJsonFormat
 import dev.inmo.tgbotapi.extensions.utils.updates.flowsUpdatesFilter
@ -11,8 +13,6 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.types.update.abstracts.UpdateDeserializationStrategy
 import dev.inmo.tgbotapi.updateshandlers.*
 import dev.inmo.tgbotapi.updateshandlers.webhook.WebhookPrivateKeyConfig
-import dev.inmo.tgbotapi.utils.ExceptionHandler
-import dev.inmo.tgbotapi.utils.handleSafely
 import io.ktor.application.call
 import io.ktor.request.receiveText
 import io.ktor.response.respond
@ -41,7 +41,7 @@ fun Route.includeWebhookHandlingInRoute(
 ) {
    val transformer = scope.updateHandlerWithMediaGroupsAdaptation(block)
    post {
-        handleSafely(
+        safely(
            exceptionsHandler ?: {}
        ) {
            val asJson =