remove tryGetChatAdmins

0.5.2

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

@@ -2,7 +2,7 @@ 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
 

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

@@ -15,8 +15,11 @@ 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 {

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.ChatId
+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<ChatId>
+) = 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.ChatId
+import dev.inmo.tgbotapi.types.UserId
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+
+fun AdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI
+): SimpleFilter<Pair<ChatId, UserId>> = SimpleFilter {
+    adminsCacheAPI.isAdmin(it.first, it.second)
+}
+
+fun <T> AdminsChecker(
+    adminsCacheAPI: AdminsCacheAPI,
+    mapper: (T) -> Pair<ChatId, 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: ChatId
+) = SimpleFilter<FromUser> {
+    adminsCacheAPI.isAdmin(chatId, it.from.id)
+}

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

@@ -3,9 +3,10 @@ package dev.inmo.tgbotapi.libraries.cache.admins
 import com.soywiz.klock.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
 
@@ -28,28 +29,37 @@ class DefaultAdminsCacheAPI(
         bot.getMe().also { botInfo = it }
     }
 
-    private suspend fun triggerUpdate(chatId: ChatId): 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: ChatId, 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

@@ -4,17 +4,40 @@ import dev.inmo.tgbotapi.types.ChatId
 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: ChatId,
+    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.ChatId
+import dev.inmo.tgbotapi.types.chat.ExtendedBot
+import dev.inmo.tgbotapi.types.chat.member.AdministratorChatMember
+
+internal suspend fun TelegramBot.updateAdmins(
+    chatId: ChatId,
+    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/micro_utils/src/commonMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/micro_utils/DefaultAdminsCacheAPI.kt

@@ -6,7 +6,7 @@ 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.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlin.coroutines.*
@@ -28,7 +28,7 @@ private class SetChatAdminsRepoAction(
     override val toReturn: Continuation<Unit>
 ) : RepoActions<Unit>()
 
-class DefaultAdminsCacheAPIRepo(
+class DefaultAdminsCacheAPIRepoImpl(
     private val adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
     private val updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
     private val scope: CoroutineScope
@@ -53,6 +53,7 @@ class DefaultAdminsCacheAPIRepo(
     override suspend fun getChatAdmins(chatId: ChatId): List<AdministratorChatMember>? = suspendCoroutine {
         actor.trySend(GetChatAdminsRepoAction(chatId, it))
     }
+
     override suspend fun setChatAdmins(chatId: ChatId, chatMembers: List<AdministratorChatMember>) = suspendCoroutine<Unit> {
         actor.trySend(SetChatAdminsRepoAction(chatId, chatMembers, it))
     }
@@ -60,3 +61,9 @@ class DefaultAdminsCacheAPIRepo(
         actor.trySend(GetUpdateDateTimeRepoAction(chatId, it))
     }
 }
+
+fun DefaultAdminsCacheAPIRepo(
+    adminsRepo: KeyValuesRepo<ChatId, AdministratorChatMember>,
+    updatesRepo: KeyValueRepo<ChatId, MilliSeconds>,
+    scope: CoroutineScope
+) = DefaultAdminsCacheAPIRepoImpl(adminsRepo, updatesRepo, scope)

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

@@ -1,53 +1,48 @@
 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>(
             keyFromToTo = { chatId },
-            valueFromToTo = { serializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { serializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
         ),
         ExposedKeyValueRepo(
             database,
@@ -62,7 +57,7 @@ fun AdminsCacheAPI(
         ),
         scope
     ),
-    DynamicAdminsCacheSettingsAPI(
+    adminsCacheSettingsAPI: AdminsCacheSettingsAPI = DynamicAdminsCacheSettingsAPI(
         ExposedKeyValueRepo(
             database,
             { long("chatId") },
@@ -70,12 +65,19 @@ fun AdminsCacheAPI(
             "DynamicAdminsCacheSettingsAPI"
         ).withMapper<ChatId, AdminsCacheSettings, Identifier, String>(
             keyFromToTo = { chatId },
-            valueFromToTo = { serializationFormat.encodeToString(this) },
+            valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
             keyToToFrom = { toChatId() },
-            valueToToFrom = { serializationFormat.decodeFromString(this) }
+            valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(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/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt

@@ -1,18 +1,26 @@
 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 Scope.adminsPlugin: AdminsPlugin?
     get() = getOrNull()
@@ -21,46 +29,78 @@ 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 fun Module.setupDI(database: Database, params: JsonObject) {
         single { this@AdminsPlugin }
+        val scopeQualifier = named("admins plugin scope")
+        single(scopeQualifier) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
+        single<DefaultAdminsCacheAPIRepo> {
+            DefaultAdminsCacheAPIRepoImpl(
+                ExposedKeyValuesRepo(
+                    database,
+                    { long("chatId") },
+                    { text("member") },
+                    "AdminsTable"
+                ).withMapper<ChatId, AdministratorChatMember, Identifier, String>(
+                    keyFromToTo = { chatId },
+                    valueFromToTo = { telegramAdminsSerializationFormat.encodeToString(this) },
+                    keyToToFrom = { toChatId() },
+                    valueToToFrom = { telegramAdminsSerializationFormat.decodeFromString(this) }
+                ),
+                ExposedKeyValueRepo(
+                    database,
+                    { long("chatId") },
+                    { long("datetime") },
+                    "AdminsUpdatesTimesTable"
+                ).withMapper<ChatId, Long, Identifier, Long>(
+                    keyFromToTo = { chatId },
+                    valueFromToTo = { this },
+                    keyToToFrom = { toChatId() },
+                    valueToToFrom = { this }
+                ),
+                get(scopeQualifier)
+            )
+        }
+        single<AdminsCacheSettingsAPI> {
+            DynamicAdminsCacheSettingsAPI(
+                ExposedKeyValueRepo(
+                    database,
+                    { long("chatId") },
+                    { text("settings") },
+                    "DynamicAdminsCacheSettingsAPI"
+                ).withMapper<ChatId, 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) {
-            when (chatsSettings) {
+            activateAdminsChangesListening(
-                null -> {
+                get()
-                    mutex.withLock {
+            )
-                        val flow = databaseToAdminsCacheAPI.getOrPut(koin.get()){ MutableStateFlow(null) }
-                        if (flow.value == null) {
-                            flow.value = AdminsCacheAPI(koin.get())
-                        }
-                    }
-                }
-                else -> mutex.withLock {
-                    globalAdminsCacheAPI.value = AdminsCacheAPI(koin.get())
-                }
-            }
         }
     }
 }

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

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.libraries.cache.media.common
 
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
-import dev.inmo.tgbotapi.utils.StorageFile
 import io.ktor.utils.io.core.*
 
 interface MessagesFilesCache<K> {

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

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

gradle.properties

@@ -6,15 +6,15 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.6.21
+kotlin_version=1.7.10
-kotlin_serialisation_core_version=1.3.3
+kotlin_serialisation_core_version=1.4.0
 
-github_release_plugin_version=2.3.7
+github_release_plugin_version=2.4.1
 
-tgbotapi_version=1.1.1
+tgbotapi_version=3.2.1
-micro_utils_version=0.10.4
+micro_utils_version=0.12.11
-exposed_version=0.38.2
+exposed_version=0.39.2
-plagubot_version=1.0.0
+plagubot_version=2.3.1
 
 # ANDROID
 
@@ -23,15 +23,15 @@ android_compileSdkVersion=32
 android_buildToolsVersion=32.0.0
 dexcount_version=3.1.0
 junit_version=4.12
-test_ext_junit_version=1.1.2
+test_ext_junit_version=1.1.3
-espresso_core=3.3.0
+espresso_core=3.4.0
 
 # Dokka
 
-dokka_version=1.6.21
+dokka_version=1.7.10
 
 # Project data
 
 group=dev.inmo
-version=0.1.0
+version=0.5.3
-android_code_version=19
+android_code_version=30

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.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mppJavaProject.gradle

@@ -5,7 +5,11 @@ apply from: "$publishGradlePath"
 
 kotlin {
     jvm {
-        compilations.main.kotlinOptions.useIR = true
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
     }
 
     sourceSets {

mppProjectWithSerialization.gradle

@@ -4,7 +4,13 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
     js (IR) {
         browser()
         nodejs()