replace market?.name with getSpotifyId()

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt

@@ -18,6 +18,7 @@ import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
@@ -49,7 +50,7 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         requireScopes(SpotifyScope.UserLibraryRead)
 
         return get(
-            endpointBuilder("/me/tracks").with("limit", limit).with("offset", offset).with("market", market?.name)
+            endpointBuilder("/me/tracks").with("limit", limit).with("offset", offset).with("market", market?.getSpotifyId())
                 .toString()
         ).toNonNullablePagingObject(SavedTrack.serializer(), api = api, json = json)
     }
@@ -76,7 +77,7 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         requireScopes(SpotifyScope.UserLibraryRead)
 
         return get(
-            endpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.name)
+            endpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.getSpotifyId())
                 .toString()
         ).toNonNullablePagingObject(SavedAlbum.serializer(), api = api, json = json)
     }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt

@@ -30,6 +30,7 @@ import com.adamratzman.spotify.models.toShowUri
 import com.adamratzman.spotify.models.toTrackUri
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
+import com.adamratzman.spotify.utils.getSpotifyId
 import com.adamratzman.spotify.utils.jsonMap
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.JsonArray
@@ -87,7 +88,7 @@ public class ClientPlayerApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
             getNullable(
                 endpointBuilder("/me/player")
                     .with("additional_types", additionalTypes.joinToString(",") { it.identifier })
-                    .with("market", market?.name)
+                    .with("market", market?.getSpotifyId())
                     .toString()
             )?.toObject(CurrentlyPlayingContext.serializer(), api, json)
         }
@@ -162,7 +163,7 @@ public class ClientPlayerApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
                     getNullable(
                         endpointBuilder("/me/player/currently-playing")
                             .with("additional_types", additionalTypes.joinToString(",") { it.identifier })
-                            .with("market", market?.name)
+                            .with("market", market?.getSpotifyId())
                             .toString()
                     )
                 }?.toObject(CurrentlyPlayingObject.serializer(), api, json)

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/AlbumApi.kt

@@ -14,6 +14,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 
 /**
  * Endpoints for retrieving information about one or more albums from the Spotify catalog.
@@ -35,7 +36,7 @@ public class AlbumApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         get(
             endpointBuilder("/albums/${AlbumUri(album).id}").with(
                 "market",
-                market?.name
+                market?.getSpotifyId()
             ).toString()
         ).toObject(Album.serializer(), api, json)
     }
@@ -56,7 +57,7 @@ public class AlbumApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         return bulkStatelessRequest(20, albums.toList()) { chunk ->
             get(
                 endpointBuilder("/albums").with("ids", chunk.joinToString(",") { AlbumUri(it).id.encodeUrl() })
-                    .with("market", market?.name).toString()
+                    .with("market", market?.getSpotifyId()).toString()
             ).toObject(AlbumsResponse.serializer(), api, json).albums
         }.flatten()
     }
@@ -83,7 +84,7 @@ public class AlbumApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         endpointBuilder("/albums/${AlbumUri(album).id.encodeUrl()}/tracks").with("limit", limit).with(
             "offset",
             offset
-        ).with("market", market?.name)
+        ).with("market", market?.getSpotifyId())
             .toString()
     ).toNonNullablePagingObject(SimpleTrack.serializer(), api = api, json = json)
 }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/ArtistApi.kt

@@ -89,7 +89,7 @@ public class ArtistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         endpointBuilder("/artists/${ArtistUri(artist).id.encodeUrl()}/albums").with("limit", limit).with(
             "offset",
             offset
-        ).with("market", market?.name)
+        ).with("market", market?.getSpotifyId())
             .with("include_groups", include.joinToString(",") { it.keyword }).toString()
     ).toNonNullablePagingObject(SimpleAlbum.serializer(), null, api, json)
 

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/BrowseApi.kt

@@ -18,8 +18,7 @@ import com.adamratzman.spotify.models.SpotifyCategory
 import com.adamratzman.spotify.models.serialization.toInnerArray
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toObject
-import com.adamratzman.spotify.utils.Locale
-import com.adamratzman.spotify.utils.Market
+import com.adamratzman.spotify.utils.*
 import com.adamratzman.spotify.utils.encodeUrl
 import com.adamratzman.spotify.utils.formatDate
 import kotlinx.serialization.Serializable
@@ -66,7 +65,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         market: Market? = null
     ): PagingObject<SimpleAlbum> = get(
         endpointBuilder("/browse/new-releases").with("limit", limit)
-            .with("offset", offset).with("country", market?.name).toString()
+            .with("offset", offset).with("country", market?.getSpotifyId()).toString()
     ).toNonNullablePagingObject(SimpleAlbum.serializer(), "albums", api = api, json = json)
 
     /**
@@ -98,7 +97,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     ): FeaturedPlaylists = get(
         endpointBuilder("/browse/featured-playlists").with("limit", limit).with("offset", offset).with(
             "market",
-            market?.name
+            market?.getSpotifyId()
         ).with("locale", locale).with("timestamp", timestamp?.let { formatDate(it) }).toString()
     ).toObject(FeaturedPlaylists.serializer(), api, json)
 
@@ -127,7 +126,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     ): PagingObject<SpotifyCategory> = get(
         endpointBuilder("/browse/categories").with("limit", limit).with("offset", offset).with(
             "market",
-            market?.name
+            market?.getSpotifyId()
         ).with("locale", locale).toString()
     ).toNonNullablePagingObject(SpotifyCategory.serializer(), "categories", api = api, json = json)
 
@@ -151,7 +150,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         market: Market? = null,
         locale: Locale? = null
     ): SpotifyCategory = get(
-        endpointBuilder("/browse/categories/${categoryId.encodeUrl()}").with("market", market?.name)
+        endpointBuilder("/browse/categories/${categoryId.encodeUrl()}").with("market", market?.getSpotifyId())
             .with("locale", locale).toString()
     ).toObject(SpotifyCategory.serializer(), api, json)
 
@@ -177,7 +176,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         endpointBuilder("/browse/categories/${categoryId.encodeUrl()}/playlists")
             .with("limit", limit)
             .with("offset", offset)
-            .with("country", market?.name).toString()
+            .with("country", market?.getSpotifyId()).toString()
     ).toNonNullablePagingObject((SimplePlaylist.serializer()), "playlists", api = api, json = json)
 
     /**
@@ -285,7 +284,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
             )
         }
 
-        val builder = endpointBuilder("/recommendations").with("limit", limit).with("market", market?.name)
+        val builder = endpointBuilder("/recommendations").with("limit", limit).with("market", market?.getSpotifyId())
             .with("seed_artists", seedArtists?.joinToString(",") { ArtistUri(it).id.encodeUrl() })
             .with("seed_genres", seedGenres?.joinToString(",") { it.encodeUrl() })
             .with("seed_tracks", seedTracks?.joinToString(",") { PlayableUri(it).id.encodeUrl() })

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/PlaylistApi.kt

@@ -19,6 +19,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 import kotlinx.serialization.builtins.ListSerializer
 
 /**
@@ -75,7 +76,7 @@ public open class PlaylistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     public suspend fun getPlaylist(playlist: String, market: Market? = null): Playlist? = catch {
         get(
             endpointBuilder("/playlists/${PlaylistUri(playlist).id.encodeUrl()}")
-                .with("market", market?.name).toString()
+                .with("market", market?.getSpotifyId()).toString()
         ).toObject(Playlist.serializer(), api, json)
     }
 
@@ -102,7 +103,7 @@ public open class PlaylistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         market: Market? = null
     ): PagingObject<PlaylistTrack> = get(
         endpointBuilder("/playlists/${PlaylistUri(playlist).id.encodeUrl()}/tracks").with("limit", limit)
-            .with("offset", offset).with("market", market?.name).toString()
+            .with("offset", offset).with("market", market?.getSpotifyId()).toString()
     )
         .toNonNullablePagingObject(PlaylistTrack.serializer(), null, api, json)
 

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/SearchApi.kt

@@ -20,6 +20,7 @@ import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import com.adamratzman.spotify.models.serialization.toNullablePagingObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.JsonObject
@@ -345,7 +346,7 @@ public open class SearchApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         return endpointBuilder("/search")
             .with("q", queryString.encodeUrl())
             .with("type", types.joinToString(",") { it.id })
-            .with("market", market?.name).with("limit", limit).with("offset", offset)
+            .with("market", market?.getSpotifyId()).with("limit", limit).with("offset", offset)
             .with("include_external", if (includeExternal == true) "audio" else null).toString()
     }
 }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/TrackApi.kt

@@ -14,6 +14,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 
 /**
  * Endpoints for retrieving information about one or more tracks from the Spotify catalog.
@@ -35,7 +36,7 @@ public class TrackApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         get(
             endpointBuilder("/tracks/${PlayableUri(track).id.encodeUrl()}").with(
                 "market",
-                market?.name
+                market?.getSpotifyId()
             ).toString()
         ).toObject(Track.serializer(), api, json)
     }
@@ -55,7 +56,7 @@ public class TrackApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         return bulkStatelessRequest(50, tracks.toList()) { chunk ->
             get(
                 endpointBuilder("/tracks").with("ids", chunk.joinToString(",") { PlayableUri(it).id.encodeUrl() })
-                    .with("market", market?.name).toString()
+                    .with("market", market?.getSpotifyId()).toString()
             ).toObject(TrackList.serializer(), api, json).tracks
         }.flatten()
     }