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

Make YouTube support optional

Browse Source
This commit is contained in:
Parker M. 2024-08-24 14:56:51 -05:00
parent 2cdaa11af4
commit c62d230697
No known key found for this signature in database
GPG Key ID: 95CD2E0C7E329F2A
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/bot.py
View File

@ -28,6 +28,7 @@ class MyBot(commands.Bot):
bot.openai = openai.OpenAI(api_key=config.OPENAI_API_KEY) bot.openai = openai.OpenAI(api_key=config.OPENAI_API_KEY)
config.LOG.info("Loading cogs...") 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"): for ext in os.listdir("./code/cogs"):
if ext.endswith(".py"): if ext.endswith(".py"):
# Load the OPTIONAL feedback cog # Load the OPTIONAL feedback cog

18
code/cogs/play.py
View File

@ -7,7 +7,7 @@ import re
import requests import requests
from cogs.music import Music, LavalinkVoiceClient 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 from utils.custom_sources import SpotifySource, AppleSource
@ -25,15 +25,15 @@ class Play(commands.Cog):
"Play a song from your favorite music provider" "Play a song from your favorite music provider"
player = self.bot.lavalink.player_manager.get(interaction.guild.id) 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: if "youtube.com" in query or "youtu.be" in query:
embed = discord.Embed( if not YOUTUBE_SUPPORT:
title="YouTube Not Supported", embed = discord.Embed(
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.", title="YouTube Not Supported",
color=BOT_COLOR, 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) )
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 ### APPLE MUSIC links, perform API requests and load all tracks from the playlist/album/track

10
code/utils/config.py
View File

@ -31,6 +31,7 @@ BOT_COLOR = None
BOT_INVITE_LINK = None BOT_INVITE_LINK = None
FEEDBACK_CHANNEL_ID = None FEEDBACK_CHANNEL_ID = None
BUG_CHANNEL_ID = None BUG_CHANNEL_ID = None
YOUTUBE_SUPPORT = None
SPOTIFY_CLIENT_ID = None SPOTIFY_CLIENT_ID = None
SPOTIFY_CLIENT_SECRET = None SPOTIFY_CLIENT_SECRET = None
GENIUS_CLIENT_ID = None GENIUS_CLIENT_ID = None
@ -51,6 +52,7 @@ schema = {
"bot_invite_link": {"type": "string"}, "bot_invite_link": {"type": "string"},
"feedback_channel_id": {"type": "integer"}, "feedback_channel_id": {"type": "integer"},
"bug_channel_id": {"type": "integer"}, "bug_channel_id": {"type": "integer"},
"youtube_support": {"type": "boolean"},
}, },
"required": ["token"], "required": ["token"],
}, },
@ -114,6 +116,7 @@ bot_info:
bot_invite_link: "" bot_invite_link: ""
feedback_channel_id: "" feedback_channel_id: ""
bug_channel_id: "" bug_channel_id: ""
youtube_support: false
spotify: spotify:
spotify_client_id: "" spotify_client_id: ""
@ -142,7 +145,7 @@ lavalink:
# Thouroughly validate all of the options in the config.yaml file # Thouroughly validate all of the options in the config.yaml file
def validate_config(file_contents): 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) config = yaml.safe_load(file_contents)
try: try:
@ -198,6 +201,11 @@ def validate_config(file_contents):
else: else:
BUG_CHANNEL_ID = config["bot_info"]["bug_channel_id"] 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 # If the SPOTIFY section is present, make sure the client ID and secret are valid
# #