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

api: standardise marshal and unmarshal fn names

Browse Source
This commit is contained in:
Adhityaa Chandrasekar
2018-07-24 12:28:43 +05:30
parent 9974365b73
commit a8ecbd9717
23 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/comment_new.go
View File

@@ -44,8 +44,8 @@ func commentNewHandler(w http.ResponseWriter, r *http.Request) {
}
var x request
if err := unmarshalBody(r, &x); err != nil {
writeBody(w, response{"success": false, "message": err.Error()})
if err := bodyUnmarshal(r, &x); err != nil {
bodyMarshal(w, response{"success": false, "message": err.Error()})
return
}
@@ -54,12 +54,12 @@ func commentNewHandler(w http.ResponseWriter, r *http.Request) {
d, err := domainGet(domain)
if err != nil {
writeBody(w, response{"success": false, "message": err.Error()})
bodyMarshal(w, response{"success": false, "message": err.Error()})
return
}
if d.State == "frozen" {
writeBody(w, response{"success": false, "message": errorDomainFrozen.Error()})
bodyMarshal(w, response{"success": false, "message": errorDomainFrozen.Error()})
return
}
@@ -80,7 +80,7 @@ func commentNewHandler(w http.ResponseWriter, r *http.Request) {
} else {
c, err := commenterGetByCommenterToken(*x.CommenterToken)
if err != nil {
writeBody(w, response{"success": false, "message": err.Error()})
bodyMarshal(w, response{"success": false, "message": err.Error()})
return
}
@@ -108,9 +108,9 @@ func commentNewHandler(w http.ResponseWriter, r *http.Request) {
commentHex, err := commentNew(commenterHex, domain, path, *x.ParentHex, *x.Markdown, state, time.Now().UTC())
if err != nil {
writeBody(w, response{"success": false, "message": err.Error()})
bodyMarshal(w, response{"success": false, "message": err.Error()})
return
}
writeBody(w, response{"success": true, "commentHex": commentHex, "approved": state == "approved"})
bodyMarshal(w, response{"success": true, "commentHex": commentHex, "approved": state == "approved"})
}