From 58e9caa86f06b107372fbd31f91f45863177cc36 Mon Sep 17 00:00:00 2001 From: Choco <94597336+ChocoMeow@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:52:22 +0800 Subject: [PATCH] Fixed some bugs --- addons/lyrics.py | 4 +--- views/controller.py | 2 +- voicelink/pool.py | 15 +++------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/addons/lyrics.py b/addons/lyrics.py index 10e4cac..6f51c09 100644 --- a/addons/lyrics.py +++ b/addons/lyrics.py @@ -103,9 +103,7 @@ class A_ZLyrics(LyricsPlatform): data = artist + ' ' * (title != '' and artist != '') + title encoded_data = quote(data.replace(' ', '+')) - - google_page = await self.get('{}{}+site%3Aazlyrics.com'.format( - 'https://duckduckgo.com/html/?q=', encoded_data)) + google_page = await self.get('{}{}+site%3Aazlyrics.com'.format('https://duckduckgo.com/html/?q=', encoded_data)) try: results = re.findall(r'(azlyrics\.com\/lyrics\/[a-z0-9]+\/(\w+).html)', google_page) diff --git a/views/controller.py b/views/controller.py index 17f541b..e44b689 100644 --- a/views/controller.py +++ b/views/controller.py @@ -76,7 +76,7 @@ class Back(ControlButton): if len(self.player.previous_votes) >= (required := self.player.required()): pass else: - return await self.send(interaction, "backVote".format(interaction.user, len(self.player.previous_votes), required)) + return await self.send(interaction, "backVote", interaction.user, len(self.player.previous_votes), required) if not self.player.is_playing: self.player.queue.backto(1) diff --git a/voicelink/pool.py b/voicelink/pool.py index 966373b..9dda7da 100644 --- a/voicelink/pool.py +++ b/voicelink/pool.py @@ -438,26 +438,17 @@ class Node: data: dict = await response.json() try: - track: dict = data["tracks"][0] - info: dict = track.get("info") + track: dict = data["data"] except: raise TrackLoadError("Not able to find the provided track.") return [ Track( - track_id=None, - info={ - "title": discord_url.group("file"), - "author": "Unknown", - "length": info.get("length"), - "uri": info.get("uri"), - "position": info.get("position"), - "identifier": info.get("identifier") - }, + track_id=track["encoded"], + info=track["info"], requester=requester ) ] - else: async with self._session.get( url=f"{self._rest_uri}/" + NODE_VERSION + f"/loadtracks?identifier={quote(query)}",