mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2026-04-05 17:52:32 +00:00
fix of HttpClient setup in PlaguBot
This commit is contained in:
@@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
## 11.1.1
|
## 11.1.1
|
||||||
|
|
||||||
|
* `Bot`:
|
||||||
|
* Logic of creating `HttpClient` now works even if proxy is ommited
|
||||||
|
|
||||||
## 11.1.0
|
## 11.1.0
|
||||||
|
|
||||||
* `Bot`:
|
* `Bot`:
|
||||||
|
|||||||
@@ -62,17 +62,19 @@ object PlaguBot : Plugin {
|
|||||||
*/
|
*/
|
||||||
override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
|
override fun KtorRequestsExecutorBuilder.setupBotClient(scope: Scope, params: JsonObject) {
|
||||||
val config = scope.get<Config>()
|
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 initialClient = config.proxy.createDefaultClient()
|
||||||
val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
|
initialClient.config {
|
||||||
HttpClient(it)
|
|
||||||
}
|
|
||||||
val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
|
|
||||||
HttpClient(it)
|
|
||||||
}
|
|
||||||
this@setupBotClient.client = initialClient.config {
|
|
||||||
install(clientFromKoin)
|
install(clientFromKoin)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
clientFromKoin
|
||||||
}
|
}
|
||||||
scope.plugins.filter { it !== this@PlaguBot }.forEach {
|
scope.plugins.filter { it !== this@PlaguBot }.forEach {
|
||||||
with(it) {
|
with(it) {
|
||||||
|
|||||||
Reference in New Issue
Block a user