Migrate conch to app command

modules/fun/conch.py

@@ -10,7 +10,7 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-from discord.ext import commands
+from discord import app_commands
 
 from core import auxiliary, cogs
 
@@ -60,59 +60,40 @@ class MagicConch(cogs.BaseCog):
     ]
     PIC_URL: str = "https://i.imgur.com/vdvGrsR.png"
 
-    def format_question(self: Self, question: str) -> str:
-        """This formats a question properly. It will crop it if needed, and add a "?" to the end
-
-        Args:
-            question (str): The original question passed from the user
-
-        Returns:
-            str: The final formatted questions. Will always be 256 or less in length,
-                and end with a "?"
-        """
-        question = question[:255]
-        if not question.endswith("?"):
-            question += "?"
-        return question
-
+    @app_commands.command(
+        name="conch",
+        description="Asks the Magic Conch (8ball) a question",
+    )
     async def conch_command(
-        self: Self, ctx: commands.Context, question: str = ""
+        self: Self, interaction: discord.Interaction, question: str
     ) -> None:
         """Method for the core logic of the conch command
 
         Args:
-            ctx (commands.Context): The context in which the command was run it
-            question (str, optional): The question asked. Defaults to "".
+            interaction (discord.Interaction): The interaction that called this command
+            question (str): The question asked.
         """
-        if question == "":
-            await auxiliary.send_deny_embed(
-                message="You need to add a question", channel=ctx.channel
-            )
-            return
-        formatted_question = self.format_question(question)
+        formatted_question = format_question(question)
         embed = auxiliary.generate_basic_embed(
             title=formatted_question,
             description=random.choice(self.RESPONSES),
             color=discord.Color.blurple(),
             url=self.PIC_URL,
         )
-        await ctx.send(embed=embed)
+        await interaction.response.send_message(embed=embed)
 
-    @commands.command(
-        name="conch",
-        aliases=["8ball", "8b"],
-        brief="Asks the Magic Conch",
-        description="Asks the Magic Conch (8ball) a question",
-        usage="[question]",
-    )
-    async def ask_question(
-        self: Self, ctx: commands.Context, *, question: str = ""
-    ) -> None:
-        """Method for how the conch command works for the bot.
-        This is a command and should be run via discord
 
-        Args:
-            ctx (commands.Context): The context in which the command was run
-            question (str, optional): The question to ask the magic conch. Defaults to "".
-        """
-        await self.conch_command(ctx, question)
+def format_question(question: str) -> str:
+    """This formats a question properly. It will crop it if needed, and add a "?" to the end
+
+    Args:
+        question (str): The original question passed from the user
+
+    Returns:
+        str: The final formatted questions. Will always be 256 or less in length,
+            and end with a "?"
+    """
+    question = question[:255]
+    if not question.endswith("?"):
+        question += "?"
+    return question

tests/commands_tests/test_extensions_conch.py

@@ -10,7 +10,7 @@
 from hypothesis import given
 from hypothesis.strategies import text
 
-from tests import config_for_tests
+from modules.fun import conch
 
 
 class Test_FormatQuestion:
@@ -25,10 +25,9 @@ def test_format_question(self: Self, question: str) -> None:
             question (str): The randomly generated question to format
         """
         # Step 1 - Setup env
-        discord_env = config_for_tests.FakeDiscordEnv()
 
         # Step 2 - Call the function
-        new_question = discord_env.conch.format_question(question)
+        new_question = conch.format_question(question)
 
         # Step 3 - Assert that everything works
         assert new_question.endswith("?")
@@ -39,10 +38,9 @@ def test_format_question(self: Self, question: str) -> None:
     def test_format_question_no_mark(self: Self) -> None:
         """Test to ensure that format question adds a question mark if needed"""
         # Step 1 - Setup env
-        discord_env = config_for_tests.FakeDiscordEnv()
 
         # Step 2 - Call the function
-        new_question = discord_env.conch.format_question("This is a question")
+        new_question = conch.format_question("This is a question")
 
         # Step 3 - Assert that everything works
         assert new_question == "This is a question?"
@@ -51,10 +49,9 @@ def test_format_question_yes_mark(self: Self) -> None:
         """Test to ensure that the format question doesn't add a
         question mark when the question ends with a question mark"""
         # Step 1 - Setup env
-        discord_env = config_for_tests.FakeDiscordEnv()
 
         # Step 2 - Call the function
-        new_question = discord_env.conch.format_question("This is a question?")
+        new_question = conch.format_question("This is a question?")
 
         # Step 3 - Assert that everything works
         assert new_question == "This is a question?"