From 78cf29b8ff48ea86aab86eeb9b78229d4c572d99 Mon Sep 17 00:00:00 2001 From: Choco <94597336+ChocoMeow@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:17:52 +0800 Subject: [PATCH] Remove necessary async functions --- cogs/basic.py | 12 ++++++------ cogs/playlist.py | 2 +- function.py | 2 +- view/controller.py | 2 +- voicelink/player.py | 24 ++++++++++++------------ voicelink/queue.py | 10 +++++----- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cogs/basic.py b/cogs/basic.py index 966f117..8566373 100644 --- a/cogs/basic.py +++ b/cogs/basic.py @@ -119,10 +119,10 @@ class Basic(commands.Cog): try: if isinstance(tracks, voicelink.Playlist): for track in tracks.tracks: - await player.queue.put(track) + player.queue.put(track) await ctx.send(player.get_msg('playlistLoad').format(tracks.name, len(tracks.tracks))) else: - position = await player.queue.put(tracks[0]) + position = player.queue.put(tracks[0]) await ctx.send((f"`{player.get_msg('live')}`" if tracks[0].is_stream else "") + (player.get_msg('trackLoad_pos').format(tracks[0].title, tracks[0].author, tracks[0].formatLength, position) if position >= 1 and player.is_playing else player.get_msg('trackLoad').format(tracks[0].title, tracks[0].author, tracks[0].formatLength))) except voicelink.QueueFull as e: await ctx.send(e) @@ -159,10 +159,10 @@ class Basic(commands.Cog): try: if isinstance(tracks, voicelink.Playlist): for track in tracks.tracks: - await player.queue.put(track) + player.queue.put(track) await ctx.send(player.get_msg('playlistLoad').format(tracks.name, len(tracks.tracks))) else: - await player.queue.put(tracks[0]) + player.queue.put(tracks[0]) await ctx.send((f"`{player.get_msg('live')}`" if tracks[0].is_stream else "") + (player.get_msg('trackLoad_pos').format(tracks[0].title, tracks[0].author, tracks[0].formatLength, player.queue.count) if player.queue.count >= 1 and player.is_playing else player.get_msg('trackLoad').format(tracks[0].title, tracks[0].author, tracks[0].formatLength))) except voicelink.QueueFull as e: await ctx.send(e) @@ -217,7 +217,7 @@ class Basic(commands.Cog): msg = "" for value in view.values: track = tracks[int(value.split(". ")[0]) - 1] - await player.queue.put(track) + player.queue.put(track) msg += ((f"`{player.get_msg('live')}`" if track.is_stream else "") + (player.get_msg('trackLoad_pos').format(track.title, track.author, track.formatLength, player.queue.count) if player.queue.count >= 1 else player.get_msg('trackLoad').format(track.title, track.author, track.formatLength))) await ctx.send(msg) @@ -315,7 +315,7 @@ class Basic(commands.Cog): return await ctx.send(player.get_msg('nodeReconnect')) if index: - await player.queue.skipto(index) + player.queue.skipto(index) await ctx.send(player.get_msg('skipped').format(ctx.author)) diff --git a/cogs/playlist.py b/cogs/playlist.py index a4def1f..519a008 100644 --- a/cogs/playlist.py +++ b/cogs/playlist.py @@ -150,7 +150,7 @@ class Playlists(commands.Cog, name="playlist"): if value and 0 < value <= (len(tracks['tracks'])): tracks['tracks'] = [tracks['tracks'][value - 1]] for track in tracks['tracks']: - await player.queue.put(track) + player.queue.put(track) await ctx.send(get_lang(ctx.guild.id, 'playlistPlay').format(result['playlist']['name'], len(tracks['tracks'][:max_t]))) diff --git a/function.py b/function.py index 6a3aa84..4f82fa4 100644 --- a/function.py +++ b/function.py @@ -214,7 +214,7 @@ async def similar_track(player) -> bool: if tracks: for track in tracks: - await player.queue.put(track) + player.queue.put(track) return True return False diff --git a/view/controller.py b/view/controller.py index dd313ed..ff26d83 100644 --- a/view/controller.py +++ b/view/controller.py @@ -226,7 +226,7 @@ class Tracks(discord.ui.Select): if not await self.player.is_privileged(interaction.user): return await interaction.response.send_message(self.player.get_msg("missingPerms_function"), ephemeral=True) - await self.player.queue.skipto(int(self.values[0].split(". ")[0])) + self.player.queue.skipto(int(self.values[0].split(". ")[0])) await self.player.stop() await interaction.response.send_message(self.player.get_msg("skipped").format(interaction.user)) diff --git a/voicelink/player.py b/voicelink/player.py index 5b2f14b..608151a 100644 --- a/voicelink/player.py +++ b/voicelink/player.py @@ -22,7 +22,7 @@ SOFTWARE. """ import time -import function +import function as func from math import ceil from asyncio import sleep @@ -81,11 +81,11 @@ class Player(VoiceProtocol): self.channel = channel self._guild = channel.guild if channel else None - self.settings: dict = function.get_settings(ctx.guild.id) + self.settings: dict = func.get_settings(ctx.guild.id) self.joinTime = round(time.time()) self._volume = self.settings.get('volume', 100) - self.lang = self.settings.get('lang', 'EN') if self.settings.get('lang', 'EN') in function.langs else "EN" - self.queue = eval(self.settings.get("queueType", "Queue"))(self.settings.get("maxQueue", function.max_queue), self.settings.get("duplicateTrack", True), self.get_msg) + self.lang = self.settings.get('lang', 'EN') if self.settings.get('lang', 'EN') in func.langs else "EN" + self.queue = eval(self.settings.get("queueType", "Queue"))(self.settings.get("maxQueue", func.max_queue), self.settings.get("duplicateTrack", True), self.get_msg) self._node = NodePool.get_node() self._current: Track = None @@ -193,7 +193,7 @@ class Player(VoiceProtocol): return round(self._ping / 1000, 2) def get_msg(self, mKey: str) -> str: - return function.langs.get(self.lang, function.langs["EN"])[mKey] + return func.langs.get(self.lang, func.langs["EN"])[mKey] def required(self, leave=False): if self.settings.get('votedisable'): @@ -274,10 +274,10 @@ class Player(VoiceProtocol): self.shuffle_votes.clear() self.stop_votes.clear() - track: Track = await self.queue.get() + track: Track = self.queue.get() if not track: if self.settings.get("autoplay", False): - if await function.similar_track(self): + if await func.similar_track(self): return await self.do_next() if self.settings.get('controller', True): await self.invoke_controller() @@ -326,18 +326,18 @@ class Player(VoiceProtocol): track = self.current if not track: - embed=Embed(title=self.get_msg("noTrackPlaying"), description=f"[Vote](https://top.gg/bot/605618911471468554/vote/) | [Support]({function.invite_link}) | [Invite](https://discord.com/oauth2/authorize?client_id=605618911471468554&permissions=2184260928&scope=bot%20applications.commands) | [Questionnaire](https://forms.gle/UqeeEv4GEdCq9hi3A)", color=function.embed_color) + embed=Embed(title=self.get_msg("noTrackPlaying"), description=f"[Vote](https://top.gg/bot/605618911471468554/vote/) | [Support]({func.invite_link}) | [Invite](https://discord.com/oauth2/authorize?client_id=605618911471468554&permissions=2184260928&scope=bot%20applications.commands) | [Questionnaire](https://forms.gle/UqeeEv4GEdCq9hi3A)", color=func.embed_color) embed.set_image(url='https://i.imgur.com/dIFBwU7.png') else: try: - embed = Embed(color=function.embed_color) + embed = Embed(color=func.embed_color) embed.set_author(name=self.get_msg("playerAuthor").format(self.channel.name), icon_url=self.client.user.avatar.url) embed.description = self.get_msg("playerDesc").format(track.title, track.uri, (track.requester.mention if track.requester else "<@605618911471468554>"), (f"<@&{self.settings['dj']}>" if self.settings.get('dj') else f"{self.dj.mention}")) embed.set_image(url=track.thumbnail if track.thumbnail else "https://cdn.discordapp.com/attachments/674788144931012638/823086668445384704/eq-dribbble.gif") - embed.set_footer(text=self.get_msg("playerFooter").format(self.queue.count, (self.get_msg("live") if track.is_stream else function.time(track.length)), self.volume, self.get_msg("playerFooter2").format(self.queue.repeat.capitalize()) if self.queue._repeat else "")) + embed.set_footer(text=self.get_msg("playerFooter").format(self.queue.count, (self.get_msg("live") if track.is_stream else func.time(track.length)), self.volume, self.get_msg("playerFooter2").format(self.queue.repeat.capitalize()) if self.queue._repeat else "")) except: - embed = Embed(description=self.get_msg("missingTrackInfo"), color=function.embed_color) + embed = Embed(description=self.get_msg("missingTrackInfo"), color=func.embed_color) return embed async def is_position_fresh(self): @@ -352,7 +352,7 @@ class Player(VoiceProtocol): async def teardown(self): timeNow = round(time.time()) - function.update_settings(self.guild.id, {"lastActice": timeNow, "playTime": round(self.settings.get("playTime", 0) + ((timeNow - self.joinTime) / 60), 2)}) + func.update_settings(self.guild.id, {"lastActice": timeNow, "playTime": round(self.settings.get("playTime", 0) + ((timeNow - self.joinTime) / 60), 2)}) try: await self.controller.delete() diff --git a/voicelink/queue.py b/voicelink/queue.py index d3c5b14..e63fb16 100644 --- a/voicelink/queue.py +++ b/voicelink/queue.py @@ -35,7 +35,7 @@ class Queue: self._duplicateTrack = duplicateTrack self.get_msg = get_msg - async def get(self): + def get(self): track = None try: track = self._queue[self._position - 1 if self._repeat == 1 else self._position] @@ -51,7 +51,7 @@ class Queue: return track - async def put(self, item: Track) -> int: + def put(self, item: Track) -> int: if len(self._queue) >= self._size: raise QueueFull(self.get_msg("voicelinkQueueFull").format(self._size)) @@ -62,7 +62,7 @@ class Queue: self._queue.append(item) return self.count - async def put_at_front(self, item: Track): + def put_at_front(self, item: Track): if len(self._queue) >= self._size: raise QueueFull(self.get_msg("voicelinkQueueFull").format(self._size)) @@ -72,7 +72,7 @@ class Queue: return self._queue.insert(self._position, item) - async def put_at_index(self, index: int, item: Track): + def put_at_index(self, index: int, item: Track): if len(self._queue) >= self._size: raise QueueFull(self.get_msg("voicelinkQueueFull").format(self._size)) @@ -82,7 +82,7 @@ class Queue: return self._queue.insert(self._position - 1 + index, item) - async def skipto(self, index: int): + def skipto(self, index: int): if not 0 < index <= self.count: raise OutofList(self.get_msg("voicelinkOutofList")) else: