a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Send empty objects when there aren't any alerts to save space. 

Fixed an alert endpoint error message.
This commit is contained in:
Azareal 2019-05-09 20:15:09 +10:00
parent f10fdcb40c
commit 33d1ea4ec7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/global.js
View File

@ -147,6 +147,7 @@ function loadAlerts(menuAlerts) {
} }
alertList = []; alertList = [];
alertMapping = {}; alertMapping = {};
if(!data.hasOwnProperty("msgs")) data = {"msgs":[],"count":0};
for(var i in data.msgs) addAlert(data.msgs[i]); for(var i in data.msgs) addAlert(data.msgs[i]);
console.log("data.count:",data.count) console.log("data.count:",data.count)
alertCount = data.count; alertCount = data.count;

12
routes.go
View File

@ -89,11 +89,10 @@ func routeAPI(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError
return nil return nil
} }
var msglist string
var count int var count int
err = stmts.getActivityCountByWatcher.QueryRow(user.ID).Scan(&count) err = stmts.getActivityCountByWatcher.QueryRow(user.ID).Scan(&count)
if err == ErrNoRows { if err == ErrNoRows {
return c.PreErrorJS("Couldn't find the parent topic", w, r) return c.PreErrorJS("Unable to get the activity count", w, r)
} else if err != nil { } else if err != nil {
return c.InternalErrorJS(err, w, r) return c.InternalErrorJS(err, w, r)
} }
@ -127,6 +126,8 @@ func routeAPI(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError
return c.InternalErrorJS(err, w, r) return c.InternalErrorJS(err, w, r)
} }
var msglist string
//var sb strings.Builder
var ok bool var ok bool
for _, alert := range alerts { for _, alert := range alerts {
alert.Actor, ok = list[alert.ActorID] alert.Actor, ok = list[alert.ActorID]
@ -139,13 +140,18 @@ func routeAPI(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError
return c.LocalErrorJS(err.Error(), w, r) return c.LocalErrorJS(err.Error(), w, r)
} }
//sb.Write(res)
msglist += res + "," msglist += res + ","
} }
if len(msglist) != 0 { if len(msglist) != 0 {
msglist = msglist[0 : len(msglist)-1] msglist = msglist[0 : len(msglist)-1]
} }
_, _ = io.WriteString(w, `{"msgs":[` + msglist + `],"count":` + strconv.Itoa(count) + `}`) if count == 0 {
_, _ = io.WriteString(w, `{}`)
} else {
_, _ = io.WriteString(w, `{"msgs":[` + msglist + `],"count":` + strconv.Itoa(count) + `}`)
}
default: default:
return c.PreErrorJS("Invalid Module", w, r) return c.PreErrorJS("Invalid Module", w, r)
} }