diff --git a/gradle.properties b/gradle.properties index 19e404e..5367647 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.parallel=true kotlin.js.generate.externals=true kotlin.incremental=true -kotlin_version=2.0.10 -plagubot_version=9.0.0 -plugins_version=0.20.0 +kotlin_version=2.1.0 +plagubot_version=10.3.1 +plugins_version=0.24.2 -micro_utils_version=0.22.0 -tgbotapi_version=16.0.0 -serialization_version=1.7.1 +micro_utils_version=0.24.5 +tgbotapi_version=23.1.2 +serialization_version=1.8.0 -version=0.2.0 +version=0.3.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48c0a02..e382118 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/dev/inmo/plagubot/example/CustomPlugin.kt b/src/main/kotlin/dev/inmo/plagubot/example/CustomPlugin.kt index baf6bce..1ea1399 100644 --- a/src/main/kotlin/dev/inmo/plagubot/example/CustomPlugin.kt +++ b/src/main/kotlin/dev/inmo/plagubot/example/CustomPlugin.kt @@ -11,17 +11,13 @@ import dev.inmo.tgbotapi.extensions.api.bot.getMe import dev.inmo.tgbotapi.extensions.api.chat.members.unbanChatMember import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.* -import dev.inmo.tgbotapi.extensions.utils.extensions.raw.new_chat_member import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.retrieveAccumulatedUpdates -import dev.inmo.tgbotapi.types.chat.member.BannedChatMember import dev.inmo.tgbotapi.types.chat.member.KickedChatMember import io.ktor.client.plugins.HttpRequestTimeoutException import kotlinx.coroutines.CancellationException -import kotlinx.coroutines.flow.onEach import kotlinx.serialization.Serializable import kotlinx.serialization.StringFormat import kotlinx.serialization.json.* -import org.jetbrains.exposed.sql.Database import org.koin.core.Koin import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -40,18 +36,18 @@ class CustomPlugin : Plugin, KoinComponent { } } - override fun Module.setupDI(database: Database, params: JsonObject) { + override fun Module.setupDI(config: JsonObject) { singleWithBinds { get() } single(named("flushUpdates")) { runCatching { - params["flushUpdates"]?.jsonPrimitive ?.booleanOrNull == true + config["flushUpdates"]?.jsonPrimitive ?.booleanOrNull == true }.getOrElse { false } } single(named("clearCommands")) { runCatching { - params["clearCommands"]?.jsonPrimitive ?.booleanOrNull == true + config["clearCommands"]?.jsonPrimitive ?.booleanOrNull == true }.getOrElse { false } @@ -60,6 +56,7 @@ class CustomPlugin : Plugin, KoinComponent { getKoin() } } + override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) { if (flushUpdates) { log.i("Start flush updates")