From 1c2e6e3da9c6ce73631efaf94d9b70771dc6c9d2 Mon Sep 17 00:00:00 2001 From: Midou36O Date: Sun, 18 Sep 2022 17:44:37 +0100 Subject: [PATCH] Fix everything odyssey pointed out. --- .gitignore | 3 +-- api/announcements.go | 5 +++-- api/form.go | 5 +---- main.go | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0e7e6c8..4319c60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -data/config.toml -data/options.json \ No newline at end of file +data/config.toml \ No newline at end of file diff --git a/api/announcements.go b/api/announcements.go index a9814d2..5cea151 100644 --- a/api/announcements.go +++ b/api/announcements.go @@ -18,12 +18,12 @@ var ( resAnn = config.OptAnn() ) -func CheckAnn() { +func AnnCheck() { if resAnn == "true" { AnnPage() Announcements() } else { - log.Println("Announcements disabled") + log.Println("[Segfautils] ℹ Announcements are disabled") http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) { http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable) }) @@ -61,6 +61,7 @@ func handleAnnouncements(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) now := time.Now().Unix() data := map[string]interface{}{ + "enabled": "true", "title": r.FormValue("title"), "link": r.FormValue("link"), "severity": r.FormValue("severity"), diff --git a/api/form.go b/api/form.go index ee0f780..5528454 100644 --- a/api/form.go +++ b/api/form.go @@ -26,13 +26,10 @@ func FormCheck() { FormPage() Form() } else { - log.Println("Forms disabled") + log.Println("[Segfautils] ℹ Contact form is disabled") http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) { http.Error(w, "Form is disabled.", http.StatusServiceUnavailable) }) - http.HandleFunc("/api/form", func(w http.ResponseWriter, r *http.Request) { - http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable) - }) } } diff --git a/main.go b/main.go index e0babda..14384b3 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ func main() { }) log.Println("[HTTP] Starting server") - api.CheckAnn() + api.AnnCheck() api.FormCheck() http.HandleFunc("/api/", func(w http.ResponseWriter, r *http.Request) {