From 4f7611cbec7ad6abe93412c9f94f3b9b7839f181 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Mon, 29 Nov 2021 10:33:07 -0500
Subject: [PATCH] Add support for empty search terms

---
 README.md                                     |  2 +-
 buildSrc/src/main/kotlin/Config.kt            |  4 ++--
 .../interactions/SourceInteractionHandler.kt  | 21 +++++++++++++++----
 .../ca/gosyer/data/server/requests/Sources.kt |  8 +++----
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 18d2c3a4..643a7cab 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ These are the versions of [Tachidesk-Server][tachidesk-server] that JUI supports
 #### [Release build][release]
 - [Tachidesk-Server][tachidesk-server] v0.4.5, works up to v0.4.9
 #### [Preview build][preview]
-- [Tachidesk-Server Preview][tachidesk-server-preview] v0.5.4-r1045
+- [Tachidesk-Server Preview][tachidesk-server-preview] v0.5.4-r1046
 
 ## Downloading and Running the app
 ### All Operating Systems (x64, Java Not Included)
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 1ca0ea93..554c2de6 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -3,9 +3,9 @@ import org.gradle.api.JavaVersion
 object Config {
     const val tachideskVersion = "v0.5.4"
     // Match this to the Tachidesk-Server commit count
-    const val serverCode = 1045
+    const val serverCode = 1046
     const val preview = true
-    const val previewCommit = "2478aa77cd4a71b0ae7c895fce0358ad7c30614b"
+    const val previewCommit = "3b73a0fd72430fcbb4f45ee2ccca0ca64f9ffb83"
 
     val jvmTarget = JavaVersion.VERSION_15
 }
\ No newline at end of file
diff --git a/src/main/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt b/src/main/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt
index 2344cc01..caa8ddb0 100644
--- a/src/main/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt
+++ b/src/main/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt
@@ -79,14 +79,27 @@ class SourceInteractionHandler @Inject constructor(
     // TODO: 2021-03-14
     suspend fun getGlobalSearchResults(searchTerm: String) = withIOContext {
         client.get<HttpResponse>(
-            serverUrl + globalSearchQuery(searchTerm)
-        )
+            serverUrl + globalSearchQuery()
+        ) {
+            url {
+                if (searchTerm.isNotBlank()) {
+                    parameter("searchTerm", searchTerm)
+                }
+            }
+        }
     }
 
     suspend fun getSearchResults(sourceId: Long, searchTerm: String, pageNum: Int) = withIOContext {
         client.get<MangaPage>(
-            serverUrl + sourceSearchQuery(sourceId, searchTerm, pageNum)
-        )
+            serverUrl + sourceSearchQuery(sourceId)
+        ) {
+            url {
+                parameter("pageNum", pageNum)
+                if (searchTerm.isNotBlank()) {
+                    parameter("searchTerm", searchTerm)
+                }
+            }
+        }
     }
 
     suspend fun getSearchResults(source: Source, searchTerm: String, pageNum: Int) = getSearchResults(
diff --git a/src/main/kotlin/ca/gosyer/data/server/requests/Sources.kt b/src/main/kotlin/ca/gosyer/data/server/requests/Sources.kt
index 81045284..85e743ab 100644
--- a/src/main/kotlin/ca/gosyer/data/server/requests/Sources.kt
+++ b/src/main/kotlin/ca/gosyer/data/server/requests/Sources.kt
@@ -23,12 +23,12 @@ fun sourceLatestQuery(sourceId: Long, pageNum: Int) =
     "/api/v1/source/$sourceId/latest/$pageNum"
 
 @Get
-fun globalSearchQuery(searchTerm: String) =
-    "/api/v1/search/$searchTerm"
+fun globalSearchQuery() =
+    "/api/v1/source/all/search"
 
 @Get
-fun sourceSearchQuery(sourceId: Long, searchTerm: String, pageNum: Int) =
-    "/api/v1/source/$sourceId/search/$searchTerm/$pageNum"
+fun sourceSearchQuery(sourceId: Long) =
+    "/api/v1/source/$sourceId/search"
 
 @Get
 fun getFilterListQuery(sourceId: Long) =