Merge pull request #30 from InsanusMokrassar/1.1.2

1.1.2

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.1.2
+
+* `Versions`
+  * `tgbotapi`: `2.0.3`
+  * `microutils`: `0.11.3`
+  * `kslog`: `0.3.1`
+* `Plugin`:
+  * Now it is possible to use `object`s of plugins instead of classes
+
 ## 1.1.1
 
 * `Versions`

bot/src/main/kotlin/dev/inmo/plagubot/App.kt

@@ -1,7 +1,9 @@
 package dev.inmo.plagubot
 
-import dev.inmo.kslog.common.*
+import dev.inmo.kslog.common.KSLog
-import dev.inmo.plagubot.config.*
+import dev.inmo.kslog.common.i
+import dev.inmo.plagubot.config.Config
+import dev.inmo.plagubot.config.defaultJsonFormat
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.json.jsonObject
 import java.io.File

bot/src/main/kotlin/dev/inmo/plagubot/HelloPlugin.kt

@@ -5,20 +5,17 @@ import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
-import kotlinx.serialization.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import org.jetbrains.exposed.sql.Database
 import org.koin.core.Koin
-import org.koin.core.KoinApplication
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 import org.koin.core.module.Module
-import org.koin.dsl.module
 
 @Serializable
 @SerialName("Hello")
-class HelloPlugin : Plugin {
+object HelloPlugin : Plugin {
     @Serializable
     data class HelloPluginConfig(
         val print: String

bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt

@@ -1,11 +1,14 @@
 package dev.inmo.plagubot
 
 import dev.inmo.kslog.common.*
+import dev.inmo.micro_utils.common.Warning
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.plagubot.config.*
+import dev.inmo.plagubot.config.Config
+import dev.inmo.plagubot.config.defaultJsonFormat
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
 import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
 import kotlinx.coroutines.*
 import kotlinx.serialization.Serializable
@@ -18,12 +21,14 @@ import org.koin.core.context.GlobalContext
 import org.koin.core.module.Module
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
-import java.util.logging.Level
-import java.util.logging.Logger
 
 val Scope.plagubot: PlaguBot
     get() = get()
 
+val Koin.plagubot: PlaguBot
+    get() = get()
+
+@OptIn(Warning::class)
 @Serializable
 data class PlaguBot(
     private val json: JsonObject,
@@ -56,17 +61,17 @@ data class PlaguBot(
     }
 
     override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
-        config.plugins.map {
+        config.plugins.map { plugin ->
             launch {
                 runCatchingSafely {
-                    logger.i("Start loading of $it")
+                    logger.i("Start loading of $plugin")
-                    with(it) {
+                    with(plugin) {
                         setupBotPlugin(koin)
                     }
                 }.onFailure { e ->
-                    logger.w("Unable to load bot part of $it", e)
+                    logger.w("Unable to load bot part of $plugin", e)
                 }.onSuccess {
-                    logger.i("Complete loading of $it")
+                    logger.i("Complete loading of $plugin")
                 }
             }
         }.joinAll()

bot/src/main/kotlin/dev/inmo/plagubot/config/Config.kt

@@ -1,9 +1,11 @@
 package dev.inmo.plagubot.config
 
+import dev.inmo.micro_utils.common.Warning
 import dev.inmo.plagubot.Plugin
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+@Warning("This API is internal and can be changed without notifications of mentions of changes")
 @Serializable
 data class Config(
     val botToken: String,

gradle.properties

@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=1.1.1
+version=1.1.2

gradle/libs.versions.toml

@@ -4,9 +4,9 @@ kt = "1.6.21"
 kt-serialization = "1.3.3"
 kt-coroutines = "1.6.2"
 
-microutils = "0.11.0"
+microutils = "0.11.3"
-tgbotapi = "2.0.2"
+tgbotapi = "2.0.3"
-kslog = "0.3.0"
+kslog = "0.3.1"
 
 jb-exposed = "0.38.2"
 jb-dokka = "1.6.21"

plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt

@@ -13,7 +13,8 @@ class PluginSerializer : KSerializer<Plugin> {
         get() = String.serializer().descriptor
 
     override fun deserialize(decoder: Decoder): Plugin {
-        return Class.forName(decoder.decodeString()).getDeclaredConstructor().newInstance() as Plugin
+        val kclass = Class.forName(decoder.decodeString()).kotlin
+        return (kclass.objectInstance ?: kclass.constructors.first { it.parameters.isEmpty() }.call()) as Plugin
     }
 
     override fun serialize(encoder: Encoder, value: Plugin) {