diff --git a/.env.dev b/.env.dev index 38e533f..4cebd38 100644 --- a/.env.dev +++ b/.env.dev @@ -1,2 +1,4 @@ DRIVER=~fastapi+~httpx+~websockets -COMMAND_START=["!", "!", "", "/"] \ No newline at end of file +COMMAND_START=["!", "!", "", "/"] + +ALCONNA_USE_ORIGIN=true \ No newline at end of file diff --git a/.env.prod b/.env.prod index 38e533f..4cebd38 100644 --- a/.env.prod +++ b/.env.prod @@ -1,2 +1,4 @@ DRIVER=~fastapi+~httpx+~websockets -COMMAND_START=["!", "!", "", "/"] \ No newline at end of file +COMMAND_START=["!", "!", "", "/"] + +ALCONNA_USE_ORIGIN=true \ No newline at end of file diff --git a/konabot/plugins/roll_dice/__init__.py b/konabot/plugins/roll_dice/__init__.py index 3239179..d980b5a 100644 --- a/konabot/plugins/roll_dice/__init__.py +++ b/konabot/plugins/roll_dice/__init__.py @@ -1,3 +1,6 @@ +from nonebot.adapters import Event as BaseEvent +from nonebot.adapters.console.event import MessageEvent as ConsoleMessageEvent +from nonebot.adapters.discord.event import MessageEvent as DiscordMessageEvent from nonebot_plugin_alconna import Alconna, UniMessage, on_alconna from konabot.plugins.roll_dice.roll_dice import roll_dice @@ -7,5 +10,10 @@ evt = on_alconna(Alconna( ), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True) @evt.handle() -async def _(): - await evt.send(await UniMessage().text(await roll_dice()).export()) +async def _(event: BaseEvent): + if isinstance(event, DiscordMessageEvent): + await evt.send(await UniMessage().text("```\n" + roll_dice() + "\n```").export()) + elif isinstance(event, ConsoleMessageEvent): + await evt.send(await UniMessage().text(roll_dice()).export()) + else: + await evt.send(await UniMessage().text(roll_dice(wide=True)).export()) diff --git a/konabot/plugins/roll_dice/roll_dice.py b/konabot/plugins/roll_dice/roll_dice.py index fd2887a..53e23bf 100644 --- a/konabot/plugins/roll_dice/roll_dice.py +++ b/konabot/plugins/roll_dice/roll_dice.py @@ -7,14 +7,14 @@ number_arts = { ''', 2: ''' ____ - |___ \ + |___ \\ __) | / __/ |_____| ''', 3: ''' _____ |___ / - |_ \ + |_ \\ ___) | |____/ ''', @@ -26,15 +26,15 @@ number_arts = { ''', 5: ''' ____ | ___| - |___ \ + |___ \\ ___) | |____/ ''', 6: ''' __ / /_ - | '_ \ + | '_ \\ | (_) | - \___/ + \\___/ ''' } @@ -42,5 +42,13 @@ def get_random_number(min: int = 1, max: int = 6) -> int: import random return random.randint(min, max) -async def roll_dice() -> str: - return number_arts[get_random_number()] \ No newline at end of file +def roll_dice(wide: bool = False) -> str: + raw = number_arts[get_random_number()] + if wide: + raw = (raw + .replace("/", "/") + .replace("\\", "\") + .replace("_", "_") + .replace("|", "|") + .replace(" ", " ")) + return raw