From 276b82f0d49d52ca02a7a51f7acb27b8cbc8381b Mon Sep 17 00:00:00 2001
From: siddharth ravikumar <s@ricketyspace.net>
Date: Sun, 12 Jun 2022 19:57:22 -0400
Subject: search: update `Search`

Add `Enabled`. Determines whether search is enabled or not.
---
 main.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index e328636..9e1a6f7 100644
--- a/main.go
+++ b/main.go
@@ -13,7 +13,6 @@ import (
 	"regexp"
 	"strconv"
 
-	"ricketyspace.net/peach/photon"
 	"ricketyspace.net/peach/search"
 	"ricketyspace.net/peach/version"
 	"ricketyspace.net/peach/weather"
@@ -102,15 +101,13 @@ func showWeather(w http.ResponseWriter, lat, lng float32) {
 func showSearch(w http.ResponseWriter, r *http.Request) {
 	logRequest(r)
 
-	// Search is disabled if photon is not enabled.
-	if !photon.Enabled() {
+	search, err, status := search.NewSearch(r)
+	if err != nil && status == 404 {
 		http.NotFound(w, r)
 		return
 	}
-
-	search, err := search.NewSearch(r)
 	if err != nil {
-		http.Error(w, err.Error(), 500)
+		http.Error(w, err.Error(), status)
 		return
 	}
 	err = peachTemplates.ExecuteTemplate(w, "search.tmpl", search)
-- 
cgit v1.2.3