Update gradle.properties

0.11.0

.github/workflows/commit-publish.yml

@@ -8,9 +8,6 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Fix android 32.0.0 dx
-        continue-on-error: true
-        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

gradle.properties

@@ -4,25 +4,23 @@ org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
-android.useAndroidX=true
-android.enableJetifier=true
 
 
-kotlin_version=1.7.22
-kotlin_serialisation_core_version=1.4.1
+kotlin_version=1.8.21
+kotlin_serialisation_core_version=1.5.0
 
 github_release_plugin_version=2.4.1
 
-tgbotapi_version=5.1.0
-micro_utils_version=0.16.8
+tgbotapi_version=7.1.1
+micro_utils_version=0.18.0
 exposed_version=0.41.1
-plagubot_version=3.4.0
+plagubot_version=5.1.1
 
 # Dokka
 
-dokka_version=1.7.20
+dokka_version=1.8.10
 
 # Project data
 
 group=dev.inmo
-version=0.8.0
+version=0.11.1

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/MessageMetaInfo.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.libraries.resender
 
+import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
 import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.message.abstracts.Message
@@ -8,6 +9,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MessageMetaInfo(
+    @Serializable(FullChatIdentifierSerializer::class)
     val chatId: IdChatIdentifier,
     val messageId: MessageId,
     val group: String? = null

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()
@@ -68,7 +74,7 @@ class MessagesResender(
                             )
                         }
                     }.getOrNull() ?.let {
-                        messageInfo to it
+                        sourceMessagesToSentMessages.add(messageInfo to it)
                     }
                 }
                 else -> {
@@ -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) { _, _ -> }
 }