fixes of build

0.25.0

.github/workflows/commit-publish.yml

@@ -7,10 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - 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
+          java-version: 17
       - name: Update version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

.gitignore

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

build.gradle

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

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

@@ -7,8 +7,8 @@ import dev.inmo.tgbotapi.types.message.abstracts.GroupContentMessage
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 interface AdminsCacheAPI {
-    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
-    suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
+    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
+    suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
         it.user.id == userId
     } == true
     suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean

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 dev.inmo.tgbotapi.types.ChatId
+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
 
@@ -23,22 +24,22 @@ data class AdminsCacheSettings(
 }
 
 interface AdminsCacheSettingsAPI {
-    suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings?
+    suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings?
 }
 
 interface MutableAdminsCacheSettingsAPI : AdminsCacheSettingsAPI {
-    val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
+    val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
 
-    suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings)
+    suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings)
 }
 
 fun AdminsCacheSettingsAPI.asMutable(): MutableAdminsCacheSettingsAPI? = this as? MutableAdminsCacheSettingsAPI
 
 @Serializable
 class StaticAdminsCacheSettingsAPI(
-    private val settings: Map<ChatId, AdminsCacheSettings>
+    private val settings: Map<IdChatIdentifier, AdminsCacheSettings>
 ) : AdminsCacheSettingsAPI {
-    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings? = settings[chatId]
+    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings? = settings[chatId]
 }
 
 

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

@@ -7,7 +7,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatMe
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.ByChatChatMemberUpdatedMarkerFactory
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 import dev.inmo.tgbotapi.types.chat.member.ChatMemberUpdated
 import dev.inmo.tgbotapi.types.update.abstracts.Update
@@ -35,7 +35,7 @@ suspend fun BehaviourContext.activateAdminsChangesListening(
 
 suspend fun BehaviourContext.activateAdminsChangesListening(
     repo: DefaultAdminsCacheAPIRepo,
-    allowedChats: List<ChatId>
+    allowedChats: List<IdChatIdentifier>
 ) = activateAdminsChangesListening(
     repo,
     {

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

@@ -2,19 +2,19 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 
 import dev.inmo.tgbotapi.abstracts.FromUser
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 
 fun AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI
-): SimpleFilter<Pair<ChatId, UserId>> = SimpleFilter {
+): SimpleFilter<Pair<IdChatIdentifier, UserId>> = SimpleFilter {
     adminsCacheAPI.isAdmin(it.first, it.second)
 }
 
 fun <T> AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI,
-    mapper: (T) -> Pair<ChatId, UserId>
+    mapper: (T) -> Pair<IdChatIdentifier, UserId>
 ): SimpleFilter<T> {
     val baseChecker = AdminsChecker(adminsCacheAPI)
 
@@ -31,7 +31,7 @@ fun MessageAdminsChecker(
 
 fun AdminsChecker(
     adminsCacheAPI: AdminsCacheAPI,
-    chatId: ChatId
+    chatId: IdChatIdentifier
 ) = SimpleFilter<FromUser> {
     adminsCacheAPI.isAdmin(chatId, it.from.id)
 }

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,12 +8,13 @@ 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 {
-    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
-    suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>)
-    suspend fun lastUpdate(chatId: ChatId): DateTime?
+    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
+    suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>)
+    suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime?
 }
 
 @Serializable
@@ -29,7 +30,7 @@ class DefaultAdminsCacheAPI(
         bot.getMe().also { botInfo = it }
     }
 
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
         val settings = settingsAPI.getChatSettings(chatId)
         val lastUpdate = repo.lastUpdate(chatId)
         return when {
@@ -42,7 +43,7 @@ class DefaultAdminsCacheAPI(
         }
     }
 
-    override suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean {
+    override suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean {
         val settings = settingsAPI.getChatSettings(chatId)
         val lastUpdate = repo.lastUpdate(chatId)
         return when {

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

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.UserId
 import dev.inmo.tgbotapi.types.message.abstracts.*
 
@@ -13,7 +13,7 @@ suspend inline fun AdminsCacheAPI.isAdmin(message: Message) = when (message) {
 suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message)
 
 suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
-    chatId: ChatId,
+    chatId: IdChatIdentifier,
     userId: UserId,
     block: () -> R
 ) = if(isAdmin(chatId, userId)) {

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

@@ -3,12 +3,12 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.chat.ExtendedBot
 import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 
 internal suspend fun TelegramBot.updateAdmins(
-    chatId: ChatId,
+    chatId: IdChatIdentifier,
     repo: DefaultAdminsCacheAPIRepo,
     botInfo: ExtendedBot? = null
 ): List<AdministratorChatMember> {

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
@@ -15,22 +15,22 @@ private sealed class RepoActions<T> {
     abstract val deferred: CompletableDeferred<T>
 }
 private class GetUpdateDateTimeRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
     override val deferred: CompletableDeferred<DateTime?>
 ) : RepoActions<DateTime?>()
 private class GetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
     override val deferred: CompletableDeferred<List<AdministratorChatMember>?>
 ) : RepoActions<List<AdministratorChatMember>?>()
 private class SetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
     val newValue: List<AdministratorChatMember>,
     override val deferred: CompletableDeferred<Unit>
 ) : RepoActions<Unit>()
 
 class DefaultAdminsCacheAPIRepoImpl(
-    private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
-    private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    private val adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
+    private val updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
     private val scope: CoroutineScope
 ) : DefaultAdminsCacheAPIRepo {
     private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
@@ -54,7 +54,7 @@ class DefaultAdminsCacheAPIRepoImpl(
         }
     }
 
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
         val deferred = CompletableDeferred<List<AdministratorChatMember>?>()
         actor.trySend(
             GetChatAdminsRepoAction(chatId, deferred)
@@ -64,7 +64,7 @@ class DefaultAdminsCacheAPIRepoImpl(
         return deferred.await()
     }
 
-    override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) {
+    override suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>) {
         val deferred = CompletableDeferred<Unit>()
         actor.trySend(
             SetChatAdminsRepoAction(chatId, chatMembers, deferred)
@@ -73,7 +73,7 @@ class DefaultAdminsCacheAPIRepoImpl(
         }
         return deferred.await()
     }
-    override suspend fun lastUpdate(chatId: ChatId): DateTime? {
+    override suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime? {
         val deferred = CompletableDeferred<DateTime?>()
         actor.trySend(
             GetUpdateDateTimeRepoAction(chatId, deferred)
@@ -85,7 +85,7 @@ class DefaultAdminsCacheAPIRepoImpl(
 }
 
 fun DefaultAdminsCacheAPIRepo(
-    adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
-    updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
+    updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
     scope: CoroutineScope
 ) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope)

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

@@ -3,22 +3,22 @@ package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.tgbotapi.libraries.cache.admins.*
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.*
 
 class DynamicAdminsCacheSettingsAPI(
-    private val repo: KeyValueRepo<ChatId, AdminsCacheSettings>,
+    private val repo: KeyValueRepo<IdChatIdentifier, AdminsCacheSettings>,
     private val scope: CoroutineScope
 ) : AdminsCacheSettingsAPI, MutableAdminsCacheSettingsAPI {
-    override val chatSettingsUpdatedFlow: SharedFlow<Pair<ChatId, AdminsCacheSettings>>
+    override val chatSettingsUpdatedFlow: SharedFlow<Pair<IdChatIdentifier, AdminsCacheSettings>>
         get() = repo.onNewValue.shareIn(scope, SharingStarted.Eagerly)
 
-    override suspend fun setChatSettings(chatId: ChatId, settings: AdminsCacheSettings) {
+    override suspend fun setChatSettings(chatId: IdChatIdentifier, settings: AdminsCacheSettings) {
         repo.set(chatId, settings)
     }
 
-    override suspend fun getChatSettings(chatId: ChatId): AdminsCacheSettings {
+    override suspend fun getChatSettings(chatId: IdChatIdentifier): AdminsCacheSettings {
         val settings = repo.get(chatId)
         return if (settings == null) {
             val newSettings = AdminsCacheSettings()
@@ -28,4 +28,4 @@ class DynamicAdminsCacheSettingsAPI(
             settings
         }
     }
-}
+}

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

@@ -38,8 +38,8 @@ fun TelegramBot.createAdminsCacheAPI(
             { long("chatId") },
             { text("member") },
             "AdminsTable"
-        ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
-            keyFromToTo = { chatId },
+        ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>(
+            keyFromToTo = { chatId.long },
             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
             keyToToFrom = { toChatId() },
             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) }
@@ -49,8 +49,8 @@ fun TelegramBot.createAdminsCacheAPI(
             { long("chatId") },
             { long("datetime") },
             "AdminsUpdatesTimesTable"
-        ).withMapper<ChatId, Long, Identifier, Long>(
-            keyFromToTo = { chatId },
+        ).withMapper<IdChatIdentifier, Long, Long, Long>(
+            keyFromToTo = { chatId.long },
             valueFromToTo = { this },
             keyToToFrom = { toChatId() },
             valueToToFrom = { this }
@@ -63,8 +63,8 @@ fun TelegramBot.createAdminsCacheAPI(
             { long("chatId") },
             { text("settings") },
             "DynamicAdminsCacheSettingsAPI"
-        ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
-            keyFromToTo = { chatId },
+        ).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>(
+            keyFromToTo = { chatId.long },
             valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
             keyToToFrom = { toChatId() },
             valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) }

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
@@ -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()) }
@@ -55,8 +56,8 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { text("member") },
                     "AdminsTable"
-                ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
-                    keyFromToTo = { chatId },
+                ).withMapper<IdChatIdentifier, AdministratorChatMember, Long, String>(
+                    keyFromToTo = { chatId.long },
                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
                     keyToToFrom = { toChatId() },
                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
@@ -66,8 +67,8 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { long("datetime") },
                     "AdminsUpdatesTimesTable"
-                ).withMapper<ChatId, Long, Identifier, Long>(
-                    keyFromToTo = { chatId },
+                ).withMapper<IdChatIdentifier, Long, Long, Long>(
+                    keyFromToTo = { chatId.long },
                     valueFromToTo = { this },
                     keyToToFrom = { toChatId() },
                     valueToToFrom = { this }
@@ -82,8 +83,8 @@ class AdminsPlugin : Plugin {
                     { long("chatId") },
                     { text("settings") },
                     "DynamicAdminsCacheSettingsAPI"
-                ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
-                    keyFromToTo = { chatId },
+                ).withMapper<IdChatIdentifier, AdminsCacheSettings, Long, String>(
+                    keyFromToTo = { chatId.long },
                     valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
                     keyToToFrom = { toChatId() },
                     valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }

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

@@ -4,7 +4,7 @@ import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DownloadFileStream
 import dev.inmo.tgbotapi.requests.get.GetFile
 import dev.inmo.tgbotapi.requests.send.media.*
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.media.*
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 import dev.inmo.tgbotapi.types.message.content.MessageContent
@@ -13,7 +13,7 @@ import io.ktor.utils.io.core.Input
 
 class DefaultMessageContentCache<K>(
     private val bot: TelegramBot,
-    private val filesRefreshingChatId: ChatId,
+    private val filesRefreshingChatId: IdChatIdentifier,
     private val simpleMessageContentCache: MessagesSimpleCache<K>,
     private val mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
         MediaFileActualityChecker.Default(filesRefreshingChatId)
@@ -111,7 +111,7 @@ class DefaultMessageContentCache<K>(
     companion object {
         operator fun invoke(
             bot: TelegramBot,
-            filesRefreshingChatId: ChatId,
+            filesRefreshingChatId: IdChatIdentifier,
             simpleMessageContentCache: MessagesSimpleCache<String> = InMemoryMessagesSimpleCache(),
             mediaFileActualityChecker: MediaFileActualityChecker = MediaFileActualityChecker.WithDelay(
                 MediaFileActualityChecker.Default(filesRefreshingChatId)

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

@@ -1,11 +1,12 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import com.soywiz.klock.DateTime
-import com.soywiz.klock.milliseconds
+import korlibs.time.DateTime
+import korlibs.time.milliseconds
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.requests.DeleteMessage
 import dev.inmo.tgbotapi.requests.abstracts.FileId
 import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.MilliSeconds
 import dev.inmo.tgbotapi.types.message.content.MediaContent
 
@@ -14,7 +15,7 @@ fun interface MediaFileActualityChecker {
     suspend fun TelegramBot.saved(mediaContent: MediaContent) {}
 
     class Default(
-        private val checkingChatId: ChatId
+        private val checkingChatId: IdChatIdentifier
     ) : MediaFileActualityChecker {
         override suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean {
             return runCatching {

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.asOutput
+import io.ktor.utils.io.streams.*
 import java.io.File
 
 class InFilesMessagesFilesCache<K>(
@@ -39,8 +38,8 @@ class InFilesMessagesFilesCache<K>(
         val file = File(folderFile, fullFileName).apply {
             delete()
         }
-        inputAllocator().use { input ->
-            file.outputStream().asOutput().use { output ->
+        inputAllocator().inputStream().use { input ->
+            file.outputStream().use { output ->
                 input.copyTo(output)
             }
         }

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

@@ -4,7 +4,7 @@ import dev.inmo.micro_utils.repos.*
 import dev.inmo.micro_utils.repos.mappers.withMapper
 import dev.inmo.tgbotapi.libraries.cache.media.common.MessagesSimpleCache
 import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.MessageIdentifier
+import dev.inmo.tgbotapi.types.MessageId
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.PairSerializer
@@ -47,7 +47,7 @@ class SimpleKeyValueMessageContentCache<K>(
 
 val chatIdToMessageIdentifierSerializer = PairSerializer(
     ChatId.serializer(),
-    MessageIdentifier.serializer()
+    MessageId.serializer()
 )
 
 val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
@@ -56,9 +56,9 @@ inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleK
 
 inline fun KeyValueRepo<String, String>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
+): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
+    return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
         { serialFormat.encodeToString(chatIdToMessageIdentifierSerializer, this) },
         { serialFormat.encodeToString(messageContentSerializer, this) },
         { serialFormat.decodeFromString(chatIdToMessageIdentifierSerializer, this) },
@@ -70,9 +70,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
 @JsName("stringsKeyValueAsHexMessageContentCache")
 inline fun KeyValueRepo<String, String>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> BinaryFormat
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
+): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, String, String>(
+    return withMapper<Pair<ChatId, MessageId>, MessageContent, String, String>(
         { serialFormat.encodeToHexString(chatIdToMessageIdentifierSerializer, this) },
         { serialFormat.encodeToHexString(messageContentSerializer, this) },
         { serialFormat.decodeFromHexString(chatIdToMessageIdentifierSerializer, this) },
@@ -84,9 +84,9 @@ inline fun KeyValueRepo<String, String>.asMessageContentCache(
 @JsName("bytesKeyValueAsMessageContentCache")
 inline fun KeyValueRepo<ByteArray, ByteArray>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> BinaryFormat
-): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {
+): StandardKeyValueRepo<Pair<ChatId, MessageId>, MessageContent> {
     val serialFormat = serialFormatCreator(MessageContent.serializationModule())
-    return withMapper<Pair<ChatId, MessageIdentifier>, MessageContent, ByteArray, ByteArray>(
+    return withMapper<Pair<ChatId, MessageId>, MessageContent, ByteArray, ByteArray>(
         { serialFormat.encodeToByteArray(chatIdToMessageIdentifierSerializer, this) },
         { serialFormat.encodeToByteArray(messageContentSerializer, this) },
         { serialFormat.decodeFromByteArray(chatIdToMessageIdentifierSerializer, this) },

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.20
-kotlin_serialisation_core_version=1.4.1
+kotlin_version=2.0.21
+kotlin_serialisation_core_version=1.7.3
 
-github_release_plugin_version=2.4.1
+github_release_plugin_version=2.5.2
 
-tgbotapi_version=4.0.0
-micro_utils_version=0.14.0
-exposed_version=0.40.1
-plagubot_version=3.0.0
+tgbotapi_version=20.0.0
+micro_utils_version=0.23.0
+exposed_version=0.55.0
+plagubot_version=10.1.0
 
 # Dokka
 
-dokka_version=1.7.20
+dokka_version=1.9.20
 
 # Project data
 
 group=dev.inmo
-version=0.6.0
+version=0.26.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.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-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"
             }
         }
     }
@@ -37,13 +37,12 @@ kotlin {
         jsTest {
             dependencies {
                 implementation kotlin('test-js')
-                implementation kotlin('test-junit')
             }
         }
     }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
@@ -42,20 +42,36 @@ publishing {
                 maven {
                     name = "GithubPackages"
                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotApiLibraries")
+            
                     credentials {
                         username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
                         password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                     }
+            
+                }
+            }
+            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+                maven {
+                    name = "InmoNexus"
+                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+            
+                    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')
+                    }
+            
                 }
             }
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                 maven {
                     name = "sonatype"
                     url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            
                     credentials {
                         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')
                     }
+            
                 }
             }
         }
@@ -76,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":"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/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+}
+
+apply from: "$mppJavaWithJsProjectPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api "dev.inmo:tgbotapi.core:$tgbotapi_version"
+            }
+        }
+    }
+}
+

resender/src/commonMain/kotlin/MessageMetaInfo.kt

@@ -0,0 +1,36 @@
+package dev.inmo.tgbotapi.libraries.resender
+
+import dev.inmo.tgbotapi.types.FullChatIdentifierSerializer
+import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.MediaGroupId
+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
+data class MessageMetaInfo(
+    @Serializable(FullChatIdentifierSerializer::class)
+    val chatId: IdChatIdentifier,
+    val messageId: MessageId,
+    val group: MediaGroupId? = 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
+) = MessageMetaInfo(message.chat.id, message.messageId, (message as? PossiblyMediaGroupMessage<*>) ?.mediaGroupId)

resender/src/commonMain/kotlin/MessagesResender.kt

@@ -0,0 +1,160 @@
+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.ForwardMessages
+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
+import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
+import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
+import dev.inmo.tgbotapi.types.message.content.MediaGroupPartContent
+
+class MessagesResender(
+    private val bot: TelegramBot,
+    private val cacheChatId: ChatIdentifier
+) {
+    suspend fun resend(
+        targetChatId: IdChatIdentifier,
+        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(
+                                    toChatId = targetChatId,
+                                    fromChatId = messageInfo.chatId,
+                                    messageId = messageInfo.messageId,
+                                )
+                            )
+                        )
+                    }.onFailure { _ ->
+                        runCatching {
+                            bot.execute(
+                                ForwardMessage(
+                                    toChatId = targetChatId,
+                                    fromChatId = messageInfo.chatId,
+                                    messageId = messageInfo.messageId
+                                )
+                            )
+                        }.onSuccess {
+                            MessageMetaInfo(
+                                targetChatId,
+                                bot.execute(
+                                    CopyMessage(
+                                        toChatId = targetChatId,
+                                        fromChatId = it.chat.id,
+                                        messageId = it.messageId
+                                    )
+                                )
+                            )
+                        }
+                    }.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(
+                                            toChatId = 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(
+                                        toChatId = targetChatId,
+                                        fromChatId = it.chat.id,
+                                        messageId = 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
+                                    )
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            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) { _, _ -> }
+}

settings.gradle

@@ -7,6 +7,8 @@ String[] includes = [
 
     ":cache:content:common",
     ":cache:content:micro_utils",
+
+    ":resender",
 ]