mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2025-12-05 22:06:02 +00:00
Compare commits
83 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| caca21fac9 | |||
| 4f2934fbae | |||
| 8c3c52c92b | |||
| 779b56394a | |||
| 3b11cdc2c6 | |||
| 1a823cda6f | |||
| 6a29264caf | |||
| 4d32de8c2f | |||
| f7cce657a8 | |||
| a4ca827a5c | |||
| 224107e35e | |||
| 9efebd027d | |||
| 841156e8b5 | |||
| ab4d06a44c | |||
| 0766bf7d76 | |||
| f7c7e338e2 | |||
| 6a4fed07ee | |||
| 88f5fbfd18 | |||
| f644817c04 | |||
| 8a8eb3c3b7 | |||
| 8cb68495c9 | |||
| 6f2c922edf | |||
| 5895335031 | |||
| 5f25250bcc | |||
| f0d2a6d39d | |||
| 3e4dc1fdb0 | |||
| 55012eacec | |||
| c64314fa11 | |||
| f0b7ae7325 | |||
| 4ade949593 | |||
| 2a9342e4c7 | |||
| 7d57ceafaa | |||
| 823a53d5aa | |||
| c1889ceff0 | |||
| 40c4ae128f | |||
| 0f59009300 | |||
| a273f1117f | |||
| c8bb5e1195 | |||
| fbd98d67a9 | |||
| 2350555fbb | |||
| 4130f98caa | |||
| f8161c34a7 | |||
| 6fe333e437 | |||
| 5806fa1c31 | |||
| 2ff712327f | |||
| 72e8e35e3f | |||
| 030f9546f2 | |||
| 1b3c479766 | |||
| dcfb66ef6c | |||
| 763718716d | |||
| dfbc7be6f2 | |||
| ab0578b312 | |||
| 7b502e073d | |||
| 137a6c1c26 | |||
| 74f1ad496e | |||
| e4a1e1f0be | |||
| 7286cf401b | |||
| cdf94ec2eb | |||
| 5bfabfa284 | |||
| ec2852beb0 | |||
| 6c2cfbf06f | |||
| caa028b799 | |||
| 53667fa8b8 | |||
| 81ca68dc06 | |||
| 6f74e6b4cb | |||
| 7dad3581f1 | |||
| 751e9aa66c | |||
| 08b797bbc2 | |||
| fa00d11a39 | |||
| 1ba3953dfa | |||
| af86a64a48 | |||
| 60fe1b5df9 | |||
| c50b35c66b | |||
| b309d6c946 | |||
| 4f2b0aa40c | |||
| 2d38292b55 | |||
| e177f3e47a | |||
| 2872395045 | |||
| e49302b750 | |||
| 60dac2067a | |||
| fc1888923f | |||
| 703d3b1d64 | |||
| 34383c1f82 |
132
CHANGELOG.md
132
CHANGELOG.md
@@ -1,5 +1,137 @@
|
||||
# Changelog
|
||||
|
||||
## 3.1.4
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.3`
|
||||
* `microutils`: `0.14.4`
|
||||
|
||||
## 3.1.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.2`
|
||||
|
||||
## 3.1.2
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.14.2`
|
||||
* `exposed`: `0.41.1`
|
||||
|
||||
## 3.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.1`
|
||||
|
||||
## 3.1.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.7.21`
|
||||
* `microutils`: `0.14.1`
|
||||
* `tgbotapi`: `4.1.0`
|
||||
* `klock`: `3.4.0`
|
||||
* `uuid`: `0.6.0`
|
||||
|
||||
## 3.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.14.0`
|
||||
* `tgbotapi`: `4.0.0`
|
||||
* `kslog`: `0.5.3`
|
||||
* `exposed`: `0.40.1`
|
||||
* `klock`: `3.3.1`
|
||||
|
||||
## 2.4.1
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.13.2`
|
||||
* `tgbotapi`: `3.3.1`
|
||||
* `klock`: `3.3.0`
|
||||
* `ktor`: `2.1.3`
|
||||
* `koin`: `3.2.2`
|
||||
|
||||
## 2.4.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.7.20`
|
||||
* `serialization`: `1.4.1`
|
||||
* `tgbotapi`: `3.3.0`
|
||||
* `microutils`: `0.13.1`
|
||||
* `klock`: `3.2.0`
|
||||
* `ktor`: `2.1.2`
|
||||
|
||||
## 2.3.4
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.7`
|
||||
* `microutils`: `0.12.16`
|
||||
|
||||
## 2.3.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.6`
|
||||
* `sqlite`: `3.39.3.0`
|
||||
|
||||
## 2.3.2
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.3`
|
||||
* `microutils`: `0.12.13`
|
||||
* `kslog`: `0.5.2`
|
||||
|
||||
## 2.3.1
|
||||
|
||||
* `Versions`:
|
||||
* `klock`: `3.1.0`
|
||||
* `tgbotapi`: `3.2.1`
|
||||
* `microutils`: `0.12.11`
|
||||
* `ktor`: `2.1.1`
|
||||
|
||||
## 2.3.0
|
||||
|
||||
* `Bot`:
|
||||
* Add option `reconnectOptions` in database config
|
||||
|
||||
## 2.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `serialization`: `1.4.0`
|
||||
* `tgbotapi`: `3.2.0`
|
||||
* `microutils`: `0.12.4`
|
||||
* `kslog`: `0.5.1`
|
||||
|
||||
## 2.1.1
|
||||
|
||||
* `Bot`:
|
||||
* Now it is possible to get bot from `koin`
|
||||
|
||||
## 2.1.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.1.1`
|
||||
* `ktor`: `2.1.0`
|
||||
* `microutils`: `0.12.1`
|
||||
* `Plugins`:
|
||||
* New fum of `Plugin` with `BehaviourContextWithFSM` receiver
|
||||
* `Bot`:
|
||||
* Now bot uses `buildBehaviourWithFSM` to be able to setup bot with FSM
|
||||
|
||||
## 2.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.7.10`
|
||||
* `serialization`: `1.4.0-RC`
|
||||
* `tgbotapi`: `3.0.2`
|
||||
* `kslog`: `0.5.0`
|
||||
* `uuid`: `0.5.0`
|
||||
* `exposed`: `0.39.2`
|
||||
* `microutils`: `0.12.0`
|
||||
|
||||
## 1.4.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `2.2.2`
|
||||
* `kslog`: `0.4.2`
|
||||
|
||||
## 1.4.0
|
||||
|
||||
* `Versions`:
|
||||
|
||||
25
README.md
25
README.md
@@ -16,3 +16,28 @@ You can create your bot using
|
||||
|
||||
That is a set of libraries for plagubots. Look at the
|
||||
[PlaguBot Plugin template](https://insanusmokrassar.github.io/PlaguBotPluginTemplate/) to find how to create your bot.
|
||||
|
||||
### Technical help
|
||||
|
||||
In this bot has been used variant with FSM. That means that you may use all the [Behaviour Builder with FSM](https://bookstack.inmo.dev/books/telegrambotapi/page/behaviour-builder-with-fsm) functionality. In case you wish to setup states repo, you should use the next code in the `setupDI` of your plugin:
|
||||
|
||||
```kotlin
|
||||
single<StatesManager<State>> {
|
||||
// setup your manager and return here
|
||||
// Default is:
|
||||
DefaultStatesManager(
|
||||
InMemoryDefaultStatesManagerRepo()
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
Besides, you may setup handling errors lambda in the same function:
|
||||
|
||||
```kotlin
|
||||
single<StateHandlingErrorHandler<State>> {
|
||||
{ state, e ->
|
||||
logger.eS(e) { "Unable to handle state $state" } // logging by default
|
||||
null // you should return new state or null, default callback will return null
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
@@ -16,6 +16,7 @@ dependencies {
|
||||
api libs.jb.exposed.jdbc
|
||||
|
||||
api libs.tgbotapi
|
||||
api libs.tgbotapi.behaviourBuilder.fsm
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.kslog
|
||||
|
||||
|
||||
@@ -49,14 +49,32 @@ publishing {
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
@@ -1,10 +1,18 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.kslog.common.*
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.plagubot.HelloPlugin.setupBotPlugin
|
||||
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.api.send.sendMessage
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitText
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitTextMessage
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUnhandledCommand
|
||||
import dev.inmo.tgbotapi.types.IdChatIdentifier
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
@@ -24,14 +32,34 @@ object HelloPlugin : Plugin {
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single {
|
||||
get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
logger.d { koin.get<HelloPluginConfig>().print }
|
||||
private sealed interface InternalFSMState : State {
|
||||
override val context: IdChatIdentifier
|
||||
data class DidntSaidHello(override val context: IdChatIdentifier) : InternalFSMState
|
||||
data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
val toPrint = koin.getOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
|
||||
logger.d { toPrint }
|
||||
logger.dS { getMe().toString() }
|
||||
onCommand("hello_world") {
|
||||
reply(it, "Hello :)")
|
||||
startChain(InternalFSMState.DidntSaidHello(it.chat.id))
|
||||
}
|
||||
|
||||
strictlyOn { state: InternalFSMState.DidntSaidHello ->
|
||||
sendMessage(state.context, toPrint)
|
||||
InternalFSMState.SaidHelloOnce(state.context)
|
||||
}
|
||||
|
||||
strictlyOn { state: InternalFSMState.SaidHelloOnce ->
|
||||
val message = waitTextMessage().first()
|
||||
reply(message, "Sorry, I can answer only this: $toPrint")
|
||||
InternalFSMState.SaidHelloOnce(state.context)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,13 @@ 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.Config
|
||||
import dev.inmo.plagubot.config.defaultJsonFormat
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||
import dev.inmo.micro_utils.fsm.common.managers.*
|
||||
import dev.inmo.plagubot.config.*
|
||||
import dev.inmo.tgbotapi.bot.ktor.telegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingOfUpdatesByLongPolling
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.serialization.Serializable
|
||||
@@ -44,6 +45,7 @@ data class PlaguBot(
|
||||
single { config.databaseConfig.database }
|
||||
single { defaultJsonFormat }
|
||||
single { this@PlaguBot }
|
||||
single { bot }
|
||||
|
||||
includes(
|
||||
config.plugins.mapNotNull {
|
||||
@@ -60,7 +62,7 @@ data class PlaguBot(
|
||||
)
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContext.setupBotPlugin(koin: Koin) {
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
config.plugins.map { plugin ->
|
||||
launch {
|
||||
runCatchingSafely {
|
||||
@@ -94,12 +96,25 @@ data class PlaguBot(
|
||||
GlobalContext.startKoin(koinApp)
|
||||
logger.i("Koin started")
|
||||
lateinit var behaviourContext: BehaviourContext
|
||||
bot.buildBehaviour(scope = scope) {
|
||||
bot.buildBehaviourWithFSM(
|
||||
scope = scope,
|
||||
defaultExceptionsHandler = {
|
||||
logger.e("Something went wrong", it)
|
||||
},
|
||||
statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
|
||||
koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
|
||||
onStartContextsConflictResolver = { _, _ -> false }
|
||||
),
|
||||
onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
|
||||
logger.eS(e) { "Unable to handle state $state" }
|
||||
null
|
||||
}
|
||||
) {
|
||||
logger.i("Start setup of bot part")
|
||||
behaviourContext = this
|
||||
setupBotPlugin(koinApp.koin)
|
||||
deleteWebhook()
|
||||
}
|
||||
}.start()
|
||||
logger.i("Behaviour builder has been setup")
|
||||
return bot.startGettingOfUpdatesByLongPolling(scope = behaviourContext, updatesFilter = behaviourContext).also {
|
||||
logger.i("Long polling has been started")
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class DBConnectOptions(
|
||||
val attempts: Int = 3,
|
||||
val delay: Long = 1000L
|
||||
)
|
||||
@@ -1,11 +1,15 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.kslog.common.logger
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Transient
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.jetbrains.exposed.sql.transactions.transactionManager
|
||||
import org.koin.core.scope.Scope
|
||||
import org.sqlite.JDBC
|
||||
import java.lang.Exception
|
||||
import java.sql.Connection
|
||||
|
||||
inline val Scope.database: Database?
|
||||
@@ -16,15 +20,24 @@ data class DatabaseConfig(
|
||||
val url: String = "jdbc:sqlite:file:test?mode=memory&cache=shared",
|
||||
val driver: String = JDBC::class.qualifiedName!!,
|
||||
val username: String = "",
|
||||
val password: String = ""
|
||||
val password: String = "",
|
||||
val reconnectOptions: DBConnectOptions? = DBConnectOptions()
|
||||
) {
|
||||
@Transient
|
||||
val database: Database = Database.connect(
|
||||
url,
|
||||
driver,
|
||||
username,
|
||||
password
|
||||
).also {
|
||||
it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
|
||||
}
|
||||
val database: Database = (0 until (reconnectOptions ?.attempts ?: 1)).firstNotNullOfOrNull {
|
||||
runCatching {
|
||||
Database.connect(
|
||||
url,
|
||||
driver,
|
||||
username,
|
||||
password
|
||||
).also {
|
||||
it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
|
||||
it.connector().close()
|
||||
}
|
||||
}.onFailure {
|
||||
logger.e(it)
|
||||
Thread.sleep(reconnectOptions ?.delay ?: return@onFailure)
|
||||
}.getOrNull()
|
||||
} ?: error("Unable to create database")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
typealias StateHandlingErrorHandler<T> = suspend (T, Throwable) -> T?
|
||||
@@ -16,6 +16,7 @@ allprojects {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
||||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=1.4.0
|
||||
version=3.1.4
|
||||
|
||||
@@ -1,28 +1,26 @@
|
||||
[versions]
|
||||
|
||||
kt = "1.6.21"
|
||||
kt-serialization = "1.3.3"
|
||||
kt = "1.7.21"
|
||||
kt-serialization = "1.4.1"
|
||||
kt-coroutines = "1.6.4"
|
||||
|
||||
microutils = "0.11.13"
|
||||
tgbotapi = "2.2.1"
|
||||
kslog = "0.4.1"
|
||||
microutils = "0.14.4"
|
||||
tgbotapi = "4.1.3"
|
||||
kslog = "0.5.3"
|
||||
|
||||
jb-exposed = "0.38.2"
|
||||
jb-dokka = "1.6.21"
|
||||
jb-exposed = "0.41.1"
|
||||
jb-dokka = "1.7.20"
|
||||
|
||||
sqlite = "3.36.0.3"
|
||||
sqlite = "3.39.3.0"
|
||||
|
||||
klock = "2.7.0"
|
||||
uuid = "0.4.1"
|
||||
klock = "3.4.0"
|
||||
uuid = "0.6.0"
|
||||
|
||||
ktor = "2.0.3"
|
||||
ktor = "2.1.3"
|
||||
|
||||
gh-release = "2.4.1"
|
||||
|
||||
android-gradle = "7.0.4"
|
||||
dexcount = "3.1.0"
|
||||
koin = "3.2.0"
|
||||
koin = "3.2.2"
|
||||
|
||||
[libraries]
|
||||
|
||||
@@ -32,6 +30,7 @@ kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", vers
|
||||
kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
|
||||
|
||||
tgbotapi = { module = "dev.inmo:tgbotapi", 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" }
|
||||
kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -49,14 +49,32 @@ publishing {
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
@@ -1,6 +1,8 @@
|
||||
package dev.inmo.plagubot
|
||||
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
@@ -23,7 +25,20 @@ interface Plugin {
|
||||
database: Database,
|
||||
params: JsonObject
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Override this method in cases when you want to declare common bot behaviour. In case you wish to use FSM, you
|
||||
* should override the method with receiver [BehaviourContextWithFSM]
|
||||
*/
|
||||
suspend fun BehaviourContext.setupBotPlugin(
|
||||
koin: Koin
|
||||
) {}
|
||||
/**
|
||||
* Override this method in cases when you want to declare full behaviour of the plugin. It is recommended to declare
|
||||
* common logic of plugin in the [setupBotPlugin] with [BehaviourContext] receiver and use override this one
|
||||
* for the FSM configuration
|
||||
*/
|
||||
suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
(this as BehaviourContext).setupBotPlugin(koin)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,12 @@ String[] toInclude = [":bot", ":plugin"]
|
||||
|
||||
rootProject.name = 'plagubot'
|
||||
|
||||
toInclude.each {
|
||||
include (it)
|
||||
project(it).name = "${rootProject.name}${it.replace(":", ".")}"
|
||||
toInclude.each { originalName ->
|
||||
String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}"
|
||||
String projectName = "${rootProject.name}${originalName.replace(":", ".")}"
|
||||
String projectIdentifier = ":${projectName}"
|
||||
include projectIdentifier
|
||||
ProjectDescriptor project = project(projectIdentifier)
|
||||
project.name = projectName
|
||||
project.projectDir = new File(projectDirectory)
|
||||
}
|
||||
|
||||
@@ -4,7 +4,10 @@
|
||||
"driver": "org.sqlite.JDBC",
|
||||
"username": "OPTIONAL username",
|
||||
"password": "OPTIONAL password",
|
||||
"initAutomatically": false
|
||||
"reconnectOptions": {
|
||||
"attempts": 3,
|
||||
"delay": 1000
|
||||
}
|
||||
},
|
||||
"botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
|
||||
"plugins": [
|
||||
|
||||
Reference in New Issue
Block a user