Update gradle.properties

0.11.3

.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 "[^/]*$"`"

build.gradle

@@ -7,10 +7,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
 }
@@ -20,6 +18,7 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
+        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
 }
 

cache/admins/common/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

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

@@ -2,13 +2,13 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 
 import dev.inmo.tgbotapi.extensions.utils.asGroupContentMessage
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 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 getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
-    suspend fun isAdmin(chatId: ChatId, userId: UserId): Boolean = getChatAdmins(chatId) ?.any {
+    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,7 +1,7 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
-import com.soywiz.klock.minutes
+import korlibs.time.minutes
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.Seconds
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.Serializable
@@ -15,27 +15,30 @@ data class AdminsCacheSettings(
      */
     val disableRequestsRefreshMode: Boolean = false
 ) {
-    val refreshOnRequests: Boolean
+    val refreshOnCacheCalls: Boolean
         get() = !disableRequestsRefreshMode
+    @Deprecated("Renamed", ReplaceWith("refreshOnCacheCalls"))
+    val refreshOnRequests: Boolean
+        get() = refreshOnCacheCalls
 }
 
 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

@@ -0,0 +1,44 @@
+package dev.inmo.tgbotapi.libraries.cache.admins
+
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.ChatMemberUpdatedFilterByChat
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatMemberUpdated
+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.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
+import kotlinx.coroutines.Job
+
+suspend fun BehaviourContext.activateAdminsChangesListening(
+    repo: DefaultAdminsCacheAPIRepo,
+    initialFilter: SimpleFilter<ChatMemberUpdated>? = null,
+    markerFactory: MarkerFactory<ChatMemberUpdated, Any> = ByChatChatMemberUpdatedMarkerFactory
+): Job {
+    val me = getMe()
+    return onChatMemberUpdated(initialFilter, markerFactory = markerFactory) {
+        when {
+            it.oldChatMemberState is AdministratorChatMember && it.newChatMemberState !is AdministratorChatMember ||
+            it.newChatMemberState is AdministratorChatMember && it.oldChatMemberState !is AdministratorChatMember -> {
+                updateAdmins(
+                    it.chat.id,
+                    repo,
+                    me
+                )
+            }
+        }
+    }
+}
+
+suspend fun BehaviourContext.activateAdminsChangesListening(
+    repo: DefaultAdminsCacheAPIRepo,
+    allowedChats: List<IdChatIdentifier>
+) = activateAdminsChangesListening(
+    repo,
+    {
+        it.chat.id in allowedChats
+    }
+)

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

@@ -0,0 +1,37 @@
+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.IdChatIdentifier
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+
+fun AdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI
+): SimpleFilter<Pair<IdChatIdentifier, UserId>> = SimpleFilter {
+    adminsCacheAPI.isAdmin(it.first, it.second)
+}
+
+fun <T> AdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI,
+    mapper: (T) -> Pair<IdChatIdentifier, UserId>
+): SimpleFilter<T> {
+    val baseChecker = AdminsChecker(adminsCacheAPI)
+
+    return SimpleFilter<T> {
+        baseChecker(mapper(it))
+    }
+}
+
+fun MessageAdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI
+) = SimpleFilter<Message> {
+    adminsCacheAPI.isAdmin(it)
+}
+
+fun AdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI,
+    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,18 +1,19 @@
 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.get.getChatAdministrators
+import dev.inmo.tgbotapi.extensions.api.chat.members.getChatMember
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
+import dev.inmo.tgbotapi.types.chat.ExtendedBot
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import kotlinx.serialization.Serializable
 
 interface DefaultAdminsCacheAPIRepo {
-    suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>?
+    suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>?
-    suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>)
+    suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>)
-    suspend fun lastUpdate(chatId: ChatId): DateTime?
+    suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime?
 }
 
 @Serializable
@@ -28,28 +29,37 @@ class DefaultAdminsCacheAPI(
         bot.getMe().also { botInfo = it }
     }
 
-    private suspend fun triggerUpdate(chatId: ChatId): List<AdministratorChatMember> {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
-        val botInfo = getBotInfo()
-        val admins = bot.getChatAdministrators(chatId).filter {
-            botInfo.id != it.user.id
-        }
-        repo.setChatAdmins(chatId, admins)
-        return admins
-    }
-
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? {
         val settings = settingsAPI.getChatSettings(chatId)
         val lastUpdate = repo.lastUpdate(chatId)
         return when {
             settings == null -> null
-            settings.refreshOnRequests &&
+            settings.refreshOnCacheCalls &&
                 (lastUpdate == null || (DateTime.now() - lastUpdate).seconds > settings.refreshSeconds) -> {
-                triggerUpdate(chatId)
+                bot.updateAdmins(chatId, repo, getBotInfo())
             }
-            else -> repo.getChatAdmins(chatId) ?: triggerUpdate(chatId)
+            else -> repo.getChatAdmins(chatId) ?: bot.updateAdmins(chatId, repo, getBotInfo())
         }
     }
 
+    override suspend fun isAdmin(chatId: IdChatIdentifier, userId: UserId): Boolean {
+        val settings = settingsAPI.getChatSettings(chatId)
+        val lastUpdate = repo.lastUpdate(chatId)
+        return when {
+            settings == null -> return false
+            settings.refreshOnCacheCalls && (lastUpdate == null || (DateTime.now() - lastUpdate).seconds > settings.refreshSeconds) -> {
+                bot.updateAdmins(chatId, repo, getBotInfo())
+            }
+            else -> {
+                val chatAdmins = repo.getChatAdmins(chatId)
+                if (chatAdmins == null) {
+                    return bot.getChatMember(chatId, userId) is AdministratorChatMember
+                }
+                chatAdmins
+            }
+        }.any { it.user.id == userId }
+    }
+
     override suspend fun sentByAdmin(groupContentMessage: GroupContentMessage<*>): Boolean {
         return when (groupContentMessage) {
             is AnonymousGroupContentMessage -> true
@@ -62,5 +72,4 @@ class DefaultAdminsCacheAPI(
     }
 
     override suspend fun settings(): AdminsCacheSettingsAPI = settingsAPI
-
 }

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

@@ -1,20 +1,43 @@
 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.*
 
-suspend fun AdminsCacheAPI.verifyMessageFromAdmin(message: ContentMessage<*>) = when (message) {
+suspend inline fun AdminsCacheAPI.isAdmin(message: Message) = when (message) {
     is CommonGroupContentMessage<*> -> isAdmin(message.chat.id, message.user.id)
     is AnonymousGroupContentMessage<*> -> true
     else -> false
 }
 
-suspend fun <R> ContentMessage<*>.doAfterVerification(adminsCacheAPI: AdminsCacheAPI, block: suspend () -> R): R? {
+suspend inline fun AdminsCacheAPI.verifyMessageFromAdmin(message: Message) = isAdmin(message)
-    val verified = adminsCacheAPI.verifyMessageFromAdmin(this)
+
+suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
+    chatId: IdChatIdentifier,
+    userId: UserId,
+    block: () -> R
+) = if(isAdmin(chatId, userId)) {
+    block()
+} else {
+    null
+}
+
+suspend inline fun <R : Any> AdminsCacheAPI.doIfAdmin(
+    message: Message,
+    block: () -> R
+) = if(isAdmin(message)) {
+    block()
+} else {
+    null
+}
+
+suspend inline fun <R> ContentMessage<*>.doIfAdmin(adminsCacheAPI: AdminsCacheAPI, block: () -> R): R? {
+    val verified = adminsCacheAPI.isAdmin(this)
     return if (verified) {
         block()
     } else {
         null
     }
 }
+
+suspend inline fun <R> ContentMessage<*>.doAfterVerification(adminsCacheAPI: AdminsCacheAPI, block: () -> R) = doIfAdmin(adminsCacheAPI, block)

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

@@ -0,0 +1,21 @@
+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.IdChatIdentifier
+import dev.inmo.tgbotapi.types.chat.ExtendedBot
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+
+internal suspend fun TelegramBot.updateAdmins(
+    chatId: IdChatIdentifier,
+    repo: DefaultAdminsCacheAPIRepo,
+    botInfo: ExtendedBot? = null
+): List<AdministratorChatMember> {
+    val botInfo = botInfo ?: getMe()
+    val admins = getChatAdministrators(chatId).filter {
+        botInfo.id != it.user.id
+    }
+    repo.setChatAdmins(chatId, admins)
+    return admins
+}

cache/admins/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins"/>

cache/admins/micro_utils/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

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

@@ -1,62 +1,91 @@
 package dev.inmo.tgbotapi.libraries.cache.admins.micro_utils
 
-import com.soywiz.klock.DateTime
+import korlibs.time.DateTime
-import dev.inmo.micro_utils.coroutines.actor
+import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.tgbotapi.libraries.cache.admins.DefaultAdminsCacheAPIRepo
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.*
 import kotlin.coroutines.*
 
 private sealed class RepoActions<T> {
-    abstract val toReturn: Continuation<T>
+    abstract val deferred: CompletableDeferred<T>
 }
 private class GetUpdateDateTimeRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
-    override val toReturn: Continuation<DateTime?>
+    override val deferred: CompletableDeferred<DateTime?>
 ) : RepoActions<DateTime?>()
 private class GetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
-    override val toReturn: Continuation<List<AdministratorChatMember>?>
+    override val deferred: CompletableDeferred<List<AdministratorChatMember>?>
 ) : RepoActions<List<AdministratorChatMember>?>()
 private class SetChatAdminsRepoAction(
-    val chatId: ChatId,
+    val chatId: IdChatIdentifier,
     val newValue: List<AdministratorChatMember>,
-    override val toReturn: Continuation<Unit>
+    override val deferred: CompletableDeferred<Unit>
 ) : RepoActions<Unit>()
 
-class DefaultAdminsCacheAPIRepo(
+class DefaultAdminsCacheAPIRepoImpl(
-    private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
+    private val adminsRepo: KeyValuesRepo<IdChatIdentifier, AdministratorChatMember>,
-    private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    private val updatesRepo: KeyValueRepo<IdChatIdentifier, MilliSeconds>,
     private val scope: CoroutineScope
 ) : DefaultAdminsCacheAPIRepo {
-    private val actor = scope.actor<RepoActions<*>>(Channel.UNLIMITED) {
+    private val actor = scope.actorAsync<RepoActions<*>>(Channel.UNLIMITED) {
-        safelyWithoutExceptions {
+        safelyWithoutExceptions(
+            { e ->
+                it.deferred.completeExceptionally(e)
+            }
+        ) {
             when (it) {
-                is GetUpdateDateTimeRepoAction -> it.toReturn.resume(
+                is GetUpdateDateTimeRepoAction -> it.deferred.complete(
                     updatesRepo.get(it.chatId) ?.let { DateTime(it.toDouble()) }
                 )
-                is GetChatAdminsRepoAction -> it.toReturn.resume(adminsRepo.getAll(it.chatId))
+                is GetChatAdminsRepoAction -> it.deferred.complete(adminsRepo.getAll(it.chatId))
                 is SetChatAdminsRepoAction -> {
                     adminsRepo.clear(it.chatId)
                     adminsRepo.set(it.chatId, it.newValue)
                     updatesRepo.set(it.chatId, DateTime.now().unixMillisLong)
-                    it.toReturn.resume(Unit)
+                    it.deferred.complete(Unit)
                 }
             }
         }
     }
 
-    override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? = suspendCoroutine {
+    override suspend fun getChatAdmins(chatId: IdChatIdentifier): List<AdministratorChatMember>? {
-        actor.trySend(GetChatAdminsRepoAction(chatId, it))
+        val deferred = CompletableDeferred<List<AdministratorChatMember>?>()
+        actor.trySend(
+            GetChatAdminsRepoAction(chatId, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add getChatAdmins action"))
+        }
+        return deferred.await()
     }
-    override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) = suspendCoroutine<Unit> {
+
-        actor.trySend(SetChatAdminsRepoAction(chatId, chatMembers, it))
+    override suspend fun setChatAdmins(chatId: IdChatIdentifier, chatMembers: List<AdministratorChatMember>) {
+        val deferred = CompletableDeferred<Unit>()
+        actor.trySend(
+            SetChatAdminsRepoAction(chatId, chatMembers, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add setChatAdmins action"))
+        }
+        return deferred.await()
     }
-    override suspend fun lastUpdate(chatId: ChatId): DateTime? = suspendCoroutine {
+    override suspend fun lastUpdate(chatId: IdChatIdentifier): DateTime? {
-        actor.trySend(GetUpdateDateTimeRepoAction(chatId, it))
+        val deferred = CompletableDeferred<DateTime?>()
+        actor.trySend(
+            GetUpdateDateTimeRepoAction(chatId, deferred)
+        ).onFailure {
+            deferred.completeExceptionally(it ?: IllegalStateException("Something went wrong when tried to add lastUpdate action"))
+        }
+        return deferred.await()
     }
 }
+
+fun DefaultAdminsCacheAPIRepo(
+    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

@@ -1,60 +1,55 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
-import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo
+import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedKeyValuesRepo
 import dev.inmo.micro_utils.repos.mappers.withMapper
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepo
+import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl
 import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
 import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.ChatMember.AdministratorChatMemberImpl
+import dev.inmo.tgbotapi.types.chat.member.*
-import dev.inmo.tgbotapi.types.ChatMember.CreatorChatMember
-import dev.inmo.tgbotapi.types.ChatMember.abstracts.AdministratorChatMember
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.serialization.*
-import kotlinx.serialization.cbor.Cbor
 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.sql.statements.api.ExposedBlob
 
-private val serializationFormat = Json {
+val telegramAdminsSerializationFormat = Json {
     ignoreUnknownKeys = true
     serializersModule = SerializersModule {
         polymorphic(AdministratorChatMember::class) {
             subclass(AdministratorChatMemberImpl::class, AdministratorChatMemberImpl.serializer())
-            subclass(CreatorChatMember::class, CreatorChatMember.serializer())
+            subclass(OwnerChatMember::class, OwnerChatMember.serializer())
         }
         contextual(AdministratorChatMember::class, PolymorphicSerializer(AdministratorChatMember::class))
     }
 }
 
-fun AdminsCacheAPI(
+fun BehaviourContext.createAdminsCacheAPI(database: Database) = AdminsCacheAPI(this, database, this)
-    bot: TelegramBot,
+
+fun TelegramBot.createAdminsCacheAPI(
     database: Database,
-    scope: CoroutineScope
+    scope: CoroutineScope,
-) : AdminsCacheAPI = DefaultAdminsCacheAPI(
+    defaultAdminsCacheAPIRepo: DefaultAdminsCacheAPIRepo = DefaultAdminsCacheAPIRepoImpl(
-    bot,
+        ExposedKeyValuesRepo(
-    DefaultAdminsCacheAPIRepo(
-        ExposedOneToManyKeyValueRepo(
             database,
             { long("chatId") },
             { text("member") },
             "AdminsTable"
-        ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
+        ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
             keyFromToTo = { chatId },
-            valueFromToTo = { serializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdministratorChatMember.serializer(), this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { serializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdministratorChatMember.serializer(), this) }
         ),
         ExposedKeyValueRepo(
             database,
             { long("chatId") },
             { long("datetime") },
             "AdminsUpdatesTimesTable"
-        ).withMapper<ChatId, Long, Identifier, Long>(
+        ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
             keyFromToTo = { chatId },
             valueFromToTo = { this },
             keyToToFrom = { toChatId() },
@@ -62,20 +57,27 @@ fun AdminsCacheAPI(
         ),
         scope
     ),
-    DynamicAdminsCacheSettingsAPI(
+    adminsCacheSettingsAPI: AdminsCacheSettingsAPI = DynamicAdminsCacheSettingsAPI(
         ExposedKeyValueRepo(
             database,
             { long("chatId") },
             { text("settings") },
             "DynamicAdminsCacheSettingsAPI"
-        ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
+        ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
             keyFromToTo = { chatId },
-            valueFromToTo = { serializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(AdminsCacheSettings.serializer() , this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { serializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(AdminsCacheSettings.serializer() , this) }
         ),
         scope
     )
-)
+) = DefaultAdminsCacheAPI(this, defaultAdminsCacheAPIRepo, adminsCacheSettingsAPI)
 
-fun BehaviourContext.AdminsCacheAPI(database: Database) = AdminsCacheAPI(this, database, this)
+fun AdminsCacheAPI(
+    bot: TelegramBot,
+    database: Database,
+    scope: CoroutineScope
+) : AdminsCacheAPI = bot.createAdminsCacheAPI(
+    database,
+    scope
+)

cache/admins/micro_utils/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.micro_utils"/>

cache/admins/plagubot/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

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

@@ -1,53 +1,106 @@
 package dev.inmo.tgbotapi.libraries.cache.admins
 
+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.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DefaultAdminsCacheAPIRepoImpl
+import dev.inmo.tgbotapi.libraries.cache.admins.micro_utils.DynamicAdminsCacheSettingsAPI
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
-import kotlinx.serialization.Transient
+import kotlinx.serialization.json.JsonObject
 import org.jetbrains.exposed.sql.Database
+import org.koin.core.Koin
+import org.koin.core.module.Module
+import org.koin.core.qualifier.named
+import org.koin.core.scope.Scope
+import org.koin.dsl.binds
 
-val Map<String, Any>.adminsPlugin: AdminsPlugin?
+val Scope.adminsPlugin: AdminsPlugin?
-    get() = get("admins") as? AdminsPlugin
+    get() = getOrNull()
+
+val Koin.adminsPlugin: AdminsPlugin?
+    get() = getOrNull()
 
 @Serializable
-class AdminsPlugin(
+class AdminsPlugin : Plugin {
-    private val chatsSettings: Map<ChatId, AdminsCacheSettings>? = null
-) : Plugin {
     @Transient
     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(null)
     @Transient
     private val databaseToAdminsCacheAPI = mutableMapOf<Database, MutableStateFlow<AdminsCacheAPI?>>()
     private val mutex = Mutex()
 
+    @Deprecated("Will be removed soon due to its redundancy")
     suspend fun adminsAPI(database: Database): AdminsCacheAPI {
-        return when (chatsSettings) {
+        val flow = mutex.withLock {
-            null -> {
+            databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
-                val flow = mutex.withLock {
-                    databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
-                }
-                flow.first { it != null }!!
-            }
-            else -> globalAdminsCacheAPI.first { it != null }!!
         }
+        return flow.filterNotNull().first()
     }
 
-    override suspend fun BehaviourContext.invoke(database: Database, params: Map<String, Any>) {
+    override fun Module.setupDI(database: Database, params: JsonObject) {
-        when (chatsSettings) {
+        single { this@AdminsPlugin }
-            null -> {
+        val scopeQualifier = named("admins plugin scope")
-                mutex.withLock {
+        single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
-                    val flow = databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) }
+        single<DefaultAdminsCacheAPIRepo> {
-                    if (flow.value == null) {
+            DefaultAdminsCacheAPIRepoImpl(
-                        flow.value = AdminsCacheAPI(database)
+                ExposedKeyValuesRepo(
-                    }
+                    database,
-                }
+                    { long("chatId") },
-            }
+                    { text("member") },
-            else -> mutex.withLock {
+                    "AdminsTable"
-                globalAdminsCacheAPI.value = AdminsCacheAPI(database)
+                ).withMapper<IdChatIdentifier, AdministratorChatMember, Identifier, String>(
-            }
+                    keyFromToTo = { chatId },
+                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
+                    keyToToFrom = { toChatId() },
+                    valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
+                ),
+                ExposedKeyValueRepo(
+                    database,
+                    { long("chatId") },
+                    { long("datetime") },
+                    "AdminsUpdatesTimesTable"
+                ).withMapper<IdChatIdentifier, Long, Identifier, Long>(
+                    keyFromToTo = { chatId },
+                    valueFromToTo = { this },
+                    keyToToFrom = { toChatId() },
+                    valueToToFrom = { this }
+                ),
+                get(scopeQualifier)
+            )
+        }
+        single<AdminsCacheSettingsAPI> {
+            DynamicAdminsCacheSettingsAPI(
+                ExposedKeyValueRepo(
+                    database,
+                    { long("chatId") },
+                    { text("settings") },
+                    "DynamicAdminsCacheSettingsAPI"
+                ).withMapper<IdChatIdentifier, AdminsCacheSettings, Identifier, String>(
+                    keyFromToTo = { chatId },
+                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
+                    keyToToFrom = { toChatId() },
+                    valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
+                ),
+                get(scopeQualifier)
+            )
+        }
+        single { DefaultAdminsCacheAPI(get(), get(), get()) } binds arrayOf(
+            AdminsCacheAPI::class
+        )
+    }
+
+    override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
+        with(koin) {
+            activateAdminsChangesListening(
+                get()
+            )
         }
     }
 }

cache/admins/plagubot/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.admins.plagubot"/>

cache/content/common/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

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

@@ -1,29 +1,27 @@
 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.ChatId
+import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.InputMedia.*
+import dev.inmo.tgbotapi.types.media.*
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
+import dev.inmo.tgbotapi.types.message.content.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.MessageContent
 import dev.inmo.tgbotapi.utils.asInput
 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)
     ),
     private val messagesFilesCache: MessagesFilesCache<K> = InMemoryMessagesFilesCache()
 ) : MessageContentCache<K> {
-    override suspend fun save(content: MessageContent): K {
+    override suspend fun save(k: K, content: MessageContent) {
-        return when (content) {
+        when (content) {
             is MediaContent -> {
                 val extendedInfo = bot.execute(
                     GetFile(content.media.fileId)
@@ -34,31 +32,30 @@ class DefaultMessageContentCache<K>(
                     )
                 )
 
-                save(content, extendedInfo.fileName) {
+                save(k, content, extendedInfo.fileName) {
                     allocator.invoke().asInput()
                 }
             }
-            else -> simpleMessageContentCache.add(content)
+            else -> simpleMessageContentCache.set(k, content)
         }
     }
 
     override suspend fun save(
+        k: K,
         content: MediaContent,
         filename: String,
         inputAllocator: suspend () -> Input
-    ): K {
+    ) {
-        val key = simpleMessageContentCache.add(content)
+        simpleMessageContentCache.set(k, content)
         runCatching {
-            messagesFilesCache.set(key, filename, inputAllocator)
+            messagesFilesCache.set(k, filename, inputAllocator)
         }.onFailure {
-            simpleMessageContentCache.remove(key)
+            simpleMessageContentCache.remove(k)
         }.onSuccess {
             with(mediaFileActualityChecker) {
                 bot.saved(content)
             }
         }
-
-        return key
     }
 
     override suspend fun get(k: K): MessageContent? {
@@ -67,40 +64,30 @@ class DefaultMessageContentCache<K>(
         if (savedSimpleContent is MediaContent && !with(mediaFileActualityChecker) { bot.isActual(savedSimpleContent) }) {
             val savedFileContentAllocator = messagesFilesCache.get(k) ?: error("Unexpected absence of $k file for content ($simpleMessageContentCache)")
             val newContent = bot.execute(
-                when (savedSimpleContent.asInputMedia()) {
+                when (savedSimpleContent.asTelegramMedia()) {
-                    is InputMediaAnimation -> SendAnimation(
+                    is TelegramMediaAnimation -> SendAnimation(
                         filesRefreshingChatId,
-                        MultipartFile(
+                        savedFileContentAllocator,
-                            savedFileContentAllocator
-                        ),
                         disableNotification = true
                     )
-                    is InputMediaAudio -> SendAudio(
+                    is TelegramMediaAudio -> SendAudio(
                         filesRefreshingChatId,
-                        MultipartFile(
+                        savedFileContentAllocator,
-                            savedFileContentAllocator
-                        ),
                         disableNotification = true
                     )
-                    is InputMediaVideo -> SendVideo(
+                    is TelegramMediaVideo -> SendVideo(
                         filesRefreshingChatId,
-                        MultipartFile(
+                        savedFileContentAllocator,
-                            savedFileContentAllocator
-                        ),
                         disableNotification = true
                     )
-                    is InputMediaDocument -> SendDocument(
+                    is TelegramMediaDocument -> SendDocument(
                         filesRefreshingChatId,
-                        MultipartFile(
+                        savedFileContentAllocator,
-                            savedFileContentAllocator
-                        ),
                         disableNotification = true
                     )
-                    is InputMediaPhoto -> SendPhoto(
+                    is TelegramMediaPhoto -> SendPhoto(
                         filesRefreshingChatId,
-                        MultipartFile(
+                        savedFileContentAllocator,
-                            savedFileContentAllocator
-                        ),
                         disableNotification = true
                     )
                 }
@@ -124,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,20 +1,21 @@
 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
 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.abstracts.MediaContent
+import dev.inmo.tgbotapi.types.message.content.MediaContent
 
 fun interface MediaFileActualityChecker {
     suspend fun TelegramBot.isActual(mediaContent: MediaContent): Boolean
     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/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/media/common/MessageContentCache.kt

@@ -1,16 +1,18 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent
+import dev.inmo.tgbotapi.types.message.content.MediaContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.MessageContent
 import io.ktor.utils.io.core.Input
 
 interface MessageContentCache<K> {
-    suspend fun save(content: MessageContent): K
+    suspend fun save(k: K, content: MessageContent)
     suspend fun save(
+        k: K,
         content: MediaContent,
         filename: String,
         inputAllocator: suspend () -> Input
-    ): K
+    )
+
     suspend fun get(k: K): MessageContent?
     suspend fun contains(k: K): Boolean
     suspend fun remove(k: K)

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

@@ -1,13 +1,11 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import dev.inmo.tgbotapi.types.ChatId
+import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.utils.StorageFile
 import io.ktor.utils.io.core.*
 
 interface MessagesFilesCache<K> {
     suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input)
-    suspend fun get(k: K): StorageFile?
+    suspend fun get(k: K): MultipartFile?
     suspend fun remove(k: K)
     suspend fun contains(k: K): Boolean
 }
@@ -18,16 +16,18 @@ interface MessagesFilesCache<K> {
  * disks-oriented one
  */
 class InMemoryMessagesFilesCache<K> : MessagesFilesCache<K> {
-    private val map = mutableMapOf<K, StorageFile>()
+    private val map = mutableMapOf<K, MultipartFile>()
 
     override suspend fun set(k: K, filename: String, inputAllocator: suspend () -> Input) {
-        map[k] = StorageFile(
+        val input = inputAllocator()
-            filename,
+        map[k] = MultipartFile(
-            inputAllocator().readBytes()
+            filename
-        )
+        ) {
+            input
+        }
     }
 
-    override suspend fun get(k: K): StorageFile? {
+    override suspend fun get(k: K): MultipartFile? {
         return map[k]
     }
 

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

@@ -1,10 +1,9 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import com.benasher44.uuid.uuid4
+import dev.inmo.tgbotapi.types.message.content.MessageContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 
 interface MessagesSimpleCache<K> {
-    suspend fun add(content: MessageContent): K
+    suspend fun set(k: K, content: MessageContent)
     suspend fun update(k: K, content: MessageContent): Boolean
     suspend fun get(k: K): MessageContent?
     suspend fun remove(k: K)
@@ -16,17 +15,14 @@ interface MessagesSimpleCache<K> {
  * start of application creation with usage of [MessageContentCache] with aim to replace this realization by some
  * disks-oriented one
  */
-class InMemoryMessagesSimpleCache<K>(
+class InMemoryMessagesSimpleCache<K> : MessagesSimpleCache<K> {
-    private val keyGenerator: () -> K
-) : MessagesSimpleCache<K> {
     private val map = mutableMapOf<K, MessageContent>()
 
-    override suspend fun add(
+    override suspend fun set(
+        k: K,
         content: MessageContent
-    ): K {
+    ) {
-        val key = keyGenerator()
+        map[k] = content
-        map[key] = content
-        return key
     }
 
     override suspend fun update(
@@ -54,10 +50,4 @@ class InMemoryMessagesSimpleCache<K>(
     override suspend fun contains(k: K): Boolean {
         return map.contains(k)
     }
-
-    companion object {
-        operator fun invoke() = InMemoryMessagesSimpleCache {
-            uuid4().toString()
-        }
-    }
 }

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

@@ -1,6 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
-import dev.inmo.tgbotapi.utils.*
+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
@@ -11,16 +11,14 @@ class InFilesMessagesFilesCache<K>(
     private val folderFile: File,
     private val filePrefixBuilder: (K) -> String
 ) : MessagesFilesCache<K> {
-    private val K.storageFile: StorageFile?
+    private val K.multipartFile: MultipartFile?
         get() {
             val prefix = filePrefix(this)
             val filename = folderFile.list() ?.firstOrNull { it.startsWith(prefix) } ?: return null
             val file = File(folderFile, filename)
             val storageFileFilename = file.name.removePrefix("$prefix ")
 
-            return StorageFile(
+            return MultipartFile(storageFileFilename) {
-                StorageFileInfo(storageFileFilename)
-            ) {
                 file.inputStream().asInput()
             }
         }
@@ -48,8 +46,8 @@ class InFilesMessagesFilesCache<K>(
         }
     }
 
-    override suspend fun get(k: K): StorageFile? {
+    override suspend fun get(k: K): MultipartFile? {
-        return k.storageFile
+        return k.multipartFile
     }
 
     override suspend fun remove(k: K) {

cache/content/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.common"/>

cache/content/micro_utils/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJavaWithJsProjectPath"
 
 kotlin {
     sourceSets {

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

@@ -1,12 +1,11 @@
 package dev.inmo.tgbotapi.libraries.cache.media.micro_utils
 
-import com.benasher44.uuid.uuid4
 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.message.content.abstracts.MessageContent
+import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.PairSerializer
 import kotlinx.serialization.builtins.serializer
@@ -16,14 +15,10 @@ import kotlin.js.JsName
 import kotlin.jvm.JvmName
 
 class SimpleKeyValueMessageContentCache<K>(
-    private val keyValueRepo: KeyValueRepo<K, MessageContent>,
+    private val keyValueRepo: KeyValueRepo<K, MessageContent>
-    private val keyGenerator: () -> K
 ) : MessagesSimpleCache<K> {
-    override suspend fun add(content: MessageContent): K {
+    override suspend fun set(k: K, content: MessageContent) {
-        val key = keyGenerator()
+        keyValueRepo.set(k, content)
-        keyValueRepo.set(key, content)
-
-        return key
     }
 
     override suspend fun update(k: K, content: MessageContent): Boolean {
@@ -48,12 +43,6 @@ class SimpleKeyValueMessageContentCache<K>(
     override suspend fun remove(k: K) {
         keyValueRepo.unset(k)
     }
-
-    companion object {
-        operator fun invoke(
-            keyValueRepo: KeyValueRepo<String, MessageContent>
-        ) = SimpleKeyValueMessageContentCache(keyValueRepo) { uuid4().toString() }
-    }
 }
 
 val chatIdToMessageIdentifierSerializer = PairSerializer(
@@ -63,6 +52,8 @@ val chatIdToMessageIdentifierSerializer = PairSerializer(
 
 val messageContentSerializer = PolymorphicSerializer<MessageContent>(MessageContent::class)
 
+inline fun <K> KeyValueRepo<K, MessageContent>.asMessageContentCache() = SimpleKeyValueMessageContentCache(this)
+
 inline fun KeyValueRepo<String, String>.asMessageContentCache(
     serialFormatCreator: (SerializersModule) -> StringFormat = { Json { serializersModule = it } }
 ): StandardKeyValueRepo<Pair<ChatId, MessageIdentifier>, MessageContent> {

cache/content/micro_utils/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.tgbotapi.libraries.cache.content.micro_utils"/>

defaultAndroidSettings.gradle

@@ -1,40 +0,0 @@
-apply plugin: 'com.getkeepsafe.dexcount'
-
-android {
-    compileSdkVersion "$android_compileSdkVersion".toInteger()
-    buildToolsVersion "$android_buildToolsVersion"
-
-    defaultConfig {
-        minSdkVersion "$android_minSdkVersion".toInteger()
-        targetSdkVersion "$android_compileSdkVersion".toInteger()
-        versionCode "${android_code_version}".toInteger()
-        versionName "$version"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            debuggable true
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-}

extensions.gradle

@@ -13,11 +13,7 @@ allprojects {
             projectByName(name)
         }
 
-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+        mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle"
-        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
-        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
-
-        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
 
         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
     }

gradle.properties

@@ -1,37 +1,26 @@
+org.gradle.jvmargs=-Xmx512m
 kotlin.code.style=official
 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.6.10
-kotlin_serialisation_core_version=1.3.2
 
-github_release_plugin_version=2.2.12
+kotlin_version=1.8.21
+kotlin_serialisation_core_version=1.5.1
 
-tgbotapi_version=0.38.13
+github_release_plugin_version=2.4.1
-micro_utils_version=0.9.22
-exposed_version=0.37.3
-plagubot_version=0.5.1
 
-# ANDROID
+tgbotapi_version=8.0.0
-
+micro_utils_version=0.19.1
-android_minSdkVersion=21
+exposed_version=0.41.1
-android_compileSdkVersion=32
+plagubot_version=6.0.0
-android_buildToolsVersion=32.0.0
-dexcount_version=3.0.1
-junit_version=4.12
-test_ext_junit_version=1.1.2
-espresso_core=3.3.0
 
 # Dokka
 
-dokka_version=1.6.10
+dokka_version=1.8.10
 
 # Project data
 
 group=dev.inmo
-version=0.0.18
+version=0.12.0
-android_code_version=18

gradle/wrapper/gradle-wrapper.properties

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

mppAndroidProject.gradle

@@ -1,26 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    android {
-        publishAllLibraryVariants()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettingsPresetPath"

mppJavaProject.gradle

@@ -1,35 +0,0 @@
-project.version = "$version"
-project.group = "$group"
-
-apply from: "$publishGradlePath"
-
-kotlin {
-    jvm {
-        compilations.main.kotlinOptions.useIR = true
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

mppJavaWithJsProject.gradle

@@ -4,14 +4,17 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
     js (IR) {
         browser()
         nodejs()
     }
-    android {
-        publishAllLibraryVariants()
-    }
 
     sourceSets {
         commonMain {
@@ -37,13 +40,6 @@ kotlin {
                 implementation kotlin('test-junit')
             }
         }
-        androidTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation "androidx.test.ext:junit:$test_ext_junit_version"
-                implementation "androidx.test.espresso:espresso-core:$espresso_core"
-            }
-        }
     }
 }
 
@@ -51,5 +47,3 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
-
-apply from: "$defaultAndroidSettingsPresetPath"

publish.gradle

@@ -42,20 +42,40 @@ 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('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                maven {
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+            
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
+                    }
+            
                 }
             }
             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')
                     }
+            
                 }
             }
         }

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":"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"}}}

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,20 @@
+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
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyMediaGroupMessage
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MessageMetaInfo(
+    @Serializable(FullChatIdentifierSerializer::class)
+    val chatId: IdChatIdentifier,
+    val messageId: MessageId,
+    val group: String? = null
+)
+
+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,157 @@
+package dev.inmo.tgbotapi.libraries.resender
+
+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.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(
+                                    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(
+                                        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(
+                                            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
+                                    )
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            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",
 ]