diff --git a/src/main/kotlin/win/taptap/musicmanager/radio/RadioService.kt b/src/main/kotlin/win/taptap/musicmanager/radio/RadioService.kt index b57b53a..7759c7a 100644 --- a/src/main/kotlin/win/taptap/musicmanager/radio/RadioService.kt +++ b/src/main/kotlin/win/taptap/musicmanager/radio/RadioService.kt @@ -99,8 +99,12 @@ class RadioService( // within one batch. if (picks.size < limit) { val pickedIds = picks.map { it.id }.toSet() - val heardCollection = collection.filter { it.id in skip && it.id !in pickedIds } - val heardRecommendations = recommendations.filter { it.id in skip && it.id !in pickedIds } + val heardCollection = collection.filter { + it.id in sessionSongs && it.id !in excluded && it.id !in pickedIds + } + val heardRecommendations = recommendations.filter { + it.id in sessionSongs && it.id !in excluded && it.id !in pickedIds + } picks += pickMixed( collectionScored = score(heardCollection, affinity, recent, heard = true), recommendationScored = score(heardRecommendations, affinity, recent, heard = true), diff --git a/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt b/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt index 7daea06..9ffb567 100644 --- a/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt +++ b/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt @@ -224,6 +224,16 @@ class ApiRoutesTest { .map { it.jsonObject.string("id") } assertEquals(nextIds.size, nextIds.distinct().size) + // Client-held tracks are never replayed even when the pool is + // exhausted and the session would otherwise repeat. + val excluded = client.post("/api/v1/sessions/$sessionId/next") { + bearer(token) + contentType(ContentType.Application.Json) + setBody("""{"limit":5,"excludeSongIds":["${seed.ambient1}"]}""") + } + assertEquals(HttpStatusCode.OK, excluded.status) + assertTrue(parse(excluded.bodyAsText())["songs"]!!.jsonArray.isEmpty()) + val event = client.post("/api/v1/sessions/$sessionId/events") { bearer(token) contentType(ContentType.Application.Json)