From c8facd013d9b285c2d24f5b0c127e326bdfa4282 Mon Sep 17 00:00:00 2001 From: Parker Date: Mon, 12 Aug 2024 20:36:17 -0500 Subject: [PATCH 1/3] Edit the original deferred interaction --- code/cogs/lyrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/cogs/lyrics.py b/code/cogs/lyrics.py index c27589e..f4434d0 100644 --- a/code/cogs/lyrics.py +++ b/code/cogs/lyrics.py @@ -75,7 +75,7 @@ class Lyrics(commands.Cog): ) + " UTC" ) - return await interaction.response.send_message(embed=embed, ephemeral=True) + return await interaction.edit_original_response(embed=embed) # If everything is successful, send the lyrics embed = discord.Embed( -- 2.39.5 From c62d2306974475aa82da8902dc3c973705588043 Mon Sep 17 00:00:00 2001 From: Parker Date: Sat, 24 Aug 2024 14:56:51 -0500 Subject: [PATCH 2/3] Make YouTube support optional --- code/bot.py | 1 + code/cogs/play.py | 18 +++++++++--------- code/utils/config.py | 10 +++++++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/bot.py b/code/bot.py index 3569e68..d0154e3 100644 --- a/code/bot.py +++ b/code/bot.py @@ -28,6 +28,7 @@ class MyBot(commands.Bot): bot.openai = openai.OpenAI(api_key=config.OPENAI_API_KEY) config.LOG.info("Loading cogs...") + config.LOG.info("YouTube support is enabled" if config.YOUTUBE_SUPPORT else "YouTube support is disabled") for ext in os.listdir("./code/cogs"): if ext.endswith(".py"): # Load the OPTIONAL feedback cog diff --git a/code/cogs/play.py b/code/cogs/play.py index fdd0233..3c60633 100644 --- a/code/cogs/play.py +++ b/code/cogs/play.py @@ -7,7 +7,7 @@ import re import requests from cogs.music import Music, LavalinkVoiceClient -from utils.config import BOT_COLOR +from utils.config import BOT_COLOR, YOUTUBE_SUPPORT from utils.custom_sources import SpotifySource, AppleSource @@ -25,15 +25,15 @@ class Play(commands.Cog): "Play a song from your favorite music provider" player = self.bot.lavalink.player_manager.get(interaction.guild.id) - # Notify users that YouTube links are not allowed - + # Notify users that YouTube links are not allowed if YouTube support is disabled if "youtube.com" in query or "youtu.be" in query: - embed = discord.Embed( - title="YouTube Not Supported", - description="Unfortunately, YouTube does not allow bots to stream from their platform. Try sending a link for a different platform, or simply type the name of the song and I will automatically find it on a supported platform.", - color=BOT_COLOR, - ) - return await interaction.response.send_message(embed=embed, ephemeral=True) + if not YOUTUBE_SUPPORT: + embed = discord.Embed( + title="YouTube Not Supported", + description="Unfortunately, YouTube does not allow bots to stream from their platform. Try sending a link for a different platform, or simply type the name of the song and I will automatically find it on a supported platform.", + color=BOT_COLOR, + ) + return await interaction.response.send_message(embed=embed, ephemeral=True) ### ### APPLE MUSIC links, perform API requests and load all tracks from the playlist/album/track diff --git a/code/utils/config.py b/code/utils/config.py index 951676e..1d3c349 100644 --- a/code/utils/config.py +++ b/code/utils/config.py @@ -31,6 +31,7 @@ BOT_COLOR = None BOT_INVITE_LINK = None FEEDBACK_CHANNEL_ID = None BUG_CHANNEL_ID = None +YOUTUBE_SUPPORT = None SPOTIFY_CLIENT_ID = None SPOTIFY_CLIENT_SECRET = None GENIUS_CLIENT_ID = None @@ -51,6 +52,7 @@ schema = { "bot_invite_link": {"type": "string"}, "feedback_channel_id": {"type": "integer"}, "bug_channel_id": {"type": "integer"}, + "youtube_support": {"type": "boolean"}, }, "required": ["token"], }, @@ -114,6 +116,7 @@ bot_info: bot_invite_link: "" feedback_channel_id: "" bug_channel_id: "" + youtube_support: false spotify: spotify_client_id: "" @@ -142,7 +145,7 @@ lavalink: # Thouroughly validate all of the options in the config.yaml file def validate_config(file_contents): - global TOKEN, BOT_COLOR, BOT_INVITE_LINK, FEEDBACK_CHANNEL_ID, BUG_CHANNEL_ID, SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET, GENIUS_CLIENT_ID, GENIUS_CLIENT_SECRET, OPENAI_API_KEY, LAVALINK_HOST, LAVALINK_PORT, LAVALINK_PASSWORD + global TOKEN, BOT_COLOR, BOT_INVITE_LINK, FEEDBACK_CHANNEL_ID, BUG_CHANNEL_ID, YOUTUBE_SUPPORT, SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET, GENIUS_CLIENT_ID, GENIUS_CLIENT_SECRET, OPENAI_API_KEY, LAVALINK_HOST, LAVALINK_PORT, LAVALINK_PASSWORD config = yaml.safe_load(file_contents) try: @@ -198,6 +201,11 @@ def validate_config(file_contents): else: BUG_CHANNEL_ID = config["bot_info"]["bug_channel_id"] + if "youtube_support" in config["bot_info"]: + YOUTUBE_SUPPORT = bool(config["bot_info"]["youtube_support"]) + else: + YOUTUBE_SUPPORT = False + # # If the SPOTIFY section is present, make sure the client ID and secret are valid # -- 2.39.5 From 7724cfdca43a85dfc53d50f2f164334625cd9a30 Mon Sep 17 00:00:00 2001 From: Parker Date: Sat, 24 Aug 2024 14:58:15 -0500 Subject: [PATCH 3/3] Update README.md to reference `YOUTUBE_SUPPORT` --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5de9b73..96ea960 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ BOT_COLOR | `HEX CODE`: Color that will be used for the color of message embeds BOT_INVITE_LINK | `URL`: Discord Invite link for your bot (shown on the `help` command) | **OPTIONAL** - *Adds an "Invite Me" button to the /help message* FEEDBACK_CHANNEL_ID | `CHANNEL ID`: Discord channel for feedback messages to be sent to | **OPTIONAL** - *Used for feedback messages* BUG_CHANNEL_ID | `CHANNEL ID`: Discord channel for bug messages to be sent to | **OPTIONAL** - *Used for bug reporting* +YOUTUBE_SUPPORT | `BOOLEAN`: Whether or not YouTube links are supported | **OPTIONAL** SPOTIFY_CLIENT_ID | `CLIENT ID`: ID from Spotify Developer account | **OPTIONAL** - *Used for Spotify support* SPOTIFY_CLIENT_SECRET | `CLIENT SECRET`: Secret string from Spotify Developer account | **OPTIONAL** - *Used for Sporify support* GENIUS_CLIENT_ID | `CLIENT ID`: ID from Genius API Dashboard | **OPTIONAL** - *Used for the /lyrics command* -- 2.39.5