🐛 Some bugfixes again

Author: Kile

algorithms/parser.md

@@ -152,7 +152,6 @@ This would
 1) Check all arguments were provided correctly
 2) Handle all check failures inside of the code of the card
 
-## THIS SYSTEM IS OUTDATED. I improved it but too lazy to update the classes below rn. 
 
 As for the actual class, all individual class subclass two classes. 
 ### 1) Card
@@ -177,19 +176,10 @@ class IndividualCard(ABC):
     """A class purely for type purposes to require subclasses to implement the exect method"""
     ctx: commands.Context
 
-    @classmethod
-    async def _new(cls, name_or_id: str, ctx: commands.Context) -> Card:
-        base = await Card.new(name_or_id=name_or_id)
-        setattr(base, "ctx", ctx)
-        setattr(base, "exec", partial(cls.exec, self=base))
-        return base
-
     @abstractmethod
     async def exec(self, *args, **kwargs) -> None: ...
 ```
-Before the async rewrite, this class was much cleaner and merely served the purpose of type hinting that individual card classes had to implement the `exec` method. However, after the async rewrite, `Card.new` always returned an instance of `Card`, not implementing the `exec` method. So I had to come up with a way to dynamically add the `exec` method to the instance of `Card` that was returned by `Card.new`. This was done by using a class method `_new` which would return an instance of `Card` with the `exec` method added to it. This was done by using the `partial` function from the `functools` module to bind the `exec` method of the subclass to the instance of `Card` that was returned by `Card.new`. 
-
-This code is not clean, it doesn't follow the idea of an abstract class and I much preffered the old version. However, it was the only way I could find to make it work.
+This class merely serves the purpose of type hinting that individual card classes had to implement the `exec` method.
 
 ### The subclass
 ```py

killua/cogs/cards.py

@@ -532,7 +532,7 @@ async def hunt(
             ):  # I don't think timedelta has an hours or minutes property :c
                 return await ctx.send("You must be at least hunting for twelve hours!")
 
-            if not ctx.interaction.response.is_done():
+            if ctx.interaction and not ctx.interaction.response.is_done():
                 await ctx.defer()  # The following part may take longer than 3 secons
 
             minutes = int(difference.seconds / 60 + difference.days * 24 * 60)

killua/cogs/help.py

@@ -83,15 +83,14 @@ def get_command_help(
 
         premium_guild, premium_user, cooldown = False, False, False
 
-        if [c for c in checks if hasattr(c, "premium_guild_only")]:
+        if any(c for c in checks if hasattr(c, "premium_guild_only")):
             premium_guild = True
 
-        if [c for c in checks if hasattr(c, "premium_user_only")]:
+        if any(c for c in checks if hasattr(c, "premium_user_only")):
             premium_user = True
 
-        if res := [c for c in checks if hasattr(c, "cooldown")]:
-            check = res[0]
-            cooldown = getattr(check, "cooldown", False)
+        if res := next((c for c in checks if hasattr(c, "cooldown")), None):
+            cooldown = getattr(res, "cooldown", False)
 
         if premium_guild or premium_user:
             embed.description += f"\n{'<:premium_guild_badge:883473807292121149>' if premium_guild else '<:tier_one_badge:879390548857880597>'} `[Premium {'servers' if premium_guild else 'users'} only]`"
@@ -303,7 +302,7 @@ async def help(
             )
 
             await view.wait()
-            if view.timed_out:
+            if view.timed_out or view.value is None:
                 view.children[0].disabled = (
                     True  # Instead of looping through all the children, we just disable the select menu since we want the links to remain clickable
                 )

killua/utils/classes/card.py

@@ -21,7 +21,7 @@
 )
 from killua.bot import BaseBot
 
-if TYPE_CHECKING:
+if TYPE_CHECKING: # Circular import my beloved
     from killua.utils.classes import User
 
 from killua.utils.interactions import Select, View, Button
@@ -38,21 +38,6 @@ class SuccessfulDefense(CheckFailure):
 class CardNotFound(Exception):
     pass
 
-# TODO this below is not true I am too lazy to rephrase need to do later.
-#
-# Unfortunately, for the Card class that provides useful methods for spell cards
-# needs to import the User class which in turn needs to import the Card class.
-# The actual methods of that spell card base class are not needed in the User class,
-# so I created a partial class that only contains the necessary methods and properties
-# to prevent a circular import. This is only used in this module.
-#
-# Circular import:
-#             ⏤⏤⏤⏤⏤⏤
-#           /             ↘︎
-#       User                Card
-#           ↖︎             /
-#             ⏤⏤⏤⏤⏤⏤
-
 
 @dataclass
 class Card:

killua/utils/paginator.py

@@ -162,7 +162,7 @@ async def backwards(self, interaction: discord.Interaction, _: discord.ui.Button
     async def delete(self, interaction: discord.Interaction, _: discord.ui.Button):
         try:
             await interaction.message.delete()
-        except discord.Forbidden:
+        except discord.HTTPException:
             await self.disable(interaction.message)
         self.ignore = True
         self.stop()