Some bug fixes

redbot/cogs/audio/audio.py

@@ -274,7 +274,7 @@ class Audio(commands.Cog):
                 ).clear_raw("playlists")
         if from_version < 3 <= to_version:
             for scope in PlaylistScope.list():
-                scope_playlist = await get_all_playlist_for_migration23(scope)
+                scope_playlist = await get_all_playlist_for_migration23(scope, self.bot)
                 for p in scope_playlist:
                     await p.save()
                 await self.config.custom(scope).clear()

redbot/cogs/audio/playlists.py

@@ -68,108 +68,86 @@ CREATE TABLE IF NOT EXISTS playlists (
 """
 
 _DELETE = """
-DELETE FROM playlists
+DELETE
+FROM
+    playlists 
 WHERE
     (
         scope_type = :scope_type 
-  AND
-    playlist_id = :playlist_id
-  AND
-    scope_id = :scope_id
+        AND playlist_id = :playlist_id 
+        AND scope_id = :scope_id 
     )
 ;
 """
 _DELETE_SCOPE = """
-DELETE FROM playlists
+DELETE
+FROM
+    playlists 
 WHERE
-  scope_type = :scope_type
-;
+    scope_type = :scope_type ;
 """
 
 _FETCH_ALL = """
 SELECT
-playlist_id,
-playlist_name,
-scope_id,
-author_id,
-playlist_url,
-tracks
-FROM playlists
-WHERE
-  scope_type = :scope_type
-;
-"""
-
-_FETCH_ALL_WITH_FILTER = """
-SELECT
-playlist_id,
-playlist_name,
-scope_id,
-author_id,
-playlist_url,
-tracks
-FROM playlists
-WHERE
-  (
-    scope_type = :scope_type
-  AND
-    author_id = :author_id
-  )
-;
-"""
-
-_FETCH = """
-SELECT
-playlist_id,
-playlist_name,
-scope_id,
-author_id,
-playlist_url,
-tracks
-FROM playlists
-WHERE 
-  (
-    scope_type = :scope_type
-  AND
-    playlist_id = :playlist_id
-  AND
-    scope_id = :scope_id
-  )
-"""
-
-_UPSET = """INSERT INTO 
-playlists 
-  (
-    scope_type
     playlist_id,
     playlist_name,
     scope_id,
     author_id,
     playlist_url,
     tracks 
+FROM
+    playlists 
+WHERE
+    scope_type = :scope_type ;
+"""
+
+_FETCH_ALL_WITH_FILTER = """
+SELECT
+    playlist_id,
+    playlist_name,
+    scope_id,
+    author_id,
+    playlist_url,
+    tracks 
+FROM
+    playlists 
+WHERE
+    (
+        scope_type = :scope_type 
+        AND author_id = :author_id 
     )
+;
+"""
+
+_FETCH = """
+SELECT
+    playlist_id,
+    playlist_name,
+    scope_id,
+    author_id,
+    playlist_url,
+    tracks 
+FROM
+    playlists 
+WHERE
+    (
+        scope_type = :scope_type 
+        AND playlist_id = :playlist_id 
+        AND scope_id = :scope_id 
+    )
+"""
+
+_UPSET = """
+INSERT INTO
+    playlists ( scope_type, playlist_id, playlist_name, scope_id, author_id, playlist_url, tracks ) 
 VALUES
     (
-    :scope_type,
-    :playlist_id,
-    :playlist_name,
-    :scope_id,
-    :author_id,
-    :playlist_url,
-    :tracks
+        :scope_type, :playlist_id, :playlist_name, :scope_id, :author_id, :playlist_url, :tracks 
     )
-ON CONFLICT
-  (
-  scope_type,
-  playlist_id, 
-  scope_id
-  )
-DO UPDATE 
+    ON CONFLICT (scope_type, playlist_id, scope_id) DO 
+    UPDATE
     SET
-    playlist_name = excluded.playlist_name, 
-    playlist_url = excluded.playlist_url, 
-    tracks = excluded.tracks
-;
+        playlist_name = excluded.playlist_name, playlist_url = excluded.playlist_url, tracks = excluded.tracks;
 """