ErrorNoInternet/ErrorNoCord
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: playback_queue -> player_queue

Browse Source
This commit is contained in:
Ryan 2024-12-30 14:53:52 -05:00
parent 6d7b46a7e5
commit a8a4cb910a
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
commands/voice.py
View File

@ -2,7 +2,7 @@ import arguments
import commands import commands
import utils import utils
import ytdlp import ytdlp
from state import client, playback_queue from state import client, player_queue
async def queue_or_play(message): async def queue_or_play(message):
@ -10,8 +10,8 @@ async def queue_or_play(message):
if not command_allowed(message): if not command_allowed(message):
return return
if message.guild.id not in playback_queue: if message.guild.id not in player_queue:
playback_queue[message.guild.id] = [] player_queue[message.guild.id] = []
tokens = commands.tokenize(message.content) tokens = commands.tokenize(message.content)
parser = arguments.ArgumentParser( parser = arguments.ArgumentParser(
@ -28,7 +28,7 @@ async def queue_or_play(message):
return return
if args.clear: if args.clear:
playback_queue[message.guild.id] = [] player_queue[message.guild.id] = []
await message.add_reaction("✅") await message.add_reaction("✅")
return return
elif query := args.query: elif query := args.query:
@ -44,7 +44,7 @@ async def queue_or_play(message):
) )
return return
playback_queue[message.guild.id].append( player_queue[message.guild.id].append(
{"player": player, "queuer": message.author.id} {"player": player, "queuer": message.author.id}
) )
@ -71,26 +71,26 @@ async def queue_or_play(message):
lambda: f"**0.** {'**paused:** ' if message.guild.voice_client.is_paused() else ''}`{message.guild.voice_client.source.title}`" lambda: f"**0.** {'**paused:** ' if message.guild.voice_client.is_paused() else ''}`{message.guild.voice_client.source.title}`"
) )
if ( if (
not playback_queue[message.guild.id] not player_queue[message.guild.id]
and not message.guild.voice_client.source and not message.guild.voice_client.source
): ):
await utils.reply( await utils.reply(
message, message,
"nothing is playing or queued!", "nothing is playing or queued!",
) )
elif not playback_queue[message.guild.id]: elif not player_queue[message.guild.id]:
await utils.reply(message, generate_currently_playing()) await utils.reply(message, generate_currently_playing())
elif not message.guild.voice_client.source: elif not message.guild.voice_client.source:
await utils.reply( await utils.reply(
message, message,
generate_queue_list(playback_queue[message.guild.id]), generate_queue_list(player_queue[message.guild.id]),
) )
else: else:
await utils.reply( await utils.reply(
message, message,
generate_currently_playing() generate_currently_playing()
+ "\n" + "\n"
+ generate_queue_list(playback_queue[message.guild.id]), + generate_queue_list(player_queue[message.guild.id]),
) )
else: else:
await utils.reply( await utils.reply(
@ -103,7 +103,7 @@ async def skip(message):
if not command_allowed(message): if not command_allowed(message):
return return
if not playback_queue[message.guild.id]: if not player_queue[message.guild.id]:
message.guild.voice_client.stop() message.guild.voice_client.stop()
await utils.reply( await utils.reply(
message, message,
@ -190,8 +190,8 @@ async def volume(message):
async def play_next(message): async def play_next(message):
while playback_queue[message.guild.id]: while player_queue[message.guild.id]:
queued = playback_queue[message.guild.id].pop() queued = player_queue[message.guild.id].pop()
await ensure_joined(message) await ensure_joined(message)
message.guild.voice_client.stop() message.guild.voice_client.stop()
message.guild.voice_client.play( message.guild.voice_client.play(

2
state.py
View File

@ -4,7 +4,7 @@ import disnake
start_time = time.time() start_time = time.time()
playback_queue = {} player_queue = {}
intents = disnake.Intents.default() intents = disnake.Intents.default()
intents.message_content = True intents.message_content = True