revert

.gitignore

@@ -2,4 +2,5 @@
 assets/
 .cache
 test*
-cookies.txt
+cookies.txt
+.gradio

app.py

@@ -1,42 +1,31 @@
 import discord
 from discord.ext import commands
+from huggingface_hub import hf_hub_download
 import gradio as gr
 from dotenv import load_dotenv
 import os
 import threading
 import asyncio
-from huggingface_hub import hf_hub_download
-import yt_dlp
 
 # Load environment variables
 load_dotenv()
-if os.path.exists('cookies.txt') is False:
-    hf_hub_download("not-lain/secrets", "cookies.txt", repo_type="dataset",local_dir=".")
+if os.path.exists("assets") is False:
+    os.makedirs("assets", exist_ok=True)
+    hf_hub_download(
+        "not-lain/assets", "lofi.mp3", repo_type="dataset", local_dir="assets"
+    )
 
-# Check if cookies.txt exists
-# if not os.path.exists('cookies.txt'):
-#     txt = os.getenv('COOKIES')
-#     with open('cookies.txt', 'w') as f:
-#         f.write(txt)
 
 # Bot configuration
 intents = discord.Intents.default()
 intents.message_content = True
-bot = commands.Bot(command_prefix='!', intents=intents)
+bot = commands.Bot(command_prefix="!", intents=intents)
+
 
 class MusicBot:
     def __init__(self):
         self.is_playing = False
         self.voice_client = None
-        self.queue = []
-        self.ydl_opts = {
-            'format': 'bestaudio/best',
-            'cookiefile': 'cookies.txt',
-            'quiet': True,
-            'no_warnings': True,
-            'extract_flat': 'in_playlist'
-        }
-        self.currently_playing = None
 
     async def join_voice(self, ctx):
         if ctx.author.voice:
@@ -45,52 +34,35 @@ class MusicBot:
                 self.voice_client = await channel.connect()
             else:
                 await self.voice_client.move_to(channel)
-            return True
-        return False
+        else:
+            await ctx.send("You need to be in a voice channel!")
 
     async def play_next(self, ctx):
-        if self.queue and not self.is_playing:
+        if not self.is_playing:
             self.is_playing = True
-            url = self.queue.pop(0)
-            
             try:
-                with yt_dlp.YoutubeDL(self.ydl_opts) as ydl:
-                    info = ydl.extract_info(url, download=False)
-                    audio_url = info['url']
-                    title = info.get('title', 'Unknown title')
-                    self.currently_playing = title
-                
-                # Create FFmpeg audio source
-                ffmpeg_options = {
-                    'before_options': '-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5',
-                    'options': '-vn -bufsize 64k'
-                }
-                audio_source = discord.FFmpegPCMAudio(audio_url, **ffmpeg_options)
-                
-                def after_playing(error):
+                audio_source = discord.FFmpegPCMAudio("assets/lofi.mp3")
+
+                def after_playing(e):
                     self.is_playing = False
-                    self.currently_playing = None
-                    if error:
-                        print(f"Playback error: {error}")
+                    # test loop by default
+                    if e:
+                        print(f"Playback error: {e}")
                     asyncio.run_coroutine_threadsafe(self.play_next(ctx), bot.loop)
 
-                # Apply volume transformation and play
-                transformed_source = discord.PCMVolumeTransformer(audio_source, volume=0.5)
-                self.voice_client.play(transformed_source, after=after_playing)
-                
-                await ctx.send(f"Now playing: {title}")
-                
+                self.voice_client.play(audio_source, after=after_playing)
             except Exception as e:
-                print(f"Error playing URL {url}: {e}")
+                print(f"Error playing file: {e}")
+                await ctx.send("Error playing the song.")
                 self.is_playing = False
-                await ctx.send(f"Error playing the song: {str(e)}")
-                await self.play_next(ctx)
+
 
 music_bot = MusicBot()
 
+
 @bot.event
 async def on_ready():
-    print(f'Bot is ready! Logged in as {bot.user}')
+    print(f"Bot is ready! Logged in as {bot.user}")
     print("Syncing commands...")
     try:
         await bot.tree.sync(guild=None)  # Set to None for global sync
@@ -100,36 +72,31 @@ async def on_ready():
     except Exception as e:
         print(f"An error occurred while syncing commands: {e}")
 
-@bot.tree.command(name="play", description="Play a YouTube URL")
-async def play(interaction: discord.Interaction, url: str):
+
+@bot.tree.command(name="play", description="Play the sample music")
+async def play(interaction: discord.Interaction):
     await interaction.response.defer()
     ctx = await commands.Context.from_interaction(interaction)
-    
-    if not await music_bot.join_voice(ctx):
-        await interaction.followup.send("You need to be in a voice channel!")
-        return
+    await music_bot.join_voice(ctx)
 
-    try:
-        with yt_dlp.YoutubeDL(music_bot.ydl_opts) as ydl:
-            info = ydl.extract_info(url, download=False)
-            title = info.get('title', 'Unknown title')
-        
-        music_bot.queue.append(url)
-        await interaction.followup.send(f'Added to queue: {title}')
-        
-        if not music_bot.is_playing:
-            await music_bot.play_next(ctx)
-    except Exception as e:
-        await interaction.followup.send(f'Error: {str(e)}')
+    if not music_bot.is_playing:
+        await music_bot.play_next(ctx)
+        await interaction.followup.send("Playing sample music!")
+    else:
+        await interaction.followup.send("Already playing!")
 
+
+# Replace the existing skip command with this version
 @bot.tree.command(name="skip", description="Skip the current song")
 async def skip(interaction: discord.Interaction):
     if music_bot.voice_client:
         music_bot.voice_client.stop()
-        await interaction.response.send_message('Skipped current song!')
+        await interaction.response.send_message("Skipped current song!")
     else:
-        await interaction.response.send_message('No song is currently playing!')
+        await interaction.response.send_message("No song is currently playing!")
+
 
+# Replace the existing leave command with this version
 @bot.tree.command(name="leave", description="Disconnect bot from voice channel")
 async def leave(interaction: discord.Interaction):
     if music_bot.voice_client:
@@ -137,47 +104,24 @@ async def leave(interaction: discord.Interaction):
         music_bot.voice_client = None
         music_bot.queue = []
         music_bot.is_playing = False
-        await interaction.response.send_message('Bot disconnected!')
+        await interaction.response.send_message("Bot disconnected!")
     else:
-        await interaction.response.send_message('Bot is not in a voice channel!')
+        await interaction.response.send_message("Bot is not in a voice channel!")
 
-@bot.tree.command(name="queue", description="Show the current music queue")
-async def queue(interaction: discord.Interaction):
-    await interaction.response.defer()
-    
-    if not music_bot.is_playing and not music_bot.queue:
-        await interaction.followup.send("No songs in the queue!")
-        return
-
-    queue_list = []
-    if music_bot.currently_playing:
-        queue_list.append(f"Currently playing: {music_bot.currently_playing}")
-    
-    if music_bot.queue:
-        with yt_dlp.YoutubeDL(music_bot.ydl_opts) as ydl:
-            for i, url in enumerate(music_bot.queue, 1):
-                try:
-                    info = ydl.extract_info(url, download=False)
-                    title = info.get('title', 'Unknown title')
-                    queue_list.append(f"{i}. {title}")
-                except:
-                    queue_list.append(f"{i}. {url}")
-    
-    queue_text = "\n".join(queue_list)
-    await interaction.followup.send(f"**Music Queue:**\n{queue_text}")
 
 def run_discord_bot():
-    bot.run(os.getenv('DISCORD_TOKEN'))
+    bot.run(os.getenv("DISCORD_TOKEN"))
+
 
 # Create the Gradio interface
 with gr.Blocks() as iface:
     gr.Markdown("# Discord Music Bot Control Panel")
     gr.Markdown("Bot is running in background")
-    
+
 if __name__ == "__main__":
     # Start the Discord bot in a separate thread
     bot_thread = threading.Thread(target=run_discord_bot, daemon=True)
     bot_thread.start()
-    
+
     # Run Gradio interface in the main thread
-    iface.launch(debug=True)
+    iface.launch(debug=True)

requirements.txt

@@ -1,7 +1,6 @@
 discord.py
+youtube_dl
 PyNaCl
 ffmpeg-python
-python-dotenv
-spotipy
-gradio
-yt-dlp
+yt-dlp
+python-dotenv