Fixed Typing...

Music-Bot.py

@@ -1,5 +1,9 @@
 import asyncio
+import re
 from datetime import timedelta
+from urllib.parse import quote_plus
+
+import aiohttp
 import yt_dlp
 import discord
 import logging
@@ -14,7 +18,9 @@ banner = """
   |   |  |   | \__ \  |  (  _____|  |   |  (   |  |   
  _|  _| \__,_| ____/ _| \___|      ____/  \___/  \__| 
 """
+
 version = "0.1"
+branch = "dev"
 success = "**Success ✅**\n"
 warning = "**Warning ℹ️**\n"
 error = "**Error ❗️**\n"
@@ -22,9 +28,24 @@ cache_dir = "cache"
 logging.basicConfig(level=logging.INFO)
 parser = argparse.ArgumentParser()
 parser.add_argument("-t", "--token", help="Bot TOKEN")
+parser.add_argument("-c", "--cores", help="Number of Cores for ffmpeg (Standard 2)")
+parser.add_argument("-p", "--prefix", help="Provides the Prefix for the bot (Standard <)")
 args = parser.parse_args()
 
-if args.token == None:
+
+if args.cores == None:
+    threads = 2
+else:
+    threads = int(args.cores)
+
+
+if args.prefix == None:
+    b_prefix = "<"
+else:
+    b_prefix = str(args.prefix)
+
+
+if args.token is None:
     print(f"{banner}\n\nPLEASE PROVIDE BOT A TOKEN BY RUNNING LIKE THE FOLLOWING:")
     print("\n")
     print(">>> python3 Music-Bot.py -t TOKEN <<<")
@@ -79,14 +100,26 @@ else:
 
             filename = data["url"] if stream else ytdl.prepare_filename(data)
             return cls(discord.FFmpegPCMAudio(source=filename, executable="ffmpeg", pipe=False, stderr=False,
-                                              before_options="-threads 2", options=ffmpeg_options), data=data)
+                                              before_options=f"-threads {threads}", options=ffmpeg_options), data=data)
+
+
+    async def youtube_search(search: str):
+        p = {"search_query": search}
+        # Spoof a user agent header or the request will immediately fail
+        h = {"User-Agent": "Mozilla/5.0"}
+        async with aiohttp.ClientSession() as client:
+            async with client.get("https://www.youtube.com/results", params=p, headers=h) as resp:
+                dom = await resp.text()
+        found = re.findall(r"watch\?v=(\S{11})", dom)[0]
+        url = f"https://www.youtube.com/watch?v={found}"
+        return url
 
 
     intents = discord.Intents.default()
     intents.message_content = True
 
     bot = commands.Bot(
-        command_prefix=commands.when_mentioned_or("!"),
+        command_prefix=commands.when_mentioned_or(b_prefix),
         description="Relatively simple music bot example",
         intents=intents, help_command=None
     )
@@ -95,8 +128,10 @@ else:
     @bot.event
     async def on_ready():
         print(banner)
-        print(f"Bot Version: {version}")
+        print(f"Bot Version: {version} ({branch})")
         print(f"Bot: {bot.user} (ID: {bot.user.id})")
+        print(f"Threads for ffmpeg: {threads}")
+        print(f"Prefix: {b_prefix}")
         print(
             f"Invitation LINK: https://discord.com/api/oauth2/authorize?client_id={bot.user.id}&permissions=968552344896&scope=bot%20applications.commands")
         print("------")
@@ -159,6 +194,10 @@ else:
                 raise commands.CommandError(err)
             finally:
                 await ctx.send(f"{success}Now playing: `{player.title}`\nRequested by {ctx.author.mention}")
+        while ctx.voice_client.is_playing():
+            await asyncio.sleep(3)
+        else:
+            await ctx.voice_client.disconnect()
 
 
     @bot.slash_command(name="stream", description="Streams a song from YouTube [Without preloading]")
@@ -168,8 +207,11 @@ else:
             ctx.voice_client.play(
                 player, after=lambda e: print(f"Player error: {e}") if e else None
             )
-
         await ctx.respond(f"{success}Now playing: `{player.title}`\nRequested by {ctx.author.mention}")
+        while ctx.voice_client.is_playing():
+            await asyncio.sleep(3)
+        else:
+            await ctx.voice_client.disconnect()
 
 
     @bot.slash_command(name="pause", description="Pauses the playback")
@@ -198,8 +240,29 @@ else:
         await ctx.voice_client.disconnect(force=True)
 
 
+    @bot.slash_command(name="youtube", description="Searches YouTube for a given string and plays the first result")
+    async def youtube(ctx, *, search: str):
+        url = await youtube_search(search=search)
+        async with ctx.typing():
+            await ctx.respond("🤖 Your song is queued for download... please wait ", ephemeral=True)
+            try:
+                player = await YTDLSource.from_url(url, loop=bot.loop)
+                ctx.voice_client.play(
+                    player, after=lambda e: print(f"Player error: {e}") if e else None
+                )
+            except discord.HTTPException as err:
+                raise commands.CommandError(err)
+            finally:
+                await ctx.send(f"{success}Now playing: `{player.title}`\nRequested by {ctx.author.mention}")
+        while ctx.voice_client.is_playing():
+            await asyncio.sleep(3)
+        else:
+            await ctx.voice_client.disconnect()
+
+
     @play.before_invoke
     @stream.before_invoke
+    @youtube.before_invoke
     async def ensure_voice(ctx: commands.Context):
         if ctx.voice_client is None:
             if ctx.author.voice:
@@ -210,6 +273,8 @@ else:
             ctx.voice_client.stop()
 
 
+
+
     @bot.event
     async def on_application_command_error(ctx, error):
         print(f"[on_application_command_error]\n{ctx.author}\n{error}")