parker/guava
parker/guava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove CreatePlayerError just go back to AppCommandError

Browse Source
This commit is contained in:
Parker M. 2024-04-09 01:59:25 -05:00
parent ccc9d5c566
commit a550657990
No known key found for this signature in database
GPG Key ID: 95CD2E0C7E329F2A
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/cogs/music.py
View File

@ -11,11 +11,6 @@ from global_variables import (
) )
class CreatePlayerError(Exception):
"Raised when the create_player function errors out"
pass
class LavalinkVoiceClient(discord.VoiceProtocol): class LavalinkVoiceClient(discord.VoiceProtocol):
""" """
This is the preferred way to handle external voice sending 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 not interaction.user.voice or not interaction.user.voice.channel:
if voice_client is not None: if voice_client is not None:
raise CreatePlayerError( raise app_commands.AppCommandError(
{ {
"title": "Not in my VC", "title": "Not in my VC",
"description": "You must join my voice channel to run that command.", "description": "You must join my voice channel to run that command.",
} }
) )
raise CreatePlayerError( raise app_commands.AppCommandError(
{ {
"title": "No Channel", "title": "No Channel",
"description": "You must join a voice channel before you can run that command.", "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 voice_client is None:
if not should_connect: if not should_connect:
raise CreatePlayerError( raise app_commands.AppCommandError(
{ {
"title": "Not Connected", "title": "Not Connected",
"description": "I am not connected and playing music right now, therefore that command will not work.", "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: if not permissions.connect or not permissions.speak:
raise CreatePlayerError( raise app_commands.AppCommandError(
{ {
"title": "Missing Permissions", "title": "Missing Permissions",
"description": "I need the `CONNECT` and `SPEAK` permissions in order to work.", "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) player.store("channel", interaction.channel.id)
else: else:
if int(player.channel_id) != interaction.user.voice.channel.id: if int(player.channel_id) != interaction.user.voice.channel.id:
raise CreatePlayerError( raise app_commands.AppCommandError(
{ {
"title": "Not in my VC", "title": "Not in my VC",
"description": "You must join my voice channel to run that command.", "description": "You must join my voice channel to run that command.",

3
code/cogs/slash_handlers.py
View File

@ -5,7 +5,6 @@ from discord.ext.commands.errors import *
import datetime import datetime
from global_variables import BOT_COLOR from global_variables import BOT_COLOR
from cogs.music import CreatePlayerError
from custom_source import LoadError from custom_source import LoadError
@ -47,7 +46,7 @@ class slash_handlers(commands.Cog):
# ) # )
# await interaction.response.send_message(embed=embed, ephemeral=True) # await interaction.response.send_message(embed=embed, ephemeral=True)
elif isinstance(error, CreatePlayerError): elif isinstance(error, app_commands.AppCommandError):
embed = discord.Embed( embed = discord.Embed(
title=error.args[0]["title"], title=error.args[0]["title"],
description=error.args[0]["description"], description=error.args[0]["description"],