solution for #636

2.2.2

CHANGELOG.md

@@ -1,5 +1,18 @@
 # TelegramBotAPI changelog
 
+## 3.0.0
+
+## 2.2.2
+
+* `Core`:
+  * Interface `ReplyMakrup` has been renamed to `WithReplyMarkup` to correspond its purpose
+* `API`:
+  * New API (`handleLiveLocation`) for live location streaming using `Flow`
+* `Utils`:
+  * `buildEntities` now is inline
+* `Behaviour Builder`:
+  * Fixes in `CallbackQuery` triggers
+
 ## 2.2.1
 
 * `Versions`:

README.md

@@ -1,9 +1,17 @@
 # TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-6.1-blue)](https://core.telegram.org/bots/api-changelog#june-20-2022)
 
-| [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Build Status](https://github.com/InsanusMokrassar/TelegramBotAPI/workflows/Build/badge.svg)](https://github.com/InsanusMokrassar/TelegramBotAPI/actions) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) [![Chat in Telegram](https://img.shields.io/static/v1?label=Telegram&message=Chat&color=blue&logo=telegram)](https://t.me/InMoTelegramBotAPI) |
-|:---:|
-| [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
-| [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/InMoTelegramBotAPI) |
+| Docs | [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Bookstack&message=Tutorial&color=blue&logo=bookstack)](https://bookstack.inmo.dev/books/telegrambotapi/chapter/introduction-tutorial) |
+|:---:|:---:|
+| Useful repos | [![Create bot](https://img.shields.io/static/v1?label=Github&message=Template&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-bot_template/generate) [![Examples](https://img.shields.io/static/v1?label=Github&message=Examples&color=blue&logo=github)](https://github.com/InsanusMokrassar/TelegramBotAPI-examples/) |
+| Misc | [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) [![Small survey](https://img.shields.io/static/v1?label=Google&message=Survey&color=blue&logo=google-sheets)](https://docs.google.com/forms/d/e/1FAIpQLSctdJHT_aEniyYT0-IUAEfo1hsIlezX2owlkEAYX4KPl2V2_A/viewform?usp=sf_link) |
+
+<!--- [![Telegram Channel](./resources/tg_channel_qr.jpg)](https://t.me/InMoTelegramBotAPI) --->
+
+<p align="center">
+  <a href="https://t.me/InMoTelegramBotAPI">
+    <img src="./resources/tg_channel_qr.jpg">
+  </a>
+</p>
 
 Hello! This is a set of libraries for working with Telegram Bot API.
 

gradle.properties

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

gradle/libs.versions.toml

@@ -1,17 +1,16 @@
 [versions]
 
-kotlin = "1.6.21"
-kotlin-serialization = "1.3.3"
+kotlin = "1.7.10"
+kotlin-serialization = "1.4.0-RC"
 kotlin-coroutines = "1.6.4"
-kotlin-gradle-plugin = "7.0.4"
 
 javax-activation = "1.1.1"
 
-korlibs = "2.7.0"
-uuid = "0.4.1"
+korlibs = "3.0.0"
+uuid = "0.5.0"
 ktor = "2.0.3"
 
-microutils = "0.11.13"
+microutils = "0.12.0"
 
 github-release-plugin = "2.4.1"
 

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

@@ -0,0 +1,151 @@
+package dev.inmo.tgbotapi.extensions.api
+
+import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
+import dev.inmo.tgbotapi.abstracts.*
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.extensions.api.edit.location.live.editLiveLocation
+import dev.inmo.tgbotapi.extensions.api.send.sendLiveLocation
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
+import dev.inmo.tgbotapi.types.location.LiveLocation
+import dev.inmo.tgbotapi.types.location.Location
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.LocationContent
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.serialization.Serializable
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
+import kotlin.math.ceil
+
+@Serializable
+data class EditLiveLocationInfo(
+    override val latitude: Double,
+    override val longitude: Double,
+    override val horizontalAccuracy: Meters? = null,
+    override val heading: Degrees? = null,
+    override val proximityAlertRadius: Meters? = null,
+    override val replyMarkup: InlineKeyboardMarkup? = null
+) : Locationed, HorizontallyAccured, ProximityAlertable, Headed, WithReplyMarkup
+
+/**
+ * Will [sendLiveLocation] with the first [EditLiveLocationInfo] data and update than. Each [liveTimeMillis] passing,
+ * the message will be sent again and new edits will be applied to the new message
+ */
+suspend fun TelegramBot.handleLiveLocation(
+    chatId: ChatIdentifier,
+    locationsFlow: Flow<EditLiveLocationInfo>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) {
+    var currentLiveLocationMessage: ContentMessage<LocationContent>? = null
+    val updateMessageJob = CoroutineScope(currentCoroutineContext().LinkedSupervisorJob()).launchSafelyWithoutExceptions(start = CoroutineStart.LAZY) {
+        while (isActive) {
+            delay(liveTimeMillis)
+            // Remove previous location message info to resend live location message
+            currentLiveLocationMessage = null
+        }
+    }
+    locationsFlow.collect {
+        val capturedLiveLocationMessage = currentLiveLocationMessage
+        if (capturedLiveLocationMessage == null) {
+            updateMessageJob.start()
+            currentLiveLocationMessage = sendLiveLocation(
+                chatId,
+                it.latitude,
+                it.longitude,
+                ceil(liveTimeMillis.toDouble() / 1000).toInt(),
+                it.horizontalAccuracy,
+                it.heading,
+                it.proximityAlertRadius,
+                disableNotification,
+                protectContent,
+                replyToMessageId,
+                allowSendingWithoutReply,
+                it.replyMarkup
+            )
+        } else {
+            editLiveLocation(
+                capturedLiveLocationMessage,
+                it.latitude,
+                it.longitude,
+                it.horizontalAccuracy,
+                it.heading,
+                it.proximityAlertRadius,
+                it.replyMarkup
+            )
+        }
+    }
+}
+
+/**
+ * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
+ * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
+ */
+@JvmName("handleLiveLocationWithLocation")
+@JsName("handleLiveLocationWithLocation")
+suspend fun TelegramBot.handleLiveLocation(
+    chatId: ChatIdentifier,
+    locationsFlow: Flow<Location>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) {
+    handleLiveLocation(
+        chatId,
+        locationsFlow.map {
+            EditLiveLocationInfo(
+                it.latitude,
+                it.longitude,
+                it.horizontalAccuracy,
+                (it as? LiveLocation) ?.heading,
+                (it as? LiveLocation) ?.proximityAlertRadius,
+                (it as? WithReplyMarkup) ?.replyMarkup as? InlineKeyboardMarkup
+            )
+        },
+        liveTimeMillis,
+        disableNotification,
+        protectContent,
+        replyToMessageId,
+        allowSendingWithoutReply
+    )
+}
+
+/**
+ * Will apply [Flow.map] to the [locationsFlow] to create [EditLiveLocationInfo] and pass the result flow to the
+ * [handleLiveLocation] with [Flow] typed by [EditLiveLocationInfo]
+ */
+@JvmName("handleLiveLocationWithLatLong")
+@JsName("handleLiveLocationWithLatLong")
+suspend fun TelegramBot.handleLiveLocation(
+    chatId: ChatIdentifier,
+    locationsFlow: Flow<Pair<Double, Double>>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null
+) {
+    handleLiveLocation(
+        chatId,
+        locationsFlow.map { (lat, long) ->
+            EditLiveLocationInfo(
+                lat,
+                long
+            )
+        },
+        liveTimeMillis,
+        disableNotification,
+        protectContent,
+        replyToMessageId,
+        allowSendingWithoutReply
+    )
+}

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

@@ -229,3 +229,224 @@ suspend inline fun TelegramBot.copyMessage(
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = copyMessage(message.chat, message.messageId, toChat, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChatId: ChatIdentifier,
+    fromChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    CopyMessage(
+        fromChatId,
+        messageId,
+        toChatId,
+        text,
+        parseMode,
+        disableNotification,
+        protectContent,
+        replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChatId: ChatIdentifier,
+    fromChat: Chat,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChatId,
+    fromChat.id,
+    messageId,
+    text,
+    parseMode,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChat: Chat,
+    fromChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChat.id,
+    fromChatId,
+    messageId,
+    text,
+    parseMode,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChat: Chat,
+    fromChat: Chat,
+    messageId: MessageIdentifier,
+    text: String? = null,
+    parseMode: ParseMode? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChat.id,
+    fromChat.id,
+    messageId,
+    text,
+    parseMode,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChatId: ChatIdentifier,
+    fromChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    entities: TextSourcesList,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    CopyMessage(
+        fromChatId,
+        messageId,
+        toChatId,
+        entities,
+        disableNotification,
+        protectContent,
+        replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChatId: ChatIdentifier,
+    fromChat: Chat,
+    messageId: MessageIdentifier,
+    entities: TextSourcesList,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChatId,
+    fromChat.id,
+    messageId,
+    entities,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChat: Chat,
+    fromChatId: ChatIdentifier,
+    messageId: MessageIdentifier,
+    entities: TextSourcesList,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChat.id,
+    fromChatId,
+    messageId,
+    entities,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend inline fun TelegramBot.copyMessage(
+    toChat: Chat,
+    fromChat: Chat,
+    messageId: MessageIdentifier,
+    entities: TextSourcesList,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = copyMessage(
+    toChat.id,
+    fromChat.id,
+    messageId,
+    entities,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)

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

@@ -1,180 +0,0 @@
-package dev.inmo.tgbotapi.extensions.api.send
-
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.send.CopyMessage
-import dev.inmo.tgbotapi.requests.send.OrderChangingDeprecationWarn
-import dev.inmo.tgbotapi.types.ChatIdentifier
-import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.message.ParseMode
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.Message
-
-// TODO:: Swap fromChatId and toChatId for more correct order of parameters
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    CopyMessage(
-        fromChatId,
-        messageId,
-        toChatId,
-        text,
-        parseMode,
-        disableNotification,
-        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChatId, messageId, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, toChat.id, messageId, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    text: String? = null,
-    parseMode: ParseMode? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChat.id, messageId, text, parseMode, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = execute(
-    CopyMessage(
-        fromChatId,
-        messageId,
-        toChatId,
-        entities,
-        disableNotification,
-        protectContent,
-        replyToMessageId,
-        allowSendingWithoutReply,
-        replyMarkup
-    )
-)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChatId: ChatIdentifier,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChatId, messageId, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChatId: ChatIdentifier,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, toChat.id, messageId, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
-
-/**
- * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
- * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
- */
-@Deprecated(OrderChangingDeprecationWarn)
-suspend inline fun TelegramBot.copyMessage(
-    fromChat: Chat,
-    toChat: Chat,
-    messageId: MessageIdentifier,
-    entities: TextSourcesList,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyToMessageId: MessageIdentifier? = null,
-    allowSendingWithoutReply: Boolean? = null,
-    replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChat.id, toChat.id, messageId, entities, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.extensions.api.send
 
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.extensions.api.*
 import dev.inmo.tgbotapi.extensions.api.send.games.sendGame
 import dev.inmo.tgbotapi.extensions.api.send.media.*
 import dev.inmo.tgbotapi.extensions.api.send.payments.sendInvoice
@@ -29,6 +31,10 @@ import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.venue.Venue
 import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlin.js.JsName
+import kotlin.jvm.JvmName
 
 
 // Contact
@@ -950,7 +956,18 @@ suspend inline fun TelegramBot.reply(
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
     replyMarkup: KeyboardMarkup? = null
-) = copyMessage(fromChatId, to.chat.id, messageId, text, parseMode, disableNotification, protectContent, to.messageId, allowSendingWithoutReply, replyMarkup)
+) = copyMessage(
+    to.chat.id,
+    fromChatId,
+    messageId,
+    text,
+    parseMode,
+    disableNotification,
+    protectContent,
+    to.messageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
 
 suspend inline fun TelegramBot.reply(
     to: Message,
@@ -995,6 +1012,80 @@ suspend fun TelegramBot.reply(
     )
 }
 
+/**
+ * Will use [handleLiveLocation] with replying to [message] each time new message will be sent by live location update
+ *
+ * @see handleLiveLocation
+ */
+suspend fun TelegramBot.reply(
+    message: Message,
+    locationsFlow: Flow<EditLiveLocationInfo>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null
+) = handleLiveLocation(
+    message.chat.id,
+    locationsFlow,
+    liveTimeMillis,
+    disableNotification,
+    protectContent,
+    message.messageId,
+    allowSendingWithoutReply
+)
+
+/**
+ * Will use [handleLiveLocation] with replying to [message] each time new message will be sent by live location update
+ *
+ * @see handleLiveLocation
+ */
+@JvmName("replyLiveLocationWithLocation")
+@JsName("replyLiveLocationWithLocation")
+suspend fun TelegramBot.reply(
+    message: Message,
+    locationsFlow: Flow<Location>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null
+) {
+    handleLiveLocation(
+        message.chat.id,
+        locationsFlow,
+        liveTimeMillis,
+        disableNotification,
+        protectContent,
+        message.messageId,
+        allowSendingWithoutReply
+    )
+}
+
+/**
+ * Will use [handleLiveLocation] with replying to [message] each time new message will be sent by live location update
+ *
+ * @see handleLiveLocation
+ */
+@JvmName("replyLiveLocationWithLatLong")
+@JsName("replyLiveLocationWithLatLong")
+suspend fun TelegramBot.reply(
+    message: Message,
+    locationsFlow: Flow<Pair<Double, Double>>,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    allowSendingWithoutReply: Boolean? = null
+) {
+    handleLiveLocation(
+        message.chat.id,
+        locationsFlow,
+        liveTimeMillis,
+        disableNotification,
+        protectContent,
+        message.messageId,
+        allowSendingWithoutReply
+    )
+}
+
 suspend fun TelegramBot.reply(
     to: Message,
     mediaFile: TelegramMediaFile,

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

@@ -0,0 +1,212 @@
+package dev.inmo.tgbotapi.extensions.api.send
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.send.SendLiveLocation
+import dev.inmo.tgbotapi.requests.send.SendStaticLocation
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.location.Location
+import dev.inmo.tgbotapi.types.location.StaticLocation
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = execute(
+    SendLiveLocation(
+        chatId,
+        latitude,
+        longitude,
+        livePeriod,
+        horizontalAccuracy,
+        heading,
+        proximityAlertRadius,
+        disableNotification,
+        protectContent,
+        replyToMessageId,
+        allowSendingWithoutReply,
+        replyMarkup
+    )
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLocation(
+    chatId: ChatIdentifier,
+    location: Location,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chatId,
+    location.latitude,
+    location.longitude,
+    livePeriod,
+    horizontalAccuracy,
+    heading,
+    proximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLocation(
+    chat: Chat,
+    latitude: Double,
+    longitude: Double,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chat.id,
+    latitude,
+    longitude,
+    livePeriod,
+    horizontalAccuracy,
+    heading,
+    proximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLocation(
+    chat: Chat,
+    location: Location,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    chat.id,
+    location.latitude,
+    location.longitude,
+    livePeriod,
+    horizontalAccuracy,
+    heading,
+    proximityAlertRadius,
+    disableNotification,
+    protectContent,
+    replyToMessageId,
+    allowSendingWithoutReply,
+    replyMarkup
+)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLiveLocation(
+    chatId: ChatIdentifier,
+    latitude: Double,
+    longitude: Double,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(chatId, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLiveLocation(
+    chatId: ChatIdentifier,
+    location: Location,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(chatId, location.latitude, location.longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLiveLocation(
+    chat: Chat,
+    latitude: Double,
+    longitude: Double,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(chat.id, latitude, longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)
+
+/**
+ * @param replyMarkup Some of [KeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard] or
+ * [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard] as a builders for that param
+ */
+suspend fun TelegramBot.sendLiveLocation(
+    chat: Chat,
+    location: Location,
+    livePeriod: Seconds,
+    horizontalAccuracy: Meters? = null,
+    heading: Degrees? = null,
+    proximityAlertRadius: Meters? = null,
+    disableNotification: Boolean = false,
+    protectContent: Boolean = false,
+    replyToMessageId: MessageIdentifier? = null,
+    allowSendingWithoutReply: Boolean? = null,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(chat.id, location.latitude, location.longitude, livePeriod, horizontalAccuracy, heading, proximityAlertRadius, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply, replyMarkup)

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

@@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.location.Location
 import dev.inmo.tgbotapi.types.location.StaticLocation
 
 /**
@@ -40,7 +41,7 @@ suspend fun TelegramBot.sendLocation(
  */
 suspend fun TelegramBot.sendLocation(
     chatId: ChatIdentifier,
-    location: StaticLocation,
+    location: Location,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
@@ -87,7 +88,7 @@ suspend fun TelegramBot.sendLocation(
  */
 suspend fun TelegramBot.sendLocation(
     chat: Chat,
-    location: StaticLocation,
+    location: Location,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
@@ -125,7 +126,7 @@ suspend fun TelegramBot.sendStaticLocation(
  */
 suspend fun TelegramBot.sendStaticLocation(
     chatId: ChatIdentifier,
-    location: StaticLocation,
+    location: Location,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,
@@ -154,7 +155,7 @@ suspend fun TelegramBot.sendStaticLocation(
  */
 suspend fun TelegramBot.sendStaticLocation(
     chat: Chat,
-    location: StaticLocation,
+    location: Location,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
     allowSendingWithoutReply: Boolean? = null,

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

@@ -57,20 +57,6 @@ interface BehaviourContext : FlowsUpdatesFilter, TelegramBot, CoroutineScope {
         upstreamUpdatesFlow: Flow<Update>? = null,
         triggersHolder: TriggersHolder = TriggersHolder()
     ): BehaviourContext
-
-    /**
-     * @param updatesFilter unused
-     */
-    @Deprecated("Do not use this method")
-    fun copy(
-        bot: TelegramBot = this.bot,
-        scope: CoroutineScope = this.scope,
-        broadcastChannelsSize: Int = 100,
-        onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
-        upstreamUpdatesFlow: Flow<Update>? = null,
-        triggersHolder: TriggersHolder = TriggersHolder(),
-        updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
-    ): BehaviourContext = copy(bot, scope, broadcastChannelsSize, onBufferOverflow, upstreamUpdatesFlow, triggersHolder)
 }
 
 class DefaultBehaviourContext(
@@ -79,9 +65,7 @@ class DefaultBehaviourContext(
     broadcastChannelsSize: Int = 100,
     onBufferOverflow: BufferOverflow = BufferOverflow.SUSPEND,
     private val upstreamUpdatesFlow: Flow<Update>? = null,
-    override val triggersHolder: TriggersHolder = TriggersHolder(),
-    @Deprecated("This parameter is not used anymore")
-    private val updatesFilter: BehaviourContextAndTypeReceiver<Boolean, Update>? = null
+    override val triggersHolder: TriggersHolder = TriggersHolder()
 ) : AbstractFlowsUpdatesFilter(), TelegramBot by bot, CoroutineScope by scope, BehaviourContext {
 
     private val additionalUpdatesSharedFlow = MutableSharedFlow<Update>(0, broadcastChannelsSize, onBufferOverflow)
@@ -137,19 +121,6 @@ fun <BC : BehaviourContext> BC.createSubContext(
     triggersHolder = triggersHolder
 ) as BC
 
-/**
- * Creates new [BehaviourContext] using its [BehaviourContext.copy] method
- *
- * @param updatesFilter This param will not be used anymore
- */
-@Deprecated("It is not recommended to use updates filter anymore")
-fun <BC : BehaviourContext> BC.createSubContext(
-    scope: CoroutineScope = LinkedSupervisorScope(),
-    triggersHolder: TriggersHolder = this.triggersHolder,
-    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
-    updatesFilter: CustomBehaviourContextAndTypeReceiver<BC, Boolean, Update>?,
-) = createSubContext(scope, triggersHolder, updatesUpstreamFlow)
-
 /**
  * Launch [behaviourContextReceiver] in context of [this] as [BehaviourContext] and as [kotlin.coroutines.CoroutineContext]
  *
@@ -187,27 +158,6 @@ suspend fun <T, BC : BehaviourContext> BC.createSubContextAndDoWithUpdatesFilter
     )
 }
 
-/**
- * Creates new one [BehaviourContext] using [createSubContext] and launches [behaviourContextReceiver] in a new context
- * using [doInContext]
- *
- * @param stopOnCompletion ___TRUE BY DEFAULT___
- * @param updatesFilter Is not used anymore
- */
-@Deprecated("It is not recommended to use updates filter anymore")
-suspend fun <T, BC : BehaviourContext> BC.createSubContextAndDoWithUpdatesFilter(
-    scope: CoroutineScope = LinkedSupervisorScope(),
-    triggersHolder: TriggersHolder = this.triggersHolder,
-    updatesUpstreamFlow: Flow<Update> = allUpdatesFlow,
-    updatesFilter: CustomBehaviourContextAndTypeReceiver<BC, Boolean, Update>?,
-    stopOnCompletion: Boolean = true,
-    behaviourContextReceiver: CustomBehaviourContextReceiver<BC, T>
-): T {
-    return createSubContextAndDoWithUpdatesFilter(
-        scope, triggersHolder, updatesUpstreamFlow, stopOnCompletion, behaviourContextReceiver
-    )
-}
-
 /**
  * This method will cancel ALL subsequent contexts, expectations and waiters
  */

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

@@ -6,10 +6,9 @@ import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CallbackQueryFilterByUser
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
+import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByUserCallbackQueryMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.plus
 import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
 import dev.inmo.tgbotapi.types.queries.callback.*
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -111,7 +110,7 @@ suspend fun <BC : BehaviourContext> BC.onDataCallbackQuery(
     markerFactory: MarkerFactory<in DataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, DataCallbackQuery>
 ) = onDataCallbackQuery(
-    initialFilter = initialFilter + {
+    initialFilter = initialFilter * {
         it.data.matches(dataRegex)
     },
     subcontextUpdatesFilter,
@@ -239,7 +238,7 @@ suspend fun <BC : BehaviourContext> BC.onInlineMessageIdDataCallbackQuery(
     markerFactory: MarkerFactory<in InlineMessageIdDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, InlineMessageIdDataCallbackQuery>
 ) = onInlineMessageIdDataCallbackQuery(
-    initialFilter = initialFilter + {
+    initialFilter = initialFilter * {
         it.data.matches(dataRegex)
     },
     subcontextUpdatesFilter,
@@ -367,7 +366,7 @@ suspend fun <BC : BehaviourContext> BC.onMessageDataCallbackQuery(
     markerFactory: MarkerFactory<in MessageDataCallbackQuery, Any> = ByUserCallbackQueryMarkerFactory,
     scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, MessageDataCallbackQuery>
 ) = onMessageDataCallbackQuery(
-    initialFilter = initialFilter + {
+    initialFilter = initialFilter * {
         it.data.matches(dataRegex)
     },
     subcontextUpdatesFilter,

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

@@ -1,7 +0,0 @@
-package dev.inmo.tgbotapi.abstracts.types
-
-import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
-
-interface ReplyMarkup {
-    val replyMarkup: KeyboardMarkup?
-}

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

@@ -0,0 +1,9 @@
+package dev.inmo.tgbotapi.abstracts.types
+
+import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
+
+interface WithReplyMarkup {
+    val replyMarkup: KeyboardMarkup?
+}
+@Deprecated("Renamed", ReplaceWith("WithReplyMarkup", "dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup"))
+typealias ReplyMarkup = WithReplyMarkup

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

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.requests
 
 import dev.inmo.tgbotapi.abstracts.types.MessageAction
-import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@@ -17,7 +17,7 @@ data class StopPoll(
     override val messageId: MessageIdentifier,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : MessageAction, SimpleRequest<Poll>, ReplyMarkup {
+) : MessageAction, SimpleRequest<Poll>, WithReplyMarkup {
     override fun method(): String = "stopPoll"
     override val resultDeserializer: DeserializationStrategy<Poll>
         get() = PollSerializer

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage.kt

@@ -1,8 +1,8 @@
 package dev.inmo.tgbotapi.requests.edit.abstracts
 
-import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 
-interface EditReplyMessage : ReplyMarkup {
+interface EditReplyMessage : WithReplyMarkup {
     override val replyMarkup: InlineKeyboardMarkup?
 }

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

@@ -20,10 +20,9 @@ import kotlinx.serialization.*
 
 const val OrderChangingDeprecationWarn = "The order of parameters in this factory will be changed soon. To avoid unexpected behaviour, swap message id and target chat id parameters"
 
-@Deprecated(OrderChangingDeprecationWarn)
 fun CopyMessage(
-    fromChatId: ChatIdentifier,
     toChatId: ChatIdentifier,
+    fromChatId: ChatIdentifier,
     messageId: MessageIdentifier,
     text: String? = null,
     parseMode: ParseMode? = null,
@@ -46,10 +45,9 @@ fun CopyMessage(
     replyMarkup
 )
 
-@Deprecated(OrderChangingDeprecationWarn)
 fun CopyMessage(
-    fromChatId: ChatIdentifier,
     toChatId: ChatIdentifier,
+    fromChatId: ChatIdentifier,
     messageId: MessageIdentifier,
     entities: List<TextSource>,
     disableNotification: Boolean = false,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt

@@ -1,5 +1,5 @@
 package dev.inmo.tgbotapi.requests.send.abstracts
 
-import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 
-interface ReplyingMarkupSendMessageRequest<T: Any>: SendMessageRequest<T>, ReplyMarkup
+interface ReplyingMarkupSendMessageRequest<T: Any>: SendMessageRequest<T>, WithReplyMarkup

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.games
 
-import dev.inmo.tgbotapi.abstracts.types.ReplyMarkup
+import dev.inmo.tgbotapi.abstracts.types.WithReplyMarkup
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
@@ -29,7 +29,7 @@ data class SendGame (
     @SerialName(replyMarkupField)
     override val replyMarkup: KeyboardMarkup? = null
 ) : SendMessageRequest<ContentMessage<GameContent>>,
-    ReplyMarkup {
+    WithReplyMarkup {
     override fun method(): String = "sendGame"
     override val resultDeserializer: DeserializationStrategy<ContentMessage<GameContent>>
         get() = commonResultDeserializer

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

@@ -72,7 +72,7 @@ data class SendInvoice(
     ChatRequest,
     DisableNotification,
     ReplyMessageId,
-    ReplyMarkup,
+    WithReplyMarkup,
     SendMessageRequest<ContentMessage<InvoiceContent>> {
     override fun method(): String = "sendInvoice"
     override val resultDeserializer: DeserializationStrategy<ContentMessage<InvoiceContent>>

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

@@ -39,19 +39,6 @@ val UserId.userLink: String
 val User.link: String
     get() = id.userLink
 
-/**
- * https://core.telegram.org/bots/api#formatting-options
- */
-@Deprecated("Renamed", ReplaceWith("userLink", "dev.inmo.tgbotapi.types.userLink"))
-val Identifier.link: String
-    get() = "tg://user?id=$this"
-/**
- * https://core.telegram.org/bots/api#formatting-options
- */
-@Deprecated("Renamed", ReplaceWith("userLink", "dev.inmo.tgbotapi.types.userLink"))
-val ChatId.link: String
-    get() = chatId.link
-
 typealias UserId = ChatId
 
 fun Identifier.toChatId(): ChatId = ChatId(this)

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

@@ -19,15 +19,6 @@ data class ReplyForce(
         val Selective = Selective()
         val NonSelective = NonSelective()
         val Default = ReplyForce()
-
-        @Deprecated("Renamed", ReplaceWith("ReplyForce.Selective"))
-        inline val ReplyForceSelective
-            get() = Selective
-        @Deprecated("Renamed", ReplaceWith("ReplyForce.NonSelective"))
-        inline val ReplyForceNonSelective
-            get() = NonSelective
-        @Deprecated("Renamed", ReplaceWith("ReplyForce.Default"))
-        val ReplyForceDefault = ReplyForce()
     }
 
     init {

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

@@ -38,6 +38,3 @@ data class OwnerChatMember(
     @Required
     private val type: String = "creator"
 }
-
-@Deprecated("Renamed", ReplaceWith("OwnerChatMember", "dev.inmo.tgbotapi.types.chat.member.OwnerChatMember"))
-typealias CreatorChatMember = OwnerChatMember

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

@@ -5,38 +5,68 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.*
 import dev.inmo.tgbotapi.types.chat.User
 
-sealed class ForwardInfo {
+sealed interface ForwardInfo {
     abstract val dateOfOriginal: TelegramDate
+
+    data class ByAnonymous(
+        override val dateOfOriginal: TelegramDate,
+        val senderName: String
+    ) : ForwardInfo
+
+    data class ByUser(
+        override val dateOfOriginal: TelegramDate,
+        override val from: User
+    ) : ForwardInfo, FromUser
+
+    sealed interface PublicChat : ForwardInfo {
+        val chat: dev.inmo.tgbotapi.types.chat.PublicChat
+
+        /**
+         * Represent forward info for the message sent by [channelChat] into some group
+         */
+        data class SentByChannel(
+            override val dateOfOriginal: TelegramDate,
+            val channelChat: ChannelChat,
+            val signature: String? = null
+        ) : PublicChat {
+            override val chat: dev.inmo.tgbotapi.types.chat.PublicChat
+                get() = channelChat
+        }
+
+        /**
+         * Represent forward info for the message sent by [channelChat] into that channel
+         */
+        data class FromChannel(
+            override val dateOfOriginal: TelegramDate,
+            val messageId: MessageIdentifier,
+            val channelChat: ChannelChat,
+            val signature: String? = null
+        ) : PublicChat {
+            override val chat: dev.inmo.tgbotapi.types.chat.PublicChat
+                get() = channelChat
+        }
+
+        data class FromSupergroup(
+            override val dateOfOriginal: TelegramDate,
+            val group: SupergroupChat
+        ) : PublicChat {
+            override val chat: dev.inmo.tgbotapi.types.chat.PublicChat
+                get() = group
+        }
+    }
 }
 
-data class AnonymousForwardInfo(
-    override val dateOfOriginal: TelegramDate,
-    val senderName: String
-) : ForwardInfo()
+@Deprecated("Replaced", ReplaceWith("ForwardInfo.ByAnonymous", "dev.inmo.tgbotapi.types.message.ForwardInfo"))
+typealias AnonymousForwardInfo = ForwardInfo.ByAnonymous
 
-data class UserForwardInfo(
-    override val dateOfOriginal: TelegramDate,
-    override val from: User
-) : ForwardInfo(), FromUser
+@Deprecated("Replaced", ReplaceWith("ForwardInfo.ByUser", "dev.inmo.tgbotapi.types.message.ForwardInfo"))
+typealias UserForwardInfo = ForwardInfo.ByUser
 
-sealed class ForwardFromPublicChatInfo : ForwardInfo() {
-    abstract val chat: PublicChat
-}
+@Deprecated("Replaced", ReplaceWith("ForwardInfo.PublicChat", "dev.inmo.tgbotapi.types.message.ForwardInfo"))
+typealias ForwardFromPublicChatInfo = ForwardInfo.PublicChat
 
-data class ForwardFromChannelInfo(
-    override val dateOfOriginal: TelegramDate,
-    val messageId: MessageIdentifier,
-    val channelChat: ChannelChat,
-    val signature: String? = null
-) : ForwardFromPublicChatInfo() {
-    override val chat: PublicChat
-        get() = channelChat
-}
+@Deprecated("Replaced", ReplaceWith("ForwardInfo.PublicChat.FromChannel", "dev.inmo.tgbotapi.types.message.ForwardInfo"))
+typealias ForwardFromChannelInfo = ForwardInfo.PublicChat.FromChannel
 
-data class ForwardFromSupergroupInfo(
-    override val dateOfOriginal: TelegramDate,
-    val group: SupergroupChat
-) : ForwardFromPublicChatInfo() {
-    override val chat: PublicChat
-        get() = group
-}
+@Deprecated("Replaced", ReplaceWith("ForwardInfo.PublicChat.FromSupergroup", "dev.inmo.tgbotapi.types.message.ForwardInfo"))
+typealias ForwardFromSupergroupInfo = ForwardInfo.PublicChat.FromSupergroup

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

@@ -156,26 +156,39 @@ internal data class RawMessage(
     }
 
     private val forwarded: ForwardInfo? by lazy {
-        forward_date ?: return@lazy null // According to the documentation, now any forwarded message contains this field
+        forward_date
+            ?: return@lazy null // According to the documentation, now any forwarded message contains this field
         when {
-            forward_sender_name != null -> AnonymousForwardInfo(
+            forward_sender_name != null -> ForwardInfo.ByAnonymous(
                 forward_date,
                 forward_sender_name
             )
-            forward_from_chat is ChannelChat -> ForwardFromChannelInfo(
-                forward_date,
-                forward_from_message_id ?: error("Channel forwarded message must contain message id, but was not"),
-                forward_from_chat,
-                forward_signature
-            )
-            forward_from_chat is SupergroupChat -> ForwardFromSupergroupInfo(
+
+            forward_from_chat is ChannelChat -> if (forward_from_message_id == null) {
+                ForwardInfo.PublicChat.SentByChannel(
+                    forward_date,
+                    forward_from_chat,
+                    forward_signature
+                )
+            } else {
+                ForwardInfo.PublicChat.FromChannel(
+                    forward_date,
+                    forward_from_message_id,
+                    forward_from_chat,
+                    forward_signature
+                )
+            }
+
+            forward_from_chat is SupergroupChat -> ForwardInfo.PublicChat.FromSupergroup(
                 forward_date,
                 forward_from_chat
             )
-            forward_from != null -> UserForwardInfo(
+
+            forward_from != null -> ForwardInfo.ByUser(
                 forward_date,
                 forward_from
             )
+
             else -> null
         }
     }

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

@@ -1,8 +1,7 @@
 package dev.inmo.tgbotapi.utils.internal
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.textsources.MultilevelTextSource
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.link
 import dev.inmo.tgbotapi.utils.extensions.*
 
 internal fun MultilevelTextSource.markdownV2Default(
@@ -61,8 +60,8 @@ internal fun MultilevelTextSource.underlineMarkdownV2(): String = markdownV2Defa
 internal fun MultilevelTextSource.underlineHTML(): String = htmlDefault(htmlUnderlineControl)
 
 
-internal fun MultilevelTextSource.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.link)
-internal fun MultilevelTextSource.textMentionHTML(userId: UserId): String = linkHTML(userId.link)
+internal fun MultilevelTextSource.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.userLink)
+internal fun MultilevelTextSource.textMentionHTML(userId: UserId): String = linkHTML(userId.userLink)
 
 internal fun MultilevelTextSource.mentionMarkdownV2(): String = optionalPrefix("@") + subsources.makeMarkdownV2String()
 internal fun MultilevelTextSource.mentionHTML(): String = optionalPrefix("@") + subsources.makeHtmlString()

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

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.utils.internal
 
-import dev.inmo.tgbotapi.types.UserId
-import dev.inmo.tgbotapi.types.link
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.message.*
 import dev.inmo.tgbotapi.utils.extensions.*
 
@@ -102,7 +101,7 @@ private inline fun String.hashTag(adapt: String.() -> String): String = if (star
     "#${adapt()}"
 }
 
-internal fun String.textMentionMarkdown(userId: UserId): String = linkMarkdown(userId.link)
+internal fun String.textMentionMarkdown(userId: UserId): String = linkMarkdown(userId.userLink)
 
 internal fun String.mentionMarkdown(): String = mention(String::toMarkdown)
 

tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/requests/abstracts/InputFileFromJavaFile.kt

@@ -1,6 +0,0 @@
-package dev.inmo.tgbotapi.requests.abstracts
-
-import java.io.File
-
-@Deprecated("Duplacation of asMultipartFile", ReplaceWith("asMultipartFile", "dev.inmo.tgbotapi.requests.abstracts.asMultipartFile"))
-fun File.toInputFile() = asMultipartFile()

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

@@ -30,9 +30,6 @@ fun <T> Flow<Iterable<T>>.flatten(): Flow<T> = flow {
     }
 }
 
-@Deprecated("Renamed", ReplaceWith("flatten", "dev.inmo.tgbotapi.extensions.utils.flatten"))
-fun <T> Flow<Iterable<T>>.flatMap(): Flow<T> = flatten()
-
 fun <T, R> Flow<T>.flatMap(mapper: (T) -> Iterable<R>): Flow<R> = flow {
     collect {
         mapper(it).forEach {

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

@@ -5,19 +5,20 @@ package dev.inmo.tgbotapi.extensions.utils.formatting
 import dev.inmo.micro_utils.common.joinTo
 import dev.inmo.tgbotapi.types.message.textsources.*
 import dev.inmo.tgbotapi.types.chat.User
+import dev.inmo.tgbotapi.utils.RiskFeature
 
 typealias EntitiesBuilderBody = EntitiesBuilder.() -> Unit
 val newLine = regular("\n")
 
-fun buildEntities(separator: TextSource? = null, init: EntitiesBuilderBody): TextSourcesList = EntitiesBuilder(separator).apply(init).build()
-fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regular(separator), init)
+inline fun buildEntities(separator: TextSource? = null, init: EntitiesBuilderBody): TextSourcesList = EntitiesBuilder(separator).apply(init).build()
+inline fun buildEntities(separator: String, init: EntitiesBuilderBody) = buildEntities(regular(separator), init)
 
 /**
  * This builder can be used to provide building of [TextSource]s [List]
  *
  * @see buildEntities
  */
-class EntitiesBuilder internal constructor(
+class EntitiesBuilder @RiskFeature constructor(
     val separator: TextSource? = null
 ) {
     private val entitiesList: MutableTextSourcesList = mutableListOf()

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

@@ -77,7 +77,7 @@ val Chat.link: String?
             inviteLink ?.let { return it }
         }
         if (this is PrivateChat) {
-            return id.link
+            return id.userLink
         }
         return null
     }

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

@@ -109,9 +109,9 @@ private inline fun String.hashTag(adapt: String.() -> String): String = if (star
 }
 
 
-fun String.textMentionMarkdown(userId: UserId): String = linkMarkdown(userId.link)
-fun String.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.link)
-fun String.textMentionHTML(userId: UserId): String = linkHTML(userId.link)
+fun String.textMentionMarkdown(userId: UserId): String = linkMarkdown(userId.userLink)
+fun String.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.userLink)
+fun String.textMentionHTML(userId: UserId): String = linkHTML(userId.userLink)
 
 
 fun String.mentionMarkdown(): String = mention(String::toMarkdown)