majjo/Vocard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bugs and cleaned up some code

Browse Source
This commit is contained in:
Choco
2023-03-16 11:34:08 +08:00
parent 4300e49ef2
commit 430b7f5963
3 changed files with 48 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
cogs/basic.py
View File

@@ -20,7 +20,6 @@ from function import (
from addons import getLyrics
from views import SearchView, ListView, LinkView, LyricsView, ChapterView, HelpView
from validators import url
from random import shuffle
searchPlatform = {
"youtube": "ytsearch",
@@ -57,7 +56,6 @@ async def nowplay(ctx: commands.Context, player: voicelink.Player):
async def help_autocomplete(ctx: commands.Context, current: str) -> list:
return [app_commands.Choice(name=c.capitalize(), value=c) for c in ctx.bot.cogs if c not in ["Nodes", "Task"] and current in c]
class Basic(commands.Cog):
def __init__(self, bot: commands.Bot) -> None:
self.bot = bot
@@ -93,9 +91,8 @@ class Basic(commands.Cog):
if not player:
player = await connect_channel(ctx)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
tracks = await player.get_tracks(query, requester=ctx.author)
if not tracks:
@@ -132,9 +129,8 @@ class Basic(commands.Cog):
if not player:
player = await connect_channel(ctx)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
tracks = await player.get_tracks(query, requester=ctx.author)
if not tracks:
@@ -172,9 +168,8 @@ class Basic(commands.Cog):
if not player:
player = await connect_channel(ctx)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if url(query):
return await ctx.send(player.get_msg('noLinkSupport'), ephemeral=True)
@@ -218,9 +213,8 @@ class Basic(commands.Cog):
if not player:
player = await connect_channel(ctx)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
tracks = await player.get_tracks(query, requester=ctx.author)
if not tracks:
@@ -249,10 +243,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if player.is_paused:
return await ctx.send(player.get_msg('pauseError'))
@@ -278,10 +268,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_paused:
return await ctx.send(player.get_msg('resumeError'))
@@ -308,10 +294,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_playing:
return await ctx.send(player.get_msg('skipError'), ephemeral=True)
@@ -348,10 +330,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
if ctx.author in player.previous_votes:
return await ctx.send(player.get_msg('voted'), ephemeral=True)
@@ -386,15 +364,10 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
if player.position == 0:
if not player.current or player.position == 0:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
num = formatTime(position)
@@ -412,9 +385,8 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if player.queue.is_empty:
return await nowplay(ctx, player)
@@ -430,9 +402,8 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.queue.history():
return await nowplay(ctx, player)
@@ -449,10 +420,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
if ctx.author in player.stop_votes:
return await ctx.send(player.get_msg('voted'), ephemeral=True)
@@ -474,9 +441,8 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
await nowplay(ctx, player)
@@ -494,10 +460,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_mode'), ephemeral=True)
@@ -519,10 +481,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_queue'), ephemeral=True)
@@ -548,10 +506,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_queue'), ephemeral=True)
@@ -567,15 +521,12 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
num = formatTime(position)
if num is None:
return await ctx.send(player.get_msg('timeFormatError'), ephemeral=True)
@@ -592,16 +543,12 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
num = formatTime(position)
if num is None:
return await ctx.send(player.get_msg('timeFormatError'), ephemeral=True)
@@ -617,16 +564,12 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
if not player.current:
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
await player.seek(0)
await ctx.send(player.get_msg('replay'))
@@ -638,10 +581,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
if ctx.author in player.shuffle_votes:
return await ctx.send(player.get_msg('voted'), ephemeral=True)
@@ -652,7 +591,7 @@ class Basic(commands.Cog):
else:
return await ctx.send(player.get_msg('shuffleVote').format(ctx.author, len(player.skip_votes), required))
player.shuffle("queue")
await player.shuffle("queue")
await ctx.send(player.get_msg('shuffled'))
@commands.hybrid_command(name="swap", aliases=get_aliases("swap"))
@@ -667,10 +606,6 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
@@ -688,11 +623,7 @@ class Basic(commands.Cog):
player: voicelink.Player = ctx.guild.voice_client
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_privileged(ctx.author):
return await ctx.send(player.get_msg('missingPerms_pos'), ephemeral=True)
@@ -729,9 +660,8 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if player.dj.id != ctx.author.id or player.settings.get('dj', False):
return await ctx.send(player.get_msg('notdj').format(f"<@&{player.settings['dj']}>" if player.settings.get('dj') else player.dj.mention), ephemeral=True)
@@ -753,9 +683,8 @@ class Basic(commands.Cog):
if not player:
return await ctx.send(get_lang(ctx.guild.id, 'noPlayer'), ephemeral=True)
if ctx.author not in player.channel.members:
if not ctx.author.guild_permissions.manage_guild:
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not player.is_user_join(ctx.author):
return await ctx.send(player.get_msg('notInChannel').format(ctx.author.mention, player.channel.mention), ephemeral=True)
if not (track := player.current):
return await ctx.send(player.get_msg('noTrackPlaying'), ephemeral=True)
@@ -765,8 +694,7 @@ class Basic(commands.Cog):
if track.source != 'youtube':
return await ctx.send(player.get_msg('chatpersNotSupport'), ephemeral=True)
request_uri = "https://youtube.googleapis.com/youtube/v3/videos?part=snippet&id={videoId}&key={key}".format(
videoId=track.identifier, key=youtube_api_key)
request_uri = "https://youtube.googleapis.com/youtube/v3/videos?part=snippet&id={videoId}&key={key}".format(videoId=track.identifier, key=youtube_api_key)
data = await requests_api(request_uri)
if not data:

2
views/controller.py
View File

@@ -323,7 +323,7 @@ class InteractiveController(discord.ui.View):
if interaction.user.id in func.bot_access_user:
return True
if self.player.channel and interaction.user in self.player.channel.members:
if self.player.channel and self.player.is_user_join(interaction.user):
retry_after = self.cooldown.update_rate_limit(interaction)
if retry_after:
raise ButtonOnCooldown(retry_after)

19
voicelink/player.py
View File

@@ -81,7 +81,7 @@ class Player(VoiceProtocol):
self._bot = client
self.context = ctx
self.dj: Member = ctx.author
self.channel = channel
self.channel: VoiceChannel = channel
self._guild = channel.guild if channel else None
self.settings: dict = func.get_settings(ctx.guild.id)
@@ -209,12 +209,23 @@ class Player(VoiceProtocol):
return required
def is_privileged(self, user: Member):
def is_user_join(self, user: Member):
if user not in self.channel.members:
if not user.guild_permissions.manage_guild:
return False
return True
def is_privileged(self, user: Member, check_user_join: bool = True):
if user.id in func.bot_access_user:
return True
manage_perm = user.guild_permissions.manage_guild
if check_user_join and not self.is_user_join(user):
raise VoicelinkException(self.get_msg('notInChannel').format(user.mention, self.channel.mention))
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
return manage_perm or (self.settings['dj'] in [role.id for role in user.roles])
return self.dj.id == user.id or manage_perm
async def _update_state(self, data: dict):
state: dict = data.get("state")