mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2024-05-31 23:15:12 +00:00
Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
8bd80c1c0c | |||
2234ffd55d | |||
1a9d8b0d5e | |||
e00f40d06a | |||
9883d2b3b1 | |||
bdfd3b816c | |||
dd37ae0f2f | |||
8efe977e76 | |||
8290a68654 | |||
493a18a0f7 | |||
36608937af | |||
1b1b069d93 | |||
37b5b8e867 | |||
468310c819 | |||
0d27a4f6f7 | |||
f9d131866f | |||
451b2bbc39 | |||
d51e2d8e7c | |||
6c45a8c848 | |||
8a7e05580d | |||
8b78f2901f | |||
cad8743ced | |||
8f827e9f79 | |||
28039df992 |
54
CHANGELOG.md
54
CHANGELOG.md
|
@ -1,5 +1,59 @@
|
|||
# Changelog
|
||||
|
||||
## 8.3.0
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.6.3`
|
||||
* `MicroUtils`: `0.20.45`
|
||||
* `tgbotapi`: `12.0.1`
|
||||
* `Exposed`: `0.49.0`
|
||||
* `SQLite`: `3.45.3.0`
|
||||
* `Koin`: `3.5.6`
|
||||
|
||||
## 8.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `Coroutines`: `1.8.0`
|
||||
* `tgbotapi`: `10.1.0`
|
||||
* `MicroUtils`: `0.20.35`
|
||||
|
||||
## 8.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `10.0.1`
|
||||
* `MicroUtils`: `0.20.32`
|
||||
* `Exposed`: `0.47.0`
|
||||
|
||||
## 8.1.0
|
||||
|
||||
* Integrate `dev.inmo:micro_utils.startup` into project
|
||||
|
||||
## 8.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `10.0.0`
|
||||
* `MicroUtils`: `0.20.26`
|
||||
* `Exposed`: `0.46.0`
|
||||
|
||||
## 7.4.2
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `1.9.22`
|
||||
* `tgbotapi`: `9.4.3`
|
||||
* `MicroUtils`: `0.20.23`
|
||||
* `Koin`: `3.5.7`
|
||||
|
||||
## 7.4.1
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.6.2`
|
||||
* `tgbotapi`: `9.4.2`
|
||||
* `Exposed`: `0.45.0`
|
||||
* `SQLite`: `3.44.1.0`
|
||||
* `MicroUtils`: `0.20.19`
|
||||
* `uuid`: `0.8.2`
|
||||
* `ktor`: `2.3.7`
|
||||
|
||||
## 7.3.0
|
||||
|
||||
* `Versions`:
|
||||
|
|
|
@ -20,6 +20,7 @@ dependencies {
|
|||
api libs.tgbotapi.behaviourBuilder.fsm
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.microutils.koin
|
||||
api libs.microutils.startup.launcher
|
||||
|
||||
api libs.sqlite
|
||||
|
||||
|
|
|
@ -49,18 +49,14 @@ publishing {
|
|||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
name = "InmoNexus"
|
||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
credentials {
|
||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_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":"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"}
|
||||
{"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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
|
@ -32,8 +32,6 @@ object HelloPlugin : Plugin {
|
|||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single {
|
||||
get<Json>().decodeFromJsonElement(HelloPluginConfig.serializer(), params["helloPlugin"] ?: return@single null)
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -43,6 +41,11 @@ object HelloPlugin : Plugin {
|
|||
data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
|
||||
}
|
||||
|
||||
override suspend fun startPlugin(koin: Koin) {
|
||||
super.startPlugin(koin)
|
||||
logger.i { "This logic called BEFORE the bot will be started and setup" }
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
val toPrint = koin.getOrNull<HelloPluginConfig>() ?.print ?: "Hello :)"
|
||||
logger.d { toPrint }
|
||||
|
|
|
@ -8,6 +8,7 @@ import dev.inmo.micro_utils.fsm.common.StatesManager
|
|||
import dev.inmo.micro_utils.fsm.common.managers.*
|
||||
import dev.inmo.micro_utils.koin.getAllDistinct
|
||||
import dev.inmo.plagubot.config.*
|
||||
import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
|
||||
import dev.inmo.tgbotapi.bot.ktor.telegramBot
|
||||
import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.*
|
||||
|
@ -37,19 +38,36 @@ data class PlaguBot(
|
|||
private val config: Config
|
||||
) : Plugin {
|
||||
@Transient
|
||||
private val bot = telegramBot(config.botToken)
|
||||
private val bot = telegramBot(
|
||||
token = config.botToken,
|
||||
apiUrl = config.botApiServer
|
||||
) {
|
||||
setupBotClient()
|
||||
}
|
||||
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
single { config }
|
||||
single { config.plugins }
|
||||
single { config.databaseConfig }
|
||||
single { config.databaseConfig.database }
|
||||
override fun KtorRequestsExecutorBuilder.setupBotClient() {
|
||||
config.botPlugins.forEach {
|
||||
with(it) {
|
||||
setupBotClient()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun Module.setupDI(config: JsonObject) {
|
||||
single { this@PlaguBot.config }
|
||||
single { this@PlaguBot.config.plugins }
|
||||
single { this@PlaguBot.config.databaseConfig }
|
||||
single { this@PlaguBot.config.databaseConfig.database }
|
||||
single { defaultJsonFormat }
|
||||
single { this@PlaguBot }
|
||||
single { bot }
|
||||
}
|
||||
|
||||
override fun Module.setupDI(database: Database, params: JsonObject) {
|
||||
setupDI(params)
|
||||
|
||||
includes(
|
||||
config.plugins.mapNotNull {
|
||||
config.botPlugins.mapNotNull {
|
||||
runCatching {
|
||||
module {
|
||||
with(it) {
|
||||
|
@ -57,14 +75,31 @@ data class PlaguBot(
|
|||
}
|
||||
}
|
||||
}.onFailure { e ->
|
||||
logger.w("Unable to load DI part of $it", e)
|
||||
logger.w(e) { "Unable to load DI part of $it" }
|
||||
}.getOrNull()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
override suspend fun startPlugin(koin: Koin) {
|
||||
super.startPlugin(koin)
|
||||
|
||||
config.plugins.forEach { plugin ->
|
||||
runCatchingSafely {
|
||||
logger.i { "Starting of $plugin common logic" }
|
||||
with(plugin) {
|
||||
startPlugin(koin)
|
||||
}
|
||||
}.onFailure { e ->
|
||||
logger.w(e) { "Unable to load common logic of $plugin" }
|
||||
}.onSuccess {
|
||||
logger.i { "Complete loading of $plugin common logic" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
config.botPlugins.forEach { plugin ->
|
||||
runCatchingSafely {
|
||||
logger.i("Start loading of $plugin")
|
||||
with(plugin) {
|
||||
|
@ -91,9 +126,11 @@ data class PlaguBot(
|
|||
setupDI(config.databaseConfig.database, json)
|
||||
}
|
||||
)
|
||||
logger.i("Modules loaded")
|
||||
logger.i("Modules loaded. Starting koin")
|
||||
GlobalContext.startKoin(koinApp)
|
||||
logger.i("Koin started")
|
||||
logger.i("Koin started. Starting plugins common logic")
|
||||
startPlugin(koinApp.koin)
|
||||
logger.i("Plugins common logic started. Starting setup of bot logic part")
|
||||
lateinit var behaviourContext: BehaviourContext
|
||||
val onStartContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnStartContextsConflictResolver>() }
|
||||
val onUpdateContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
|
||||
|
|
|
@ -1,15 +1,20 @@
|
|||
package dev.inmo.plagubot.config
|
||||
|
||||
import dev.inmo.micro_utils.common.Warning
|
||||
import dev.inmo.micro_utils.startup.plugin.StartPlugin
|
||||
import dev.inmo.plagubot.Plugin
|
||||
import dev.inmo.tgbotapi.utils.telegramBotAPIDefaultUrl
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Warning("This API is internal and can be changed without notifications of mentions of changes")
|
||||
@Warning("This API is internal and can be changed without notifications or mentions of changes")
|
||||
@Serializable
|
||||
data class Config(
|
||||
val botToken: String,
|
||||
val plugins: List<Plugin>,
|
||||
val plugins: List<StartPlugin>,
|
||||
@SerialName("database")
|
||||
val databaseConfig: DatabaseConfig = DatabaseConfig(),
|
||||
)
|
||||
val botApiServer: String = telegramBotAPIDefaultUrl
|
||||
) {
|
||||
val botPlugins = plugins.filterIsInstance<Plugin>()
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@ allprojects {
|
|||
mavenCentral()
|
||||
mavenLocal()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
||||
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,13 +20,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
|
|||
|
||||
releaseAssets.from('bot/build/distributions')
|
||||
|
||||
owner "InsanusMokrassar"
|
||||
repo "PlaguBot"
|
||||
owner = "InsanusMokrassar"
|
||||
repo = "PlaguBot"
|
||||
|
||||
tagName "v${project.version}"
|
||||
releaseName "${project.version}"
|
||||
targetCommitish "${project.version}"
|
||||
tagName = "v${project.version}"
|
||||
releaseName = "${project.version}"
|
||||
targetCommitish = "${project.version}"
|
||||
|
||||
body getCurrentVersionChangelog()
|
||||
body = getCurrentVersionChangelog()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
|||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=7.4.0
|
||||
version=8.3.0
|
||||
|
|
|
@ -1,27 +1,22 @@
|
|||
[versions]
|
||||
|
||||
kt = "1.9.21"
|
||||
kt-serialization = "1.6.1"
|
||||
kt-coroutines = "1.7.3"
|
||||
kt = "1.9.23"
|
||||
kt-serialization = "1.6.3"
|
||||
kt-coroutines = "1.8.0"
|
||||
|
||||
microutils = "0.20.15"
|
||||
tgbotapi = "9.4.1"
|
||||
microutils = "0.20.45"
|
||||
tgbotapi = "12.0.1"
|
||||
|
||||
ksp = "1.9.20-1.0.14"
|
||||
ksp = "1.9.23-1.0.20"
|
||||
|
||||
jb-exposed = "0.44.1"
|
||||
jb-dokka = "1.9.10"
|
||||
jb-exposed = "0.49.0"
|
||||
jb-dokka = "1.9.20"
|
||||
|
||||
sqlite = "3.43.0.0"
|
||||
sqlite = "3.45.3.0"
|
||||
|
||||
klock = "4.0.10"
|
||||
uuid = "0.8.1"
|
||||
gh-release = "2.5.2"
|
||||
|
||||
ktor = "2.3.6"
|
||||
|
||||
gh-release = "2.4.1"
|
||||
|
||||
koin = "3.5.0"
|
||||
koin = "3.5.6"
|
||||
|
||||
[libraries]
|
||||
|
||||
|
@ -35,6 +30,8 @@ tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.
|
|||
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" }
|
||||
microutils-startup-launcher = { module = "dev.inmo:micro_utils.startup.launcher", version.ref = "microutils" }
|
||||
microutils-startup-plugin = { module = "dev.inmo:micro_utils.startup.plugin", version.ref = "microutils" }
|
||||
|
||||
koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
||||
|
||||
|
|
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-8.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -14,6 +14,7 @@ dependencies {
|
|||
|
||||
api libs.tgbotapi
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.microutils.startup.plugin
|
||||
|
||||
api libs.koin
|
||||
}
|
||||
|
|
|
@ -49,18 +49,14 @@ publishing {
|
|||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
name = "InmoNexus"
|
||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
credentials {
|
||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_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":"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"}
|
||||
{"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":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"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.micro_utils.startup.plugin.StartPlugin
|
||||
import dev.inmo.tgbotapi.bot.ktor.KtorRequestsExecutorBuilder
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
|
||||
import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContextWithFSM
|
||||
import kotlinx.serialization.Serializable
|
||||
|
@ -17,14 +19,18 @@ import org.koin.core.module.Module
|
|||
* too.
|
||||
*/
|
||||
@Serializable(PluginSerializer::class)
|
||||
interface Plugin {
|
||||
interface Plugin : StartPlugin {
|
||||
fun KtorRequestsExecutorBuilder.setupBotClient() {}
|
||||
|
||||
/**
|
||||
* This method will be called when this plugin should configure di module based on the incoming params
|
||||
*/
|
||||
fun Module.setupDI(
|
||||
database: Database,
|
||||
params: JsonObject
|
||||
) {}
|
||||
) {
|
||||
setupDI(params)
|
||||
}
|
||||
|
||||
/**
|
||||
* Override this method in cases when you want to declare common bot behaviour. In case you wish to use FSM, you
|
||||
|
|
Loading…
Reference in New Issue
Block a user