Code cleanup

This commit is contained in:
Choco
2023-02-21 10:06:08 +08:00
parent 3522aeacb6
commit a21bc04411
2 changed files with 6 additions and 9 deletions

View File

@@ -143,14 +143,10 @@ class Admin(commands.Cog, name="settings"):
settings.get('lang', 'EN'),
settings.get('controller', True),
f"<@&{settings['dj']}>" if 'dj' in settings else '`None`',
settings.get(
'votedisable', False),
settings.get(
'24/7', False),
settings.get(
'volume', 100),
ctime(settings.get(
'playTime', 0) * 60 * 1000),
settings.get('votedisable', False),
settings.get('24/7', False),
settings.get('volume', 100),
ctime(settings.get('playTime', 0) * 60 * 1000),
inline=True)
)
embed.add_field(name=get_lang(ctx.guild.id, 'settingsTitle2'), value=get_lang(ctx.guild.id, 'settingsValue2').format(
@@ -176,7 +172,6 @@ class Admin(commands.Cog, name="settings"):
async def volume(self, ctx: commands.Context, value: commands.Range[int, 1, 150]):
"Set the player's volume."
player: voicelink.Player = ctx.guild.voice_client
if player:
player.settings['volume'] = value
await player.set_volume(value)

View File

@@ -365,6 +365,8 @@ class Player(VoiceProtocol):
pass
async def is_privileged(self, user: Member):
if user.id in func.bot_access_user:
return True
if 'dj' in self.settings and self.settings['dj']:
return user.guild_permissions.manage_guild or (self.settings['dj'] in [role.id for role in user.roles])
return self.dj.id == user.id or user.guild_permissions.manage_guild