Compare commits
No commits in common. "Dev-Music-Only" and "main" have entirely different histories.
Dev-Music-
...
main
15
.github/workflows/discord_sync.yml
vendored
15
.github/workflows/discord_sync.yml
vendored
@ -1,15 +0,0 @@
|
||||
name: Discord Webhook
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
git:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Run Discord Webhook
|
||||
uses: johnnyhuy/actions-discord-git-webhook@main
|
||||
with:
|
||||
webhook_url: ${{ secrets.YOUR_DISCORD_WEBHOOK_URL }}
|
15
.vscode/launch.json
vendored
15
.vscode/launch.json
vendored
@ -1,15 +0,0 @@
|
||||
{
|
||||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Selena",
|
||||
"type": "debugpy",
|
||||
"request": "launch",
|
||||
"program": "E:\\Development\\AI Development\\Selena\\main.py",
|
||||
"console": "integratedTerminal"
|
||||
}
|
||||
]
|
||||
}
|
35
main.py
35
main.py
@ -1,35 +0,0 @@
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
import asyncio
|
||||
import os
|
||||
from dotenv import load_dotenv
|
||||
|
||||
# Load environment variables
|
||||
load_dotenv()
|
||||
TOKEN = os.getenv('DISCORD_TOKEN')
|
||||
|
||||
# Import the Music module
|
||||
from modules.music import Music
|
||||
|
||||
intents = discord.Intents.default()
|
||||
intents.message_content = True # Required for accessing message content
|
||||
|
||||
|
||||
class Selena(discord.Client):
|
||||
def __init__(self, *, intents):
|
||||
super().__init__(intents=intents)
|
||||
self.tree = discord.app_commands.CommandTree(self)
|
||||
|
||||
# Initialize modules
|
||||
self.music = Music(self)
|
||||
|
||||
async def setup_hook(self):
|
||||
# Sync the app commands with Discord
|
||||
self.loop.create_task(self.music.auto_resume_playback())
|
||||
await self.tree.sync()
|
||||
|
||||
|
||||
client = Selena(intents=intents)
|
||||
|
||||
# Run the bot
|
||||
client.run(TOKEN)
|
378
modules/music.py
378
modules/music.py
@ -1,378 +0,0 @@
|
||||
# modules/music.py
|
||||
|
||||
import discord
|
||||
from discord import app_commands
|
||||
import yt_dlp
|
||||
import asyncio
|
||||
import json
|
||||
import os
|
||||
|
||||
class Music:
|
||||
def __init__(self, client):
|
||||
self.client = client
|
||||
self.voice_clients = {}
|
||||
self.music_queues = {}
|
||||
self.current_tracks = {}
|
||||
self.save_file = 'music_state.json'
|
||||
self.volumes = {} # Store volume levels per guild
|
||||
self.default_volume = 0.5 # Default volume level (50%)
|
||||
self.current_interactions = {} # Store interactions per guild
|
||||
|
||||
# Load saved state for auto-resume
|
||||
self.load_music_state()
|
||||
|
||||
# Register app commands
|
||||
self.register_commands()
|
||||
|
||||
# Removed self.client.loop.create_task(self.auto_resume_playback()) from here
|
||||
|
||||
def register_commands(self):
|
||||
@app_commands.command(name='play', description='Play a song by title and artist')
|
||||
async def play(interaction: discord.Interaction, *, query: str):
|
||||
await self.play(interaction, query)
|
||||
|
||||
@app_commands.command(name='pause', description='Pause the current song')
|
||||
async def pause(interaction: discord.Interaction):
|
||||
await self.pause(interaction)
|
||||
|
||||
@app_commands.command(name='resume', description='Resume the paused song')
|
||||
async def resume(interaction: discord.Interaction):
|
||||
await self.resume(interaction)
|
||||
|
||||
@app_commands.command(name='skip', description='Skip the current song')
|
||||
async def skip(interaction: discord.Interaction):
|
||||
await self.skip(interaction)
|
||||
|
||||
@app_commands.command(name='stop', description='Stop playback and clear the queue')
|
||||
async def stop(interaction: discord.Interaction):
|
||||
await self.stop(interaction)
|
||||
|
||||
@app_commands.command(name='leave', description='Disconnect the bot from the voice channel')
|
||||
async def leave(interaction: discord.Interaction):
|
||||
await self.leave(interaction)
|
||||
|
||||
@app_commands.command(name='volume', description='Set the playback volume')
|
||||
@app_commands.describe(level='Volume level between 0 and 100')
|
||||
async def volume(interaction: discord.Interaction, level: int):
|
||||
await self.set_volume(interaction, level)
|
||||
|
||||
# Add commands to the client's tree
|
||||
self.client.tree.add_command(play)
|
||||
self.client.tree.add_command(pause)
|
||||
self.client.tree.add_command(resume)
|
||||
self.client.tree.add_command(skip)
|
||||
self.client.tree.add_command(stop)
|
||||
self.client.tree.add_command(leave)
|
||||
self.client.tree.add_command(volume)
|
||||
|
||||
async def auto_resume_playback(self):
|
||||
await self.client.wait_until_ready()
|
||||
for guild_id_str, url in self.current_tracks.items():
|
||||
guild_id = int(guild_id_str)
|
||||
guild = self.client.get_guild(guild_id)
|
||||
if guild is None:
|
||||
continue
|
||||
|
||||
# Find a voice channel the bot was connected to
|
||||
voice_channel = None
|
||||
for vc in guild.voice_channels:
|
||||
if guild.me in vc.members:
|
||||
voice_channel = vc
|
||||
break
|
||||
|
||||
if voice_channel is None:
|
||||
# If the bot was not in any voice channel, skip this guild
|
||||
continue
|
||||
|
||||
# Connect to the voice channel
|
||||
try:
|
||||
self.voice_clients[guild_id] = await voice_channel.connect()
|
||||
except discord.ClientException:
|
||||
# Already connected to a voice channel in this guild
|
||||
self.voice_clients[guild_id] = guild.voice_client
|
||||
|
||||
# Resume playing
|
||||
await self.play_current_track(guild_id)
|
||||
|
||||
async def play_current_track(self, guild_id):
|
||||
url = self.current_tracks.get(str(guild_id))
|
||||
if not url:
|
||||
return
|
||||
|
||||
try:
|
||||
# Use yt_dlp to get audio source
|
||||
ytdl_opts = {'format': 'bestaudio/best'}
|
||||
loop = asyncio.get_event_loop()
|
||||
with yt_dlp.YoutubeDL(ytdl_opts) as ytdl:
|
||||
info = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=False))
|
||||
audio_url = info['url']
|
||||
title = info.get('title', 'Unknown Title')
|
||||
webpage_url = info.get('webpage_url', url)
|
||||
thumbnail = info.get('thumbnail')
|
||||
|
||||
# Prepare FFmpeg options
|
||||
ffmpeg_opts = {
|
||||
'before_options': '-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5',
|
||||
'options': '-vn',
|
||||
}
|
||||
|
||||
# Create audio source using FFmpegPCMAudio
|
||||
source = discord.FFmpegPCMAudio(audio_url, **ffmpeg_opts)
|
||||
volume = self.volumes.get(str(guild_id), self.default_volume)
|
||||
source = discord.PCMVolumeTransformer(source, volume=volume)
|
||||
|
||||
# Play audio
|
||||
self.voice_clients[guild_id].play(source, after=lambda e: self.after_song(e, guild_id))
|
||||
|
||||
# Send an embedded message indicating the song is now playing
|
||||
embed = discord.Embed(
|
||||
title="Auto-Resumed Playing 🎵",
|
||||
description=f"[{title}]({webpage_url})",
|
||||
color=discord.Color.green()
|
||||
)
|
||||
if thumbnail:
|
||||
embed.set_thumbnail(url=thumbnail)
|
||||
|
||||
guild = self.client.get_guild(guild_id)
|
||||
if guild:
|
||||
text_channel = guild.system_channel or guild.text_channels[0]
|
||||
try:
|
||||
await text_channel.send(embed=embed)
|
||||
except discord.HTTPException as e:
|
||||
print(f"Failed to send message: {e}")
|
||||
|
||||
# Save state for auto-resume
|
||||
self.save_music_state()
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error during auto-resume playback: {e}")
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_connected():
|
||||
await self.voice_clients[guild_id].disconnect()
|
||||
|
||||
async def play(self, interaction: discord.Interaction, query: str):
|
||||
await interaction.response.defer()
|
||||
|
||||
guild_id = interaction.guild_id
|
||||
|
||||
# Store the interaction object for later use
|
||||
self.current_interactions[guild_id] = interaction
|
||||
|
||||
# Check if the user is in a voice channel
|
||||
if interaction.user.voice is None:
|
||||
await interaction.followup.send("You must be connected to a voice channel to use this command.")
|
||||
return
|
||||
|
||||
# Connect to the voice channel if not already connected
|
||||
if guild_id not in self.voice_clients or not self.voice_clients[guild_id].is_connected():
|
||||
channel = interaction.user.voice.channel
|
||||
self.voice_clients[guild_id] = await channel.connect()
|
||||
|
||||
# Ensure volume is set
|
||||
if guild_id not in self.volumes:
|
||||
self.volumes[str(guild_id)] = self.default_volume
|
||||
|
||||
await interaction.followup.send(f"🔍 **Searching for:** {query}")
|
||||
|
||||
# Search YouTube for the song
|
||||
search_url = await self.search_youtube(query)
|
||||
if not search_url:
|
||||
await interaction.followup.send("❌ **Could not find the song on YouTube.**")
|
||||
return
|
||||
|
||||
# Add URL to the music queue
|
||||
if guild_id not in self.music_queues:
|
||||
self.music_queues[guild_id] = []
|
||||
self.music_queues[guild_id].append(search_url)
|
||||
|
||||
await interaction.followup.send(f"✅ **Added to queue:** {query}")
|
||||
|
||||
# If nothing is playing, start playing
|
||||
if not self.voice_clients[guild_id].is_playing():
|
||||
await self.play_next(guild_id)
|
||||
|
||||
async def search_youtube(self, query):
|
||||
"""Searches YouTube for the query and returns the URL of the first result."""
|
||||
ytdl_opts = {
|
||||
'format': 'bestaudio/best',
|
||||
'noplaylist': True,
|
||||
'default_search': 'ytsearch',
|
||||
'quiet': True,
|
||||
'no_warnings': True,
|
||||
'skip_download': True,
|
||||
}
|
||||
loop = asyncio.get_event_loop()
|
||||
with yt_dlp.YoutubeDL(ytdl_opts) as ytdl:
|
||||
try:
|
||||
info = await loop.run_in_executor(None, lambda: ytdl.extract_info(query, download=False))
|
||||
if 'entries' in info:
|
||||
# Take the first item from the search results
|
||||
video = info['entries'][0]
|
||||
else:
|
||||
video = info
|
||||
video_url = f"https://www.youtube.com/watch?v={video['id']}"
|
||||
return video_url
|
||||
except Exception as e:
|
||||
print(f"Error searching YouTube: {e}")
|
||||
return None
|
||||
|
||||
async def play_next(self, guild_id):
|
||||
if guild_id not in self.music_queues or not self.music_queues[guild_id]:
|
||||
# Do not disconnect here
|
||||
return
|
||||
|
||||
url = self.music_queues[guild_id].pop(0)
|
||||
self.current_tracks[str(guild_id)] = url
|
||||
|
||||
try:
|
||||
# Use yt_dlp to get audio source
|
||||
ytdl_opts = {'format': 'bestaudio/best'}
|
||||
loop = asyncio.get_event_loop()
|
||||
with yt_dlp.YoutubeDL(ytdl_opts) as ytdl:
|
||||
info = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=False))
|
||||
audio_url = info['url']
|
||||
title = info.get('title', 'Unknown Title')
|
||||
webpage_url = info.get('webpage_url', url)
|
||||
thumbnail = info.get('thumbnail')
|
||||
|
||||
# Prepare FFmpeg options
|
||||
ffmpeg_opts = {
|
||||
'before_options': '-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5',
|
||||
'options': '-vn',
|
||||
}
|
||||
|
||||
# Create audio source using FFmpegPCMAudio
|
||||
source = discord.FFmpegPCMAudio(audio_url, **ffmpeg_opts)
|
||||
volume = self.volumes.get(str(guild_id), self.default_volume)
|
||||
source = discord.PCMVolumeTransformer(source, volume=volume)
|
||||
|
||||
# Play audio
|
||||
self.voice_clients[guild_id].play(source, after=lambda e: self.after_song(e, guild_id))
|
||||
|
||||
# Send an embedded message indicating the song is now playing
|
||||
embed = discord.Embed(
|
||||
title="Now Playing 🎵",
|
||||
description=f"[{title}]({webpage_url})",
|
||||
color=discord.Color.blue()
|
||||
)
|
||||
if thumbnail:
|
||||
embed.set_thumbnail(url=thumbnail)
|
||||
|
||||
# Use the stored interaction to send the message
|
||||
interaction = self.current_interactions.get(guild_id)
|
||||
if interaction:
|
||||
try:
|
||||
await interaction.followup.send(embed=embed)
|
||||
except discord.HTTPException as e:
|
||||
print(f"Failed to send message: {e}")
|
||||
finally:
|
||||
# Remove the interaction to prevent reuse
|
||||
self.current_interactions.pop(guild_id, None)
|
||||
else:
|
||||
# Fallback to a default text channel
|
||||
guild = self.client.get_guild(guild_id)
|
||||
if guild:
|
||||
text_channel = guild.system_channel or guild.text_channels[0]
|
||||
try:
|
||||
await text_channel.send(embed=embed)
|
||||
except discord.HTTPException as e:
|
||||
print(f"Failed to send message: {e}")
|
||||
|
||||
# Save state for auto-resume
|
||||
self.save_music_state()
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error during playback: {e}")
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_connected():
|
||||
await self.voice_clients[guild_id].disconnect()
|
||||
|
||||
def after_song(self, error, guild_id):
|
||||
if error:
|
||||
print(f"Error: {error}")
|
||||
coro = self.play_next(guild_id)
|
||||
asyncio.run_coroutine_threadsafe(coro, self.client.loop)
|
||||
|
||||
async def pause(self, interaction: discord.Interaction):
|
||||
guild_id = interaction.guild_id
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_playing():
|
||||
self.voice_clients[guild_id].pause()
|
||||
await interaction.response.send_message("⏸️ **Music paused.**")
|
||||
else:
|
||||
await interaction.response.send_message("❌ **No music is playing.**")
|
||||
|
||||
async def resume(self, interaction: discord.Interaction):
|
||||
guild_id = interaction.guild_id
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_paused():
|
||||
self.voice_clients[guild_id].resume()
|
||||
await interaction.response.send_message("▶️ **Music resumed.**")
|
||||
else:
|
||||
await interaction.response.send_message("❌ **No music is paused.**")
|
||||
|
||||
async def skip(self, interaction: discord.Interaction):
|
||||
guild_id = interaction.guild_id
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_playing():
|
||||
self.voice_clients[guild_id].stop()
|
||||
await interaction.response.send_message("⏭️ **Skipped current song.**")
|
||||
else:
|
||||
await interaction.response.send_message("❌ **No music is playing.**")
|
||||
|
||||
async def stop(self, interaction: discord.Interaction):
|
||||
guild_id = interaction.guild_id
|
||||
if guild_id in self.voice_clients:
|
||||
self.voice_clients[guild_id].stop()
|
||||
self.music_queues[guild_id] = []
|
||||
self.current_tracks.pop(str(guild_id), None) # Remove current track
|
||||
await interaction.response.send_message("🛑 **Playback stopped and queue cleared.**")
|
||||
else:
|
||||
await interaction.response.send_message("❌ **No music is playing.**")
|
||||
|
||||
async def leave(self, interaction: discord.Interaction):
|
||||
guild_id = interaction.guild_id
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_connected():
|
||||
await self.voice_clients[guild_id].disconnect()
|
||||
await interaction.response.send_message("👋 **Disconnected from the voice channel.**")
|
||||
else:
|
||||
await interaction.response.send_message("❌ **I am not connected to a voice channel.**")
|
||||
|
||||
async def set_volume(self, interaction: discord.Interaction, level: int):
|
||||
guild_id = interaction.guild_id
|
||||
|
||||
# Validate volume level
|
||||
if level < 0 or level > 100:
|
||||
await interaction.response.send_message("❌ **Volume must be between 0 and 100.**")
|
||||
return
|
||||
|
||||
# Set the volume
|
||||
volume = level / 100 # Convert to a 0.0 - 1.0 scale
|
||||
self.volumes[str(guild_id)] = volume
|
||||
|
||||
# Adjust volume if something is playing
|
||||
if guild_id in self.voice_clients and self.voice_clients[guild_id].is_playing():
|
||||
current_source = self.voice_clients[guild_id].source
|
||||
if isinstance(current_source, discord.PCMVolumeTransformer):
|
||||
current_source.volume = volume
|
||||
else:
|
||||
# Wrap the existing source with PCMVolumeTransformer
|
||||
self.voice_clients[guild_id].source = discord.PCMVolumeTransformer(current_source, volume=volume)
|
||||
|
||||
await interaction.response.send_message(f"🔊 **Volume set to {level}%.**")
|
||||
|
||||
def save_music_state(self):
|
||||
state = {
|
||||
'current_tracks': self.current_tracks,
|
||||
'music_queues': self.music_queues,
|
||||
'volumes': self.volumes
|
||||
}
|
||||
with open(self.save_file, 'w') as f:
|
||||
json.dump(state, f)
|
||||
|
||||
def load_music_state(self):
|
||||
if os.path.exists(self.save_file):
|
||||
with open(self.save_file, 'r') as f:
|
||||
state = json.load(f)
|
||||
self.current_tracks = state.get('current_tracks', {})
|
||||
self.music_queues = state.get('music_queues', {})
|
||||
self.volumes = state.get('volumes', {})
|
||||
else:
|
||||
self.current_tracks = {}
|
||||
self.music_queues = {}
|
||||
self.volumes = {}
|
@ -1 +0,0 @@
|
||||
{"current_tracks": {"1161168803888107550": "https://www.youtube.com/watch?v=fnlJw9H0xAM", "1142517462529757184": "https://www.youtube.com/watch?v=wWoQ7PFSYlk"}, "music_queues": {"1161168803888107550": [], "1142517462529757184": []}, "volumes": {"1161168803888107550": 0.5, "1142517462529757184": 0.5}}
|
Loading…
x
Reference in New Issue
Block a user