From ec658520b7ab880f652cb98e574283e73723b5cd Mon Sep 17 00:00:00 2001 From: Justin Hawkins Date: Sun, 7 Feb 2021 08:10:27 +1030 Subject: [PATCH] go fmt --- web/server.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/web/server.go b/web/server.go index 8c4e06f..361c571 100644 --- a/web/server.go +++ b/web/server.go @@ -4,14 +4,14 @@ import ( "encoding/json" "fmt" "github.com/tardisx/discord-auto-upload/assets" - "log" - "net/http" - "strconv" "github.com/tardisx/discord-auto-upload/config" + "log" "mime" + "net/http" "os" "path/filepath" "regexp" + "strconv" "text/template" ) @@ -26,8 +26,8 @@ type valueStringResponse struct { } type valueBooleanResponse struct { - Success bool `json: 'success'` - Value bool `json: 'value'` + Success bool `json: 'success'` + Value bool `json: 'value'` } type errorResponse struct { @@ -123,7 +123,6 @@ func getSetUsername(w http.ResponseWriter, r *http.Request) { } } - func getSetWatch(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -139,7 +138,7 @@ func getSetWatch(w http.ResponseWriter, r *http.Request) { log.Fatal(err) } - i, err := strconv.Atoi(r.PostForm.Get("value")) + i, err := strconv.Atoi(r.PostForm.Get("value")) if err != nil { response := errorResponse{Success: false, Error: fmt.Sprintf("Bad value for watch: %v", err)} @@ -155,7 +154,6 @@ func getSetWatch(w http.ResponseWriter, r *http.Request) { return } - config.Config.Watch = i postResponse := valueStringResponse{Success: true, Value: strconv.Itoa(config.Config.Watch)} @@ -179,13 +177,13 @@ func getSetNoWatermark(w http.ResponseWriter, r *http.Request) { log.Fatal(err) } - v := r.PostForm.Get("value") + v := r.PostForm.Get("value") if v != "0" && v != "1" { - response := errorResponse{Success: false, Error: fmt.Sprintf("Bad value for nowatermark: %v", err)} - js, _ := json.Marshal(response) - w.Write(js) - return + response := errorResponse{Success: false, Error: fmt.Sprintf("Bad value for nowatermark: %v", err)} + js, _ := json.Marshal(response) + w.Write(js) + return } if v == "0" { @@ -193,14 +191,13 @@ func getSetNoWatermark(w http.ResponseWriter, r *http.Request) { } else { config.Config.NoWatermark = true } - postResponse := valueBooleanResponse{Success: true, Value: config.Config.NoWatermark} + postResponse := valueBooleanResponse{Success: true, Value: config.Config.NoWatermark} js, _ := json.Marshal(postResponse) w.Write(js) } } - func getSetDirectory(w http.ResponseWriter, r *http.Request) { log.Print("ok") w.Header().Set("Content-Type", "application/json")