From a7814c61b5f1a3fb1ff08320337e3995608bd2f5 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 30 Jul 2022 23:24:24 +0600 Subject: [PATCH] update admins api --- .../libraries/cache/admins/AdminsPlugin.kt | 15 ++++----------- gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt b/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt index 049421b..45acfc3 100644 --- a/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt +++ b/cache/admins/plagubot/src/jvmMain/kotlin/dev/inmo/tgbotapi/libraries/cache/admins/AdminsPlugin.kt @@ -21,9 +21,7 @@ val Koin.adminsPlugin: AdminsPlugin? get() = getOrNull() @Serializable -class AdminsPlugin( - private val chatsSettings: Map? = null -) : Plugin { +class AdminsPlugin : Plugin { @Transient private val globalAdminsCacheAPI = MutableStateFlow(null) @Transient @@ -31,15 +29,10 @@ class AdminsPlugin( private val mutex = Mutex() suspend fun adminsAPI(database: Database): AdminsCacheAPI { - return when (chatsSettings) { - null -> { - val flow = mutex.withLock { - databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } - } - flow.first { it != null }!! - } - else -> globalAdminsCacheAPI.first { it != null }!! + val flow = mutex.withLock { + databaseToAdminsCacheAPI.getOrPut(database){ MutableStateFlow(null) } } + return flow.filterNotNull().first() } override fun Module.setupDI(database: Database, params: JsonObject) { diff --git a/gradle.properties b/gradle.properties index a0d64e1..ffb1c12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ dokka_version=1.6.21 # Project data group=dev.inmo -version=0.4.0 -android_code_version=24 +version=0.4.1 +android_code_version=25