From 8b0d198934982d4f8ae3fe682d6c3e42bcc19744 Mon Sep 17 00:00:00 2001 From: Adhityaa Date: Sun, 10 Jun 2018 23:13:42 +0530 Subject: [PATCH] api: run go fmt --- api/comment.go | 22 +++++++++++----------- api/comment_statistics.go | 2 +- api/commenter_new.go | 3 +-- api/config.go | 12 ++++++------ api/config_test.go | 2 +- api/oauth_google.go | 2 +- api/router_static.go | 6 +++--- api/smtp_owner_confirm_hex.go | 2 +- api/smtp_owner_reset_hex.go | 2 +- api/smtp_templates.go | 2 +- 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/api/comment.go b/api/comment.go index b1a23b0..0326e18 100644 --- a/api/comment.go +++ b/api/comment.go @@ -5,15 +5,15 @@ import ( ) type comment struct { - CommentHex string `json:"commentHex"` - Domain string `json:"domain,omitempty"` - Path string `json:"url,omitempty"` - CommenterHex string `json:"commenterHex"` - Markdown string `json:"markdown"` - Html string `json:"html"` - ParentHex string `json:"parentHex"` - Score int `json:"score"` - State string `json:"state"` - CreationDate time.Time `json:"creationDate"` - Direction int `json:"direction"` + CommentHex string `json:"commentHex"` + Domain string `json:"domain,omitempty"` + Path string `json:"url,omitempty"` + CommenterHex string `json:"commenterHex"` + Markdown string `json:"markdown"` + Html string `json:"html"` + ParentHex string `json:"parentHex"` + Score int `json:"score"` + State string `json:"state"` + CreationDate time.Time `json:"creationDate"` + Direction int `json:"direction"` } diff --git a/api/comment_statistics.go b/api/comment_statistics.go index ac6d089..24274fc 100644 --- a/api/comment_statistics.go +++ b/api/comment_statistics.go @@ -1,6 +1,6 @@ package main -import() +import () func commentStatistics(domain string) ([]int64, error) { statement := ` diff --git a/api/commenter_new.go b/api/commenter_new.go index 0476846..7bce2e7 100644 --- a/api/commenter_new.go +++ b/api/commenter_new.go @@ -32,7 +32,7 @@ func commenterNew(email string, name string, link string, photo string, provider } passwordHash := []byte{} - if (password != "") { + if password != "" { passwordHash, err = bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) if err != nil { logger.Errorf("cannot generate hash from password: %v\n", err) @@ -54,7 +54,6 @@ func commenterNew(email string, name string, link string, photo string, provider return commenterHex, nil } - func commenterNewHandler(w http.ResponseWriter, r *http.Request) { type request struct { Email *string `json:"email"` diff --git a/api/config.go b/api/config.go index 58c0ea5..67e888d 100644 --- a/api/config.go +++ b/api/config.go @@ -2,8 +2,8 @@ package main import ( "os" - "strings" "path/filepath" + "strings" ) func parseConfig() error { @@ -29,15 +29,15 @@ func parseConfig() error { "SMTP_PORT": "", "SMTP_FROM_ADDRESS": "", - "GOOGLE_KEY": "", - "GOOGLE_SECRET": "", + "GOOGLE_KEY": "", + "GOOGLE_SECRET": "", } for key, value := range defaults { - if os.Getenv("COMMENTO_" + key) == "" { + if os.Getenv("COMMENTO_"+key) == "" { os.Setenv(key, value) } else { - os.Setenv(key, os.Getenv("COMMENTO_" + key)) + os.Setenv(key, os.Getenv("COMMENTO_"+key)) } } @@ -55,7 +55,7 @@ func parseConfig() error { static := os.Getenv("STATIC") for strings.HasSuffix(static, "/") { - static = static[0:len(static)-1] + static = static[0 : len(static)-1] } file, err := os.Stat(static) diff --git a/api/config_test.go b/api/config_test.go index ea15387..967bb46 100644 --- a/api/config_test.go +++ b/api/config_test.go @@ -2,8 +2,8 @@ package main import ( "os" - "testing" "path/filepath" + "testing" ) func TestParseConfigBasics(t *testing.T) { diff --git a/api/oauth_google.go b/api/oauth_google.go index f519614..21eeece 100644 --- a/api/oauth_google.go +++ b/api/oauth_google.go @@ -37,7 +37,7 @@ func googleOauthConfigure() error { Endpoint: google.Endpoint, } - configuredOauths = append(configuredOauths, "google"); + configuredOauths = append(configuredOauths, "google") return nil } diff --git a/api/router_static.go b/api/router_static.go index 80c160b..f23f63c 100644 --- a/api/router_static.go +++ b/api/router_static.go @@ -6,10 +6,10 @@ import ( "github.com/gorilla/mux" "html/template" "io/ioutil" + "mime" "net/http" "os" "path" - "mime" ) func redirectLogin(w http.ResponseWriter, r *http.Request) { @@ -52,7 +52,7 @@ func initStaticRouter(router *mux.Router) error { prefix += "window.commento_cdn='" + os.Getenv("CDN_PREFIX") + "';\n" } - asset[p] = prefix + string(contents); + asset[p] = prefix + string(contents) router.HandleFunc(p, func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", mime.TypeByExtension(path.Ext(r.URL.Path))) @@ -95,7 +95,7 @@ func initStaticRouter(router *mux.Router) error { } for _, page := range pages { - router.HandleFunc("/" + page, func(w http.ResponseWriter, r *http.Request) { + router.HandleFunc("/"+page, func(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, html[r.URL.Path]) }) } diff --git a/api/smtp_owner_confirm_hex.go b/api/smtp_owner_confirm_hex.go index d143305..2cf08f1 100644 --- a/api/smtp_owner_confirm_hex.go +++ b/api/smtp_owner_confirm_hex.go @@ -18,7 +18,7 @@ func smtpOwnerConfirmHex(to string, toName string, confirmHex string) error { var body bytes.Buffer templates["confirm-hex"].Execute(&body, &ownerConfirmHexPlugs{Origin: os.Getenv("ORIGIN"), ConfirmHex: confirmHex}) - err := smtp.SendMail(os.Getenv("SMTP_HOST") + ":" + os.Getenv("SMTP_PORT"), smtpAuth, os.Getenv("SMTP_FROM_ADDRESS"), []string{to}, concat(header, body)) + err := smtp.SendMail(os.Getenv("SMTP_HOST")+":"+os.Getenv("SMTP_PORT"), smtpAuth, os.Getenv("SMTP_FROM_ADDRESS"), []string{to}, concat(header, body)) if err != nil { logger.Errorf("cannot send confirmation email: %v", err) return errorCannotSendEmail diff --git a/api/smtp_owner_reset_hex.go b/api/smtp_owner_reset_hex.go index 6dc1f3c..1d9dcfe 100644 --- a/api/smtp_owner_reset_hex.go +++ b/api/smtp_owner_reset_hex.go @@ -18,7 +18,7 @@ func smtpOwnerResetHex(to string, toName string, resetHex string) error { var body bytes.Buffer templates["reset-hex"].Execute(&body, &ownerResetHexPlugs{Origin: os.Getenv("ORIGIN"), ResetHex: resetHex}) - err := smtp.SendMail(os.Getenv("SMTP_HOST") + ":" + os.Getenv("SMTP_PORT"), smtpAuth, os.Getenv("SMTP_FROM_ADDRESS"), []string{to}, concat(header, body)) + err := smtp.SendMail(os.Getenv("SMTP_HOST")+":"+os.Getenv("SMTP_PORT"), smtpAuth, os.Getenv("SMTP_FROM_ADDRESS"), []string{to}, concat(header, body)) if err != nil { logger.Errorf("cannot send reset email: %v", err) return errorCannotSendEmail diff --git a/api/smtp_templates.go b/api/smtp_templates.go index d0aa6e7..9db5c0b 100644 --- a/api/smtp_templates.go +++ b/api/smtp_templates.go @@ -1,9 +1,9 @@ package main import ( - "os" "fmt" "html/template" + "os" ) var headerTemplate *template.Template