Progress on contet, error handling, whatever

Author: Iapetus-11

discord/bot/cogs/core/events.py

@@ -355,12 +355,6 @@ async def handle_command_cooldown(
     async def on_command_error(self, ctx: Ctx, e: Exception):
         self.bot.error_count += 1
 
-        if (custom_error := getattr(ctx, "custom_error", None)) is not None:
-            e = custom_error
-
-        # if not isinstance(e, MaxKarenConcurrencyReached) and ctx.command:
-        #     await self.karen.release_concurrency(ctx.command.qualified_name, ctx.author.id)
-
         if isinstance(e, commands.CommandOnCooldown):
             await self.handle_command_cooldown(ctx, e.retry_after, False)
         elif isinstance(e, CommandOnKarenCooldownError):

discord/bot/logic/command_errors.py

@@ -0,0 +1,29 @@
+from datetime import datetime, timedelta, timezone
+from typing import Any
+
+from discord.ext.commands import CommandError
+
+
+class CommandOnKarenCooldown(CommandError):
+    def __init__(self, cooldown_until: datetime):
+        self.cooldown_until = cooldown_until
+        super().__init__(f"You are on cooldown. Try again in {self.remaining.total_seconds():.2f}s")
+
+    @property
+    def remaining(self) -> timedelta:
+        return self.cooldown_until - datetime.now(timezone.utc)
+
+
+class UserBotBanned(CommandError):
+    def __init__(self):
+        super().__init__("You are banned from this bot")
+
+
+class BotNotReadyYet(CommandError):
+    def __init__(self):
+        super().__init__("Bot has not finished starting yet")
+
+
+class CommandDisabledByGuild(CommandError):
+    def __init__(self) -> None:
+        super().__init__("Command is disabled by this Discord server")

discord/bot/logic/ctx.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
+import dataclasses
 import typing
 
 import discord
 from discord.ext.commands import Context
 
 from bot.models.translation import Translation
+from bot.services.karen.resources.discord.guild import DiscordGuildSettings as KarenDiscordGuild
+from bot.services.karen.resources.users import User as KarenUser
 
 if typing.TYPE_CHECKING:
     from bot.villager_bot import VillagerBotCluster
@@ -14,16 +17,17 @@
 class CustomContext(Context["VillagerBotCluster"]):
     """Custom context class to provide extra helper methods and multi-language support"""
 
-    embed_color: discord.Color | None  # used in send_embed(...) and reply_embed(...)
+    @dataclasses.dataclass(frozen=True, slots=True, kw_only=True, eq=False, match_args=False)
+    class KarenData:
+        user: KarenUser
+        guild: KarenDiscordGuild | None
+
     l: Translation  # the translation of the bot text for the current context  # noqa: E741
-    failure_reason: str | None  # failure reason used in some command error handling
-    custom_error: Exception | None
+    k: KarenData
 
-    def __init__(self, *args, embed_color: discord.Color | None = None, **kwargs):
+    def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.embed_color = embed_color
-
     async def send_embed(self, message: str, *, ignore_exceptions: bool = False) -> None:
         await self.bot.send_embed(self, message, ignore_exceptions=ignore_exceptions)
 
@@ -42,6 +46,17 @@ def __repr__(self) -> str:
 
         return f"Ctx({guild_id=}, {author_id=})"
 
+    async def async_init(self):
+        self.l = await self.bot.get_language(self)
+
+        karen_guild_settings: KarenDiscordGuild | None = None
+        if self.guild is not None:
+            karen_guild_settings = await self.bot.karen.discord.cached.guilds.get(self.guild.id)
+
+        karen_user = await self.bot.karen.cached.users.get(self.author.id)
+
+        self.k = self.KarenData(user=karen_user, guild=karen_guild_settings)
+
 
 Ctx = CustomContext
 

discord/bot/logic/errors.py

@@ -1,2 +1,2 @@
 from .cache import KarenResourceCache
-from .client import KarenClient
+from .client import KarenClient

discord/bot/services/karen/__init__.py

@@ -5,6 +5,7 @@
 from typing import Any
 
 import aiohttp
+from bot.logic.command_errors import BotNotReadyYet, CommandDisabledByGuild, UserBotBanned
 import captcha.image
 import discord
 import psutil
@@ -158,32 +159,31 @@ async def on_ready(self):
                     "An error occurred in on_ready while syncing slash commands",
                 )
 
-            try:
-                self.logger.info("Syncing db item prices...")
+            # try:
+            #     self.logger.info("Syncing db item prices...")
 
-                item_prices = {v.db_entry.item: v.db_entry.sell_price for k, v in self.d.shop_items.items()}
-                item_prices.update(
-                    {self.d.farming.name_map[k]: v for k, v in self.d.farming.emerald_yields.items()},
-                )
-                item_prices.update({f.item: f.sell_price for f in self.d.fishing_findables})
-                item_prices.update({
-                    self.d.farming.name_map[crop_type]: emerald_amount
-                    for crop_type, emerald_amount in self.d.farming.emerald_yields.items()
-                })
+            #     item_prices = {v.db_entry.item: v.db_entry.sell_price for k, v in self.d.shop_items.items()}
+            #     item_prices.update(
+            #         {self.d.farming.name_map[k]: v for k, v in self.d.farming.emerald_yields.items()},
+            #     )
+            #     item_prices.update({f.item: f.sell_price for f in self.d.fishing_findables})
+            #     item_prices.update({
+            #         self.d.farming.name_map[crop_type]: emerald_amount
+            #         for crop_type, emerald_amount in self.d.farming.emerald_yields.items()
+            #     })
 
-                await self.get_cog("Database").sync_item_prices(item_prices)
+            #     await self.get_cog("Database").sync_item_prices(item_prices)
 
-                self.logger.info("Done syncing db item prices!")
-            except Exception:
-                self.logger.exception(
-                    "An error occurred in on_ready while syncing db item prices",
-                )
+            #     self.logger.info("Done syncing db item prices!")
+            # except Exception:
+            #     self.logger.exception(
+            #         "An error occurred in on_ready while syncing db item prices",
+            #     )
 
     async def get_context(self, *args, **kwargs) -> CustomContext:  # type: ignore[override]
-        ctx = await super().get_context(*args, **kwargs, cls=CustomContext)
+        ctx: CustomContext = await super().get_context(*args, **kwargs, cls=CustomContext)
 
-        ctx.embed_color = self.embed_color
-        ctx.l = await self.get_language(ctx)
+        await ctx.async_init()
 
         return ctx
 
@@ -230,16 +230,13 @@ async def check_global(self, ctx: CustomContext) -> bool:  # the global command
         karen_guild_settings = (await self.karen.discord.cached.guilds.get(ctx.guild.id)) if ctx.guild else None
 
         if karen_user.banned:
-            ctx.failure_reason = "bot_banned"
-            return False
+            raise UserBotBanned()
 
         if not self.is_ready():
-            ctx.failure_reason = "not_ready"
-            return False
+            raise BotNotReadyYet()
 
         if karen_guild_settings is not None and command_name in karen_guild_settings.disabled_commands:
-            ctx.failure_reason = "disabled"
-            return False
+            raise CommandDisabledByGuild()
 
         preflight = await self.karen.command_executions.preflight(
             CommandExecutionPreflightRequest(