diff --git a/.gitignore b/.gitignore index 4319c60..649bd21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -data/config.toml \ No newline at end of file +data/config.toml +data/announcements.json \ No newline at end of file diff --git a/api/announcements.go b/api/announcements.go index 5cea151..176dcc1 100644 --- a/api/announcements.go +++ b/api/announcements.go @@ -19,10 +19,7 @@ var ( ) func AnnCheck() { - if resAnn == "true" { - AnnPage() - Announcements() - } else { + if resAnn == "false" { log.Println("[Segfautils] ℹ Announcements are disabled") http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) { http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable) @@ -30,6 +27,9 @@ func AnnCheck() { http.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) { http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable) }) + } else { + AnnPage() + Announcements() } } diff --git a/api/form.go b/api/form.go index 5528454..a576564 100644 --- a/api/form.go +++ b/api/form.go @@ -22,14 +22,14 @@ var ( ) func FormCheck() { - if resForm == "true" { - FormPage() - Form() - } else { + if resForm == "false" { 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) }) + } else { + FormPage() + Form() } } diff --git a/config/optionannounce.go b/config/optionannounce.go index db2f184..7cb3bba 100644 --- a/config/optionannounce.go +++ b/config/optionannounce.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/viper" ) -func OptForm() string { +func OptAnn() string { viper.SetConfigName("config") viper.AddConfigPath("./data") err := viper.ReadInConfig() if err != nil { - log.Println("Error reading config. Error getting: options.form", err.Error()) + log.Println("Error reading config. Error getting: options.announce", err.Error()) } - result := viper.GetString("options.form") + result := viper.GetString("options.announce") return result } diff --git a/config/optionform.go b/config/optionform.go index 7cb3bba..db2f184 100644 --- a/config/optionform.go +++ b/config/optionform.go @@ -6,13 +6,13 @@ import ( "github.com/spf13/viper" ) -func OptAnn() string { +func OptForm() string { viper.SetConfigName("config") viper.AddConfigPath("./data") err := viper.ReadInConfig() if err != nil { - log.Println("Error reading config. Error getting: options.announce", err.Error()) + log.Println("Error reading config. Error getting: options.form", err.Error()) } - result := viper.GetString("options.announce") + result := viper.GetString("options.form") return result }