commands/utils.py

@@ -30,13 +30,10 @@ class Command(Enum):
 
 @lru_cache
 def match_token(token: str) -> list[Command]:
-    match token.lower():
+    if token.lower() == "r":
-        case "r":
+        return [Command.RELOAD]
-            return [Command.RELOAD]
+    elif token.lower() == "s":
-        case "s":
+        return [Command.SKIP]
-            return [Command.SKIP]
-        case "c":
-            return [Command.CURRENT]
 
     if exact_match := list(
         filter(

constants.py

@@ -45,8 +45,6 @@ RELOADABLE_MODULES = [
     "sponsorblock",
     "tasks",
     "utils",
-    "utils.common",
-    "utils.discord",
     "voice",
     "yt_dlp",
     "yt_dlp.version",

core.py

@@ -48,12 +48,11 @@ async def on_message(message, edited=False):
 
     try:
         if (cooldowns := command_cooldowns.get(message.author.id)) and not edited:
-            if (end_time := cooldowns.get(matched)) and (
+            cur_time = time.time()
-                remaining_time := round(end_time - time.time()) > 0
+            if (end_time := cooldowns.get(matched)) and round(end_time - cur_time) > 0:
-            ):
                 await utils.reply(
                     message,
-                    f"please wait **{utils.format_duration(remaining_time, natural=True)}** before using this command again!",
+                    f"please wait **{utils.format_duration(round(end_time - cur_time), natural=True)}** before using this command again!",
                 )
                 return
 
@@ -71,9 +70,10 @@ async def on_message(message, edited=False):
                     rreload(reloaded_modules, module)
 
                 end = time.time()
-                debug(
+                if __debug__:
-                    f"reloaded {len(reloaded_modules)} modules in {round(end - start, 2)}s"
+                    debug(
-                )
+                        f"reloaded {len(reloaded_modules)} modules in {round(end - start, 2)}s"
+                    )
 
                 await utils.add_check_reaction(message)
 

tasks.py

@@ -19,7 +19,8 @@ async def cleanup():
                 targets.append(guild_id)
         for target in targets:
             del players[target]
-        debug(f"cleanup removed {len(targets)} empty players")
+        if __debug__:
+            debug(f"cleanup removed {len(targets)} empty players")
 
         if (
             not idle_tracker["is_idle"]

utils/discord.py

@@ -5,14 +5,10 @@ from logging import error, info
 import disnake
 
 import commands
-from constants import OWNERS
 from state import command_cooldowns, message_responses
 
 
 def cooldown(message, cooldown_time: int):
-    if message.author.id in OWNERS:
-        return
-
     possible_commands = commands.match(message.content)
     if not possible_commands or len(possible_commands) > 1:
         return
@@ -90,7 +86,8 @@ class ChannelResponseWrapper:
         self.sent_message = None
 
     async def send_message(self, **kwargs):
-        kwargs.pop("ephemeral", None)
+        if "ephemeral" in kwargs:
+            del kwargs["ephemeral"]
         self.sent_message = await reply(self.message, **kwargs)
 
     async def edit_message(self, content=None, embed=None, view=None):