From aa1234d3638a6b079025ef08eba30da632e28929 Mon Sep 17 00:00:00 2001
From: droideparanoico <david.alvarez.81@gmail.com>
Date: Mon, 6 Jul 2026 15:30:48 +0200
Subject: [PATCH] Fix: read search query from both query param and form body

---
 src/main/java/com/discdrop/web/ArtistController.java     | 9 ++++++---
 .../resources/templates/fragments/search-results.html    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/discdrop/web/ArtistController.java b/src/main/java/com/discdrop/web/ArtistController.java
index b82ad71..470e995 100644
--- a/src/main/java/com/discdrop/web/ArtistController.java
+++ b/src/main/java/com/discdrop/web/ArtistController.java
@@ -79,14 +79,17 @@ public class ArtistController {
     @DELETE
     @Path("/{mbid}/from-search")
     @Produces(MediaType.TEXT_HTML)
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     public TemplateInstance removeArtistFromSearch(@PathParam("mbid") String mbid,
-                                                    @QueryParam("q") @DefaultValue("") String q) {
+                                                    @QueryParam("q") @DefaultValue("") String q,
+                                                    @FormParam("q") @DefaultValue("") String qForm) {
         artistService.removeArtist(mbid);
+        var query = q != null && !q.isBlank() ? q : qForm;
         List<SearchResult> results;
-        if (q == null || q.isBlank()) {
+        if (query.isBlank()) {
             results = List.of();
         } else {
-            results = artistService.search(q);
+            results = artistService.search(query);
         }
         return searchResultsTemplate.data("artists", results);
     }
diff --git a/src/main/resources/templates/fragments/search-results.html b/src/main/resources/templates/fragments/search-results.html
index ca1ef68..9cab4f1 100644
--- a/src/main/resources/templates/fragments/search-results.html
+++ b/src/main/resources/templates/fragments/search-results.html
@@ -22,7 +22,7 @@
         {#if artist.alreadyTracked}
           <button class="btn btn-warning btn-sm"
                   hx-delete="/api/artists/{artist.mbid}/from-search"
-                  hx-vals='js:{{q: document.getElementById("search-input").value}}'
+                  hx-include="#search-input"
                   hx-target="#search-results"
                   hx-swap="innerHTML">✓ Added</button>
         {#else}