Skip to content

fix: repair collapsed scheme in subscriptions delete #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Priveetee merged 1 commit into from
Apr 13, 2026
Merged

fix: repair collapsed scheme in subscriptions delete #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/kotlin/dev/typetype/server/routes/SubscriptionsRoutes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,11 @@ private fun ApplicationCall.extractDeleteChannelUrl(): String? {
if (rawTail.isBlank()) return null
return runCatching { URLDecoder.decode(rawTail, StandardCharsets.UTF_8) }
.getOrDefault(rawTail)
.restoreCollapsedScheme()
.takeIf { it.isNotBlank() }
}

private fun String.restoreCollapsedScheme(): String {
val match = Regex("^([A-Za-z][A-Za-z0-9+.-]*):/([^/].*)$").matchEntire(this) ?: return this
return "${match.groupValues[1]}://${match.groupValues[2]}"
}
13 changes: 11 additions & 2 deletions src/test/kotlin/dev/typetype/server/SubscriptionsDeleteProxyRoutesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ class SubscriptionsDeleteProxyRoutesTest {
}

@Test
fun `DELETE subscriptions uses query url when path is proxy-decoded`() = withApp {
fun `DELETE subscriptions repairs proxy-decoded path`() = withApp {
service.add(TEST_USER_ID, SubscriptionItem(channelUrl = "https://www.youtube.com/channel/UC123", name = "T", avatarUrl = ""))
val response = client.delete("/subscriptions/https:/www.youtube.com/channel/UC123?url=https%3A%2F%2Fwww.youtube.com%2Fchannel%2FUC123") {
val response = client.delete("/subscriptions/https:/www.youtube.com/channel/UC123") {
headers.append(HttpHeaders.Authorization, "Bearer test-jwt")
}
assertEquals(HttpStatusCode.NoContent, response.status)
Expand All @@ -72,4 +72,13 @@ class SubscriptionsDeleteProxyRoutesTest {
}.bodyAsText()
assertFalse(body.contains("UC123"))
}

@Test
fun `DELETE subscriptions accepts query url when provided`() = withApp {
service.add(TEST_USER_ID, SubscriptionItem(channelUrl = "https://www.youtube.com/channel/UC123", name = "T", avatarUrl = ""))
val response = client.delete("/subscriptions/https:/www.youtube.com/channel/UC123?url=https%3A%2F%2Fwww.youtube.com%2Fchannel%2FUC123") {
headers.append(HttpHeaders.Authorization, "Bearer test-jwt")
}
assertEquals(HttpStatusCode.NoContent, response.status)
}
}