update dependencies and start 0.18.2

0.18.1

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

@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 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

@@ -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 {

gradle.properties

@@ -6,15 +6,15 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 
-kotlin_version=1.9.21
-kotlin_serialisation_core_version=1.6.1
+kotlin_version=1.9.22
+kotlin_serialisation_core_version=1.6.2
 
-github_release_plugin_version=2.4.1
+github_release_plugin_version=2.5.2
 
-tgbotapi_version=9.4.1
-micro_utils_version=0.20.15
-exposed_version=0.44.1
-plagubot_version=7.4.0
+tgbotapi_version=10.1.0
+micro_utils_version=0.20.35
+exposed_version=0.47.0
+plagubot_version=8.2.0
 
 # Dokka
 
@@ -23,4 +23,4 @@ dokka_version=1.9.10
 # Project data
 
 group=dev.inmo
-version=0.17.0
+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-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

publish.gradle

@@ -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"
-                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+                    name = "InmoNexus"
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
             
-                    credentials(HttpHeaderCredentials) {
-                        name = "Authorization"
-                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
-                    }
-            
-                    authentication {
-                        header(HttpHeaderAuthentication)
+                    credentials {
+                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
                     }
             
                 }

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 ordersWithMessagesGroups = messagesInfo.groupBy { it.group }.flatMap { (group, list) ->
-            if (group == null) {
-                list.map {
-                    messagesWithOrders.getValue(it) to listOf(it)
-                }
-            } 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(
-                                    targetChatId,
-                                    fromChatId = messageInfo.chatId,
-                                    messageId = messageInfo.messageId
-                                )
-                            )
+        val currentGroup = mutableListOf<MessageMetaInfo>()
+        suspend fun makeCopy(): List<Pair<MessageMetaInfo, MessageMetaInfo>> {
+            currentGroup.sortBy { it.messageId }
+            while (currentGroup.isNotEmpty()) {
+                return runCatching {
+                    bot.execute(
+                        CopyMessages(
+                            toChatId = targetChatId,
+                            fromChatId = currentGroup.firstOrNull() ?.chatId ?: return emptyList(),
+                            messageIds = currentGroup.map { it.messageId }
                         )
-                    }.onFailure { _ ->
-                        runCatching {
-                            bot.execute(
-                                ForwardMessage(
-                                    toChatId = targetChatId,
-                                    fromChatId = messageInfo.chatId,
-                                    messageId = messageInfo.messageId
-                                )
-                            )
-                        }.onSuccess {
-                            MessageMetaInfo(
-                                targetChatId,
+                    ).mapIndexed { i, newMessageId ->
+                        currentGroup[i] to MessageMetaInfo(targetChatId, newMessageId)
+                    }.also {
+                        currentGroup.clear()
+                    }
+                }.getOrElse {
+                    currentGroup.applyDiff(
+                        currentGroup.filter {
+                            runCatching {
                                 bot.execute(
-                                    CopyMessage(
-                                        targetChatId,
-                                        fromChatId = it.chat.id,
+                                    ForwardMessage(
+                                        toChatId = cacheChatId,
+                                        fromChatId = it.chatId,
                                         messageId = it.messageId
                                     )
                                 )
-                            )
+                            }.isSuccess
                         }
-                    }.getOrNull() ?.let {
-                        sourceMessagesToSentMessages.add(messageInfo to it)
-                    }
-                }
-                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) ->
-                        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
-                                        )
-                                    )
-                                )
-                            )
-                        } ?: return@mapNotNull null)
-                    }
-
-                    resultContents.singleOrNull() ?.also { (src, it) ->
-                        sourceMessagesToSentMessages.add(
-                            src to MessageMetaInfo(
-                                targetChatId,
-                                bot.execute(
-                                    CopyMessage(
-                                        targetChatId,
-                                        it.chat.id,
-                                        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
-                                    )
-                                )
-                            }
-                        }
-                    }
-                }
+                    )
+                    null
+                } ?: continue
             }
-
-            leftToSend.takeIf { it.isNotEmpty() } ?.removeAt(0) ?.also {
-                sent.addAll(it)
-            }
-            sourceMessagesToSentMessages.toList()
+            return emptyList()
         }
+
+        val copied = mutableListOf<Pair<MessageMetaInfo, MessageMetaInfo>>()
+        for (content in messagesInfo) {
+            when {
+                currentGroup.isEmpty() ||
+                currentGroup.first().chatId == content.chatId -> currentGroup.add(content)
+                else -> {
+                    onBetweenMessages(copied.map { it.first }, currentGroup.toList())
+                    copied.addAll(makeCopy())
+                }
+            }
+        }
+        if (currentGroup.isNotEmpty()) {
+            onBetweenMessages(copied.map { it.first }, currentGroup.toList())
+            copied.addAll(makeCopy())
+        }
+        return copied.toList()
     }
 
     suspend fun resend(