Ivan/commento
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: run go fmt

Browse Source
This commit is contained in:
Adhityaa 2018-06-10 23:13:42 +05:30
parent 42a58f1d87
commit 8b0d198934
10 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/comment.go
View File

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

2
api/comment_statistics.go
View File

@ -1,6 +1,6 @@
package main
import()
import ()
func commentStatistics(domain string) ([]int64, error) {
statement := `

3
api/commenter_new.go
View File

@ -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"`

12
api/config.go
View File

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

2
api/config_test.go
View File

@ -2,8 +2,8 @@ package main
import (
"os"
"testing"
"path/filepath"
"testing"
)
func TestParseConfigBasics(t *testing.T) {

2
api/oauth_google.go
View File

@ -37,7 +37,7 @@ func googleOauthConfigure() error {
Endpoint: google.Endpoint,
}
configuredOauths = append(configuredOauths, "google");
configuredOauths = append(configuredOauths, "google")
return nil
}

6
api/router_static.go
View File

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

2
api/smtp_owner_confirm_hex.go
View File

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

2
api/smtp_owner_reset_hex.go
View File

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

2
api/smtp_templates.go
View File

@ -1,9 +1,9 @@
package main
import (
"os"
"fmt"
"html/template"
"os"
)
var headerTemplate *template.Template