multi-server support with broken volume
This commit is contained in:
parent
014d05629a
commit
60ebd345e7
1 changed files with 22 additions and 18 deletions
38
main.py
38
main.py
|
|
@ -9,8 +9,8 @@ intents = discord.Intents.default()
|
|||
intents.message_content = True # Needed to read .play/.stop commands
|
||||
bot = commands.Bot(command_prefix="..", intents=intents)
|
||||
|
||||
# Global variable to hold the current voice client
|
||||
voice_client = None
|
||||
# Global variable to hold the current voice clients
|
||||
voice_clients = {}
|
||||
|
||||
# Sets the default volume to 20%, to make headphone users survive
|
||||
# the volume does not change when the bot is already playing, only new audio
|
||||
|
|
@ -27,26 +27,26 @@ async def on_ready():
|
|||
|
||||
@bot.command()
|
||||
async def play(ctx, url: str):
|
||||
global voice_client
|
||||
guild_id = ctx.guild.id
|
||||
|
||||
if not ctx.author.voice:
|
||||
await ctx.send("lépjél már be egy kurva csatornába te szerencsétlen fasz")
|
||||
return
|
||||
|
||||
# Connect to the user's voice channel if not already connected
|
||||
if not voice_client or not voice_client.is_connected():
|
||||
voice_client = await ctx.author.voice.channel.connect()
|
||||
if guild_id not in voice_clients or not voice_clients[guild_id].is_connected():
|
||||
voice_clients[guild_id] = await ctx.author.voice.channel.connect()
|
||||
|
||||
# Stop any currently playing audio
|
||||
if voice_client.is_playing():
|
||||
voice_client.stop()
|
||||
vc = voice_clients[guild_id]
|
||||
|
||||
if vc.is_playing():
|
||||
vc.stop()
|
||||
|
||||
try:
|
||||
# Load blocked keywords from file
|
||||
with open("blocked_keywords.txt", "r", encoding="utf-8") as f:
|
||||
blocked_keywords = [line.strip().lower() for line in f if line.strip()]
|
||||
|
||||
# YTDLP options
|
||||
ydl_opts = {
|
||||
"format": "bestaudio/best",
|
||||
"quiet": True,
|
||||
|
|
@ -54,6 +54,7 @@ async def play(ctx, url: str):
|
|||
"default_search": "auto",
|
||||
}
|
||||
|
||||
# Use yt-dlp to extract audio URL and check for blocked keywords
|
||||
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
|
||||
info = ydl.extract_info(url, download=False)
|
||||
title = info["title"].lower()
|
||||
|
|
@ -63,12 +64,14 @@ async def play(ctx, url: str):
|
|||
audio_url = info["url"]
|
||||
print("Audio URL:", audio_url)
|
||||
|
||||
# Set up FFmpeg options with the current volume
|
||||
ffmpeg_options = {
|
||||
"before_options": "-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5 -protocol_whitelist file,http,https,tcp,tls,crypto",
|
||||
"options": f"-vn -af volume={current_volume}"
|
||||
}
|
||||
|
||||
voice_client.play(
|
||||
# Play the audio
|
||||
vc.play(
|
||||
FFmpegPCMAudio(audio_url, **ffmpeg_options),
|
||||
after=lambda e: print(f"Finished playing: {e}")
|
||||
)
|
||||
|
|
@ -79,14 +82,15 @@ async def play(ctx, url: str):
|
|||
|
||||
@bot.command()
|
||||
async def stop(ctx):
|
||||
global voice_client
|
||||
guild_id = ctx.guild.id
|
||||
|
||||
if voice_client and voice_client.is_playing():
|
||||
voice_client.stop()
|
||||
if guild_id in voice_clients and voice_clients[guild_id].is_playing():
|
||||
voice_clients[guild_id].stop()
|
||||
await ctx.send("hát akkor ne hallgassad basszalak szájba")
|
||||
else:
|
||||
await ctx.send("nem is szól semmi te buzeráns fasz")
|
||||
|
||||
#Does not work in multi-server setup, needs fix
|
||||
@bot.command()
|
||||
async def volume(ctx, vol: float):
|
||||
global current_volume
|
||||
|
|
@ -98,11 +102,11 @@ async def volume(ctx, vol: float):
|
|||
|
||||
@bot.command()
|
||||
async def leave(ctx):
|
||||
global voice_client
|
||||
guild_id = ctx.guild.id
|
||||
|
||||
if voice_client and voice_client.is_connected():
|
||||
await voice_client.disconnect()
|
||||
voice_client = None
|
||||
if guild_id in voice_clients and voice_clients[guild_id].is_connected():
|
||||
await voice_clients[guild_id].disconnect()
|
||||
del voice_clients[guild_id]
|
||||
await ctx.send("akkor csá gecik")
|
||||
else:
|
||||
await ctx.send("nem is vagyok voice channelben basszam ki a szádat")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue