diff --git a/code/cogs/music.py b/code/cogs/music.py index 1d8049b..077cb0a 100644 --- a/code/cogs/music.py +++ b/code/cogs/music.py @@ -11,11 +11,6 @@ from global_variables import ( ) -class CreatePlayerError(Exception): - "Raised when the create_player function errors out" - pass - - class LavalinkVoiceClient(discord.VoiceProtocol): """ This is the preferred way to handle external voice sending @@ -139,14 +134,14 @@ class Music(commands.Cog): if not interaction.user.voice or not interaction.user.voice.channel: if voice_client is not None: - raise CreatePlayerError( + raise app_commands.AppCommandError( { "title": "Not in my VC", "description": "You must join my voice channel to run that command.", } ) - raise CreatePlayerError( + raise app_commands.AppCommandError( { "title": "No Channel", "description": "You must join a voice channel before you can run that command.", @@ -155,7 +150,7 @@ class Music(commands.Cog): if voice_client is None: if not should_connect: - raise CreatePlayerError( + raise app_commands.AppCommandError( { "title": "Not Connected", "description": "I am not connected and playing music right now, therefore that command will not work.", @@ -167,7 +162,7 @@ class Music(commands.Cog): ) if not permissions.connect or not permissions.speak: - raise CreatePlayerError( + raise app_commands.AppCommandError( { "title": "Missing Permissions", "description": "I need the `CONNECT` and `SPEAK` permissions in order to work.", @@ -177,7 +172,7 @@ class Music(commands.Cog): player.store("channel", interaction.channel.id) else: if int(player.channel_id) != interaction.user.voice.channel.id: - raise CreatePlayerError( + raise app_commands.AppCommandError( { "title": "Not in my VC", "description": "You must join my voice channel to run that command.", diff --git a/code/cogs/slash_handlers.py b/code/cogs/slash_handlers.py index e6f67b9..9f8f201 100644 --- a/code/cogs/slash_handlers.py +++ b/code/cogs/slash_handlers.py @@ -5,7 +5,6 @@ from discord.ext.commands.errors import * import datetime from global_variables import BOT_COLOR -from cogs.music import CreatePlayerError from custom_source import LoadError @@ -47,7 +46,7 @@ class slash_handlers(commands.Cog): # ) # await interaction.response.send_message(embed=embed, ephemeral=True) - elif isinstance(error, CreatePlayerError): + elif isinstance(error, app_commands.AppCommandError): embed = discord.Embed( title=error.args[0]["title"], description=error.args[0]["description"],