diff --git a/cogs/admin.py b/cogs/admin.py index 4201481..2fb2599 100644 --- a/cogs/admin.py +++ b/cogs/admin.py @@ -4,7 +4,7 @@ import io import contextlib import textwrap import traceback -import function +import function as func from discord import app_commands from discord.ext import commands @@ -155,7 +155,7 @@ class Admin(commands.Cog, name="settings"): ) embed.add_field(name=get_lang(ctx.guild.id, 'settingsTitle2'), value=get_lang(ctx.guild.id, 'settingsValue2').format( settings.get("queueType", "Queue"), - function.max_queue, + func.max_queue, settings.get("duplicateTrack", True) ) ) @@ -219,7 +219,7 @@ class Admin(commands.Cog, name="settings"): @app_commands.command(name="debug") async def debug(self, interaction: discord.Interaction): - if interaction.user.id not in function.bot_access_user: + if interaction.user.id not in func.bot_access_user: return await interaction.response.send_message("You are not able to use this command!") def clear_code(content): diff --git a/cogs/nodes.py b/cogs/nodes.py index eec3234..38555cc 100644 --- a/cogs/nodes.py +++ b/cogs/nodes.py @@ -1,6 +1,6 @@ import voicelink import asyncio -import function +import function as func from os import getenv from discord.ext import commands @@ -17,7 +17,7 @@ class Nodes(commands.Cog): async def start_nodes(self) -> None: """Connect and intiate nodes.""" await self.bot.wait_until_ready() - for n in function.nodes.values(): + for n in func.nodes.values(): try: await self.voicelink.create_node(bot=self.bot, spotify_client_id=getenv('SPOTIFY_CLIENT_ID'), diff --git a/cogs/task.py b/cogs/task.py index 55d4b12..6462fc0 100644 --- a/cogs/task.py +++ b/cogs/task.py @@ -1,6 +1,5 @@ -import function import voicelink -import discord +import function as func from discord.ext import commands, tasks from datetime import datetime @@ -56,18 +55,18 @@ class Task(commands.Cog): @tasks.loop(hours=12.0) async def cache_cleaner(self): - function.lang_guilds.clear() - function.playlist_name.clear() + func.lang_guilds.clear() + func.playlist_name.clear() - errorFile = function.gen_report() + errorFile = func.gen_report() if errorFile: - report_channel = self.bot.get_channel(function.report_channel_id) + report_channel = self.bot.get_channel(func.report_channel_id) if report_channel: try: await report_channel.send(content=f"Report Before: ", file=errorFile) except Exception as e: print(f"Report could not be sent (Reason: {e})") - function.error_log.clear() + func.error_log.clear() async def setup(bot: commands.Bot): await bot.add_cog(Task(bot)) diff --git a/view/controller.py b/view/controller.py index a6e5263..d4df07d 100644 --- a/view/controller.py +++ b/view/controller.py @@ -22,6 +22,7 @@ SOFTWARE. """ import discord +import function as func from discord.ext import commands from . import ButtonOnCooldown diff --git a/view/help.py b/view/help.py index 481fcdd..5c3f63b 100644 --- a/view/help.py +++ b/view/help.py @@ -25,7 +25,7 @@ import discord from discord.ext import commands from os import getenv -import function +import function as func class HelpDropdown(discord.ui.Select): def __init__(self, category:list): @@ -58,7 +58,7 @@ class HelpView(discord.ui.View): self.response = None self.categorys = [ category.capitalize() for category in bot.cogs if category not in ["Task", "Nodes"] ] - self.add_item(discord.ui.Button(label='Support', emoji=':support:915152950471581696', url=function.invite_link)) + self.add_item(discord.ui.Button(label='Support', emoji=':support:915152950471581696', url=func.invite_link)) self.add_item(discord.ui.Button(label='Invite', emoji=':invite:915152589056790589', url='https://discord.com/oauth2/authorize?client_id={}&permissions=2184260928&scope=bot%20applications.commands'.format(getenv('CLIENT_ID')))) self.add_item(discord.ui.Button(label='Github', url='https://github.com/ChocoMeow/Vocard')) self.add_item(discord.ui.Button(label='Donate', emoji=':patreon:913397909024800878', url='https://www.patreon.com/Vocard')) @@ -84,7 +84,7 @@ class HelpView(discord.ui.View): def build_embed(self, category: str): category = category.lower() if category == "news": - embed = discord.Embed(title="Vocard Help Menu", url="https://discord.com/channels/811542332678996008/811909963718459392/1069971173116481636", color=function.embed_color) + embed = discord.Embed(title="Vocard Help Menu", url="https://discord.com/channels/811542332678996008/811909963718459392/1069971173116481636", color=func.embed_color) embed.add_field(name=f"Available Categories: [{2 + len(self.categorys)}]", value="```py\nšŸ‘‰ News\n2. Tutorial\n{}```".format("".join(f"{i}. {c}\n" for i, c in enumerate(self.categorys, start=3))), @@ -101,7 +101,7 @@ class HelpView(discord.ui.View): return embed - embed = discord.Embed(title=f"Category: {category}", color=function.embed_color) + embed = discord.Embed(title=f"Category: {category}", color=func.embed_color) embed.add_field(name=f"Categories: [{2 + len(self.categorys)}]", value="```py\n" + "\n".join(f"šŸ‘‰ {c}" if c == category else f"{i}. {c}" for i, c in enumerate(['News', 'Tutorial'] + self.categorys, start=1)) + "```", inline=True) if category == 'tutorial': diff --git a/view/inbox.py b/view/inbox.py index 5f8cec9..e169e9f 100644 --- a/view/inbox.py +++ b/view/inbox.py @@ -22,7 +22,7 @@ SOFTWARE. """ import discord -import function +import function as func class Select_message(discord.ui.Select): def __init__(self, inbox): @@ -51,7 +51,7 @@ class InboxView(discord.ui.View): def build_embed(self): embed=discord.Embed(title=f"šŸ“­ All {self.author}'s Inbox", description=f'Max Messages: {len(self.inbox)}/10' + '```%0s %2s %20s\n' % (" ", "ID:", "Title:") + '\n'.join('%0s %2s. %35s'% ('āœ‰ļø' if mail['type'] == 'invite' else 'šŸ“¢', index, mail['title'][:35] + "...") for index, mail in enumerate(self.inbox, start=1)) + '```', - color=function.embed_color) + color=func.embed_color) if self.current: embed.add_field(name="Message Info:", value=f"```{self.current['description']}\nSender ID: {self.current['sender']}\nPlaylist ID: {self.current['referId']}\nInvite Time: {self.current['time'].strftime('%d-%m %H:%M:%S')}```") return embed diff --git a/view/list.py b/view/list.py index e18cb64..5a4d623 100644 --- a/view/list.py +++ b/view/list.py @@ -22,9 +22,9 @@ SOFTWARE. """ import discord +import function as func from math import ceil -import function class ListView(discord.ui.View): def __init__(self, player, author, isQueue = True): @@ -40,7 +40,7 @@ class ListView(discord.ui.View): self.page = ceil(len(self.tracks) / 7) self.current_page = 1 try: - self.time = function.time(sum([track.length for track in self.tracks])) + self.time = func.time(sum([track.length for track in self.tracks])) except: self.time = "āˆž" @@ -64,11 +64,11 @@ class ListView(discord.ui.View): offset = self.current_page * 7 tracks = self.tracks[(offset-7):offset] - embed = discord.Embed(title=self.player.get_msg('viewTitle'), color=function.embed_color) + embed = discord.Embed(title=self.player.get_msg('viewTitle'), color=func.embed_color) embed.description=self.player.get_msg('viewDesc').format(self.player.current.uri, f"```{self.player.current.title}```") if self.player.current else self.player.get_msg('nowplayingDesc').format("None") queueText = "" for index, track in enumerate(tracks, start=offset - 6): - queueText += f"{track.emoji} `{index}.` `[" + (self.player.get_msg("live") if track.is_stream else function.time(track.length)) + f'`] **{track.title[:30]}** ' + (track.requester.mention if track.requester else self.player.client.id) + "\n" + queueText += f"{track.emoji} `{index}.` `[" + (self.player.get_msg("live") if track.is_stream else func.time(track.length)) + f'`] **{track.title[:30]}** ' + (track.requester.mention if track.requester else self.player.client.id) + "\n" embed.add_field(name=self.name, value=queueText) embed.set_footer(text=self.player.get_msg('viewFooter').format(self.current_page, self.page, self.time)) diff --git a/view/lyrics.py b/view/lyrics.py index c515e36..c374be9 100644 --- a/view/lyrics.py +++ b/view/lyrics.py @@ -22,7 +22,7 @@ SOFTWARE. """ import discord -import function +import function as func class LyricsDropdown(discord.ui.Select): def __init__(self, langs: list): @@ -72,7 +72,7 @@ class LyricsView(discord.ui.View): def build_embed(self): chunk = self.source.get(self.lang)[self.current_page - 1] - embed=discord.Embed(description=chunk, color=function.embed_color) + embed=discord.Embed(description=chunk, color=func.embed_color) embed.set_author(name=f"Searching Query: {self.name}", icon_url=self.author.display_avatar.url) embed.set_footer(text=f"Page: {self.current_page}/{self.pages}") return embed diff --git a/view/playlist.py b/view/playlist.py index b4bd284..f749891 100644 --- a/view/playlist.py +++ b/view/playlist.py @@ -22,7 +22,7 @@ SOFTWARE. """ import discord -import function +import function as func from math import ceil from tldextract import extract @@ -88,27 +88,27 @@ class PlaylistView(discord.ui.View): offset = self.current_page * 7 tracks = self.current['tracks'][(offset-7):offset] - embed = discord.Embed(title=function.get_lang(self.guildID, 'playlistView'), color=function.embed_color) + embed = discord.Embed(title=func.get_lang(self.guildID, 'playlistView'), color=func.embed_color) - embed.description= function.get_lang(self.guildID, 'playlistViewDesc').format(self.current['name'], self.current['id'], len(self.current['tracks']), self.current.get('owner', "None"), self.current['type']) + embed.description= func.get_lang(self.guildID, 'playlistViewDesc').format(self.current['name'], self.current['id'], len(self.current['tracks']), self.current.get('owner', "None"), self.current['type']) perms = self.current['perms'] - permsStr = function.get_lang(self.guildID, 'settingsPermTitle') + permsStr = func.get_lang(self.guildID, 'settingsPermTitle') if self.current['type'] == 'share': - embed.add_field(name=permsStr, value=function.get_lang(self.guildID, 'playlistViewPermsValue').format('āœ“' if 'write' in perms and self.author.id in perms['write'] else 'āœ˜', 'āœ“' if 'remove' in perms and self.author.id in perms['remove'] else 'āœ˜')) + embed.add_field(name=permsStr, value=func.get_lang(self.guildID, 'playlistViewPermsValue').format('āœ“' if 'write' in perms and self.author.id in perms['write'] else 'āœ˜', 'āœ“' if 'remove' in perms and self.author.id in perms['remove'] else 'āœ˜')) else: - embed.add_field(name=permsStr, value=function.get_lang(self.guildID, 'playlistViewPermsValue2').format(', '.join(f'<@{user}>' for user in perms['read']))) + embed.add_field(name=permsStr, value=func.get_lang(self.guildID, 'playlistViewPermsValue2').format(', '.join(f'<@{user}>' for user in perms['read']))) - trackStr = function.get_lang(self.guildID, 'playlistViewTrack') + trackStr = func.get_lang(self.guildID, 'playlistViewTrack') if tracks: try: - embed.add_field(name=trackStr, value='\n'.join(f"{function.emoji_source(extract(track['info']['uri']).domain)} `{index}.` `[{function.time(track['info']['length'] * 1000)}]` **{track['info']['title'][:30]}** " for index, track in enumerate(tracks, start=offset - 6)), inline=False) + embed.add_field(name=trackStr, value='\n'.join(f"{func.emoji_source(extract(track['info']['uri']).domain)} `{index}.` `[{func.time(track['info']['length'] * 1000)}]` **{track['info']['title'][:30]}** " for index, track in enumerate(tracks, start=offset - 6)), inline=False) except: - embed.add_field(name=trackStr, value='\n'.join(f"{function.emoji_source(extract(track.info['uri']).domain)} `{index}.` `[{function.time(track.length)}]` **{track.title[:30]}** " for index, track in enumerate(tracks, start=offset - 6)), inline=False) + embed.add_field(name=trackStr, value='\n'.join(f"{func.emoji_source(extract(track.info['uri']).domain)} `{index}.` `[{func.time(track.length)}]` **{track.title[:30]}** " for index, track in enumerate(tracks, start=offset - 6)), inline=False) else: - embed.add_field(name=trackStr, value=function.get_lang(self.guildID, 'playlistNoTrack').format(self.current['name']), inline=False) + embed.add_field(name=trackStr, value=func.get_lang(self.guildID, 'playlistNoTrack').format(self.current['name']), inline=False) - embed.set_footer(text=function.get_lang(self.guildID, 'playlistViewPage').format(self.current_page, self.page, self.current['time'])) + embed.set_footer(text=func.get_lang(self.guildID, 'playlistViewPage').format(self.current_page, self.page, self.current['time'])) return embed @@ -163,7 +163,7 @@ class CreateView(discord.ui.View): self.value = None self.response = None self.add_item(agree()) - self.add_item(discord.ui.Button(label='Support', emoji=':support:915152950471581696', url=function.invite_link)) + self.add_item(discord.ui.Button(label='Support', emoji=':support:915152950471581696', url=func.invite_link)) async def on_timeout(self): for child in self.children: diff --git a/voicelink/queue.py b/voicelink/queue.py index a14ea8e..d3c5b14 100644 --- a/voicelink/queue.py +++ b/voicelink/queue.py @@ -27,7 +27,6 @@ from discord import Member class Queue: def __init__(self, size:int, duplicateTrack: bool, get_msg): - self._queue = [] self._position = 0 self._size = size