From 8a7e05580dde3baea11dc353197ebbb3af8a5629 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 24 Dec 2023 23:14:24 +0600 Subject: [PATCH 1/3] start 7.4.2 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3df5699..63a8472 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 7.4.2 + ## 7.4.1 * `Versions`: diff --git a/gradle.properties b/gradle.properties index f184d6c..7f81437 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ kotlin.js.generate.externals=true kotlin.incremental=true group=dev.inmo -version=7.4.1 +version=7.4.2 From 6c45a8c848697cfe373d51f76242de0002a3f2e2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 24 Dec 2023 23:17:29 +0600 Subject: [PATCH 2/3] update dependencies --- CHANGELOG.md | 6 ++++++ gradle/libs.versions.toml | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a8472..d4d89fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 7.4.2 +* `Versions`: + * `Kotlin`: `1.9.22` + * `tgbotapi`: `9.4.3` + * `MicroUtils`: `0.20.23` + * `Koin`: `3.5.7` + ## 7.4.1 * `Versions`: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 827708d..b0dbbdc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -kt = "1.9.21" +kt = "1.9.22" kt-serialization = "1.6.2" kt-coroutines = "1.7.3" -microutils = "0.20.19" -tgbotapi = "9.4.2" +microutils = "0.20.23" +tgbotapi = "9.4.3" -ksp = "1.9.21-1.0.15" +ksp = "1.9.21-1.0.16" jb-exposed = "0.45.0" jb-dokka = "1.9.10" @@ -21,7 +21,7 @@ ktor = "2.3.7" gh-release = "2.4.1" -koin = "3.5.0" +koin = "3.5.3" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From d51e2d8e7c79a1ef10a54e59e0088ae2744c1825 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 24 Dec 2023 23:24:04 +0600 Subject: [PATCH 3/3] fix of #90 and #91 --- .../main/kotlin/dev/inmo/plagubot/PlaguBot.kt | 16 +++++++++++++++- .../kotlin/dev/inmo/plagubot/config/Config.kt | 2 ++ .../src/main/kotlin/dev/inmo/plagubot/Plugin.kt | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt index edd99b5..e66801e 100644 --- a/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt +++ b/bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt @@ -8,6 +8,7 @@ import dev.inmo.micro_utils.fsm.common.StatesManager import dev.inmo.micro_utils.fsm.common.managers.* import dev.inmo.micro_utils.koin.getAllDistinct import dev.inmo.plagubot.config.* +import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder import dev.inmo.tgbotapi.bot.ktor.telegramBot import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook import dev.inmo.tgbotapi.extensions.behaviour_builder.* @@ -37,7 +38,20 @@ data class PlaguBot( private val config: Config ) : Plugin { @Transient - private val bot = telegramBot(config.botToken) + private val bot = telegramBot( + token = config.botToken, + apiUrl = config.botApiServer + ) { + setupBotClient() + } + + override fun KtorRequestsExecutorBuilder.setupBotClient() { + config.plugins.forEach { + with(it) { + setupBotClient() + } + } + } override fun Module.setupDI(database: Database, params: JsonObject) { single { config } diff --git a/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt b/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt index 88c1769..bc88fbd 100644 --- a/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt +++ b/bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt @@ -2,6 +2,7 @@ package dev.inmo.plagubot.config import dev.inmo.micro_utils.common.Warning import dev.inmo.plagubot.Plugin +import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -12,4 +13,5 @@ data class Config( val plugins: List, @SerialName("database") val databaseConfig: DatabaseConfig = DatabaseConfig(), + val botApiServer: String = telegramBotAPIDefaultUrl ) diff --git a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt index 83d6ad6..b040505 100644 --- a/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt +++ b/plugin/src/main/kotlin/dev/inmo/plagubot/Plugin.kt @@ -1,6 +1,7 @@ package dev.inmo.plagubot import dev.inmo.micro_utils.fsm.common.State +import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM import kotlinx.serialization.Serializable @@ -18,6 +19,8 @@ import org.koin.core.module.Module */ @Serializable(PluginSerializer::class) interface Plugin { + fun KtorRequestsExecutorBuilder.setupBotClient() {} + /** * This method will be called when this plugin should configure di module based on the incoming params */