diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/Module.scala b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/Module.scala index ec34094..2b4b42c 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/Module.scala +++ b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/Module.scala @@ -3,7 +3,7 @@ package cc.sukazyo.cono.morny.reporter import cc.sukazyo.cono.morny.core.internal.MornyInternalModule import cc.sukazyo.cono.morny.core.Log.logger import cc.sukazyo.cono.morny.core.MornyCoeur -import cc.sukazyo.cono.morny.core.event.TelegramBotEvents +import cc.sukazyo.cono.morny.core.event.{TelegramBotEvents, TelegramCoreCommandEvents} class Module extends MornyInternalModule { @@ -46,6 +46,8 @@ class Module extends MornyInternalModule { .registerListener(instance.botErrorsReport.onGetUpdateFailed) TelegramBotEvents.inCoeur.OnListenerOccursException .registerListener(instance.botErrorsReport.onEventListenersThrowException) + TelegramCoreCommandEvents.inCoeur.OnUnauthorizedManageCommandCall + .registerListener(instance.coreCommandsReports.onUnauthorizedManageCommandCall) } || { logger `warn` "There seems no reporter instance is provided; skipped start it." diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/MornyReport.scala b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/MornyReport.scala index cb21f55..6b62346 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/MornyReport.scala +++ b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/MornyReport.scala @@ -3,7 +3,7 @@ package cc.sukazyo.cono.morny.reporter import cc.sukazyo.cono.morny.core.{MornyCoeur, MornyConfig} import cc.sukazyo.cono.morny.core.Log.logger import cc.sukazyo.cono.morny.data.MornyInformation.getVersionAllFullTagHTML -import cc.sukazyo.cono.morny.reporter.telegram_bot.BotErrorsReport +import cc.sukazyo.cono.morny.reporter.telegram_bot.{BotErrorsReport, CoreCommandsReports} import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener, EventRuntimeException} import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.* import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h @@ -150,6 +150,7 @@ class MornyReport (using val coeur: MornyCoeur) { } object botErrorsReport extends BotErrorsReport() + object coreCommandsReports extends CoreCommandsReports() object EventStatistics { diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/telegram_bot/CoreCommandsReports.scala b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/telegram_bot/CoreCommandsReports.scala new file mode 100644 index 0000000..1f84af5 --- /dev/null +++ b/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/reporter/telegram_bot/CoreCommandsReports.scala @@ -0,0 +1,18 @@ +package cc.sukazyo.cono.morny.reporter.telegram_bot + +import cc.sukazyo.cono.morny.core.event.TelegramCoreCommandEvents +import cc.sukazyo.cono.morny.reporter.MornyReport + +class CoreCommandsReports (using reporter: MornyReport) { + + private val _Event = TelegramCoreCommandEvents.inCoeur(using reporter.coeur) + + val onUnauthorizedManageCommandCall: _Event.OnUnauthorizedManageCommandCall.MyCallback + = (context, command) => { + reporter.unauthenticatedAction( + s"/${command.name}", + context.bind_user + ) + } + +} diff --git a/morny-core/src/main/scala/cc/sukazyo/cono/morny/BuildConfig.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/BuildConfig.scala new file mode 100644 index 0000000..6304e9a --- /dev/null +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/BuildConfig.scala @@ -0,0 +1,40 @@ +// $COVERAGE-OFF$ +package cc.sukazyo.cono.morny + +/** This object was generated by sbt-buildinfo. */ +case object BuildConfig { + /** The value is "Morny Coeur". */ + val name: String = "Morny Coeur" + /** The value is "2.0.0-alpha21-SNAPSHOT". */ + val version: String = "2.0.0-alpha21-SNAPSHOT" + /** The value is "3.4.1". */ + val scalaVersion: String = "3.4.1" + /** The value is "1.10.0". */ + val sbtVersion: String = "1.10.0" + /** The value is "2.0.0-alpha21-SNAPSHOT". */ + val VERSION: String = "2.0.0-alpha21-SNAPSHOT" + /** The value is "2.0.0-alpha21-SNAPSHOT+gitbd958708.δ". */ + val VERSION_FULL: String = "2.0.0-alpha21-SNAPSHOT+gitbd958708.δ" + /** The value is "2.0.0-alpha21". */ + val VERSION_BASE: String = "2.0.0-alpha21" + /** The value is scala.None. */ + val VERSION_DELTA: scala.Option[String] = scala.None + /** The value is "xinzheng". */ + val CODENAME: String = "xinzheng" + /** The value is 1739975193572L. */ + val CODE_TIMESTAMP: scala.Long = 1739975193572L + /** The value is "bd95870864075e9921257e14bf446f53d4bc5e02". */ + val COMMIT: String = "bd95870864075e9921257e14bf446f53d4bc5e02" + /** The value is false. */ + val CLEAN_BUILD: scala.Boolean = false + /** The value is "https://github.com/Eyre-S/Coeur-Morny-Cono". */ + val CODE_STORE: String = "https://github.com/Eyre-S/Coeur-Morny-Cono" + /** The value is "https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s". */ + val COMMIT_PATH: String = "https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s" + override val toString: String = { + "name: %s, version: %s, scalaVersion: %s, sbtVersion: %s, VERSION: %s, VERSION_FULL: %s, VERSION_BASE: %s, VERSION_DELTA: %s, CODENAME: %s, CODE_TIMESTAMP: %s, COMMIT: %s, CLEAN_BUILD: %s, CODE_STORE: %s, COMMIT_PATH: %s".format( + name, version, scalaVersion, sbtVersion, VERSION, VERSION_FULL, VERSION_BASE, VERSION_DELTA, CODENAME, CODE_TIMESTAMP, COMMIT, CLEAN_BUILD, CODE_STORE, COMMIT_PATH + ) + } +} +// $COVERAGE-ON$ diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/Log.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/Log.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/Log.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/Log.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyAbout.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyAbout.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyAbout.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyAbout.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala similarity index 99% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala index 8cf7a44..76ae768 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyCoeur.scala @@ -6,7 +6,7 @@ import cc.sukazyo.cono.morny.core.bot.api.{BotExtension, EventListenerManager, M import cc.sukazyo.cono.morny.core.bot.api.messages.ThreadingManager import cc.sukazyo.cono.morny.core.bot.event.{MornyOnInlineQuery, MornyOnTelegramCommand, MornyOnUpdateTimestampOffsetLock} import cc.sukazyo.cono.morny.core.bot.internal.{ErrorMessageManager, ThreadingManagerImpl} -import cc.sukazyo.cono.morny.core.event.TelegramBotEvents +import cc.sukazyo.cono.morny.core.event.{TelegramBotEvents, TelegramCoreCommandEvents} import cc.sukazyo.cono.morny.core.http.api.{HttpServer, MornyHttpServerContext} import cc.sukazyo.cono.morny.core.http.internal.MornyHttpServerContextImpl import cc.sukazyo.cono.morny.core.module.ModuleHelper @@ -119,6 +119,7 @@ class MornyCoeur (modules: List[MornyModule])(using val config: MornyConfig)(tes given MornyCoeur = this val telegramBotEvents = new TelegramBotEvents() + val telegramCoreCommandEvents = new TelegramCoreCommandEvents() val externalContext: GivenContext = GivenContext() logger `info` diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyConfig.java b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyConfig.java similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyConfig.java rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyConfig.java diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyLangs.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyLangs.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyLangs.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyLangs.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyModule.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyModule.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyModule.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyModule.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornySystem.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornySystem.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornySystem.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornySystem.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyTrusted.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyTrusted.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/MornyTrusted.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/MornyTrusted.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/ServerMain.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/ServerMain.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/ServerMain.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/ServerMain.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/BotExtension.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/BotExtension.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/BotExtension.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/BotExtension.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/EventListenerManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/EventListenerManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/EventListenerManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/EventListenerManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyCommandManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyCommandManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyCommandManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyCommandManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyQueryManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyQueryManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyQueryManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/MornyQueryManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/SimpleCommandManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/SimpleCommandManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/SimpleCommandManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/SimpleCommandManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ErrorMessage.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ErrorMessage.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ErrorMessage.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ErrorMessage.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessageThread.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessageThread.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessageThread.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessageThread.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessagingContext.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessagingContext.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessagingContext.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/MessagingContext.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ThreadingManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ThreadingManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ThreadingManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/api/messages/ThreadingManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/DirectMsgClear.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/DirectMsgClear.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/DirectMsgClear.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/DirectMsgClear.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyHellos.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyHellos.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyHellos.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyHellos.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInfoOnStart.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInfoOnStart.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInfoOnStart.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInfoOnStart.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala similarity index 94% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala index 42a4cfa..fb527df 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformation.scala @@ -4,7 +4,6 @@ import cc.sukazyo.cono.morny.core.{MornyCoeur, MornySystem} import cc.sukazyo.cono.morny.core.bot.api.messages.{ErrorMessage, MessagingContext} import cc.sukazyo.cono.morny.data.MornyInformation.* import cc.sukazyo.cono.morny.data.TelegramStickers -import cc.sukazyo.cono.morny.reporter.MornyReport import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramParseEscape.escapeHtml as h import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute import cc.sukazyo.cono.morny.system.telegram_api.command.{ICommandAlias, InputCommand, ITelegramCommand} @@ -220,23 +219,24 @@ class MornyInformation (using coeur: MornyCoeur) extends ITelegramCommand { .unsafeExecute } + // todo: fix this private def echoEventStatistics (using update: Update): Unit = { - coeur.externalContext >> { (reporter: MornyReport) => - SendMessage( - update.message.chat.id, - VarText( - // language=html - """Event Statistics : - |in today - |{event_statistics}""".stripMargin - ).render( - "event_statistics" -> reporter.EventStatistics.eventStatisticsHTML - ) - ).parseMode(ParseMode.HTML).replyToMessageId(update.message.messageId) - .unsafeExecute - } || { - echo404 - } +// coeur.externalContext >> { (reporter: MornyReport) => +// SendMessage( +// update.message.chat.id, +// VarText( +// // language=html +// """Event Statistics : +// |in today +// |{event_statistics}""".stripMargin +// ).render( +// "event_statistics" -> reporter.EventStatistics.eventStatisticsHTML +// ) +// ).parseMode(ParseMode.HTML).replyToMessageId(update.message.messageId) +// .unsafeExecute +// } || { +// echo404 +// } } private def echo404 (using event: Update): Unit = diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformationOlds.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformationOlds.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformationOlds.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyInformationOlds.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala similarity index 95% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala index 9c460ea..e9bcb3f 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/command/MornyManagers.scala @@ -4,8 +4,8 @@ import cc.sukazyo.cono.morny.core.Log.logger import cc.sukazyo.cono.morny.core.MornyCoeur import cc.sukazyo.cono.morny.core.bot.api.messages import cc.sukazyo.cono.morny.core.bot.api.messages.MessagingContext +import cc.sukazyo.cono.morny.core.event.TelegramCoreCommandEvents import cc.sukazyo.cono.morny.data.TelegramStickers -import cc.sukazyo.cono.morny.reporter.MornyReport import cc.sukazyo.cono.morny.system.telegram_api.command.ICommandAlias.HiddenAlias import cc.sukazyo.cono.morny.system.telegram_api.formatting.TelegramFormatter.* import cc.sukazyo.cono.morny.system.telegram_api.TelegramExtensions.Requests.unsafeExecute @@ -24,7 +24,7 @@ class MornyManagers (using coeur: MornyCoeur) { ).replyToMessageId(cxt.bind_message.messageId) .unsafeExecute logger `attention` s"403 ${command.name} caught from user ${cxt.bind_user toLogTag}" - coeur.externalContext.consume[MornyReport](_.unauthenticatedAction(s"/${command.name}", cxt.bind_user)) + TelegramCoreCommandEvents.inCoeur.OnUnauthorizedManageCommandCall.emit((cxt, command)) false else true } diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnInlineQuery.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnInlineQuery.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnInlineQuery.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnInlineQuery.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnTelegramCommand.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnTelegramCommand.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnTelegramCommand.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnTelegramCommand.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnUpdateTimestampOffsetLock.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnUpdateTimestampOffsetLock.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnUpdateTimestampOffsetLock.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/event/MornyOnUpdateTimestampOffsetLock.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ErrorMessageManager.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ErrorMessageManager.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ErrorMessageManager.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ErrorMessageManager.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ThreadingManagerImpl.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ThreadingManagerImpl.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ThreadingManagerImpl.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/bot/internal/ThreadingManagerImpl.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala similarity index 81% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala index c16b94b..4d828fe 100644 --- a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramBotEvents.scala @@ -2,16 +2,12 @@ package cc.sukazyo.cono.morny.core.event import cc.sukazyo.cono.morny.core.MornyCoeur import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener as TelegramEventListener} -import cc.sukazyo.std.event.{EventContext, RichEvent} +import cc.sukazyo.std.event.RichEvent import cc.sukazyo.std.event.impl.NormalEventManager import com.pengrad.telegrambot.TelegramException class TelegramBotEvents (using coeur: MornyCoeur) { - private val contextInitializer: EventContext[?]=>Unit = context => { - context.givenCxt << coeur - } - /** * Event: OnGetUpdateFailed in TelegramBotEvents * @@ -25,10 +21,10 @@ class TelegramBotEvents (using coeur: MornyCoeur) { * You should register your own listener at stage [[MornyModule.onStartingPost]]. */ val OnGetUpdateFailed: NormalEventManager[TelegramException, Unit] = - NormalEventManager().initContextWith(contextInitializer) + NormalEventManager().initContextWith(initWithCoeur) val OnListenerOccursException: RichEvent[(Throwable, TelegramEventListener, EventEnv), Unit] = - NormalEventManager().initContextWith(contextInitializer) + NormalEventManager().initContextWith(initWithCoeur) } diff --git a/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramCoreCommandEvents.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramCoreCommandEvents.scala new file mode 100644 index 0000000..9274fb4 --- /dev/null +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/TelegramCoreCommandEvents.scala @@ -0,0 +1,21 @@ +package cc.sukazyo.cono.morny.core.event + +import cc.sukazyo.cono.morny.core.MornyCoeur +import cc.sukazyo.cono.morny.core.bot.api.messages.MessagingContext +import cc.sukazyo.cono.morny.system.telegram_api.command.ISimpleCommand +import cc.sukazyo.std.event.RichEvent +import cc.sukazyo.std.event.impl.NormalEventManager + +class TelegramCoreCommandEvents (using coeur: MornyCoeur) { + + val OnUnauthorizedManageCommandCall: RichEvent[(MessagingContext.WithUserAndMessage, ISimpleCommand), Unit] = + NormalEventManager().initContextWith(initWithCoeur) + +} + +object TelegramCoreCommandEvents { + + def inCoeur (using coeur: MornyCoeur): TelegramCoreCommandEvents = + coeur.telegramCoreCommandEvents + +} diff --git a/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/package.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/package.scala new file mode 100644 index 0000000..2292fcc --- /dev/null +++ b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/event/package.scala @@ -0,0 +1,12 @@ +package cc.sukazyo.cono.morny.core + +import cc.sukazyo.std.event.EventContext + +package object event { + + def initWithCoeur (using coeur: MornyCoeur): EventContext[?]=>Unit + = context => { + context.givenCxt << coeur + } + +} diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/ServiceUI.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/ServiceUI.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/ServiceUI.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/ServiceUI.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpServer.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpServer.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpServer.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpServer.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpService4Api.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpService4Api.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpService4Api.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpService4Api.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpStatus.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpStatus.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpStatus.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/HttpStatus.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/MornyHttpServerContext.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/MornyHttpServerContext.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/api/MornyHttpServerContext.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/api/MornyHttpServerContext.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/internal/MornyHttpServerContextImpl.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/internal/MornyHttpServerContextImpl.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/internal/MornyHttpServerContextImpl.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/internal/MornyHttpServerContextImpl.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/services/Ping.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/services/Ping.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/http/services/Ping.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/http/services/Ping.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/BuildConfigField.java b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/BuildConfigField.java similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/BuildConfigField.java rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/BuildConfigField.java diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/MornyInternalModule.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/MornyInternalModule.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/MornyInternalModule.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/MornyInternalModule.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/IMornyLogLevelImpl.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/IMornyLogLevelImpl.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/IMornyLogLevelImpl.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/IMornyLogLevelImpl.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyFormatterConsole.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyFormatterConsole.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyFormatterConsole.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyFormatterConsole.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLogLevels.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLogLevels.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLogLevels.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLogLevels.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLoggerBase.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLoggerBase.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLoggerBase.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/internal/logging/MornyLoggerBase.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleHelper.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleHelper.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleHelper.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleHelper.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleLoader.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleLoader.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleLoader.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModuleLoader.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModulesJarLoader.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModulesJarLoader.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/core/module/ModulesJarLoader.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/core/module/ModulesJarLoader.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/MornyAssets.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/data/MornyAssets.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/MornyAssets.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/data/MornyAssets.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/MornyInformation.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/data/MornyInformation.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/MornyInformation.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/data/MornyInformation.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/TelegramImages.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/data/TelegramImages.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/TelegramImages.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/data/TelegramImages.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/TelegramStickers.java b/morny-core/src/main/scala/cc/sukazyo/cono/morny/data/TelegramStickers.java similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/data/TelegramStickers.java rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/data/TelegramStickers.java diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/CommonFormat.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/CommonFormat.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/CommonFormat.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/CommonFormat.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/FileUtils.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/FileUtils.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/FileUtils.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/FileUtils.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/StringEnsure.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/StringEnsure.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/StringEnsure.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/StringEnsure.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/UseString.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/UseString.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/UseString.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/UseString.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/UseThrowable.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/UseThrowable.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/UseThrowable.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/UseThrowable.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/dataview/Table.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/dataview/Table.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/dataview/Table.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/dataview/Table.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Definitions.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Definitions.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Definitions.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Definitions.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LangTag.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LangTag.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LangTag.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LangTag.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LanguageTree.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LanguageTree.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LanguageTree.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/LanguageTree.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Parser.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Parser.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Parser.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Parser.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Translations.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Translations.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Translations.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/hytrans/Translations.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/CronTask.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/CronTask.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/CronTask.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/CronTask.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/DelayedTask.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/DelayedTask.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/DelayedTask.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/DelayedTask.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalTask.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalTask.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalTask.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalTask.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalWithTimesTask.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalWithTimesTask.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalWithTimesTask.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/IntervalWithTimesTask.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/RoutineTask.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/RoutineTask.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/RoutineTask.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/RoutineTask.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Scheduler.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Scheduler.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Scheduler.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Scheduler.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Task.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Task.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Task.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/schedule/Task.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/time/WatchDog.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/time/WatchDog.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/time/WatchDog.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/time/WatchDog.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNode.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNode.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNode.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNode.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeLiteral.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeLiteral.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeLiteral.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeLiteral.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeVar.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeVar.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeVar.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VTNodeVar.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/Var.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/Var.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/Var.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/Var.scala diff --git a/morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VarText.scala b/morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VarText.scala similarity index 100% rename from morny-coeur/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VarText.scala rename to morny-core/src/main/scala/cc/sukazyo/cono/morny/util/var_text/VarText.scala diff --git a/project/MornyConfiguration.scala b/project/MornyConfiguration.scala index 3f1f27c..bee850e 100644 --- a/project/MornyConfiguration.scala +++ b/project/MornyConfiguration.scala @@ -74,7 +74,32 @@ object MornyConfiguration { override val group = GROUP override val root_package = s"$GROUP.cono.morny.core" - override val dependencies = Seq() + override val dependencies = Seq( + + "com.github.spotbugs" % "spotbugs-annotations" % "4.9.1" % Compile, + + "cc.sukazyo" % "messiva" % "0.2.0", + "cc.sukazyo" % "resource-tools" % "0.3.1", + "cc.sukazyo" % "da4a" % "0.2.0-SNAPSHOT" changing(), + + "com.github.pengrad" % "java-telegram-bot-api" % "6.2.0", + "org.http4s" %% "http4s-dsl" % "0.23.30", + "org.http4s" %% "http4s-circe" % "0.23.30", + "org.http4s" %% "http4s-netty-server" % "0.5.22", + + "io.circe" %% "circe-core" % "0.14.10", + "io.circe" %% "circe-generic" % "0.14.10", + "io.circe" %% "circe-parser" % "0.14.10", + + "com.cronutils" % "cron-utils" % "9.2.1", + + "org.scalatest" %% "scalatest" % "3.2.19" % Test, + "org.scalatest" %% "scalatest-freespec" % "3.2.19" % Test, + // for test report + "com.vladsch.flexmark" % "flexmark" % "0.64.8" % Test, + "com.vladsch.flexmark" % "flexmark-profile-pegdown" % "0.64.8" % Test + + ) }