start migration

This commit is contained in:
2022-05-13 13:04:49 +06:00
parent 9521217765
commit 11c5a38b72
17 changed files with 130 additions and 142 deletions

View File

@@ -2,7 +2,7 @@ package dev.inmo.plagubot
import dev.inmo.micro_utils.coroutines.safelyWithoutExceptions
import dev.inmo.plagubot.config.*
import dev.inmo.tgbotapi.bot.Ktor.telegramBot
import dev.inmo.tgbotapi.bot.ktor.telegramBot
import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
import dev.inmo.tgbotapi.types.BotCommand
@@ -24,8 +24,6 @@ data class PlaguBot(
@Transient
private val bot = telegramBot(config.botToken)
@Transient
private val paramsMap = config.params ?.toMap() ?: emptyMap()
@Transient
private val database = config.params ?.database ?: config.database.database
override suspend fun getCommands(): List<BotCommand> = config.plugins.flatMap {

View File

@@ -4,12 +4,12 @@ import dev.inmo.plagubot.Plugin
import dev.inmo.sdi.Module
import kotlinx.serialization.Contextual
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonObject
@Serializable
data class Config(
override val plugins: List<@Contextual Plugin>,
override val plugins: List<Plugin>,
val database: DatabaseConfig = DatabaseConfig(),
val botToken: String,
@Contextual
override val params: Module? = null
val rawConfig: JsonObject
) : PluginsConfiguration

View File

@@ -2,7 +2,6 @@ package dev.inmo.plagubot.config
import com.github.matfax.klassindex.KlassIndex
import dev.inmo.plagubot.Plugin
import dev.inmo.plagubot.PluginSerializer
import dev.inmo.sdi.Module
import dev.inmo.sdi.ModuleSerializer
import kotlinx.serialization.*