Prefer YT over DZ
This commit is contained in:
parent
968cd93482
commit
3c66d50822
@ -52,15 +52,15 @@ async def add_song_recommendations(bot_user, player, number, inputs, retries: in
|
||||
for entry in completion.split("\n"):
|
||||
song, artist = entry.split(" - ")
|
||||
|
||||
dzsearch = f"dzsearch:{song} {artist}"
|
||||
results = await player.node.get_tracks(dzsearch)
|
||||
ytsearch = f"ytsearch:{song} {artist} audio"
|
||||
results = await player.node.get_tracks(ytsearch)
|
||||
|
||||
if not results.tracks or results.load_type in (
|
||||
LoadType.EMPTY,
|
||||
LoadType.ERROR,
|
||||
):
|
||||
ytsearch = f"ytsearch:{song} {artist} audio"
|
||||
results = await player.node.get_tracks(ytsearch)
|
||||
dzsearch = f"dzsearch:{song} {artist}"
|
||||
results = await player.node.get_tracks(dzsearch)
|
||||
|
||||
if not results.tracks or results.load_type in (
|
||||
LoadType.EMPTY,
|
||||
|
@ -132,15 +132,15 @@ class Play(commands.Cog):
|
||||
|
||||
else:
|
||||
if not url_rx.match(query):
|
||||
dzsearch = f"dzsearch:{query}"
|
||||
results = await player.node.get_tracks(dzsearch)
|
||||
ytsearch = f"ytsearch:{query}"
|
||||
results = await player.node.get_tracks(ytsearch)
|
||||
|
||||
if not results.tracks or results.load_type in (
|
||||
LoadType.EMPTY,
|
||||
LoadType.ERROR,
|
||||
):
|
||||
ytsearch = f"ytsearch:{query}"
|
||||
results = await player.node.get_tracks(ytsearch)
|
||||
dzsearch = f"dzsearch:{query}"
|
||||
results = await player.node.get_tracks(dzsearch)
|
||||
else:
|
||||
results = await player.node.get_tracks(query)
|
||||
|
||||
|
@ -13,14 +13,14 @@ class CustomAudioTrack(DeferredAudioTrack):
|
||||
async def load(
|
||||
self, client
|
||||
): # Load our 'actual' playback track using the metadata from this one.
|
||||
dzsearch = f"dzsearch:{self.title} {self.author}"
|
||||
results = await client.get_tracks(dzsearch)
|
||||
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,
|
||||
):
|
||||
ytsearch = f"ytsearch:{self.title} {self.author}"
|
||||
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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user