update dependencies and fix build

0.28.0

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.kotlin
 out/*
 *.iml
 target

build.gradle

@@ -13,6 +13,23 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.gradleup.nmcp.aggregation" version "$nmcp_version"
+}
+
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            validationTimeout = Duration.ofHours(4)
+            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
+}
+
 allprojects {
     repositories {
         mavenLocal()

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

@@ -34,7 +34,7 @@ class DefaultAdminsCacheAPIRepoImpl(
     private val scope: CoroutineScope
 ) : DefaultAdminsCacheAPIRepo {
     private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
-        safelyWithoutExceptions(
+        runCatchingLogging (
             { e ->
                 it.deferred.completeExceptionally(e)
             }

cache/admins/micro_utils/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsCacheAPI.kt

@@ -14,7 +14,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
-import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.v1.jdbc.Database
 
 val telegramAdminsSerializationFormat = Json {
     ignoreUnknownKeys = true

cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt

@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo
 import dev.inmo.micro_utils.repos.mappers.withMapper
 import dev.inmo.plagubot.Plugin
+import dev.inmo.plagubot.database
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl
 import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
@@ -15,7 +16,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonObject
-import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.v1.jdbc.Database
 import org.koin.core.Koin
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -44,7 +45,7 @@ class AdminsPlugin : Plugin {
         return flow.filterNotNull().first()
     }
 
-    override fun Module.setupDI(database: Database, params: JsonObject) {
+    override fun Module.setupDI(config: JsonObject) {
         single { this@AdminsPlugin }
         val scopeQualifier = named("admins plugin scope")
         single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }

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

@@ -1,11 +1,15 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
 import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.requests.DownloadFileStream
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import dev.inmo.tgbotapi.requests.get.GetFile
 import dev.inmo.tgbotapi.requests.send.media.*
 import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.media.*
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.DocumentContent
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 import dev.inmo.tgbotapi.utils.asInput
@@ -58,6 +62,30 @@ class DefaultMessageContentCache<K>(
         }
     }
 
+    override suspend fun sendAndSave(
+        k: K,
+        filename: String,
+        inputAllocator: () -> Input
+    ): DocumentContent {
+        val sentDocument = bot.execute(
+            SendDocument(
+                filesRefreshingChatId,
+                MultipartFile(filename, inputAllocator),
+            )
+        )
+        save(k, sentDocument.content, filename, inputAllocator)
+        runCatching {
+            bot.execute(
+                DeleteMessage(
+                    sentDocument.chat.id,
+                    sentDocument.messageId
+                )
+            )
+        }
+
+        return sentDocument.content
+    }
+
     override suspend fun get(k: K): MessageContent? {
         val savedSimpleContent = simpleMessageContentCache.get(k) ?: return null
 

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

@@ -1,5 +1,7 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.DocumentContent
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 import io.ktor.utils.io.core.Input
@@ -12,6 +14,11 @@ interface MessageContentCache<K> {
         filename: String,
         inputAllocator: suspend () -> Input
     )
+    suspend fun sendAndSave(
+        k: K,
+        filename: String,
+        inputAllocator: () -> Input
+    ): DocumentContent
 
     suspend fun get(k: K): MessageContent?
     suspend fun contains(k: K): Boolean

cache/content/common/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/InFilesMessagesFilesCache.kt

@@ -3,8 +3,7 @@ package dev.inmo.tgbotapi.libraries.cache.media.common
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
 import io.ktor.utils.io.core.Input
 import io.ktor.utils.io.core.copyTo
-import io.ktor.utils.io.streams.asInput
+import io.ktor.utils.io.streams.*
-import io.ktor.utils.io.streams.asOutput
 import java.io.File
 
 class InFilesMessagesFilesCache<K>(
@@ -39,8 +38,8 @@ class InFilesMessagesFilesCache<K>(
         val file = File(folderFile, fullFileName).apply {
             delete()
         }
-        inputAllocator().use { input ->
+        inputAllocator().inputStream().use { input ->
-            file.outputStream().asOutput().use { output ->
+            file.outputStream().use { output ->
                 input.copyTo(output)
             }
         }

cache/content/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/micro_utils/SimpleKeyValueMessageContentCache.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RemoveExplicitTypeArguments", "unused")
+
 package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
 
 import dev.inmo.micro_utils.repos.*
@@ -8,7 +10,6 @@ import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.PairSerializer
-import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import kotlin.js.JsName
@@ -52,11 +53,12 @@ val chatIdToMessageIdentifierSerializer = PairSerializer(
 
 val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
 
-inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
+fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
 
 inline fun KeyValueRepo<String, String>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
 ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
+    @Suppress("OPT_IN_USAGE")
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
     return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
         { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
@@ -71,6 +73,7 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
 inline fun KeyValueRepo<String, String>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> BinaryFormat
 ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
+    @Suppress("OPT_IN_USAGE")
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
     return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
         { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
@@ -85,6 +88,7 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
 inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> BinaryFormat
 ): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
+    @Suppress("OPT_IN_USAGE")
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
     return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>(
         { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },

gradle.properties

@@ -6,21 +6,23 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 
-kotlin_version=2.0.10
+kotlin_version=2.3.10
-kotlin_serialisation_core_version=1.7.1
+kotlin_serialisation_core_version=1.10.0
 
 github_release_plugin_version=2.5.2
 
-tgbotapi_version=16.0.0
+tgbotapi_version=32.0.0
-micro_utils_version=0.22.0
+micro_utils_version=0.29.1
-exposed_version=0.53.0
+exposed_version=1.1.1
-plagubot_version=9.0.0
+plagubot_version=11.0.0
+
+nmcp_version=1.4.4
 
 # Dokka
 
-dokka_version=1.9.20
+dokka_version=2.1.0
 
 # Project data
 
 group=dev.inmo
-version=0.22.0
+version=0.29.0

gradle/wrapper/gradle-wrapper.properties

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

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

resender/src/commonMain/kotlin/MessagesResender.kt

@@ -49,9 +49,9 @@ class MessagesResender(
                             targetChatId,
                             bot.execute(
                                 CopyMessage(
-                                    targetChatId,
+                                    toChatId = targetChatId,
                                     fromChatId = messageInfo.chatId,
-                                    messageId = messageInfo.messageId
+                                    messageId = messageInfo.messageId,
                                 )
                             )
                         )
@@ -69,7 +69,7 @@ class MessagesResender(
                                 targetChatId,
                                 bot.execute(
                                     CopyMessage(
-                                        targetChatId,
+                                        toChatId = targetChatId,
                                         fromChatId = it.chat.id,
                                         messageId = it.messageId
                                     )
@@ -102,7 +102,7 @@ class MessagesResender(
                                     targetChatId,
                                     bot.execute(
                                         CopyMessage(
-                                            targetChatId,
+                                            toChatId = targetChatId,
                                             fromChatId = forwardedMessage.chat.id,
                                             messageId = forwardedMessage.messageId
                                         )
@@ -118,9 +118,9 @@ class MessagesResender(
                                 targetChatId,
                                 bot.execute(
                                     CopyMessage(
-                                        targetChatId,
+                                        toChatId = targetChatId,
-                                        it.chat.id,
+                                        fromChatId = it.chat.id,
-                                        it.messageId
+                                        messageId = it.messageId
                                     )
                                 )
                             )