update dependencies and start 0.18.2

0.18.1

.github/workflows/commit-publish.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

build.gradle

@@ -18,7 +18,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
+        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
     }
 }
 

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

@@ -1,8 +1,9 @@
 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 korlibs.time.seconds
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.Serializable
 

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
@@ -8,6 +8,7 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ExtendedBot
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 import dev.inmo.tgbotapi.types.message.abstracts.*
+import korlibs.time.seconds
 import kotlinx.serialization.Serializable
 
 interface DefaultAdminsCacheAPIRepo {

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.21
+kotlin_version=1.9.22
-kotlin_serialisation_core_version=1.5.0
+kotlin_serialisation_core_version=1.6.2
 
-github_release_plugin_version=2.4.1
+github_release_plugin_version=2.5.2
 
-tgbotapi_version=7.1.1
+tgbotapi_version=10.1.0
-micro_utils_version=0.18.0
+micro_utils_version=0.20.35
-exposed_version=0.41.1
+exposed_version=0.47.0
-plagubot_version=5.1.1
+plagubot_version=8.2.0
 
 # Dokka
 
-dokka_version=1.8.10
+dokka_version=1.9.10
 
 # Project data
 
 group=dev.inmo
-version=0.11.1
+version=0.18.2

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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mppJavaWithJsProject.gradle

@@ -7,7 +7,7 @@ kotlin {
     jvm {
         compilations.main {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -44,6 +44,6 @@ kotlin {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -50,18 +50,14 @@ publishing {
             
                 }
             }
-            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
                 maven {
-                    name = "Gitea"
+                    name = "InmoNexus"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
+                    credentials {
-                        name = "Authorization"
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
                     }
             
                 }
@@ -96,4 +92,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }

publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"${project.name}","url":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries","vcsUrl":"https://github.com/InsanusMokrassar/TelegramBotApiLibraries.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

resender/src/commonMain/kotlin/MessageMetaInfo.kt

@@ -3,8 +3,10 @@ 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.ContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
+import dev.inmo.tgbotapi.types.message.content.MediaGroupContent
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -13,7 +15,20 @@ data class MessageMetaInfo(
     val chatId: IdChatIdentifier,
     val messageId: MessageId,
     val group: String? = null
-)
+) {
+    val metaInfo: Message.MetaInfo
+        get() = Message.MetaInfo(chatId, messageId)
+}
+
+fun Message.asMessageMetaInfos(): List<MessageMetaInfo> {
+    return if (this is ContentMessage<*>) {
+        (content as? MediaGroupContent<*>) ?.group ?.map {
+            MessageMetaInfo(it.sourceMessage.chat.id, it.sourceMessage.messageId, it.sourceMessage.mediaGroupId)
+        }
+    } else {
+        null
+    } ?: listOf(MessageMetaInfo(chat.id, messageId, (this as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId))
+}
 
 operator fun MessageMetaInfo.Companion.invoke(
     message: Message

resender/src/commonMain/kotlin/MessagesResender.kt

@@ -1,8 +1,10 @@
 package dev.inmo.tgbotapi.libraries.resender
 
+import dev.inmo.micro_utils.common.applyDiff
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.ForwardMessage
 import dev.inmo.tgbotapi.requests.send.CopyMessage
+import dev.inmo.tgbotapi.requests.send.CopyMessages
 import dev.inmo.tgbotapi.requests.send.media.SendMediaGroup
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.IdChatIdentifier
@@ -19,135 +21,58 @@ class MessagesResender(
         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 currentGroup = mutableListOf<MessageMetaInfo>()
-        val ordersWithMessagesGroups = messagesInfo.groupBy { it.group }.flatMap { (group, list) ->
+        suspend fun makeCopy(): List<Pair<MessageMetaInfo, MessageMetaInfo>> {
-            if (group == null) {
+            currentGroup.sortBy { it.messageId }
-                list.map {
+            while (currentGroup.isNotEmpty()) {
-                    messagesWithOrders.getValue(it) to listOf(it)
+                return runCatching {
-                }
-            } else {
-                listOf(messagesWithOrders.getValue(list.first()) to list)
-            }
-        }.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()
-                    runCatching {
-                        MessageMetaInfo(
-                            targetChatId,
                     bot.execute(
-                                CopyMessage(
+                        CopyMessages(
-                                    targetChatId,
-                                    fromChatId = messageInfo.chatId,
-                                    messageId = messageInfo.messageId
-                                )
-                            )
-                        )
-                    }.onFailure { _ ->
-                        runCatching {
-                            bot.execute(
-                                ForwardMessage(
                             toChatId = targetChatId,
-                                    fromChatId = messageInfo.chatId,
+                            fromChatId = currentGroup.firstOrNull() ?.chatId ?: return emptyList(),
-                                    messageId = messageInfo.messageId
+                            messageIds = currentGroup.map { it.messageId }
-                                )
-                            )
-                        }.onSuccess {
-                            MessageMetaInfo(
-                                targetChatId,
-                                bot.execute(
-                                    CopyMessage(
-                                        targetChatId,
-                                        fromChatId = it.chat.id,
-                                        messageId = it.messageId
-                                    )
-                                )
                         )
+                    ).mapIndexed { i, newMessageId ->
+                        currentGroup[i] to MessageMetaInfo(targetChatId, newMessageId)
+                    }.also {
+                        currentGroup.clear()
                     }
-                    }.getOrNull() ?.let {
+                }.getOrElse {
-                        sourceMessagesToSentMessages.add(messageInfo to it)
+                    currentGroup.applyDiff(
-                    }
+                        currentGroup.filter {
-                }
+                            runCatching {
-                else -> {
-                    val resultContents = contents.mapNotNull {
-                        it to (
                                 bot.execute(
                                     ForwardMessage(
                                         toChatId = cacheChatId,
                                         fromChatId = it.chatId,
                                         messageId = it.messageId
                                     )
-                            ) as? ContentMessage<*> ?: return@mapNotNull null)
+                                )
-                    }.mapNotNull { (src, forwardedMessage) ->
+                            }.isSuccess
-                        val forwardedMessageAsMediaPartMessage = forwardedMessage.takeIf {
-                            it.content is MediaGroupPartContent
-                        } ?.let {
-                            it as ContentMessage<MediaGroupPartContent>
                         }
-                        src to (forwardedMessageAsMediaPartMessage ?: null.also { _ ->
-                            sourceMessagesToSentMessages.add(
-                                src to MessageMetaInfo(
-                                    targetChatId,
-                                    bot.execute(
-                                        CopyMessage(
-                                            targetChatId,
-                                            fromChatId = forwardedMessage.chat.id,
-                                            messageId = forwardedMessage.messageId
                     )
-                                    )
+                    null
-                                )
+                } ?: continue
-                            )
+            }
-                        } ?: return@mapNotNull null)
+            return emptyList()
         }
 
-                    resultContents.singleOrNull() ?.also { (src, it) ->
+        val copied = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>()
-                        sourceMessagesToSentMessages.add(
+        for (content in messagesInfo) {
-                            src to MessageMetaInfo(
+            when {
-                                targetChatId,
+                currentGroup.isEmpty() ||
-                                bot.execute(
+                currentGroup.first().chatId == content.chatId -> currentGroup.add(content)
-                                    CopyMessage(
+                else -> {
-                                        targetChatId,
+                    onBetweenMessages(copied.map { it.first }, currentGroup.toList())
-                                        it.chat.id,
+                    copied.addAll(makeCopy())
-                                        it.messageId
-                                    )
-                                )
-                            )
-                        )
-                    } ?: resultContents.chunked(mediaCountInMediaGroup.last).forEach {
-                        bot.execute(
-                            SendMediaGroup<MediaGroupPartContent>(
-                                targetChatId,
-                                it.map { it.second.content.toMediaGroupMemberTelegramMedia() }
-                            )
-                        ).content.group.mapIndexed { i, partWrapper ->
-                            it.getOrNull(i) ?.let {
-                                sourceMessagesToSentMessages.add(
-                                    it.first to MessageMetaInfo(
-                                        partWrapper.sourceMessage.chat.id,
-                                        partWrapper.sourceMessage.messageId,
-                                        partWrapper.sourceMessage.mediaGroupId
-                                    )
-                                )
                 }
             }
         }
+        if (currentGroup.isNotEmpty()) {
+            onBetweenMessages(copied.map { it.first }, currentGroup.toList())
+            copied.addAll(makeCopy())
         }
-            }
+        return copied.toList()
-
-            leftToSend.takeIf { it.isNotEmpty() } ?.removeAt(0) ?.also {
-                sent.addAll(it)
-            }
-            sourceMessagesToSentMessages.toList()
-        }
     }
 
     suspend fun resend(