From a328266a7580fe52d6c460696af007fbaaba88f2 Mon Sep 17 00:00:00 2001
From: tehkillerbee <tehkillerbee@users.noreply.github.com>
Date: Tue, 15 Oct 2024 21:51:05 +0200
Subject: [PATCH] Revert incorrect default limit (Fixes #291)

Fix broken unit tests

Revert incorrect default limit (Fixes #291)
---
 tests/test_media.py | 4 ++--
 tests/test_user.py  | 1 +
 tidalapi/user.py    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test_media.py b/tests/test_media.py
index 02a9a6b..7a1b532 100644
--- a/tests/test_media.py
+++ b/tests/test_media.py
@@ -527,7 +527,7 @@ def validate_stream_manifest(manifest, is_hi_res_lossless: bool = False):
         assert manifest.dash_info is None
         assert manifest.encryption_key is None
         assert manifest.encryption_type == "NONE"
-        assert manifest.file_extension == AudioExtensions.MP4
+        assert manifest.file_extension == AudioExtensions.M4A
         assert manifest.is_encrypted == False
         assert manifest.manifest_mime_type == ManifestMimeType.BTS
         assert manifest.mime_type == MimeType.audio_mp4
@@ -539,7 +539,7 @@ def validate_stream_manifest(manifest, is_hi_res_lossless: bool = False):
         assert manifest.dash_info is not None
         assert manifest.encryption_key is None
         assert manifest.encryption_type == "NONE"
-        assert manifest.file_extension == AudioExtensions.MP4
+        assert manifest.file_extension == AudioExtensions.FLAC
         assert manifest.is_encrypted == False
         assert manifest.manifest_mime_type == ManifestMimeType.MPD
         assert manifest.mime_type == MimeType.audio_mp4
diff --git a/tests/test_user.py b/tests/test_user.py
index 66950a2..0f76336 100644
--- a/tests/test_user.py
+++ b/tests/test_user.py
@@ -66,6 +66,7 @@ def test_get_playlist_folders(session):
     folder_ids = [folder.id for folder in session.user.playlist_folders()]
     assert folder.id in folder_ids
     folder.remove()
+    folder_ids = [folder.id for folder in session.user.playlist_folders()]
     assert folder.id not in folder_ids
 
 
diff --git a/tidalapi/user.py b/tidalapi/user.py
index eea2f29..80a0190 100644
--- a/tidalapi/user.py
+++ b/tidalapi/user.py
@@ -187,8 +187,8 @@ def public_playlists(
     ) -> List[Union["Playlist", "UserPlaylist"]]:
         """Get the (public) playlists created by the user.
 
-        :param offset: The amount of items you want returned.
         :param limit: The index of the first item you want included.
+        :param offset: The amount of items you want returned.
         :return: List of public playlists.
         """
         params = {"limit": limit, "offset": offset}
@@ -209,7 +209,7 @@ def public_playlists(
         )
 
     def playlist_and_favorite_playlists(
-        self, limit: Optional[int] = None, offset: int = 0
+        self, offset: int = 0, limit: int = 50
     ) -> List[Union["Playlist", "UserPlaylist"]]:
         """Get the playlists created by the user, and the playlists favorited by the
         user. This function is limited to 50 by TIDAL, requiring pagination.