From 288858cf6416f8e7a08c92940feae91c53d53198 Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Fri, 4 Feb 2022 11:06:57 +0800
Subject: [PATCH] fix(opds): incorrect url encode for next/previous links

closes #792
---
 .../org/gotson/komga/interfaces/api/opds/OpdsController.kt | 7 ++-----
 1 file changed, 2 insertions(+), 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
index fe477bbcc..e0e14e725 100644
--- 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,
     )