fix(opds): incorrect url encode for next/previous links

closes #792
gotson · Feb 4, 2022 · 288858c · 288858c
1 parent c12701c
commit 288858c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt
@@ -115,18 +115,15 @@ class OpdsController(
       .fromPath("$routeBase$path")
 
   private fun <T> linkPage(uriBuilder: UriComponentsBuilder, page: Page<T>): List<OpdsLink> {
-    val pageBuilder = uriBuilder.cloneBuilder()
-      .queryParam("page", "{page}")
-      .build()
     return listOfNotNull(
       if (!page.isFirst) OpdsLinkFeedNavigation(
         OpdsLinkRel.PREVIOUS,
-        pageBuilder.expand(mapOf("page" to page.pageable.previousOrFirst().pageNumber)).toUriString(),
+        uriBuilder.cloneBuilder().queryParam("page", page.pageable.previousOrFirst().pageNumber).toUriString(),
       )
       else null,
       if (!page.isLast) OpdsLinkFeedNavigation(
         OpdsLinkRel.NEXT,
-        pageBuilder.expand(mapOf("page" to page.pageable.next().pageNumber)).toUriString(),
+        uriBuilder.cloneBuilder().queryParam("page", page.pageable.next().pageNumber).toUriString(),
       )
       else null,
     )