From 1b95b0a91777405c12925e585b6883e76f35be8c Mon Sep 17 00:00:00 2001 From: Eyre_S Date: Wed, 9 Apr 2025 15:08:13 +0800 Subject: [PATCH] add support for "o" and "/o" as alias of "/on" in PRIVATE chats --- gradle.properties | 2 +- .../morny/bot/command/MornyCommands.scala | 2 +- .../morny/bot/event/MornyEventListeners.scala | 1 + .../cono/morny/bot/event/OnOnAlias.scala | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/scala/cc/sukazyo/cono/morny/bot/event/OnOnAlias.scala diff --git a/gradle.properties b/gradle.properties index 1320bec..cb1dc67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ MORNY_ARCHIVE_NAME = morny-coeur MORNY_CODE_STORE = https://github.com/Eyre-S/Coeur-Morny-Cono MORNY_COMMIT_PATH = https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s -VERSION = 1.5.0-alpha.1 +VERSION = 1.5.0-alpha.2 USE_DELTA = false VERSION_DELTA = diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/command/MornyCommands.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/command/MornyCommands.scala index d46b48a..3eb8749 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/command/MornyCommands.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/command/MornyCommands.scala @@ -23,7 +23,7 @@ class MornyCommands (using coeur: MornyCoeur) { stash += (alias.name -> i) stash - private val $MornyHellos = MornyHellos() + private[bot] val $MornyHellos = MornyHellos() private val $IP186Query = IP186Query() private val $MornyInformation = MornyInformation() private val $MornyInformationOlds = MornyInformationOlds(using $MornyInformation) diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyEventListeners.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyEventListeners.scala index 9e2d674..0e05d4c 100644 --- a/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyEventListeners.scala +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyEventListeners.scala @@ -9,6 +9,7 @@ class MornyEventListeners (using manager: EventListenerManager) (using coeur: Mo manager.register( // ACTIVITY_RECORDER // KUOHUANHUAN_NEED_SLEEP + OnOnAlias(), OnUniMeowTrigger(using coeur.commands), $OnUserRandom.RandomSelect, //noinspection NonAsciiCharacters diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnOnAlias.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnOnAlias.scala new file mode 100644 index 0000000..bb44c48 --- /dev/null +++ b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnOnAlias.scala @@ -0,0 +1,19 @@ +package cc.sukazyo.cono.morny.bot.event + +import cc.sukazyo.cono.morny.bot.api.{EventEnv, EventListener} +import cc.sukazyo.cono.morny.MornyCoeur +import cc.sukazyo.cono.morny.util.tgapi.InputCommand +import com.pengrad.telegrambot.model.Chat + +class OnOnAlias (using coeur: MornyCoeur) extends EventListener { + + override def onMessage (using event: EventEnv): Unit = { + + if (event.update.message.chat.`type` != Chat.Type.Private) return; + if !(List("o", "/o") contains event.update.message.text) then return; + + coeur.commands.$MornyHellos.On.execute(using InputCommand(""), event.update) + + } + +}