didier/cogs/owner.py

@@ -36,6 +36,7 @@ class Owner(commands.Cog):
             self.client.tree.copy_global_to(guild=guild)
             await self.client.tree.sync(guild=guild)
         else:
+            self.client.tree.clear_commands(guild=None)
             await self.client.tree.sync()
 
         await ctx.message.add_reaction("🔄")
@@ -72,14 +73,14 @@ class Owner(commands.Cog):
     @add_slash.command(name="custom", description="Add a custom command")
     async def add_custom_slash(self, interaction: discord.Interaction):
         """Slash command to add a custom command"""
-        if not await self.client.is_owner(interaction.user):
+        if not self.client.is_owner(interaction.user):
             return interaction.response.send_message(
                 "Je hebt geen toestemming om dit commando uit te voeren.", ephemeral=True
             )
 
-        # await interaction.response.defer(ephemeral=True)
+        await interaction.response.defer(ephemeral=True)
         modal = CreateCustomCommand()
-        await interaction.response.send_modal(modal)
+        await interaction.response.send_message(modal)
 
     @commands.group(name="Edit")
     async def edit(self, ctx: commands.Context):

didier/data/modals/custom_commands.py

@@ -6,10 +6,10 @@ import discord
 class CreateCustomCommand(discord.ui.Modal, title="Custom Command"):
     """Modal shown to visually create custom commands"""
 
-    name: discord.ui.TextInput = discord.ui.TextInput(label="Name", placeholder="Name of the command")
+    name: discord.ui.TextInput = discord.ui.TextInput(label="Name", placeholder="Name of the command...")
 
     response: discord.ui.TextInput = discord.ui.TextInput(
-        label="Response", style=discord.TextStyle.long, placeholder="Response of the command", max_length=2000
+        label="Response", style=discord.TextStyle.long, placeholder="Response of the command...", max_length=2000
     )
 
     async def on_submit(self, interaction: discord.Interaction) -> None:

tests/conftest.py

@@ -3,10 +3,11 @@ from typing import AsyncGenerator, Generator
 from unittest.mock import MagicMock
 
 import pytest
+
+from alembic import command, config
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from database.engine import engine
-from database.models import Base
 from didier import Didier
 
 
@@ -18,10 +19,15 @@ def event_loop() -> Generator:
 
 
 @pytest.fixture(scope="session")
-async def tables(event_loop):
-    """Initialize a database before the tests, and then tear it down again"""
-    async with engine.begin() as connection:
-        await connection.run_sync(Base.metadata.create_all)
+def tables(event_loop):
+    """Initialize a database before the tests, and then tear it down again
+    Starts from an empty database and runs through all the migrations to check those as well
+    while we're at it
+    """
+    alembic_config = config.Config("alembic.ini")
+    command.upgrade(alembic_config, "head")
+    yield
+    command.downgrade(alembic_config, "base")
 
 
 @pytest.fixture