Merge pull request #123 from InsanusMokrassar/11.1.1

11.1.1

Author: InsanusMokrassar

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 11.1.1
+
+* `Bot`:
+  * Logic of creating `HttpClient` now works even if proxy is ommited
+
 ## 11.1.0
 
 * `Bot`:

bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt

@@ -62,17 +62,19 @@ object PlaguBot : Plugin {
      */
     override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
         val config = scope.get<Config>()
-        if (config.proxy != null) {
+        val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
+            HttpClient(it)
+        }
+        val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
+            HttpClient(it)
+        }
+        this@setupBotClient.client = if (config.proxy != null) {
             val initialClient = config.proxy.createDefaultClient()
-            val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
-                HttpClient(it)
-            }
-            val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
-                HttpClient(it)
-            }
-            this@setupBotClient.client = initialClient.config {
+            initialClient.config {
                 install(clientFromKoin)
             }
+        } else {
+            clientFromKoin
         }
         scope.plugins.filter { it !== this@PlaguBot }.forEach {
             with(it) {

gradle.properties

@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=11.1.0
+version=11.1.1