Skip to content

Commit d112c67

Browse files
adamintadamint
committed
fix #298 
1 parent 2439916 commit d112c67

File tree

12 files changed

+38
-21
lines changed

12 files changed

+38
-21
lines changed

‎build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
55

66
plugins {
77
id("lt.petuska.npm.publish") version "1.1.2"
8-
kotlin("multiplatform") version "1.5.21"
8+
kotlin("multiplatform") version "1.5.31"
99
`maven-publish`
1010
signing
1111
id("io.codearte.nexus-staging") version "0.30.0"
1212
id("com.android.library")
13-
kotlin("plugin.serialization") version "1.5.21"
13+
kotlin("plugin.serialization") version "1.5.31"
1414
id("com.diffplug.spotless") version "5.14.2"
1515
id("com.moowork.node") version "1.3.1"
1616
id("org.jetbrains.dokka") version "1.5.0"
@@ -29,7 +29,7 @@ buildscript {
2929
}
3030
dependencies {
3131
classpath("com.android.tools.build:gradle:4.1.0")
32-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
32+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
3333
}
3434
}
3535

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientEpisodeApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class ClientEpisodeApi(api: GenericSpotifyApi) : EpisodeApi(api) {
7575
requireScopes(SpotifyScope.USER_READ_PLAYBACK_POSITION)
7676
checkBulkRequesting(50, ids.size)
7777

78-
return bulkRequest(50, ids.toList()) { chunk ->
78+
return bulkStatelessRequest(50, ids.toList()) { chunk ->
7979
get(
8080
endpointBuilder("/episodes")
8181
.with("ids", chunk.joinToString(",") { EpisodeUri(it).id.encodeUrl() })

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
112112
public suspend fun isFollowingUsers(vararg users: String): List<Boolean> {
113113
requireScopes(SpotifyScope.USER_FOLLOW_READ)
114114
checkBulkRequesting(50, users.size)
115-
return bulkRequest(50, users.toList()) { chunk ->
115+
return bulkStatelessRequest(50, users.toList()) { chunk ->
116116
get(
117117
endpointBuilder("/me/following/contains").with("type", "user")
118118
.with("ids", chunk.joinToString(",") { UserUri(it).id.encodeUrl() }).toString()
@@ -181,7 +181,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
181181
public suspend fun isFollowingArtists(vararg artists: String): List<Boolean> {
182182
requireScopes(SpotifyScope.USER_FOLLOW_READ)
183183
checkBulkRequesting(50, artists.size)
184-
return bulkRequest(50, artists.toList()) { chunk ->
184+
return bulkStatelessRequest(50, artists.toList()) { chunk ->
185185
get(
186186
endpointBuilder("/me/following/contains").with("type", "artist")
187187
.with("ids", chunk.joinToString(",") { ArtistUri(it).id.encodeUrl() }).toString()
@@ -285,7 +285,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
285285
public suspend fun followUsers(vararg users: String) {
286286
requireScopes(SpotifyScope.USER_FOLLOW_MODIFY)
287287
checkBulkRequesting(50, users.size)
288-
bulkRequest(50, users.toList()) { chunk ->
288+
bulkStatelessRequest(50, users.toList()) { chunk ->
289289
put(
290290
endpointBuilder("/me/following").with("type", "user")
291291
.with("ids", chunk.joinToString(",") { UserUri(it).id.encodeUrl() }).toString()
@@ -344,7 +344,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
344344
public suspend fun followArtists(vararg artists: String) {
345345
requireScopes(SpotifyScope.USER_FOLLOW_MODIFY)
346346
checkBulkRequesting(50, artists.size)
347-
bulkRequest(50, artists.toList()) { chunk ->
347+
bulkStatelessRequest(50, artists.toList()) { chunk ->
348348
put(
349349
endpointBuilder("/me/following").with("type", "artist")
350350
.with("ids", chunk.joinToString(",") { ArtistUri(it).id.encodeUrl() }).toString()
@@ -462,7 +462,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
462462
public suspend fun unfollowUsers(vararg users: String) {
463463
requireScopes(SpotifyScope.USER_FOLLOW_MODIFY)
464464
checkBulkRequesting(50, users.size)
465-
bulkRequest(50, users.toList()) { list ->
465+
bulkStatelessRequest(50, users.toList()) { list ->
466466
delete(
467467
endpointBuilder("/me/following").with("type", "user")
468468
.with("ids", list.joinToString(",") { UserUri(it).id.encodeUrl() }).toString()
@@ -528,7 +528,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
528528
public suspend fun unfollowArtists(vararg artists: String) {
529529
requireScopes(SpotifyScope.USER_FOLLOW_MODIFY)
530530
checkBulkRequesting(50, artists.size)
531-
bulkRequest(50, artists.toList()) { list ->
531+
bulkStatelessRequest(50, artists.toList()) { list ->
532532
delete(
533533
endpointBuilder("/me/following").with("type", "artist")
534534
.with("ids", list.joinToString(",") { ArtistUri(it).id.encodeUrl() }).toString()

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public class ClientPlaylistApi(api: GenericSpotifyApi) : PlaylistApi(api) {
173173
requireScopes(SpotifyScope.PLAYLIST_MODIFY_PUBLIC, SpotifyScope.PLAYLIST_MODIFY_PRIVATE, anyOf = true)
174174
checkBulkRequesting(100, playables.size)
175175

176-
bulkRequest(100, playables.toList()) { chunk ->
176+
bulkStatefulRequest(100, playables.toList()) { chunk ->
177177
val body = jsonMap()
178178
body += buildJsonObject {
179179
put(
@@ -804,7 +804,7 @@ public class ClientPlaylistApi(api: GenericSpotifyApi) : PlaylistApi(api) {
804804
checkBulkRequesting(100, playables.size)
805805
if (snapshotId != null && playables.size > 100) throw BadRequestException("You cannot provide both the snapshot id and attempt bulk requesting")
806806

807-
return bulkRequest(100, playables.toList()) { chunk ->
807+
return bulkStatefulRequest(100, playables.toList()) { chunk ->
808808
val body = jsonMap()
809809
if (snapshotId != null) body += buildJsonObject { put("snapshot_id", snapshotId) }
810810
body += buildJsonObject {

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientShowApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class ClientShowApi(api: GenericSpotifyApi) : ShowApi(api) {
7575
*/
7676
public suspend fun getShows(vararg ids: String): List<SimpleShow?> {
7777
checkBulkRequesting(50, ids.size)
78-
return bulkRequest(50, ids.toList()) { chunk ->
78+
return bulkStatelessRequest(50, ids.toList()) { chunk ->
7979
get(
8080
endpointBuilder("/shows")
8181
.with("ids", chunk.joinToString(",") { ShowUri(it).id.encodeUrl() })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class AlbumApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
6868
*/
6969
public suspend fun getAlbums(vararg albums: String, market: Market? = null): List<Album?> {
7070
checkBulkRequesting(20, albums.size)
71-
return bulkRequest(20, albums.toList()) { chunk ->
71+
return bulkStatelessRequest(20, albums.toList()) { chunk ->
7272
get(
7373
endpointBuilder("/albums").with("ids", chunk.joinToString(",") { AlbumUri(it).id.encodeUrl() })
7474
.with("market", market?.name).toString()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ArtistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
6666
public suspend fun getArtists(vararg artists: String): List<Artist?> {
6767
checkBulkRequesting(50, artists.size)
6868

69-
return bulkRequest(50, artists.toList()) { chunk ->
69+
return bulkStatelessRequest(50, artists.toList()) { chunk ->
7070
get(
7171
endpointBuilder("/artists").with(
7272
"ids",

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/EpisodeApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public open class EpisodeApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
8484
public suspend fun getEpisodes(vararg ids: String, market: Market): List<Episode?> {
8585
checkBulkRequesting(50, ids.size)
8686

87-
return bulkRequest(50, ids.toList()) { chunk ->
87+
return bulkStatelessRequest(50, ids.toList()) { chunk ->
8888
get(
8989
endpointBuilder("/episodes").with("ids", chunk.joinToString(",") { EpisodeUri(it).id.encodeUrl() })
9090
.with("market", market.name).toString()

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/FollowingApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public open class FollowingApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
3636
): List<Boolean> {
3737
checkBulkRequesting(5, users.size)
3838

39-
return bulkRequest(5, users.toList()) { chunk ->
39+
return bulkStatelessRequest(5, users.toList()) { chunk ->
4040
get(
4141
endpointBuilder("/playlists/${PlaylistUri(playlist).id.encodeUrl()}/followers/contains")
4242
.with("ids", chunk.joinToString(",") { UserUri(it).id.encodeUrl() }).toString()

‎src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/ShowApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public open class ShowApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
8686
*/
8787
public suspend fun getShows(vararg ids: String, market: Market): List<SimpleShow?> {
8888
checkBulkRequesting(50, ids.size)
89-
return bulkRequest(50, ids.toList()) { chunk ->
89+
return bulkStatelessRequest(50, ids.toList()) { chunk ->
9090
get(
9191
endpointBuilder("/shows").with("ids", chunk.joinToString(",") { ShowUri(it).id.encodeUrl() })
9292
.with("market", market.name).toString()

0 commit comments

Comments
 (0)