Merge pull request #11 from PacketParker/dev

Dev

application.yml

@@ -32,11 +32,11 @@ plugins:
       flowerytts: falsee
       youtube: false
     deezer:
-      masterDecryptionKey: "" # the master key used for decrypting the deezer tracks. (yes this is not here you need to get it from somewhere else)
+      masterDecryptionKey: "" # master decryption key from deezer
 
 lavalink:
   plugins:
-    - dependency: "dev.lavalink.youtube:youtube-plugin:1.8.3"
+    - dependency: "dev.lavalink.youtube:youtube-plugin:1.11.1"
       snapshot: false
     - dependency: "com.github.topi314.lavasrc:lavasrc-plugin:4.3.0"
       snapshot: false

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,
             ):

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,
                 ):

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,
                     ):