Update gradle.properties

0.11.3

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheSettingsAPI.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
-import com.soywiz.klock.minutes
+import korlibs.time.minutes
 import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.Seconds
 import kotlinx.coroutines.flow.SharedFlow

cache/admins/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/DefaultAdminsCacheAPI.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember

cache/admins/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
 import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo

cache/content/common/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MediaFileActualityChecker.kt

@@ -1,7 +1,7 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import com.soywiz.klock.milliseconds
+import korlibs.time.milliseconds
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.requests.abstracts.FileId

gradle.properties

@@ -6,21 +6,21 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 
-kotlin_version=1.8.10
+kotlin_version=1.8.21
-kotlin_serialisation_core_version=1.5.0
+kotlin_serialisation_core_version=1.5.1
 
 github_release_plugin_version=2.4.1
 
-tgbotapi_version=6.0.3
+tgbotapi_version=8.0.0
-micro_utils_version=0.17.2
+micro_utils_version=0.19.1
 exposed_version=0.41.1
-plagubot_version=4.0.3
+plagubot_version=6.0.0
 
 # Dokka
 
-dokka_version=1.7.20
+dokka_version=1.8.10
 
 # Project data
 
 group=dev.inmo
-version=0.9.3
+version=0.12.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

resender/src/commonMain/kotlin/MessagesResender.kt

@@ -16,7 +16,8 @@ class MessagesResender(
 ) {
     suspend fun resend(
         targetChatId: IdChatIdentifier,
-        messagesInfo: List<MessageMetaInfo>
+        messagesInfo: List<MessageMetaInfo>,
+        onBetweenMessages: suspend (sent: List<MessageMetaInfo>, toBeSent: List<MessageMetaInfo>) -> Unit
     ): List<Pair<MessageMetaInfo, MessageMetaInfo>> {
         val messagesWithOrders = messagesInfo.mapIndexed { i, messageInfo -> messageInfo to i }.toMap()
         val ordersWithMessagesGroups = messagesInfo.groupBy { it.group }.flatMap { (group, list) ->
@@ -29,9 +30,14 @@ class MessagesResender(
             }
         }.sortedBy { it.first }
 
+        val sent = mutableListOf<MessageMetaInfo>()
+        val leftToSend = ordersWithMessagesGroups.map { it.second }.toMutableList()
+
         return ordersWithMessagesGroups.flatMap { (_, contents) ->
             val sourceMessagesToSentMessages = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>()
 
+            onBetweenMessages(sent.toList(), leftToSend.flatten())
+
             when {
                 contents.size == 1 -> {
                     val messageInfo = contents.first()
@@ -137,8 +143,15 @@ class MessagesResender(
                 }
             }
 
+            leftToSend.takeIf { it.isNotEmpty() } ?.removeAt(0) ?.also {
+                sent.addAll(it)
+            }
             sourceMessagesToSentMessages.toList()
         }
+    }
 
-    }
+    suspend fun resend(
+        targetChatId: IdChatIdentifier,
+        messagesInfo: List<MessageMetaInfo>
+    ): List<Pair<MessageMetaInfo, MessageMetaInfo>> = resend(targetChatId, messagesInfo) { _, _ -> }
 }