start rework

2025-09-05 08:09:21 +00:00 · 2022-11-06 14:07:31 +06:00
parent 867a46d397
commit 541e00fa03
42 changed files with 495 additions and 227 deletions
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/InternalUtils/UpdatesUtils.kt
@@ -2,7 +2,31 @@ package dev.inmo.tgbotapi.extensions.api.InternalUtils

 import dev.inmo.tgbotapi.types.MediaGroupIdentifier
 import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.message.AnonymousForumContentMessageImpl
+import dev.inmo.tgbotapi.types.message.AnonymousGroupContentMessageImpl
+import dev.inmo.tgbotapi.types.message.ChannelContentMessageImpl
+import dev.inmo.tgbotapi.types.message.CommonForumContentMessageImpl
+import dev.inmo.tgbotapi.types.message.CommonGroupContentMessageImpl
+import dev.inmo.tgbotapi.types.message.ConnectedFromChannelGroupContentMessageImpl
+import dev.inmo.tgbotapi.types.message.FromChannelForumContentMessageImpl
+import dev.inmo.tgbotapi.types.message.PrivateContentMessageImpl
+import dev.inmo.tgbotapi.types.message.UnconnectedFromChannelGroupContentMessageImpl
+import dev.inmo.tgbotapi.types.message.abstracts.AnonymousForumContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.AnonymousGroupContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.ChannelContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.CommonForumContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.CommonGroupContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
+import dev.inmo.tgbotapi.types.message.abstracts.ConnectedFromChannelGroupContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.FromChannelForumContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
+import dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.UnconnectedFromChannelGroupContentMessage
+import dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
 import dev.inmo.tgbotapi.types.update.*
 import dev.inmo.tgbotapi.types.update.abstracts.*
 import dev.inmo.tgbotapi.types.update.media_group.*
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/CopyMessages.kt
@@ -9,7 +9,7 @@ import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.message.ParseMode
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
 import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate

 /**
@@ -18,14 +18,14 @@ import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
 */
 suspend inline fun TelegramBot.copyMessages(
    toChatId: ChatIdentifier,
-    messages: List<MediaGroupMessage<MediaGroupContent>>,
+    messages: List<MediaGroupMessage<MediaGroupPartContent>>,
    text: String? = null,
    parseMode: ParseMode? = null,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
    allowSendingWithoutReply: Boolean? = null
-): List<MediaGroupMessage<MediaGroupContent>> {
+): List<MediaGroupMessage<MediaGroupPartContent>> {
    val first = messages.first().content.toMediaGroupMemberTelegramMedia().let {
        if (text != null) {
            when (it) {
@@ -57,7 +57,7 @@ suspend inline fun TelegramBot.copyMessages(
 */
 suspend inline fun TelegramBot.copyMessages(
    toChat: Chat,
-    messages: List<MediaGroupMessage<MediaGroupContent>>,
+    messages: List<MediaGroupMessage<MediaGroupPartContent>>,
    text: String? = null,
    parseMode: ParseMode? = null,
    disableNotification: Boolean = false,
@@ -102,13 +102,13 @@ suspend inline fun TelegramBot.copyMessages(
 */
 suspend inline fun TelegramBot.copyMessages(
    toChatId: ChatIdentifier,
-    messages: List<MediaGroupMessage<MediaGroupContent>>,
+    messages: List<MediaGroupMessage<MediaGroupPartContent>>,
    entities: TextSourcesList,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
    allowSendingWithoutReply: Boolean? = null
-): List<MediaGroupMessage<MediaGroupContent>> {
+): List<MediaGroupMessage<MediaGroupPartContent>> {
    val first = messages.first().content.toMediaGroupMemberTelegramMedia().let {
        when (it) {
            is TelegramMediaAudio -> TelegramMediaAudio(it.file, entities, it.duration, it.performer, it.title, it.thumb)
@@ -136,7 +136,7 @@ suspend inline fun TelegramBot.copyMessages(
 */
 suspend inline fun TelegramBot.copyMessages(
    toChat: Chat,
-    messages: List<MediaGroupMessage<MediaGroupContent>>,
+    messages: List<MediaGroupMessage<MediaGroupPartContent>>,
    entities: TextSourcesList,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Replies.kt
@@ -1027,18 +1027,16 @@ suspend fun TelegramBot.reply(
    protectContent: Boolean = false,
    allowSendingWithoutReply: Boolean? = null,
    replyMarkup: KeyboardMarkup? = null
-) {
-    execute(
-        content.createResend(
-            to.chat.id,
-            disableNotification,
-            protectContent,
-            to.messageId,
-            allowSendingWithoutReply,
-            replyMarkup
-        )
+) = execute(
+    content.createResend(
+        to.chat.id,
+        disableNotification,
+        protectContent,
+        to.messageId,
+        allowSendingWithoutReply,
+        replyMarkup
    )
-}
+)

 /**
 * Will use [handleLiveLocation] with replying to [message] each time new message will be sent by live location update
@@ -1219,7 +1217,7 @@ suspend fun TelegramBot.reply(
            allowSendingWithoutReply = allowSendingWithoutReply,
            replyMarkup = replyMarkup
        )
-        is AudioMediaGroupContent -> reply(
+        is AudioMediaGroupPartContent -> reply(
            to = to,
            audio = content.media,
            text = text,
@@ -1291,7 +1289,7 @@ suspend fun TelegramBot.reply(
            allowSendingWithoutReply = allowSendingWithoutReply,
            replyMarkup = replyMarkup
        )
-        is AudioMediaGroupContent -> reply(
+        is AudioMediaGroupPartContent -> reply(
            to = to,
            audio = content.media,
            entities = entities,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/RepliesWithChatsAndMessages.kt
@@ -1298,7 +1298,7 @@ suspend fun TelegramBot.reply(
            allowSendingWithoutReply = allowSendingWithoutReply,
            replyMarkup = replyMarkup
        )
-        is AudioMediaGroupContent -> reply(
+        is AudioMediaGroupPartContent -> reply(
            toChatId = toChatId,
            toMessageId = toMessageId,
            audio = content.media,
@@ -1377,7 +1377,7 @@ suspend fun TelegramBot.reply(
            allowSendingWithoutReply = allowSendingWithoutReply,
            replyMarkup = replyMarkup
        )
-        is AudioMediaGroupContent -> reply(
+        is AudioMediaGroupPartContent -> reply(
            toChatId = toChatId,
            toMessageId = toMessageId,
            audio = content.media,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/Sends.kt
@@ -1379,7 +1379,7 @@ suspend fun TelegramBot.send(
@JvmName("sendMedaGroupByContent")
 suspend fun TelegramBot.send(
    chatId: ChatIdentifier,
-    media: List<MediaGroupContent>,
+    media: List<MediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -1393,7 +1393,7 @@ suspend fun TelegramBot.send(
@JvmName("sendMedaGroupByContent")
 suspend fun TelegramBot.send(
    chat: Chat,
-    media: List<MediaGroupContent>,
+    media: List<MediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -1536,7 +1536,7 @@ suspend fun TelegramBot.send(
@JvmName("sendVisualMediaGroupByContent")
 suspend fun TelegramBot.send(
    chatId: ChatIdentifier,
-    media: List<VisualMediaGroupContent>,
+    media: List<VisualMediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -1549,7 +1549,7 @@ suspend fun TelegramBot.send(
@JvmName("sendVisualMediaGroupByContent")
 suspend fun TelegramBot.send(
    chat: Chat,
-    media: List<VisualMediaGroupContent>,
+    media: List<VisualMediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt
@@ -6,8 +6,8 @@ import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.media.*
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.VisualMediaGroupContent
+import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+import dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
 import dev.inmo.tgbotapi.types.message.content.AudioContent
 import dev.inmo.tgbotapi.types.message.content.DocumentContent
 import dev.inmo.tgbotapi.utils.RiskFeature
@@ -25,7 +25,7 @@ suspend fun TelegramBot.sendMediaGroup(
    replyToMessageId: MessageId? = null,
    allowSendingWithoutReply: Boolean? = null
 ) = execute(
-    SendMediaGroup<MediaGroupContent>(
+    SendMediaGroup<MediaGroupPartContent>(
        chatId, media, disableNotification, protectContent, replyToMessageId, allowSendingWithoutReply
    )
 )
@@ -52,7 +52,7 @@ suspend fun TelegramBot.sendMediaGroup(
@JvmName("sendMedaGroupByContent")
 suspend fun TelegramBot.sendMediaGroup(
    chatId: ChatIdentifier,
-    media: List<MediaGroupContent>,
+    media: List<MediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -68,7 +68,7 @@ suspend fun TelegramBot.sendMediaGroup(
@JvmName("sendMedaGroupByContent")
 suspend fun TelegramBot.sendMediaGroup(
    chat: Chat,
-    media: List<MediaGroupContent>,
+    media: List<MediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -233,7 +233,7 @@ suspend fun TelegramBot.sendVisualMediaGroup(
@JvmName("sendVisualMediaGroupByContent")
 suspend fun TelegramBot.sendVisualMediaGroup(
    chatId: ChatIdentifier,
-    media: List<VisualMediaGroupContent>,
+    media: List<VisualMediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,
@@ -248,7 +248,7 @@ suspend fun TelegramBot.sendVisualMediaGroup(
@JvmName("sendVisualMediaGroupByContent")
 suspend fun TelegramBot.sendVisualMediaGroup(
    chat: Chat,
-    media: List<VisualMediaGroupContent>,
+    media: List<VisualMediaGroupPartContent>,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    replyToMessageId: MessageId? = null,