From 944d15f3269eec8b6d7a013187850c3bcbc87f24 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Tue, 17 Mar 2020 17:20:42 +0600
Subject: [PATCH] new startGettingUpdates method

---
 CHANGELOG.md                                  |  2 +
 .../extensions/api/updates/UpdatesPolling.kt  | 53 +++++++++++--------
 .../updateshandlers/UpdatesFilter.kt          |  2 +-
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0442b5d865..7c3db33a80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
 * `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`
+    * Now new method of getting updates available: `startGettingUpdates` with `UpdatesFilter` as incoming first
+    parameter
 
 ## 0.23.0 TelegramBotAPI 4.6
 
diff --git a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt
index 375db36de4..f7418d99f8 100644
--- a/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt
+++ b/TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt
@@ -6,9 +6,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
 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 com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.KtorUpdatesPoller
-import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdatesFilter
-import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.UpdateReceiver
+import com.github.insanusmokrassar.TelegramBotAPI.updateshandlers.*
 import kotlinx.coroutines.*
 
 
@@ -28,6 +26,17 @@ fun RequestsExecutor.startGettingOfUpdates(
     }
 }
 
+fun RequestsExecutor.startGettingOfUpdates(
+    updatesFilter: UpdatesFilter,
+    timeoutMillis: Long = 30 * 1000,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+): UpdatesPoller = startGettingOfUpdates(
+    timeoutMillis,
+    scope,
+    updatesFilter.allowedUpdates,
+    updatesFilter.asUpdateReceiver
+)
+
 fun RequestsExecutor.startGettingOfUpdates(
     messageCallback: UpdateReceiver<MessageUpdate>? = null,
     messageMediaGroupCallback: UpdateReceiver<MessageMediaGroupUpdate>? = null,
@@ -47,28 +56,26 @@ fun RequestsExecutor.startGettingOfUpdates(
     timeoutMillis: Long = 30 * 1000,
     scope: CoroutineScope = GlobalScope
 ): UpdatesPoller {
-    val filter = UpdatesFilter(
-        messageCallback,
-        messageMediaGroupCallback,
-        editedMessageCallback,
-        editedMessageMediaGroupCallback,
-        channelPostCallback,
-        channelPostMediaGroupCallback,
-        editedChannelPostCallback,
-        editedChannelPostMediaGroupCallback,
-        chosenInlineResultCallback,
-        inlineQueryCallback,
-        callbackQueryCallback,
-        shippingQueryCallback,
-        preCheckoutQueryCallback,
-        pollCallback,
-        pollAnswerCallback
-    )
     return startGettingOfUpdates(
+        SimpleUpdatesFilter(
+            messageCallback,
+            messageMediaGroupCallback,
+            editedMessageCallback,
+            editedMessageMediaGroupCallback,
+            channelPostCallback,
+            channelPostMediaGroupCallback,
+            editedChannelPostCallback,
+            editedChannelPostMediaGroupCallback,
+            chosenInlineResultCallback,
+            inlineQueryCallback,
+            callbackQueryCallback,
+            shippingQueryCallback,
+            preCheckoutQueryCallback,
+            pollCallback,
+            pollAnswerCallback
+        ),
         timeoutMillis,
-        scope,
-        filter.allowedUpdates,
-        filter.asUpdateReceiver
+        scope
     )
 }
 
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 e436b81b90..ba0daee6b7 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
@@ -145,7 +145,7 @@ fun createSimpleUpdateFilter(
     pollCallback: UpdateReceiver<PollUpdate>? = null,
     pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
     unknownCallback: UpdateReceiver<UnknownUpdateType>? = null
-): UpdatesFilter = UpdatesFilter(
+): UpdatesFilter = SimpleUpdatesFilter(
     messageCallback = messageCallback,
     messageMediaGroupCallback = mediaGroupCallback,
     editedMessageCallback = editedMessageCallback,