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

feat(commands/voice): allow immutable commands from non-vc members

Browse Source
This commit is contained in:
Ryan 2025-01-06 11:53:19 -05:00
parent 290e85a1c1
commit b0e378105e
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
commands/voice.py
View File

@ -213,7 +213,7 @@ async def queue_or_play(message, edited=False):
async def playing(message): async def playing(message):
if not command_allowed(message): if not command_allowed(message, immutable=True):
return return
tokens = commands.tokenize(message.content) tokens = commands.tokenize(message.content)
@ -342,11 +342,11 @@ async def pause(message):
async def volume(message): async def volume(message):
if not command_allowed(message): if not command_allowed(message, immutable=True):
return return
tokens = commands.tokenize(message.content) tokens = commands.tokenize(message.content)
parser = arguments.ArgumentParser(tokens[0], "set the current volume level") parser = arguments.ArgumentParser(tokens[0], "get or set the current volume level")
parser.add_argument( parser.add_argument(
"volume", "volume",
nargs="?", nargs="?",
@ -366,6 +366,9 @@ async def volume(message):
f"{int(message.guild.voice_client.source.volume * 100)}", f"{int(message.guild.voice_client.source.volume * 100)}",
) )
else: else:
if not command_allowed(message):
return
message.guild.voice_client.source.volume = float(args.volume) / 100.0 message.guild.voice_client.source.volume = float(args.volume) / 100.0
await utils.add_check_reaction(message) await utils.add_check_reaction(message)
@ -419,7 +422,12 @@ async def ensure_joined(message):
await utils.reply(message, "You are not connected to a voice channel.") await utils.reply(message, "You are not connected to a voice channel.")
def command_allowed(message): def command_allowed(message, immutable=False):
if not message.author.voice or not message.guild.voice_client: if not message.guild.voice_client:
return
if immutable:
return message.channel.id == message.guild.voice_client.channel.id
else:
if not message.author.voice:
return False return False
return message.author.voice.channel.id == message.guild.voice_client.channel.id return message.author.voice.channel.id == message.guild.voice_client.channel.id