Make it compatible with the previous version.
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Midou36O 2022-09-18 19:16:57 +01:00
parent 1c2e6e3da9
commit 6bdbf3b83d
Signed by: midou
GPG Key ID: 08063D5407090BC2
5 changed files with 16 additions and 15 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
data/config.toml data/config.toml
data/announcements.json

View File

@ -19,10 +19,7 @@ var (
) )
func AnnCheck() { func AnnCheck() {
if resAnn == "true" { if resAnn == "false" {
AnnPage()
Announcements()
} else {
log.Println("[Segfautils] Announcements are disabled") log.Println("[Segfautils] Announcements are disabled")
http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable) 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.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) {
http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable) http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable)
}) })
} else {
AnnPage()
Announcements()
} }
} }

View File

@ -22,14 +22,14 @@ var (
) )
func FormCheck() { func FormCheck() {
if resForm == "true" { if resForm == "false" {
FormPage()
Form()
} else {
log.Println("[Segfautils] Contact form is disabled") log.Println("[Segfautils] Contact form is disabled")
http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Form is disabled.", http.StatusServiceUnavailable) http.Error(w, "Form is disabled.", http.StatusServiceUnavailable)
}) })
} else {
FormPage()
Form()
} }
} }

View File

@ -6,13 +6,13 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
func OptForm() string { func OptAnn() string {
viper.SetConfigName("config") viper.SetConfigName("config")
viper.AddConfigPath("./data") viper.AddConfigPath("./data")
err := viper.ReadInConfig() err := viper.ReadInConfig()
if err != nil { 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 return result
} }

View File

@ -6,13 +6,13 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
func OptAnn() string { func OptForm() string {
viper.SetConfigName("config") viper.SetConfigName("config")
viper.AddConfigPath("./data") viper.AddConfigPath("./data")
err := viper.ReadInConfig() err := viper.ReadInConfig()
if err != nil { 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 return result
} }