From ba2c4cbb30d2c315a0303aab91de256dd5ca86cd Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Tue, 17 Mar 2020 17:16:14 +0600
Subject: [PATCH] UpdatesFilter now is interface

---
 CHANGELOG.md                                  |  4 ++
 .../updateshandlers/FlowsUpdatesFilter.kt     | 10 ++-
 .../updateshandlers/UpdatesFilter.kt          | 61 +++++++++++++++++--
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01100cd50f..0442b5d865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@
     * `UpdateReceiver` was replaced to the package `com.github.insanusmokrassar.TelegramBotAPI.updateshandlers`
     * All functions inside `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesPolling` are deprecated
     and will be removed in some soon versions. Their replacement are able inside `TelegramBotAPI-extensions-api`
+    * `UpdatesFilter` is interface for now
+        * Previous `UpdatesFilter` class was renamed to `SimpleUpdatesFilter` and for backward compatibility was added
+        builder function `UpdatesFilter`, which will be removed in near releases
+        * `FlowsUpdatesFilter` now implements `UpdatesFilter`
 * `TelegramBotAPI-extensions-api`:
     * All functions from `com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.UpdatesPolling` now available
     in package `com.github.insanusmokrassar.TelegramBotAPI.extensions.api.updates.UpdatesPolling`
diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt
index ff86675e05..e57697e4fa 100644
--- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt
+++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/FlowsUpdatesFilter.kt
@@ -2,6 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.updateshandlers
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -11,7 +12,7 @@ private fun <T> BroadcastChannel<T>.createUpdateReceiver(): UpdateReceiver<T> =
 
 class FlowsUpdatesFilter(
     broadcastChannelsSize: Int = Channel.CONFLATED
-) {
+): UpdatesFilter {
     private val messageChannel: BroadcastChannel<MessageUpdate> = BroadcastChannel(broadcastChannelsSize)
     private val messageMediaGroupChannel: BroadcastChannel<MessageMediaGroupUpdate> = BroadcastChannel(broadcastChannelsSize)
     private val editedMessageChannel: BroadcastChannel<EditMessageUpdate> = BroadcastChannel(broadcastChannelsSize)
@@ -27,7 +28,12 @@ class FlowsUpdatesFilter(
     private val preCheckoutQueryChannel: BroadcastChannel<PreCheckoutQueryUpdate> = BroadcastChannel(broadcastChannelsSize)
     private val pollChannel: BroadcastChannel<PollUpdate> = BroadcastChannel(broadcastChannelsSize)
 
-    val filter = UpdatesFilter(
+    override val allowedUpdates: List<String>
+        get() = filter.allowedUpdates
+    override val asUpdateReceiver: UpdateReceiver<Update>
+        get() = filter.asUpdateReceiver
+
+    val filter = SimpleUpdatesFilter(
         messageChannel.createUpdateReceiver(),
         messageMediaGroupChannel.createUpdateReceiver(),
         editedMessageChannel.createUpdateReceiver(),
diff --git a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt
index 0732b3562f..e436b81b90 100644
--- a/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt
+++ b/TelegramBotAPI/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/updateshandlers/UpdatesFilter.kt
@@ -6,7 +6,57 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.UnknownUpdateType
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 
-data class UpdatesFilter(
+typealias UpdateReceiver<T> = suspend (T) -> Unit
+
+interface UpdatesFilter {
+    val asUpdateReceiver: UpdateReceiver<Update>
+    val allowedUpdates: List<String>
+}
+
+@Deprecated(
+    "It is builder function for SimpleUpdatesFilter",
+    ReplaceWith(
+        "SimpleUpdatesFilter",
+        "com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.SimpleUpdatesFilter"
+    )
+)
+fun UpdatesFilter(
+    messageCallback: UpdateReceiver<MessageUpdate>? = null,
+    messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
+    editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
+    editedMessageMediaGroupCallback: UpdateReceiver<EditMessageMediaGroupUpdate>? = null,
+    channelPostCallback: UpdateReceiver<ChannelPostUpdate>? = null,
+    channelPostMediaGroupCallback: UpdateReceiver<ChannelPostMediaGroupUpdate>? = null,
+    editedChannelPostCallback: UpdateReceiver<EditChannelPostUpdate>? = null,
+    editedChannelPostMediaGroupCallback: UpdateReceiver<EditChannelPostMediaGroupUpdate>? = null,
+    chosenInlineResultCallback: UpdateReceiver<ChosenInlineResultUpdate>? = null,
+    inlineQueryCallback: UpdateReceiver<InlineQueryUpdate>? = null,
+    callbackQueryCallback: UpdateReceiver<CallbackQueryUpdate>? = null,
+    shippingQueryCallback: UpdateReceiver<ShippingQueryUpdate>? = null,
+    preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
+    pollUpdateCallback: UpdateReceiver<PollUpdate>? = null,
+    pollAnswerUpdateCallback: UpdateReceiver<PollAnswerUpdate>? = null,
+    unknownUpdateTypeCallback: UpdateReceiver<UnknownUpdateType>? = null
+) = SimpleUpdatesFilter(
+    messageCallback,
+    messageMediaGroupCallback,
+    editedMessageCallback,
+    editedMessageMediaGroupCallback,
+    channelPostCallback,
+    channelPostMediaGroupCallback,
+    editedChannelPostCallback,
+    editedChannelPostMediaGroupCallback,
+    chosenInlineResultCallback,
+    inlineQueryCallback,
+    callbackQueryCallback,
+    shippingQueryCallback,
+    preCheckoutQueryCallback,
+    pollUpdateCallback,
+    pollAnswerUpdateCallback,
+    unknownUpdateTypeCallback
+)
+
+data class SimpleUpdatesFilter(
     private val messageCallback: UpdateReceiver<MessageUpdate>? = null,
     private val messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
     private val editedMessageCallback: UpdateReceiver<EditMessageUpdate>? = null,
@@ -23,9 +73,9 @@ data class UpdatesFilter(
     private val pollUpdateCallback: UpdateReceiver<PollUpdate>? = null,
     private val pollAnswerUpdateCallback: UpdateReceiver<PollAnswerUpdate>? = null,
     private val unknownUpdateTypeCallback: UpdateReceiver<UnknownUpdateType>? = null
-) {
-    val asUpdateReceiver: UpdateReceiver<Update> = this::invoke
-    val allowedUpdates = listOfNotNull(
+) : UpdatesFilter {
+    override val asUpdateReceiver: UpdateReceiver<Update> = this::invoke
+    override val allowedUpdates = listOfNotNull(
         (messageCallback ?: messageMediaGroupCallback) ?.let { UPDATE_MESSAGE },
         (editedMessageCallback ?: editedMessageMediaGroupCallback) ?.let { UPDATE_EDITED_MESSAGE },
         (channelPostCallback ?: channelPostMediaGroupCallback) ?.let { UPDATE_CHANNEL_POST },
@@ -112,5 +162,4 @@ fun createSimpleUpdateFilter(
     pollUpdateCallback = pollCallback,
     pollAnswerUpdateCallback = pollAnswerCallback,
     unknownUpdateTypeCallback = unknownCallback
-)
-typealias UpdateReceiver<T> = suspend (T) -> Unit
\ No newline at end of file
+)
\ No newline at end of file