mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2026-05-01 14:22:27 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b2e436b967 | |||
| 544c93e151 | |||
| 693d552ad2 | |||
| 247a47909d | |||
| 07fc280c8c |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 11.2.0
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `kotlin`: `2.3.20`
|
||||||
|
* `serialization`: `1.11.0`
|
||||||
|
* `microutils`: `0.29.2`
|
||||||
|
* `tgbotapi`: `33.1.0`
|
||||||
|
* `ktor`: `3.4.2`
|
||||||
|
* `exposed`: `1.2.0`
|
||||||
|
* `sqlite`: `3.53.0.0`
|
||||||
|
* `koin`: `4.2.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 initialClient = config.proxy.createDefaultClient()
|
|
||||||
val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
|
val clientFromHttpClientEngine = scope.getOrNull<HttpClientEngine>() ?.let {
|
||||||
HttpClient(it)
|
HttpClient(it)
|
||||||
}
|
}
|
||||||
val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
|
val clientFromKoin = clientFromHttpClientEngine ?: (scope.getOrNull<HttpClientEngineFactory<*>>() ?: OkHttp).let {
|
||||||
HttpClient(it)
|
HttpClient(it)
|
||||||
}
|
}
|
||||||
this@setupBotClient.client = initialClient.config {
|
this@setupBotClient.client = if (config.proxy != null) {
|
||||||
|
val initialClient = config.proxy.createDefaultClient()
|
||||||
|
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) {
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
|||||||
kotlin.incremental=true
|
kotlin.incremental=true
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=11.1.0
|
version=11.2.0
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "2.3.10"
|
kt = "2.3.20"
|
||||||
kt-serialization = "1.10.0"
|
kt-serialization = "1.11.0"
|
||||||
kt-coroutines = "1.10.2"
|
kt-coroutines = "1.10.2"
|
||||||
|
|
||||||
microutils = "0.29.1"
|
microutils = "0.29.2"
|
||||||
tgbotapi = "32.0.0"
|
tgbotapi = "33.1.0"
|
||||||
ktor = "3.4.1"
|
ktor = "3.4.2"
|
||||||
|
|
||||||
ksp = "2.3.6"
|
ksp = "2.3.6"
|
||||||
|
|
||||||
jb-exposed = "1.1.1"
|
jb-exposed = "1.2.0"
|
||||||
jb-dokka = "2.1.0"
|
jb-dokka = "2.2.0"
|
||||||
|
|
||||||
sqlite = "3.51.2.0"
|
sqlite = "3.53.0.0"
|
||||||
|
|
||||||
gh-release = "2.5.2"
|
gh-release = "2.5.2"
|
||||||
|
|
||||||
koin = "4.1.1"
|
koin = "4.2.1"
|
||||||
|
|
||||||
nmcp = "1.4.4"
|
nmcp = "1.4.4"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user