From 0f2b0f4f5d8c92b8e0e0a34f05be18dd17252c34 Mon Sep 17 00:00:00 2001
From: Caleb Gardner <calebq23@gmail.com>
Date: Fri, 1 Nov 2024 11:46:07 -0500
Subject: [PATCH] Simplified sending HTMX

---
 blog.go      | 12 ++----------
 files.go     |  8 ++------
 portfolio.go |  6 +-----
 web.go       |  7 +++++++
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/blog.go b/blog.go
index 7d183e3..82b0663 100644
--- a/blog.go
+++ b/blog.go
@@ -24,11 +24,7 @@ func latestBlogsHandle(w http.ResponseWriter, r *http.Request) {
 	for _, b := range latest {
 		out += b.HTMX(blogApp, r.Context())
 	}
-	if r.Header.Get("Hx-Request") == "true" {
-		w.Write([]byte("<title>Darkstorm.tech</title>" + out))
-	} else {
-		sendContent(w, r, out, "", "")
-	}
+	sendContent(w, r, out, "", "")
 }
 
 func blogHandle(w http.ResponseWriter, r *http.Request, blog string) {
@@ -44,9 +40,5 @@ func blogHandle(w http.ResponseWriter, r *http.Request, blog string) {
 		sendContent(w, r, "Error getting page", "", "")
 		return
 	}
-	if r.Header.Get("Hx-Request") == "true" {
-		w.Write([]byte("<title>" + bl.Title + "</title>" + bl.HTMX(blogApp, r.Context())))
-	} else {
-		sendContent(w, r, bl.HTMX(blogApp, r.Context()), bl.Title, bl.Favicon)
-	}
+	sendContent(w, r, bl.HTMX(blogApp, r.Context()), bl.Title, bl.Favicon)
 }
diff --git a/files.go b/files.go
index 6488b8f..7f7f033 100644
--- a/files.go
+++ b/files.go
@@ -21,7 +21,7 @@ func filesRequest(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		if os.IsNotExist(err) {
 			pageContent = "<p>404 Not Found</p>"
-			// w.WriteHeader(http.StatusNotFound)
+			w.WriteHeader(http.StatusNotFound)
 		} else {
 			pageContent = "<p>Server error!</p>"
 			w.WriteHeader(http.StatusInternalServerError)
@@ -52,9 +52,5 @@ func filesRequest(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	if r.Header.Get("Hx-Request") == "true" {
-		w.Write([]byte(pageContent))
-	} else {
-		sendContent(w, r, pageContent, "Files", "")
-	}
+	sendContent(w, r, pageContent, "Files", "")
 }
diff --git a/portfolio.go b/portfolio.go
index b48a1f5..346ed9c 100644
--- a/portfolio.go
+++ b/portfolio.go
@@ -14,9 +14,5 @@ func portfolioRequest(w http.ResponseWriter, r *http.Request) {
 		sendContent(w, r, "Error getting portfolio", "", "")
 		return
 	}
-	if r.Header.Get("Hx-Request") == "true" {
-		w.Write([]byte("<title>Portfolio</title>" + proj.FullHTMX(r.Context(), blogApp, selectedTech)))
-	} else {
-		sendContent(w, r, proj.FullHTMX(r.Context(), blogApp, selectedTech), "Portfolio", "")
-	}
+	sendContent(w, r, proj.FullHTMX(r.Context(), blogApp, selectedTech), "Portfolio", "")
 }
diff --git a/web.go b/web.go
index a9cdc20..a2be94e 100644
--- a/web.go
+++ b/web.go
@@ -17,6 +17,13 @@ const (
 )
 
 func sendContent(w http.ResponseWriter, r *http.Request, content string, title string, favicon string) {
+	if title == "" {
+		title = "Darkstorm.tech"
+	}
+	if r.Header.Get("Hx-Request") == "true" {
+		w.Write([]byte("<title>" + title + "</title>" + content))
+		return
+	}
 	if r.URL.Query().Get("contentOnly") == "true" {
 		json.NewEncoder(w).Encode(map[string]string{"content": content, "title": title, "favicon": favicon})
 		return