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..a53a14a 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) { @@ -48,17 +41,10 @@ class AdminsPlugin( override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) { with(koin) { - when (chatsSettings) { - null -> { - 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()) + mutex.withLock { + val flow = databaseToAdminsCacheAPI.getOrPut(koin.get()){ MutableStateFlow(null) } + if (flow.value == null) { + flow.value = AdminsCacheAPI(koin.get()) } } } 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