Make it compatible with the previous version.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

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() {
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()
}
}

View File

@ -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()
}
}

View File

@ -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
}

View File

@ -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
}