From 718dc66d4e5f785177d2fa5b7aa49c6365c0eeaa Mon Sep 17 00:00:00 2001 From: Zakkai Thomas <76952730+Carlover101@users.noreply.github.com> Date: Tue, 9 May 2023 18:50:49 -0400 Subject: [PATCH 1/4] Update main.py Improved functionality and made some bug fixes to main.py --- main.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 7955ffd..0f94921 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,8 @@ import discord from discord.ext import commands import os +# added to allow the cogs to be force-added later +import asyncio #import all of the cogs from help_cog import help_cog @@ -12,8 +14,10 @@ bot.remove_command('help') #register the class with the bot -bot.add_cog(help_cog(bot)) -bot.add_cog(music_cog(bot)) +async def setup(bot): + await bot.add_cog(help_cog(bot)) + await bot.add_cog(music_cog(bot)) #start the bot with our token -bot.run(os.getenv("TOKEN")) \ No newline at end of file +asyncio.run(setup(bot)) +bot.run(os.getenv("TOKEN")) From 136d4feab7144b08a697d73531ae25c940002375 Mon Sep 17 00:00:00 2001 From: Zakkai Thomas <76952730+Carlover101@users.noreply.github.com> Date: Wed, 10 May 2023 13:48:49 -0400 Subject: [PATCH 2/4] Update music_cog.py --- music_cog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/music_cog.py b/music_cog.py index ab51008..c12203c 100644 --- a/music_cog.py +++ b/music_cog.py @@ -2,7 +2,7 @@ import discord from discord.ext import commands -from youtube_dl import YoutubeDL +from yt_dlp import YoutubeDL class music_cog(commands.Cog): def __init__(self, bot): From 04c47dcc458a72b16d96a2d2e883166c05230ce0 Mon Sep 17 00:00:00 2001 From: Zakkai Thomas <76952730+Carlover101@users.noreply.github.com> Date: Wed, 10 May 2023 13:50:30 -0400 Subject: [PATCH 3/4] Update requirements.txt --- requirements.txt | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0fa1d73..a98f617 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,28 @@ -aiohttp==3.7.4.post0 -astroid==2.5.1 -async-timeout==3.0.1 -attrs==21.4.0 -cffi==1.14.5 -chardet==4.0.0 -colorama==0.4.4 -cryptography==3.4.7 -discord.py==1.7.3 -ffmpeg==1.4 -idna==3.3 -isort==5.8.0 -lazy-object-proxy==1.6.0 -mccabe==0.6.1 -multidict==6.0.2 -pycparser==2.20 -pylint==2.7.2 -pymongo==3.12.1 -PyNaCl==1.5.0 -pyspnego==0.1.5 -six==1.15.0 -smbprotocol==1.5.0 -toml==0.10.2 -typing_extensions==4.1.1 -wrapt==1.12.1 -yarl==1.7.2 -youtube-dl==2021.12.17 +aiohttp +astroid +async-timeout +attrs +cffi +chardet +colorama +cryptography +discord.py +discord +ffmpeg +idna +isort +lazy-object-proxy +mccabe +multidict +pycparser +pylint +pymongo +PyNaCl +pyspnego +six +smbprotocol +toml +typing_extensions +wrapt +yarl +yt_dlp From be2bd3781444c5ef07f6e976f0cfea82749be7b6 Mon Sep 17 00:00:00 2001 From: Zakkai Thomas <76952730+Carlover101@users.noreply.github.com> Date: Wed, 10 May 2023 13:51:17 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a0a476..afee51a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Since a lot of discord music bots are being blocked by youtube nowadays I've dec /resume - resumes playing the current song # Running with docker -To run with docker simply run the command `docker run -e TOKEN= -d pabolo02345/music_bot:latest` +To run with docker simply run the command `docker run -e TOKEN= -d carlover101/music_bot:latest` # Installation