mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2026-04-30 22:02:41 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0679eca5aa | |||
| b2e436b967 | |||
| 544c93e151 | |||
| 6ec5b95d6e | |||
| 693d552ad2 | |||
| 247a47909d | |||
| 07fc280c8c |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
||||
# 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
|
||||
|
||||
* `Bot`:
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
||||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=11.1.0
|
||||
version=11.2.0
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
[versions]
|
||||
|
||||
kt = "2.3.10"
|
||||
kt-serialization = "1.10.0"
|
||||
kt = "2.3.20"
|
||||
kt-serialization = "1.11.0"
|
||||
kt-coroutines = "1.10.2"
|
||||
|
||||
microutils = "0.29.1"
|
||||
tgbotapi = "32.0.0"
|
||||
ktor = "3.4.1"
|
||||
microutils = "0.29.2"
|
||||
tgbotapi = "33.1.0"
|
||||
ktor = "3.4.2"
|
||||
|
||||
ksp = "2.3.6"
|
||||
|
||||
jb-exposed = "1.1.1"
|
||||
jb-dokka = "2.1.0"
|
||||
jb-exposed = "1.2.0"
|
||||
jb-dokka = "2.2.0"
|
||||
|
||||
sqlite = "3.51.2.0"
|
||||
sqlite = "3.53.0.0"
|
||||
|
||||
gh-release = "2.5.2"
|
||||
|
||||
koin = "4.1.1"
|
||||
koin = "4.2.1"
|
||||
|
||||
nmcp = "1.4.4"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user