taggart

commit 37b5c4667bbb73df8b7b2fba0f84dcc7ab44ab7b
parent 7675da2bd376b486964ad331aa305e8c5dee636e
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Fri,  3 Oct 2025 14:49:04 +0100

Fix /and/tag/ construction

Diffstat:
M
main.go
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
@@ -709,11 +709,9 @@ func tagsHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func tagFilterHandler(w http.ResponseWriter, r *http.Request) {
-	pathParts := strings.Split(strings.TrimPrefix(r.URL.Path, "/tag/"), "/")
-	if len(pathParts)%2 != 0 {
-		renderError(w, "Invalid tag filter path", http.StatusBadRequest)
-		return
-	}
+	// Split by /and/tag/ to get individual tag pairs
+	fullPath := strings.TrimPrefix(r.URL.Path, "/tag/")
+	tagPairs := strings.Split(fullPath, "/and/tag/")
 
 	type filter struct {
 		Category string
@@ -721,8 +719,13 @@ func tagFilterHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var filters []filter
-	for i := 0; i < len(pathParts); i += 2 {
-		filters = append(filters, filter{pathParts[i], pathParts[i+1]})
+	for _, pair := range tagPairs {
+		parts := strings.Split(pair, "/")
+		if len(parts) != 2 {
+			renderError(w, "Invalid tag filter path", http.StatusBadRequest)
+			return
+		}
+		filters = append(filters, filter{parts[0], parts[1]})
 	}
 
 	query := `SELECT f.id, f.filename, f.path, COALESCE(f.description, '') as description FROM files f WHERE 1=1`