Merge pull request #22 from InsanusMokrassar/0.4.1

0.4.1

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(
+class AdminsPlugin : Plugin {
-    private val chatsSettings: Map<ChatId, AdminsCacheSettings>? = null
-) : Plugin {
     @Transient
     private val globalAdminsCacheAPI = MutableStateFlow<AdminsCacheAPI?>(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 }!!
+        return flow.filterNotNull().first()
-            }
-            else -> globalAdminsCacheAPI.first { it != null }!!
-        }
     }
 
     override fun Module.setupDI(database: Database, params: JsonObject) {
@@ -48,8 +41,6 @@ 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) {
@@ -57,10 +48,5 @@ class AdminsPlugin(
                 }
             }
         }
-                else -> mutex.withLock {
-                    globalAdminsCacheAPI.value = AdminsCacheAPI(koin.get())
-                }
-            }
-        }
     }
 }

gradle.properties

@@ -14,7 +14,7 @@ github_release_plugin_version=2.4.1
 tgbotapi_version=2.2.1
 micro_utils_version=0.11.13
 exposed_version=0.38.2
-plagubot_version=1.3.1
+plagubot_version=1.4.0
 
 # ANDROID
 
@@ -33,5 +33,5 @@ dokka_version=1.6.21
 # Project data
 
 group=dev.inmo
-version=0.3.1
+version=0.4.1
-android_code_version=23
+android_code_version=25

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