From 6f650f6d6c42d0ce3f049bee0da3e21a8e99777b Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 13 Aug 2020 01:19:12 +0600
Subject: [PATCH] Flow<BaseSentMessageUpdate> extensions

---
 CHANGELOG.md                                  | 20 ++++++++++++
 .../utils/shortcuts/FlowsUpdatesFilter.kt     | 32 ++++++++++++++++---
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 434c1b0c6c..631a9a8d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,26 @@
 
 ### 0.27.11
 
+* `TelegramBotAPI-extensions-utils`:
+    * A lot of extensions like `Flow<BaseSentMessageUpdate>#textMessages` were added:
+        * `Flow<BaseSentMessageUpdate>#animationMessages`
+        * `Flow<BaseSentMessageUpdate>#audioMessages`
+        * `Flow<BaseSentMessageUpdate>#contactMessages`
+        * `Flow<BaseSentMessageUpdate>#diceMessages`
+        * `Flow<BaseSentMessageUpdate>#documentMessages`
+        * `Flow<BaseSentMessageUpdate>#gameMessages`
+        * `Flow<BaseSentMessageUpdate>#invoiceMessages`
+        * `Flow<BaseSentMessageUpdate>#locationMessages`
+        * `Flow<BaseSentMessageUpdate>#photoMessages`
+            * `Flow<BaseSentMessageUpdate>#imageMessages`
+        * `Flow<BaseSentMessageUpdate>#pollMessages`
+        * `Flow<BaseSentMessageUpdate>#stickerMessages`
+        * `Flow<BaseSentMessageUpdate>#textMessages`
+        * `Flow<BaseSentMessageUpdate>#venueMessages`
+        * `Flow<BaseSentMessageUpdate>#videoMessages`
+        * `Flow<BaseSentMessageUpdate>#videoNoteMessages`
+        * `Flow<BaseSentMessageUpdate>#voiceMessages`
+
 ### 0.27.10
 
 * `TelegramBotAPI-extensions-api`:
diff --git a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/shortcuts/FlowsUpdatesFilter.kt b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
index 8b02c3924f..8776b894e8 100644
--- a/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
+++ b/TelegramBotAPI-extensions-utils/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/utils/shortcuts/FlowsUpdatesFilter.kt
@@ -3,10 +3,12 @@ package com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts
 import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.aggregateFlows
 import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.asContentMessagesFlow
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.media.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.InvoiceContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.BaseSentMessageUpdate
 import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.FlowsUpdatesFilter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.*
@@ -19,6 +21,10 @@ inline fun <reified T : MessageContent> filterForContentMessage(): suspend (Cont
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+inline fun <reified T: MessageContent> Flow<BaseSentMessageUpdate>.filterContentMessages(
+): Flow<ContentMessage<T>> = asContentMessagesFlow().mapNotNull(filterForContentMessage())
+
 /**
  * @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 agregate messages from [FlowsUpdatesFilter.messageFlow] and
@@ -28,48 +34,57 @@ inline fun <reified T : MessageContent> filterForContentMessage(): suspend (Cont
 inline fun <reified T: MessageContent> FlowsUpdatesFilter.filterContentMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ): Flow<ContentMessage<T>> {
-    val filter = filterForContentMessage<T>()
-    return scopeToIncludeChannels ?.let { scope ->
+    return (scopeToIncludeChannels ?.let { scope ->
         aggregateFlows(
             scope,
-            messageFlow.asContentMessagesFlow().mapNotNull(filter),
-            channelPostFlow.asContentMessagesFlow().mapNotNull(filter)
+            messageFlow,
+            channelPostFlow
         )
-    } ?: messageFlow.asContentMessagesFlow().mapNotNull(filter)
+    } ?: messageFlow).filterContentMessages()
 }
 
+fun Flow<BaseSentMessageUpdate>.animationMessages() = filterContentMessages<AnimationContent>()
 fun FlowsUpdatesFilter.animationMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<AnimationContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.audioMessages() = filterContentMessages<AudioContent>()
 fun FlowsUpdatesFilter.audioMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<AudioContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.contactMessages() = filterContentMessages<ContactContent>()
 fun FlowsUpdatesFilter.contactMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<ContactContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.diceMessages() = filterContentMessages<DiceContent>()
 fun FlowsUpdatesFilter.diceMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<DiceContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.documentMessages() = filterContentMessages<DocumentContent>()
 fun FlowsUpdatesFilter.documentMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<DocumentContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.gameMessages() = filterContentMessages<GameContent>()
 fun FlowsUpdatesFilter.gameMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<GameContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.invoiceMessages() = filterContentMessages<InvoiceContent>()
 fun FlowsUpdatesFilter.invoiceMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<InvoiceContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.locationMessages() = filterContentMessages<LocationContent>()
 fun FlowsUpdatesFilter.locationMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<LocationContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.photoMessages() = filterContentMessages<PhotoContent>()
+fun Flow<BaseSentMessageUpdate>.imageMessages() = photoMessages()
 fun FlowsUpdatesFilter.photoMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<PhotoContent>(scopeToIncludeChannels)
@@ -81,30 +96,37 @@ inline fun FlowsUpdatesFilter.imageMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = photoMessages(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.pollMessages() = filterContentMessages<PollContent>()
 fun FlowsUpdatesFilter.pollMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<PollContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.stickerMessages() = filterContentMessages<StickerContent>()
 fun FlowsUpdatesFilter.stickerMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<StickerContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.textMessages() = filterContentMessages<TextContent>()
 fun FlowsUpdatesFilter.textMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<TextContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.venueMessages() = filterContentMessages<VenueContent>()
 fun FlowsUpdatesFilter.venueMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VenueContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.videoMessages() = filterContentMessages<VideoContent>()
 fun FlowsUpdatesFilter.videoMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VideoContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.videoNoteMessages() = filterContentMessages<VideoNoteContent>()
 fun FlowsUpdatesFilter.videoNoteMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VideoNoteContent>(scopeToIncludeChannels)
 
+fun Flow<BaseSentMessageUpdate>.voiceMessages() = filterContentMessages<VoiceContent>()
 fun FlowsUpdatesFilter.voiceMessages(
     scopeToIncludeChannels: CoroutineScope? = null
 ) = filterContentMessages<VoiceContent>(scopeToIncludeChannels)