deprecations removing

2025-09-04 15:49:41 +00:00 · 2023-03-10 14:59:59 +06:00
parent 2d2310daca
commit 6f9f880b79
22 changed files with 37 additions and 931 deletions
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
@@ -20,15 +20,6 @@ suspend inline fun <reified O : MessageContent> BehaviourContext.waitContent(
 ): Flow<O> = waitContentMessage<O>(initRequest, errorFactory).map { it.content }


-@Deprecated(
-    includeMediaGroupsDeprecationMessage,
-    ReplaceWith("waitAnyContent(initRequest, errorFactory)", "dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitAnyContent")
-)
-suspend fun BehaviourContext.waitContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<MessageContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAnyContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
@@ -69,62 +60,26 @@ suspend fun BehaviourContext.waitVenue(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<VenueContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAudioMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<AudioMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAudioMediaGroupContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent<AudioMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitDocumentMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<DocumentMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitDocumentMediaGroupContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitMedia(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<MediaContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitMedia(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<MediaContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAnyMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<MediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAnyMediaGroupContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent<MediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitVisualMediaGroupContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<VisualMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitVisualMediaGroupContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent<VisualMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitTextedMediaContent(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<TextedMediaContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitTextedMediaContent(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
@@ -133,32 +88,14 @@ suspend fun BehaviourContext.waitAnimation(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<AnimationContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAudio(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<AudioContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAudio(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent<AudioContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitDocument(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<DocumentContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitDocument(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
 ) = waitContent<DocumentContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitPhoto(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<PhotoContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitPhoto(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
@@ -167,12 +104,6 @@ suspend fun BehaviourContext.waitSticker(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContent<StickerContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitVideo(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContent<VideoContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitVideo(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContentMessage.kt
@@ -13,7 +13,6 @@ import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.lowLevelRiskFeatureMessage
 import kotlinx.coroutines.flow.Flow

-const val includeMediaGroupsDeprecationMessage = "includeMediaGroups is deprecated and its usage will not lead to any changes"
 typealias CommonMessageToCommonMessageMapper<T> = suspend CommonMessage<T>.() -> CommonMessage<T>?

@RiskFeature(lowLevelRiskFeatureMessage)
@@ -47,15 +46,6 @@ internal inline fun <reified T : MessageContent> contentMessageConverter(
    if (content is T) this as CommonMessage<T> else null
 }

-@Deprecated(
-    includeMediaGroupsDeprecationMessage,
-    ReplaceWith("waitAnyContentMessage(initRequest, errorFactory)", "dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitAnyContentMessage")
-)
-suspend fun BehaviourContext.waitContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<MessageContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAnyContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null },
@@ -96,62 +86,26 @@ suspend fun BehaviourContext.waitVenueMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<VenueContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAudioMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<AudioMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAudioMediaGroupContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<AudioMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitDocumentMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<DocumentMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitDocumentMediaGroupContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<DocumentMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitMediaMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<MediaContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitMediaMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<MediaContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAnyMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<MediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAnyMediaGroupContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<MediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitVisualMediaGroupContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<VisualMediaGroupPartContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitVisualMediaGroupContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<VisualMediaGroupPartContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitTextedMediaContentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<TextedMediaContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitTextedMediaContentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
@@ -160,32 +114,14 @@ suspend fun BehaviourContext.waitAnimationMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<AnimationContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitAudioMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<AudioContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitAudioMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<AudioContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitDocumentMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<DocumentContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitDocumentMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<DocumentContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitPhotoMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<PhotoContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitPhotoMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
@@ -194,12 +130,6 @@ suspend fun BehaviourContext.waitStickerMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
 ) = waitContentMessage<StickerContent>(initRequest, errorFactory)
-@Deprecated(includeMediaGroupsDeprecationMessage)
-suspend fun BehaviourContext.waitVideoMessage(
-    initRequest: Request<*>? = null,
-    errorFactory: NullableRequestBuilder<*> = { null },
-    includeMediaGroups: Boolean
-) = waitContentMessage<VideoContent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitVideoMessage(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@@ -109,7 +109,7 @@ suspend fun BehaviourContext.waitGroupChatCreatedEvents(
 suspend fun BehaviourContext.waitLeftChatMemberEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
-) = waitEvents<LeftChatMember>(initRequest, errorFactory)
+) = waitEvents<LeftChatMemberEvent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitNewChatPhotoEvents(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventActionMessages.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventActionMessages.kt
@@ -106,7 +106,7 @@ suspend fun BehaviourContext.waitGroupChatCreatedEventsMessages(
 suspend fun BehaviourContext.waitLeftChatMemberEventsMessages(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
-) = waitEventsMessages<LeftChatMember>(initRequest, errorFactory)
+) = waitEventsMessages<LeftChatMemberEvent>(initRequest, errorFactory)
 suspend fun BehaviourContext.waitNewChatPhotoEventsMessages(
    initRequest: Request<*>? = null,
    errorFactory: NullableRequestBuilder<*> = { null }
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt
@@ -346,10 +346,10 @@ suspend fun <BC : BehaviourContext> BC.onGroupChatCreated(
 * data
 */
 suspend fun <BC : BehaviourContext> BC.onLeftChatMember(
-    initialFilter: SimpleFilter<ChatEventMessage<LeftChatMember>>? = null,
-    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<LeftChatMember>, Update>? = MessageFilterByChat,
-    markerFactory: MarkerFactory<in ChatEventMessage<LeftChatMember>, Any> = ByChatMessageMarkerFactory,
-    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<LeftChatMember>>
+    initialFilter: SimpleFilter<ChatEventMessage<LeftChatMemberEvent>>? = null,
+    subcontextUpdatesFilter: CustomBehaviourContextAndTwoTypesReceiver<BC, Boolean, ChatEventMessage<LeftChatMemberEvent>, Update>? = MessageFilterByChat,
+    markerFactory: MarkerFactory<in ChatEventMessage<LeftChatMemberEvent>, Any> = ByChatMessageMarkerFactory,
+    scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, ChatEventMessage<LeftChatMemberEvent>>
 ) = onEvent(initialFilter, subcontextUpdatesFilter, markerFactory, scenarioReceiver)

 /**