diff options
| author | Parker <contact@pkrm.dev> | 2024-12-15 22:44:38 -0600 |
|---|---|---|
| committer | Parker <contact@pkrm.dev> | 2024-12-15 22:44:38 -0600 |
| commit | 78ebd842755154c03c950ccbb8ec5b5033936ec6 (patch) | |
| tree | b12c99c84fe7c10bbd71b0a9ed6a2a7e28daf023 | |
| parent | 2399336f6f0e01d69d535d96518d20845424d071 (diff) | |
Protect against `results` being `None`
| -rw-r--r-- | code/cogs/play.py | 8 | ||||
| -rw-r--r-- | code/utils/ai_recommendations.py | 4 | ||||
| -rw-r--r-- | code/utils/custom_sources.py | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/code/cogs/play.py b/code/cogs/play.py index 1756141..2e07486 100644 --- a/code/cogs/play.py +++ b/code/cogs/play.py @@ -63,7 +63,7 @@ class Play(commands.Cog): dzsearch = f"dzsearch:{query}" results = await player.node.get_tracks(dzsearch) # If Deezer returned nothing - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): @@ -71,7 +71,9 @@ class Play(commands.Cog): ytmsearch = f"ytmsearch:{query}" results = await player.node.get_tracks(ytmsearch) # If YouTube Music returned nothing - if not results.tracks or results.load_type in ( + if not ( + results and results.tracks + ) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): @@ -82,7 +84,7 @@ class Play(commands.Cog): results = await player.node.get_tracks(query) # If there are no results found, set results/embed to None, handled further down - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): diff --git a/code/utils/ai_recommendations.py b/code/utils/ai_recommendations.py index 68764bc..2fc71d3 100644 --- a/code/utils/ai_recommendations.py +++ b/code/utils/ai_recommendations.py @@ -62,14 +62,14 @@ async def add_song_recommendations( ytsearch = f"ytsearch:{song} by {artist} audio" results = await player.node.get_tracks(ytsearch) - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): dzsearch = f"dzsearch:{song}" results = await player.node.get_tracks(dzsearch) - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): diff --git a/code/utils/custom_sources.py b/code/utils/custom_sources.py index 5cf2295..063b886 100644 --- a/code/utils/custom_sources.py +++ b/code/utils/custom_sources.py @@ -30,7 +30,7 @@ class CustomAudioTrack(DeferredAudioTrack): ): # Load our 'actual' playback track using the metadata from this one. dzsearch = f"dzsearch:{self.title} {self.author}" results = await client.get_tracks(dzsearch) - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): @@ -38,14 +38,16 @@ class CustomAudioTrack(DeferredAudioTrack): ytmsearch = f"ytmsearch:{self.title} {self.author}" results = await client.get_tracks(ytmsearch) - if not results.tracks or results.load_type in ( + if not (results and results.tracks) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): ytsearch = f"ytsearch:{self.title} {self.author} audio" results = await client.get_tracks(ytsearch) - if not results.tracks or results.load_type in ( + if not ( + results and results.tracks + ) or results.load_type in ( LoadType.EMPTY, LoadType.ERROR, ): |