mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2024-11-21 23:23:47 +00:00
conflicts resolvers customization
This commit is contained in:
parent
9d72d79321
commit
30cf190461
@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
## 7.2.2
|
## 7.2.2
|
||||||
|
|
||||||
|
* `Bot`:
|
||||||
|
* Now you may customize both `onStart` and `onUpdate` conflicts resolvers
|
||||||
|
|
||||||
## 7.2.1
|
## 7.2.1
|
||||||
|
|
||||||
* `Versions`:
|
* `Versions`:
|
||||||
|
@ -2,6 +2,7 @@ plugins {
|
|||||||
id 'org.jetbrains.kotlin.jvm'
|
id 'org.jetbrains.kotlin.jvm'
|
||||||
id "org.jetbrains.kotlin.plugin.serialization"
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
id 'application'
|
id 'application'
|
||||||
|
id "com.google.devtools.ksp"
|
||||||
}
|
}
|
||||||
|
|
||||||
project.group="$group"
|
project.group="$group"
|
||||||
@ -36,3 +37,6 @@ java {
|
|||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ksp { // this generator do not require any arguments and we should left `ksp` empty
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package dev.inmo.plagubot
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.fsm.common.State
|
||||||
|
|
||||||
|
fun interface OnStartContextsConflictResolver {
|
||||||
|
/**
|
||||||
|
* @param old Old state which is currently placed on the [State.context]
|
||||||
|
* @param new New state pretend to replace [old] one
|
||||||
|
* @return Should return:
|
||||||
|
*
|
||||||
|
* * Null in case when current realization unable to resolve conflict
|
||||||
|
* * False when current realization knows that [new] [State] must **not** replace [old] one
|
||||||
|
* * True when current realization knows that [new] [State] must replace [old] one
|
||||||
|
*/
|
||||||
|
suspend operator fun invoke(old: State, new: State): Boolean?
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
package dev.inmo.plagubot
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.fsm.common.State
|
||||||
|
|
||||||
|
fun interface OnUpdateContextsConflictResolver {
|
||||||
|
/**
|
||||||
|
* This method will be called when [sourceStateWithOldContext] [State.context] and [newStateWithNewContext] are not equal and currently there is
|
||||||
|
* launched [currentStateOnNewContext] state on the chain with [State.context] from [currentStateOnNewContext]
|
||||||
|
*
|
||||||
|
* @param sourceStateWithOldContext Old state where from [newStateWithNewContext] came
|
||||||
|
* @param newStateWithNewContext New state with changing [State.context] (it is different with [sourceStateWithOldContext] [State.context])
|
||||||
|
* @param currentStateOnNewContext State which is currently running on [newStateWithNewContext] [State.context]
|
||||||
|
* @return Should return:
|
||||||
|
*
|
||||||
|
* * Null in case when current realization unable to resolve conflict
|
||||||
|
* * False when [currentStateOnNewContext] **should not** be stopped in favor to [newStateWithNewContext]
|
||||||
|
* * True when [currentStateOnNewContext] **should** be stopped in favor to [newStateWithNewContext]
|
||||||
|
*/
|
||||||
|
suspend operator fun invoke(sourceStateWithOldContext: State, newStateWithNewContext: State, currentStateOnNewContext: State): Boolean?
|
||||||
|
}
|
@ -6,6 +6,7 @@ import dev.inmo.micro_utils.coroutines.runCatchingSafely
|
|||||||
import dev.inmo.micro_utils.fsm.common.State
|
import dev.inmo.micro_utils.fsm.common.State
|
||||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||||
import dev.inmo.micro_utils.fsm.common.managers.*
|
import dev.inmo.micro_utils.fsm.common.managers.*
|
||||||
|
import dev.inmo.micro_utils.koin.getAllDistinct
|
||||||
import dev.inmo.plagubot.config.*
|
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.webhook.deleteWebhook
|
import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
|
||||||
@ -94,6 +95,8 @@ data class PlaguBot(
|
|||||||
GlobalContext.startKoin(koinApp)
|
GlobalContext.startKoin(koinApp)
|
||||||
logger.i("Koin started")
|
logger.i("Koin started")
|
||||||
lateinit var behaviourContext: BehaviourContext
|
lateinit var behaviourContext: BehaviourContext
|
||||||
|
val onStartContextsConflictResolver = koinApp.koin.getAllDistinct<OnStartContextsConflictResolver>()
|
||||||
|
val onUpdateContextsConflictResolver = koinApp.koin.getAllDistinct<OnUpdateContextsConflictResolver>()
|
||||||
bot.buildBehaviourWithFSM(
|
bot.buildBehaviourWithFSM(
|
||||||
scope = scope,
|
scope = scope,
|
||||||
defaultExceptionsHandler = {
|
defaultExceptionsHandler = {
|
||||||
@ -101,7 +104,8 @@ data class PlaguBot(
|
|||||||
},
|
},
|
||||||
statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
|
statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
|
||||||
koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
|
koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
|
||||||
onStartContextsConflictResolver = { _, _ -> false }
|
onStartContextsConflictResolver = { old, new -> onStartContextsConflictResolver.firstNotNullOfOrNull { it(old, new) } ?: false },
|
||||||
|
onUpdateContextsConflictResolver = { old, new, currentNew -> onUpdateContextsConflictResolver.firstNotNullOfOrNull { it(old, new, currentNew) } ?: false }
|
||||||
),
|
),
|
||||||
onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
|
onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
|
||||||
logger.eS(e) { "Unable to handle state $state" }
|
logger.eS(e) { "Unable to handle state $state" }
|
||||||
|
@ -8,6 +8,7 @@ buildscript {
|
|||||||
classpath libs.buildscript.kt.gradle
|
classpath libs.buildscript.kt.gradle
|
||||||
classpath libs.buildscript.kt.serialization
|
classpath libs.buildscript.kt.serialization
|
||||||
classpath libs.buildscript.gh.release
|
classpath libs.buildscript.gh.release
|
||||||
|
classpath libs.buildscript.ksp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,6 +8,8 @@ microutils = "0.19.9"
|
|||||||
tgbotapi = "9.2.1"
|
tgbotapi = "9.2.1"
|
||||||
kslog = "1.1.2"
|
kslog = "1.1.2"
|
||||||
|
|
||||||
|
ksp = "1.8.22-1.0.11"
|
||||||
|
|
||||||
jb-exposed = "0.41.1"
|
jb-exposed = "0.41.1"
|
||||||
jb-dokka = "1.8.20"
|
jb-dokka = "1.8.20"
|
||||||
|
|
||||||
@ -32,6 +34,8 @@ kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json"
|
|||||||
tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
|
tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
|
||||||
tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.fsm", version.ref = "tgbotapi" }
|
tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.fsm", version.ref = "tgbotapi" }
|
||||||
microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
|
microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
|
||||||
|
microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
|
||||||
|
microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
|
||||||
kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
|
kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
|
||||||
|
|
||||||
koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
||||||
@ -48,3 +52,4 @@ buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",
|
|||||||
buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
|
buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
|
||||||
buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
|
buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
|
||||||
buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
|
buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
|
||||||
|
buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
|
||||||
|
Loading…
Reference in New Issue
Block a user