diff options
Diffstat (limited to 'code')
| -rw-r--r-- | code/cogs/play.py | 15 | ||||
| -rw-r--r-- | code/utils/custom_sources.py | 17 |
2 files changed, 23 insertions, 9 deletions
diff --git a/code/cogs/play.py b/code/cogs/play.py index 1c04793..02c0a11 100644 --- a/code/cogs/play.py +++ b/code/cogs/play.py @@ -233,15 +233,22 @@ class Play(commands.Cog): else: if not url_rx.match(query): - ytsearch = f"ytsearch:{query}" - results = await player.node.get_tracks(ytsearch) + dzsearch = f"dzsearch:{query}" + results = await player.node.get_tracks(dzsearch) if not results.tracks or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): - dzsearch = f"dzsearch:{query}" - results = await player.node.get_tracks(dzsearch) + scsearch = f"scsearch:{query}" + results = await player.node.get_tracks(scsearch) + + if not results.tracks or results.load_type in ( + LoadType.EMPTY, + LoadType.ERROR, + ): + ytsearch = f"ytsearch:{query}" + results = await player.node.get_tracks(ytsearch) else: results = await player.node.get_tracks(query) diff --git a/code/utils/custom_sources.py b/code/utils/custom_sources.py index 96ae3a9..6f5d65a 100644 --- a/code/utils/custom_sources.py +++ b/code/utils/custom_sources.py @@ -18,20 +18,27 @@ class CustomAudioTrack(DeferredAudioTrack): async def load( self, client ): # Load our 'actual' playback track using the metadata from this one. - ytsearch = f"ytsearch:{self.title} {self.author} audio" - results = await client.get_tracks(ytsearch) + dzsearch = f"dzsearch:{self.title} {self.author}" + results = await client.get_tracks(dzsearch) if not results.tracks or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): - dzsearch = f"dzsearch:{self.title} {self.author}" - results = await client.get_tracks(dzsearch) + scsearch = f"scsearch:{self.title} {self.author}" + results = await client.get_tracks(scsearch) if not results.tracks or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): - raise LoadError + ytsearch = f"ytsearch:{self.title} {self.author} audio" + results = await client.get_tracks(ytsearch) + + if not results.tracks or results.load_type in ( + LoadType.EMPTY, + LoadType.ERROR, + ): + raise LoadError first_track = results.tracks[0] # Grab the first track from the results. base64 = first_track.track # Extract the base64 string from the track. |