From d51e2d8e7c79a1ef10a54e59e0088ae2744c1825 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 24 Dec 2023 23:24:04 +0600 Subject: [PATCH] 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 */