getting updates refactoring

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/GetUpdates.kt

@@ -2,14 +2,13 @@ package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
 import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates
-import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
-import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 
 suspend fun RequestsExecutor.getUpdates(
     offset: UpdateIdentifier? = null,
     limit: Int? = null,
-    timeout: Int? = null,
+    timeout: Seconds? = null,
     allowed_updates: List<String>? = ALL_UPDATES_LIST
 ) = execute(
     GetUpdates(
@@ -20,7 +19,7 @@ suspend fun RequestsExecutor.getUpdates(
 suspend fun RequestsExecutor.getUpdates(
     lastUpdate: Update,
     limit: Int? = null,
-    timeout: Int? = null,
+    timeout: Seconds? = null,
     allowed_updates: List<String>? = ALL_UPDATES_LIST
 ) = getUpdates(
     lastUpdate.updateId + 1, limit, timeout, allowed_updates

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/InternalUtils/UpdatesUtils.kt

@@ -1,15 +1,32 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.InternalUtils
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.MediaGroupIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.MediaGroupUpdates.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.*
 
-internal fun List<BaseMessageUpdate>.convertWithMediaGroupUpdates(): List<Update> {
+internal fun Update.lastUpdateIdentifier(): UpdateIdentifier {
+    return if (this is SentMediaGroupUpdate) {
+        origins.last().updateId
+    } else {
+        updateId
+    }
+}
+
+internal fun List<Update>.lastUpdateIdentifier(): UpdateIdentifier? {
+    return maxBy { it.updateId } ?.lastUpdateIdentifier()
+}
+
+internal fun List<Update>.convertWithMediaGroupUpdates(): List<Update> {
     val resultUpdates = mutableListOf<Update>()
     val mediaGroups = mutableMapOf<MediaGroupIdentifier, MutableList<BaseMessageUpdate>>()
     for (update in this) {
+        if (update !is BaseMessageUpdate) {
+            resultUpdates.add(update)
+            continue
+        }
         val asEditMediaGroupMessage = update.toEditMediaGroupUpdate()
         if (asEditMediaGroupMessage != null) {
             resultUpdates.add(asEditMediaGroupMessage)
@@ -27,7 +44,8 @@ internal fun List<BaseMessageUpdate>.convertWithMediaGroupUpdates(): List<Update
             resultUpdates.add(mediaGroupUpdate)
         }
     }
-    return resultUpdates.sortedBy { it.updateId }
+    resultUpdates.sortBy { it.updateId }
+    return resultUpdates
 }
 
 internal fun List<BaseMessageUpdate>.toSentMediaGroupUpdate(): SentMediaGroupUpdate? = (this as? SentMediaGroupUpdate) ?: let {

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/updates/UpdatesPolling.kt

@@ -1,36 +1,49 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.updates
 
 import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
-import com.github.insanusmokrassar.TelegramBotAPI.bot.UpdatesPoller
-import com.github.insanusmokrassar.TelegramBotAPI.types.ALL_UPDATES_LIST
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.InternalUtils.convertWithMediaGroupUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.InternalUtils.lastUpdateIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.getUpdates
+import com.github.insanusmokrassar.TelegramBotAPI.types.Seconds
+import com.github.insanusmokrassar.TelegramBotAPI.types.UpdateIdentifier
 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.*
 import kotlinx.coroutines.*
 
-
 fun RequestsExecutor.startGettingOfUpdates(
-    timeoutMillis: Long = 30 * 1000,
+    timeoutMillis: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     allowedUpdates: List<String>? = null,
-    block: UpdateReceiver<Update>
-): UpdatesPoller {
-    return KtorUpdatesPoller(
-        this,
-        timeoutMillis.toInt() / 1000,
-        allowedUpdates = allowedUpdates ?: ALL_UPDATES_LIST,
-        updatesReceiver = block
-    ).also {
-        it.start(scope)
+    updatesReceiver: UpdateReceiver<Update>
+): Job = scope.launch {
+    var lastUpdateIdentifier: UpdateIdentifier? = null
+
+    while (isActive) {
+        supervisorScope {
+            val updates = getUpdates(
+                offset = lastUpdateIdentifier,
+                timeout = timeoutMillis,
+                allowed_updates = allowedUpdates
+            ).convertWithMediaGroupUpdates()
+
+            supervisorScope {
+                for (update in updates) {
+                    updatesReceiver(update)
+
+                    lastUpdateIdentifier = update.lastUpdateIdentifier()
+                }
+            }
+        }
     }
 }
 
 fun RequestsExecutor.startGettingOfUpdates(
     updatesFilter: UpdatesFilter,
-    timeoutMillis: Long = 30 * 1000,
+    timeoutMillis: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-): UpdatesPoller = startGettingOfUpdates(
+): Job = startGettingOfUpdates(
     timeoutMillis,
     scope,
     updatesFilter.allowedUpdates,
@@ -53,9 +66,9 @@ fun RequestsExecutor.startGettingOfUpdates(
     preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
     pollCallback: UpdateReceiver<PollUpdate>? = null,
     pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
-    timeoutMillis: Long = 30 * 1000,
+    timeoutMillis: Seconds = 30,
     scope: CoroutineScope = GlobalScope
-): UpdatesPoller {
+): Job {
     return startGettingOfUpdates(
         SimpleUpdatesFilter(
             messageCallback,
@@ -92,9 +105,9 @@ fun RequestsExecutor.startGettingOfUpdates(
     preCheckoutQueryCallback: UpdateReceiver<PreCheckoutQueryUpdate>? = null,
     pollCallback: UpdateReceiver<PollUpdate>? = null,
     pollAnswerCallback: UpdateReceiver<PollAnswerUpdate>? = null,
-    timeoutMillis: Long = 30 * 1000,
+    timeoutMillis: Seconds = 30,
     scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-): UpdatesPoller = startGettingOfUpdates(
+): Job = startGettingOfUpdates(
     messageCallback = messageCallback,
     messageMediaGroupCallback = mediaGroupCallback,
     editedMessageCallback = editedMessageCallback,