fixes

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

@@ -46,7 +46,6 @@ import dev.inmo.tgbotapi.types.polls.*
 import dev.inmo.tgbotapi.types.queries.callback.*
 import dev.inmo.tgbotapi.types.update.*
 import dev.inmo.tgbotapi.types.update.abstracts.*
-import dev.inmo.tgbotapi.types.update.media_group.*
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
@@ -1036,18 +1035,6 @@ inline fun Message.asChannelEventMessage(): ChannelEventMessage<ChannelEvent>? =
 inline fun Message.requireChannelEventMessage(): ChannelEventMessage<ChannelEvent> =
     this as ChannelEventMessage<ChannelEvent>
 
-@PreviewFeature
-inline fun <T> Message.whenChannelMediaGroupMessage(block: (ChannelMediaGroupMessage<MediaGroupPartContent>) -> T) =
-    asChannelMediaGroupMessage()?.let(block)
-
-@PreviewFeature
-inline fun Message.asChannelMediaGroupMessage(): ChannelMediaGroupMessage<MediaGroupPartContent>? =
-    this as? ChannelMediaGroupMessage<MediaGroupPartContent>
-
-@PreviewFeature
-inline fun Message.requireChannelMediaGroupMessage(): ChannelMediaGroupMessage<MediaGroupPartContent> =
-    this as ChannelMediaGroupMessage<MediaGroupPartContent>
-
 @PreviewFeature
 inline fun <T> Message.whenCommonGroupEventMessage(block: (CommonGroupEventMessage<GroupEvent>) -> T) =
     asCommonGroupEventMessage()?.let(block)
@@ -1060,18 +1047,6 @@ inline fun Message.asCommonGroupEventMessage(): CommonGroupEventMessage<GroupEve
 inline fun Message.requireCommonGroupEventMessage(): CommonGroupEventMessage<GroupEvent> =
     this as CommonGroupEventMessage<GroupEvent>
 
-@PreviewFeature
-inline fun <T> Message.whenCommonMediaGroupMessage(block: (CommonMediaGroupMessage<MediaGroupPartContent>) -> T) =
-    asCommonMediaGroupMessage()?.let(block)
-
-@PreviewFeature
-inline fun Message.asCommonMediaGroupMessage(): CommonMediaGroupMessage<MediaGroupPartContent>? =
-    this as? CommonMediaGroupMessage<MediaGroupPartContent>
-
-@PreviewFeature
-inline fun Message.requireCommonMediaGroupMessage(): CommonMediaGroupMessage<MediaGroupPartContent> =
-    this as CommonMediaGroupMessage<MediaGroupPartContent>
-
 @PreviewFeature
 inline fun <T> Message.whenCommonSupergroupEventMessage(block: (CommonSupergroupEventMessage<SupergroupEvent>) -> T) =
     asCommonSupergroupEventMessage()?.let(block)
@@ -1219,16 +1194,16 @@ inline fun Message.requireGroupContentMessage(): GroupContentMessage<MessageCont
     this as GroupContentMessage<MessageContent>
 
 @PreviewFeature
-inline fun <T> Message.whenMediaGroupMessage(block: (MediaGroupMessage<MediaGroupPartContent>) -> T) =
+inline fun <T> Message.whenMediaGroupMessage(block: (MediaGroupMessage) -> T) =
     asMediaGroupMessage()?.let(block)
 
 @PreviewFeature
-inline fun Message.asMediaGroupMessage(): MediaGroupMessage<MediaGroupPartContent>? =
-    this as? MediaGroupMessage<MediaGroupPartContent>
+inline fun Message.asMediaGroupMessage(): MediaGroupMessage? =
+    this as? MediaGroupMessage
 
 @PreviewFeature
-inline fun Message.requireMediaGroupMessage(): MediaGroupMessage<MediaGroupPartContent> =
-    this as MediaGroupMessage<MediaGroupPartContent>
+inline fun Message.requireMediaGroupMessage(): MediaGroupMessage =
+    this as MediaGroupMessage
 
 @PreviewFeature
 inline fun <T> Message.whenPossiblyEditedMessage(block: (PossiblyEditedMessage) -> T) =
@@ -2218,79 +2193,6 @@ inline fun Update.asInlineQueryUpdate(): InlineQueryUpdate? = this as? InlineQue
 @PreviewFeature
 inline fun Update.requireInlineQueryUpdate(): InlineQueryUpdate = this as InlineQueryUpdate
 
-@PreviewFeature
-inline fun <T> Update.whenChannelPostMediaGroupUpdate(block: (ChannelPostMediaGroupUpdate) -> T) =
-    asChannelPostMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asChannelPostMediaGroupUpdate(): ChannelPostMediaGroupUpdate? = this as? ChannelPostMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireChannelPostMediaGroupUpdate(): ChannelPostMediaGroupUpdate =
-    this as ChannelPostMediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenEditChannelPostMediaGroupUpdate(block: (EditChannelPostMediaGroupUpdate) -> T) =
-    asEditChannelPostMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asEditChannelPostMediaGroupUpdate(): EditChannelPostMediaGroupUpdate? =
-    this as? EditChannelPostMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireEditChannelPostMediaGroupUpdate(): EditChannelPostMediaGroupUpdate =
-    this as EditChannelPostMediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenEditMediaGroupUpdate(block: (EditMediaGroupUpdate) -> T) =
-    asEditMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asEditMediaGroupUpdate(): EditMediaGroupUpdate? = this as? EditMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireEditMediaGroupUpdate(): EditMediaGroupUpdate = this as EditMediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenEditMessageMediaGroupUpdate(block: (EditMessageMediaGroupUpdate) -> T) =
-    asEditMessageMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asEditMessageMediaGroupUpdate(): EditMessageMediaGroupUpdate? = this as? EditMessageMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireEditMessageMediaGroupUpdate(): EditMessageMediaGroupUpdate =
-    this as EditMessageMediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenMediaGroupUpdate(block: (MediaGroupUpdate) -> T) = asMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asMediaGroupUpdate(): MediaGroupUpdate? = this as? MediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireMediaGroupUpdate(): MediaGroupUpdate = this as MediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenMessageMediaGroupUpdate(block: (MessageMediaGroupUpdate) -> T) =
-    asMessageMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asMessageMediaGroupUpdate(): MessageMediaGroupUpdate? = this as? MessageMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireMessageMediaGroupUpdate(): MessageMediaGroupUpdate = this as MessageMediaGroupUpdate
-
-@PreviewFeature
-inline fun <T> Update.whenSentMediaGroupUpdate(block: (SentMediaGroupUpdate) -> T) =
-    asSentMediaGroupUpdate()?.let(block)
-
-@PreviewFeature
-inline fun Update.asSentMediaGroupUpdate(): SentMediaGroupUpdate? = this as? SentMediaGroupUpdate
-
-@PreviewFeature
-inline fun Update.requireSentMediaGroupUpdate(): SentMediaGroupUpdate = this as SentMediaGroupUpdate
-
 @PreviewFeature
 inline fun <T> Update.whenMessageUpdate(block: (MessageUpdate) -> T) = asMessageUpdate()?.let(block)
 

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

@@ -280,8 +280,10 @@ import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyEditedMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyPaymentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblySentViaBotCommonMessage
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyTopicMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.PublicContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.SignedMessage
@@ -301,6 +303,8 @@ import dev.inmo.tgbotapi.types.message.content.LiveLocationContent
 import dev.inmo.tgbotapi.types.message.content.LocationContent
 import dev.inmo.tgbotapi.types.message.content.MediaCollectionContent
 import dev.inmo.tgbotapi.types.message.content.MediaContent
+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.message.content.MessageContent
 import dev.inmo.tgbotapi.types.message.content.PhotoContent
@@ -438,13 +442,6 @@ import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.types.update.media_group.ChannelPostMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.EditChannelPostMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.EditMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.EditMessageMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.MediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.MessageMediaGroupUpdate
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
 import kotlin.Suppress
 
 public inline fun CommonSendInvoiceData.createInvoiceLinkOrNull(): CreateInvoiceLink? = this as?
@@ -738,18 +735,6 @@ public inline fun <T>
     WithUser.ifCommonGroupEventMessage(block: (CommonGroupEventMessage<GroupEvent>) -> T): T? =
     commonGroupEventMessageOrNull() ?.let(block)
 
-public inline fun WithUser.commonMediaGroupMessageOrNull():
-    CommonMediaGroupMessage<MediaGroupPartContent>? = this as?
-    dev.inmo.tgbotapi.types.message.CommonMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun WithUser.commonMediaGroupMessageOrThrow():
-    CommonMediaGroupMessage<MediaGroupPartContent> = this as
-    dev.inmo.tgbotapi.types.message.CommonMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun <T>
-    WithUser.ifCommonMediaGroupMessage(block: (CommonMediaGroupMessage<MediaGroupPartContent>) -> T): T?
-    = commonMediaGroupMessageOrNull() ?.let(block)
-
 public inline fun WithUser.commonSupergroupEventMessageOrNull():
     CommonSupergroupEventMessage<SupergroupEvent>? = this as?
     dev.inmo.tgbotapi.types.message.CommonSupergroupEventMessage<dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent>
@@ -3032,18 +3017,6 @@ public inline fun <T>
     Message.ifChannelEventMessage(block: (ChannelEventMessage<ChannelEvent>) -> T): T? =
     channelEventMessageOrNull() ?.let(block)
 
-public inline fun Message.channelMediaGroupMessageOrNull():
-    ChannelMediaGroupMessage<MediaGroupPartContent>? = this as?
-    dev.inmo.tgbotapi.types.message.ChannelMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun Message.channelMediaGroupMessageOrThrow():
-    ChannelMediaGroupMessage<MediaGroupPartContent> = this as
-    dev.inmo.tgbotapi.types.message.ChannelMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun <T>
-    Message.ifChannelMediaGroupMessage(block: (ChannelMediaGroupMessage<MediaGroupPartContent>) -> T):
-    T? = channelMediaGroupMessageOrNull() ?.let(block)
-
 public inline fun Message.commonGroupEventMessageOrNull(): CommonGroupEventMessage<GroupEvent>? =
     this as?
     dev.inmo.tgbotapi.types.message.CommonGroupEventMessage<dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent>
@@ -3056,18 +3029,6 @@ public inline fun <T>
     Message.ifCommonGroupEventMessage(block: (CommonGroupEventMessage<GroupEvent>) -> T): T? =
     commonGroupEventMessageOrNull() ?.let(block)
 
-public inline fun Message.commonMediaGroupMessageOrNull():
-    CommonMediaGroupMessage<MediaGroupPartContent>? = this as?
-    dev.inmo.tgbotapi.types.message.CommonMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun Message.commonMediaGroupMessageOrThrow():
-    CommonMediaGroupMessage<MediaGroupPartContent> = this as
-    dev.inmo.tgbotapi.types.message.CommonMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun <T>
-    Message.ifCommonMediaGroupMessage(block: (CommonMediaGroupMessage<MediaGroupPartContent>) -> T): T?
-    = commonMediaGroupMessageOrNull() ?.let(block)
-
 public inline fun Message.commonSupergroupEventMessageOrNull():
     CommonSupergroupEventMessage<SupergroupEvent>? = this as?
     dev.inmo.tgbotapi.types.message.CommonSupergroupEventMessage<dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent>
@@ -3372,17 +3333,6 @@ public inline fun <T>
     Message.ifCommonForumContentMessage(block: (CommonForumContentMessage<MessageContent>) -> T): T?
     = commonForumContentMessageOrNull() ?.let(block)
 
-public inline fun Message.mediaGroupMessageOrNull(): MediaGroupMessage<MediaGroupPartContent>? = this
-    as?
-    dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun Message.mediaGroupMessageOrThrow(): MediaGroupMessage<MediaGroupPartContent> = this as
-    dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent>
-
-public inline fun <T>
-    Message.ifMediaGroupMessage(block: (MediaGroupMessage<MediaGroupPartContent>) -> T): T? =
-    mediaGroupMessageOrNull() ?.let(block)
-
 public inline fun Message.unknownMessageTypeOrNull(): UnknownMessageType? = this as?
     dev.inmo.tgbotapi.types.message.abstracts.UnknownMessageType
 
@@ -3410,6 +3360,18 @@ public inline fun Message.possiblyForwardedMessageOrThrow(): PossiblyForwardedMe
 public inline fun <T> Message.ifPossiblyForwardedMessage(block: (PossiblyForwardedMessage) -> T): T?
     = possiblyForwardedMessageOrNull() ?.let(block)
 
+public inline fun Message.possiblyMediaGroupMessageOrNull():
+    PossiblyMediaGroupMessage<MessageContent>? = this as?
+    dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MessageContent>
+
+public inline fun Message.possiblyMediaGroupMessageOrThrow():
+    PossiblyMediaGroupMessage<MessageContent> = this as
+    dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage<dev.inmo.tgbotapi.types.message.content.MessageContent>
+
+public inline fun <T>
+    Message.ifPossiblyMediaGroupMessage(block: (PossiblyMediaGroupMessage<MessageContent>) -> T): T?
+    = possiblyMediaGroupMessageOrNull() ?.let(block)
+
 public inline fun Message.possiblyPaymentMessageOrNull(): PossiblyPaymentMessage? = this as?
     dev.inmo.tgbotapi.types.message.abstracts.PossiblyPaymentMessage
 
@@ -3431,6 +3393,15 @@ public inline fun <T>
     Message.ifPossiblySentViaBotCommonMessage(block: (PossiblySentViaBotCommonMessage<MessageContent>) -> T):
     T? = possiblySentViaBotCommonMessageOrNull() ?.let(block)
 
+public inline fun Message.possiblyTopicMessageOrNull(): PossiblyTopicMessage? = this as?
+    dev.inmo.tgbotapi.types.message.abstracts.PossiblyTopicMessage
+
+public inline fun Message.possiblyTopicMessageOrThrow(): PossiblyTopicMessage = this as
+    dev.inmo.tgbotapi.types.message.abstracts.PossiblyTopicMessage
+
+public inline fun <T> Message.ifPossiblyTopicMessage(block: (PossiblyTopicMessage) -> T): T? =
+    possiblyTopicMessageOrNull() ?.let(block)
+
 public inline fun Message.privateContentMessageOrNull(): PrivateContentMessage<MessageContent>? =
     this as?
     dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage<dev.inmo.tgbotapi.types.message.content.MessageContent>
@@ -3506,34 +3477,27 @@ public inline fun ResendableContent.mediaContentOrThrow(): MediaContent = this a
 public inline fun <T> ResendableContent.ifMediaContent(block: (MediaContent) -> T): T? =
     mediaContentOrNull() ?.let(block)
 
-public inline fun ResendableContent.audioMediaGroupContentOrNull(): AudioMediaGroupPartContent? = this
-    as? dev.inmo.tgbotapi.types.message.content.AudioMediaGroupPartContent
+public inline fun ResendableContent.audioMediaGroupPartContentOrNull(): AudioMediaGroupPartContent?
+    = this as? dev.inmo.tgbotapi.types.message.content.AudioMediaGroupPartContent
 
-public inline fun ResendableContent.audioMediaGroupContentOrThrow(): AudioMediaGroupPartContent = this
-    as dev.inmo.tgbotapi.types.message.content.AudioMediaGroupPartContent
+public inline fun ResendableContent.audioMediaGroupPartContentOrThrow(): AudioMediaGroupPartContent
+    = this as dev.inmo.tgbotapi.types.message.content.AudioMediaGroupPartContent
 
 public inline fun <T>
-    ResendableContent.ifAudioMediaGroupContent(block: (AudioMediaGroupPartContent) -> T): T? =
-    audioMediaGroupContentOrNull() ?.let(block)
+    ResendableContent.ifAudioMediaGroupPartContent(block: (AudioMediaGroupPartContent) -> T): T? =
+    audioMediaGroupPartContentOrNull() ?.let(block)
 
-public inline fun ResendableContent.documentMediaGroupContentOrNull(): DocumentMediaGroupPartContent? =
-    this as? dev.inmo.tgbotapi.types.message.content.DocumentMediaGroupPartContent
+public inline fun ResendableContent.documentMediaGroupPartContentOrNull():
+    DocumentMediaGroupPartContent? = this as?
+    dev.inmo.tgbotapi.types.message.content.DocumentMediaGroupPartContent
 
-public inline fun ResendableContent.documentMediaGroupContentOrThrow(): DocumentMediaGroupPartContent =
-    this as dev.inmo.tgbotapi.types.message.content.DocumentMediaGroupPartContent
+public inline fun ResendableContent.documentMediaGroupPartContentOrThrow():
+    DocumentMediaGroupPartContent = this as
+    dev.inmo.tgbotapi.types.message.content.DocumentMediaGroupPartContent
 
 public inline fun <T>
-    ResendableContent.ifDocumentMediaGroupContent(block: (DocumentMediaGroupPartContent) -> T): T? =
-    documentMediaGroupContentOrNull() ?.let(block)
-
-public inline fun ResendableContent.mediaGroupContentOrNull(): MediaGroupPartContent? = this as?
-    dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
-
-public inline fun ResendableContent.mediaGroupContentOrThrow(): MediaGroupPartContent = this as
-    dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
-
-public inline fun <T> ResendableContent.ifMediaGroupContent(block: (MediaGroupPartContent) -> T): T? =
-    mediaGroupContentOrNull() ?.let(block)
+    ResendableContent.ifDocumentMediaGroupPartContent(block: (DocumentMediaGroupPartContent) -> T):
+    T? = documentMediaGroupPartContentOrNull() ?.let(block)
 
 public inline fun ResendableContent.textedMediaContentOrNull(): TextedMediaContent? = this as?
     dev.inmo.tgbotapi.types.message.content.TextedMediaContent
@@ -3544,15 +3508,39 @@ public inline fun ResendableContent.textedMediaContentOrThrow(): TextedMediaCont
 public inline fun <T> ResendableContent.ifTextedMediaContent(block: (TextedMediaContent) -> T): T? =
     textedMediaContentOrNull() ?.let(block)
 
-public inline fun ResendableContent.visualMediaGroupContentOrNull(): VisualMediaGroupPartContent? = this
-    as? dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
+public inline fun ResendableContent.mediaGroupCollectionContentOrNull():
+    MediaGroupCollectionContent? = this as?
+    dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
 
-public inline fun ResendableContent.visualMediaGroupContentOrThrow(): VisualMediaGroupPartContent = this
-    as dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
+public inline fun ResendableContent.mediaGroupCollectionContentOrThrow():
+    MediaGroupCollectionContent = this as
+    dev.inmo.tgbotapi.types.message.content.MediaGroupCollectionContent
 
 public inline fun <T>
-    ResendableContent.ifVisualMediaGroupContent(block: (VisualMediaGroupPartContent) -> T): T? =
-    visualMediaGroupContentOrNull() ?.let(block)
+    ResendableContent.ifMediaGroupCollectionContent(block: (MediaGroupCollectionContent) -> T): T? =
+    mediaGroupCollectionContentOrNull() ?.let(block)
+
+public inline fun ResendableContent.mediaGroupPartContentOrNull(): MediaGroupPartContent? = this as?
+    dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+
+public inline fun ResendableContent.mediaGroupPartContentOrThrow(): MediaGroupPartContent = this as
+    dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+
+public inline fun <T>
+    ResendableContent.ifMediaGroupPartContent(block: (MediaGroupPartContent) -> T): T? =
+    mediaGroupPartContentOrNull() ?.let(block)
+
+public inline fun ResendableContent.visualMediaGroupPartContentOrNull():
+    VisualMediaGroupPartContent? = this as?
+    dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
+
+public inline fun ResendableContent.visualMediaGroupPartContentOrThrow():
+    VisualMediaGroupPartContent = this as
+    dev.inmo.tgbotapi.types.message.content.VisualMediaGroupPartContent
+
+public inline fun <T>
+    ResendableContent.ifVisualMediaGroupPartContent(block: (VisualMediaGroupPartContent) -> T): T? =
+    visualMediaGroupPartContentOrNull() ?.let(block)
 
 public inline fun ResendableContent.animationContentOrNull(): AnimationContent? = this as?
     dev.inmo.tgbotapi.types.message.content.AnimationContent
@@ -3645,6 +3633,15 @@ public inline fun <T>
     ResendableContent.ifStaticLocationContent(block: (StaticLocationContent) -> T): T? =
     staticLocationContentOrNull() ?.let(block)
 
+public inline fun ResendableContent.mediaGroupContentOrNull(): MediaGroupContent? = this as?
+    dev.inmo.tgbotapi.types.message.content.MediaGroupContent
+
+public inline fun ResendableContent.mediaGroupContentOrThrow(): MediaGroupContent = this as
+    dev.inmo.tgbotapi.types.message.content.MediaGroupContent
+
+public inline fun <T> ResendableContent.ifMediaGroupContent(block: (MediaGroupContent) -> T): T? =
+    mediaGroupContentOrNull() ?.let(block)
+
 public inline fun ResendableContent.photoContentOrNull(): PhotoContent? = this as?
     dev.inmo.tgbotapi.types.message.content.PhotoContent
 
@@ -4728,69 +4725,3 @@ public inline fun Update.unknownUpdateOrThrow(): UnknownUpdate = this as
 
 public inline fun <T> Update.ifUnknownUpdate(block: (UnknownUpdate) -> T): T? =
     unknownUpdateOrNull() ?.let(block)
-
-public inline fun Update.channelPostMediaGroupUpdateOrNull(): ChannelPostMediaGroupUpdate? = this
-    as? dev.inmo.tgbotapi.types.update.media_group.ChannelPostMediaGroupUpdate
-
-public inline fun Update.channelPostMediaGroupUpdateOrThrow(): ChannelPostMediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.ChannelPostMediaGroupUpdate
-
-public inline fun <T>
-    Update.ifChannelPostMediaGroupUpdate(block: (ChannelPostMediaGroupUpdate) -> T): T? =
-    channelPostMediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.editChannelPostMediaGroupUpdateOrNull(): EditChannelPostMediaGroupUpdate? =
-    this as? dev.inmo.tgbotapi.types.update.media_group.EditChannelPostMediaGroupUpdate
-
-public inline fun Update.editChannelPostMediaGroupUpdateOrThrow(): EditChannelPostMediaGroupUpdate =
-    this as dev.inmo.tgbotapi.types.update.media_group.EditChannelPostMediaGroupUpdate
-
-public inline fun <T>
-    Update.ifEditChannelPostMediaGroupUpdate(block: (EditChannelPostMediaGroupUpdate) -> T): T? =
-    editChannelPostMediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.editMessageMediaGroupUpdateOrNull(): EditMessageMediaGroupUpdate? = this
-    as? dev.inmo.tgbotapi.types.update.media_group.EditMessageMediaGroupUpdate
-
-public inline fun Update.editMessageMediaGroupUpdateOrThrow(): EditMessageMediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.EditMessageMediaGroupUpdate
-
-public inline fun <T>
-    Update.ifEditMessageMediaGroupUpdate(block: (EditMessageMediaGroupUpdate) -> T): T? =
-    editMessageMediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.mediaGroupUpdateOrNull(): MediaGroupUpdate? = this as?
-    dev.inmo.tgbotapi.types.update.media_group.MediaGroupUpdate
-
-public inline fun Update.mediaGroupUpdateOrThrow(): MediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.MediaGroupUpdate
-
-public inline fun <T> Update.ifMediaGroupUpdate(block: (MediaGroupUpdate) -> T): T? =
-    mediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.sentMediaGroupUpdateOrNull(): SentMediaGroupUpdate? = this as?
-    dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
-
-public inline fun Update.sentMediaGroupUpdateOrThrow(): SentMediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
-
-public inline fun <T> Update.ifSentMediaGroupUpdate(block: (SentMediaGroupUpdate) -> T): T? =
-    sentMediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.editMediaGroupUpdateOrNull(): EditMediaGroupUpdate? = this as?
-    dev.inmo.tgbotapi.types.update.media_group.EditMediaGroupUpdate
-
-public inline fun Update.editMediaGroupUpdateOrThrow(): EditMediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.EditMediaGroupUpdate
-
-public inline fun <T> Update.ifEditMediaGroupUpdate(block: (EditMediaGroupUpdate) -> T): T? =
-    editMediaGroupUpdateOrNull() ?.let(block)
-
-public inline fun Update.messageMediaGroupUpdateOrNull(): MessageMediaGroupUpdate? = this as?
-    dev.inmo.tgbotapi.types.update.media_group.MessageMediaGroupUpdate
-
-public inline fun Update.messageMediaGroupUpdateOrThrow(): MessageMediaGroupUpdate = this as
-    dev.inmo.tgbotapi.types.update.media_group.MessageMediaGroupUpdate
-
-public inline fun <T> Update.ifMessageMediaGroupUpdate(block: (MessageMediaGroupUpdate) -> T): T? =
-    messageMediaGroupUpdateOrNull() ?.let(block)

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

@@ -3,6 +3,7 @@
 package dev.inmo.tgbotapi.extensions.utils
 
 import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.types.message.content.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
@@ -36,6 +37,3 @@ inline fun <reified T : MessageContent> AnonymousGroupContentMessage<*>.requireW
 
 inline fun <reified T : MessageContent> CommonGroupContentMessage<*>.withContent() = if (content is T) { this as CommonGroupContentMessage<T> } else { null }
 inline fun <reified T : MessageContent> CommonGroupContentMessage<*>.requireWithContent() = withContent<T>()!!
-
-inline fun <reified T : MediaGroupPartContent> MediaGroupMessage<*>.withContent() = if (content is T) { this as MediaGroupMessage<T> } else { null }
-inline fun <reified T : MediaGroupPartContent> MediaGroupMessage<*>.requireWithContent() = withContent<T>()!!

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

@@ -3,21 +3,15 @@ package dev.inmo.tgbotapi.extensions.utils.extensions
 import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.abstracts.WithUser
 import dev.inmo.tgbotapi.extensions.utils.asUser
-import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.update.ChatJoinRequestUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.types.update.media_group.*
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature
 fun Update.sourceChat(): Chat? = when (this) {
-    is MediaGroupUpdate -> when (this) {
-        is SentMediaGroupUpdate -> data.chat
-        is EditMediaGroupUpdate -> data.chat
-    }
     is BaseMessageUpdate -> data.chat
     is ChatJoinRequestUpdate -> data.chat
     else -> {

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

@@ -8,7 +8,6 @@ import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
 import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
@@ -30,19 +29,6 @@ inline fun <reified T : MessageContent> filterForContentMessage(): suspend (Cont
 inline fun <reified T: MessageContent> Flow<BaseSentMessageUpdate>.filterContentMessages(
 ): Flow<ContentMessage<T>> = asContentMessagesFlow().mapNotNull(filterForContentMessage())
 
-@RiskFeature("This method is low-level")
-inline fun <reified T : MediaGroupPartContent> Flow<SentMediaGroupUpdate>.filterMediaGroupMessages(
-): Flow<List<CommonMessage<T>>> = map {
-    it.data.mapNotNull { message ->
-        if (message.content is T) {
-            @Suppress("UNCHECKED_CAST")
-            message as CommonMessage<T>
-        } else {
-            null
-        }
-    }
-}
-
 /**
  * @param scopeToIncludeChannels This parameter is required when you want to include [textMessages] for channels too.
  * In this case will be created new channel which will aggregate messages from [FlowsUpdatesFilter.messagesFlow] and
@@ -62,39 +48,9 @@ inline fun <reified T: MessageContent> FlowsUpdatesFilter.filterContentMessages(
     } ?: messagesFlow).filterContentMessages()
 }
 
-/**
- * @param scopeToIncludeChannels This parameter is required when you want to include [SentMediaGroupUpdate] for channels
- * too. In this case will be created new channel which will aggregate messages from [FlowsUpdatesFilter.messagesFlow] and
- * [FlowsUpdatesFilter.channelPostsFlow]. In case it is null will be used [Flow]s mapping
- */
-@Suppress("UNCHECKED_CAST")
-@RiskFeature(lowLevelRiskFeatureMessage)
-inline fun <reified T: MediaGroupPartContent> FlowsUpdatesFilter.filterMediaGroupMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-): Flow<List<CommonMessage<T>>> {
-    return (scopeToIncludeChannels ?.let { scope ->
-        aggregateFlows(
-            scope,
-            messageMediaGroupsFlow,
-            channelPostMediaGroupsFlow
-        )
-    } ?: messageMediaGroupsFlow).filterMediaGroupMessages()
-}
-
 fun FlowsUpdatesFilter.sentMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ): Flow<ContentMessage<MessageContent>> = filterContentMessages(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.sentMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-): Flow<ContentMessage<MessageContent>> = merge(
-    sentMessages(scopeToIncludeChannels),
-    mediaGroupMessages(scopeToIncludeChannels).flatMap {
-        it.mapNotNull {
-            @Suppress("UNCHECKED_CAST")
-            it as? ContentMessage<MessageContent>
-        }
-    }
-)
 
 fun Flow<BaseSentMessageUpdate>.animationMessages() = filterContentMessages<AnimationContent>()
 fun FlowsUpdatesFilter.animationMessages(
@@ -105,12 +61,6 @@ fun Flow<BaseSentMessageUpdate>.audioMessages() = filterContentMessages<AudioCon
 fun FlowsUpdatesFilter.audioMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<AudioContent>(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.audioMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = merge(
-    filterContentMessages<AudioContent>(scopeToIncludeChannels),
-    mediaGroupAudioMessages(scopeToIncludeChannels).flatten()
-)
 
 fun Flow<BaseSentMessageUpdate>.contactMessages() = filterContentMessages<ContactContent>()
 fun FlowsUpdatesFilter.contactMessages(
@@ -126,12 +76,6 @@ fun Flow<BaseSentMessageUpdate>.documentMessages() = filterContentMessages<Docum
 fun FlowsUpdatesFilter.documentMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<DocumentContent>(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.documentMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = merge(
-    filterContentMessages<DocumentContent>(scopeToIncludeChannels),
-    mediaGroupDocumentMessages(scopeToIncludeChannels).flatten()
-)
 
 fun Flow<BaseSentMessageUpdate>.gameMessages() = filterContentMessages<GameContent>()
 fun FlowsUpdatesFilter.gameMessages(
@@ -153,12 +97,6 @@ fun Flow<BaseSentMessageUpdate>.imageMessages() = photoMessages()
 fun FlowsUpdatesFilter.photoMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<PhotoContent>(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.photoMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = merge(
-    filterContentMessages<PhotoContent>(scopeToIncludeChannels),
-    mediaGroupPhotosMessages(scopeToIncludeChannels).flatten()
-)
 /**
  * Shortcut for [photoMessages]
  */
@@ -166,9 +104,6 @@ fun FlowsUpdatesFilter.photoMessagesWithMediaGroups(
 inline fun FlowsUpdatesFilter.imageMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = photoMessages(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.imageMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = photoMessagesWithMediaGroups(scopeToIncludeChannels)
 
 fun Flow<BaseSentMessageUpdate>.pollMessages() = filterContentMessages<PollContent>()
 fun FlowsUpdatesFilter.pollMessages(
@@ -194,12 +129,6 @@ fun Flow<BaseSentMessageUpdate>.videoMessages() = filterContentMessages<VideoCon
 fun FlowsUpdatesFilter.videoMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VideoContent>(scopeToIncludeChannels)
-fun FlowsUpdatesFilter.videoMessagesWithMediaGroups(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = merge(
-    filterContentMessages<VideoContent>(scopeToIncludeChannels),
-    mediaGroupVideosMessages(scopeToIncludeChannels).flatten()
-)
 
 fun Flow<BaseSentMessageUpdate>.videoNoteMessages() = filterContentMessages<VideoNoteContent>()
 fun FlowsUpdatesFilter.videoNoteMessages(
@@ -210,34 +139,3 @@ fun Flow<BaseSentMessageUpdate>.voiceMessages() = filterContentMessages<VoiceCon
 fun FlowsUpdatesFilter.voiceMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VoiceContent>(scopeToIncludeChannels)
-
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupMessages() = filterMediaGroupMessages<MediaGroupPartContent>()
-fun FlowsUpdatesFilter.mediaGroupMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<MediaGroupPartContent>(scopeToIncludeChannels)
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupPhotosMessages() = filterMediaGroupMessages<PhotoContent>()
-fun FlowsUpdatesFilter.mediaGroupPhotosMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<PhotoContent>(scopeToIncludeChannels)
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupVideosMessages() = filterMediaGroupMessages<VideoContent>()
-fun FlowsUpdatesFilter.mediaGroupVideosMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<VideoContent>(scopeToIncludeChannels)
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupVisualMessages() = filterMediaGroupMessages<VisualMediaGroupPartContent>()
-fun FlowsUpdatesFilter.mediaGroupVisualMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<VisualMediaGroupPartContent>(scopeToIncludeChannels)
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupAudioMessages() = filterMediaGroupMessages<AudioContent>()
-fun FlowsUpdatesFilter.mediaGroupAudioMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<AudioContent>(scopeToIncludeChannels)
-
-fun Flow<SentMediaGroupUpdate>.mediaGroupDocumentMessages() = filterMediaGroupMessages<DocumentContent>()
-fun FlowsUpdatesFilter.mediaGroupDocumentMessages(
-    scopeToIncludeChannels: CoroutineScope? = null
-) = filterMediaGroupMessages<DocumentContent>(scopeToIncludeChannels)

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

@@ -1,69 +0,0 @@
-package dev.inmo.tgbotapi.extensions.utils.shortcuts
-
-import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
-import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.Chat
-import dev.inmo.tgbotapi.types.message.ForwardInfo
-import dev.inmo.tgbotapi.types.message.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
-
-val List<CommonMessage<out MediaGroupPartContent>>.forwardInfo: ForwardInfo?
-    get() = firstOrNull() ?.forwardInfo
-val List<CommonMessage<out MediaGroupPartContent>>.replyTo: Message?
-    get() = firstOrNull() ?.replyTo
-val List<CommonMessage<out MediaGroupPartContent>>.chat: Chat?
-    get() = firstOrNull() ?.chat
-val List<MediaGroupMessage<*>>.mediaGroupId: MediaGroupIdentifier?
-    get() = firstOrNull() ?.mediaGroupId
-
-val SentMediaGroupUpdate.forwardInfo: ForwardInfo?
-    get() = data.first().forwardInfo
-val SentMediaGroupUpdate.replyTo: Message?
-    get() = data.first().replyTo
-val SentMediaGroupUpdate.chat: Chat
-    get() = data.chat!!
-val SentMediaGroupUpdate.mediaGroupId: MediaGroupIdentifier
-    get() = data.mediaGroupId!!
-
-fun List<CommonMessage<MediaGroupPartContent>>.createResend(
-    chatId: ChatId,
-    threadId: MessageThreadId? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyTo: MessageId? = null
-) = SendMediaGroup<MediaGroupPartContent>(
-    chatId,
-    map { it.content.toMediaGroupMemberTelegramMedia() },
-    threadId,
-    disableNotification,
-    protectContent,
-    replyTo
-)
-
-fun List<CommonMessage<MediaGroupPartContent>>.createResend(
-    chat: Chat,
-    threadId: MessageThreadId? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyTo: MessageId? = null
-) = createResend(
-    chat.id,
-    threadId,
-    disableNotification,
-    protectContent,
-    replyTo
-)
-
-fun SentMediaGroupUpdate.createResend(
-    threadId: MessageThreadId? = null,
-    disableNotification: Boolean = false,
-    protectContent: Boolean = false,
-    replyTo: MessageId? = null
-) = data.createResend(
-    chat,
-    threadId,
-    disableNotification,
-    protectContent,
-    replyTo
-)

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

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.extensions.utils.updates
 
 import dev.inmo.tgbotapi.types.update.abstracts.*
-import dev.inmo.tgbotapi.types.update.media_group.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterIsInstance
 
@@ -16,22 +15,3 @@ fun Flow<BaseMessageUpdate>.onlySentMessageUpdates(): Flow<BaseSentMessageUpdate
  * Converts flow to [Flow] of [BaseSentMessageUpdate]
  */
 fun Flow<BaseMessageUpdate>.onlyEditMessageUpdates(): Flow<BaseEditMessageUpdate> = filterIsInstance()
-
-/**
- * Converts flow to [Flow] of [MediaGroupUpdate]. Please, remember that it could be either [EditMediaGroupUpdate]
- * or [SentMediaGroupUpdate]
- *
- * @see onlySentMediaGroupUpdates
- * @see onlyEditMediaGroupUpdates
- */
-fun Flow<BaseMessageUpdate>.onlyMediaGroupsUpdates(): Flow<MediaGroupUpdate> = filterIsInstance()
-
-/**
- * Converts flow to [Flow] of [SentMediaGroupUpdate]
- */
-fun Flow<MediaGroupUpdate>.onlySentMediaGroupUpdates(): Flow<SentMediaGroupUpdate> = filterIsInstance()
-
-/**
- * Converts flow to [Flow] of [EditMediaGroupUpdate]
- */
-fun Flow<MediaGroupUpdate>.onlyEditMediaGroupUpdates(): Flow<EditMediaGroupUpdate> = filterIsInstance()

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

@@ -3,7 +3,6 @@ package dev.inmo.tgbotapi.extensions.utils.updates
 import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.chat.Chat
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 
@@ -15,13 +14,3 @@ fun <T : BaseMessageUpdate> Flow<T>.filterBaseMessageUpdatesByChatId(chatId: Cha
  * [Flow.filter] incoming [BaseMessageUpdate]s by their [ChatId] using [Chat.id] of [chat]
  */
 fun <T : BaseMessageUpdate> Flow<T>.filterBaseMessageUpdatesByChat(chat: Chat): Flow<T> = filterBaseMessageUpdatesByChatId(chat.id)
-
-
-/**
- * [Flow.filter] incoming [SentMediaGroupUpdate]s by their [ChatId]
- */
-fun <T : SentMediaGroupUpdate> Flow<T>.filterSentMediaGroupUpdatesByChatId(chatId: ChatId): Flow<T> = filter { it.data.first().chat.id == chatId }
-/**
- * [Flow.filter] incoming [SentMediaGroupUpdate]s by their [ChatId] using [Chat.id] of [chat]
- */
-fun <T : SentMediaGroupUpdate> Flow<T>.filterSentMediaGroupUpdatesByChat(chat: Chat): Flow<T> = filterSentMediaGroupUpdatesByChatId(chat.id)

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

@@ -8,9 +8,11 @@ import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.extensions.utils.updates.lastUpdateIdentifier
 import dev.inmo.tgbotapi.requests.GetUpdates
 import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
+import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.*
+import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.types.update.media_group.SentMediaGroupUpdate
 import dev.inmo.tgbotapi.updateshandlers.*
 import io.ktor.client.plugins.HttpRequestTimeoutException
 import io.ktor.utils.io.CancellationException
@@ -56,7 +58,10 @@ fun TelegramBot.longPollingFlow(
                  * We are throw out the last media group and will reretrieve it again in the next get updates
                  * and it will guarantee that it is full
                  */
-                if (originalUpdates.size == getUpdatesLimit.last && converted.last() is SentMediaGroupUpdate) {
+                if (
+                    originalUpdates.size == getUpdatesLimit.last
+                    && ((converted.last() as? BaseSentMessageUpdate) ?.data as? CommonMessage<*>) ?.content is MediaGroupContent
+                ) {
                     converted - converted.last()
                 } else {
                     converted
@@ -67,7 +72,7 @@ fun TelegramBot.longPollingFlow(
                 for (update in updates) {
                     send(update)
 
-                    lastUpdateIdentifier = update.lastUpdateIdentifier()
+                    lastUpdateIdentifier = update.updateId
                 }
             }.onFailure {
                 cancel(it as? CancellationException ?: return@onFailure)