Leahnaya/wfc-server
1
0
Fork 0
mirror of https://github.com/WiiLink24/wfc-server.git synced 2026-07-18 16:51:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from MikeIsAStar/do-not-return-null-when-no-groups-exist

Browse Source 
API: Do not return 'null' when no groups exist
This commit is contained in:
Palapeli 2024-01-07 22:21:18 -05:00 committed by GitHub
commit 989b5c2477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/groups.go
View File

@ -10,8 +10,6 @@ import (
)
func HandleGroups(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
u, err := url.Parse(r.URL.String())
if err != nil {
w.WriteHeader(http.StatusBadRequest)
@ -47,12 +45,18 @@ func HandleGroups(w http.ResponseWriter, r *http.Request) {
}
}
jsonData, err := json.Marshal(groups)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
var jsonData []byte
if len(groups) == 0 {
jsonData, _ = json.Marshal([]string{})
} else {
jsonData, err = json.Marshal(groups)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
}
w.Header().Set("Content-Type", "application/json")
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Content-Length", strconv.Itoa(len(jsonData)))
w.Write(jsonData)

3
api/stats.go
View File

@ -16,8 +16,6 @@ type Stats struct {
}
func HandleStats(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
u, err := url.Parse(r.URL.String())
if err != nil {
w.WriteHeader(http.StatusBadRequest)
@ -85,6 +83,7 @@ func HandleStats(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Content-Length", strconv.Itoa(len(jsonData)))
w.Write(jsonData)