mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't expose empty dates in share info

This commit is contained in:
Deluan 2023-01-22 11:39:22 -05:00
parent 58fc271864
commit 12bb6c3847
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/serve_index.go
View File

@ -1,6 +1,7 @@
package server
import (
"context"
"encoding/json"
"html/template"
"io"
@ -77,12 +78,7 @@ func serveIndex(ds model.DataStore, fs fs.FS, shareInfo *model.Share) http.Handl
log.Trace(r, "Injecting config in index.html", "config", string(appConfigJson))
}
shareInfoJson, err := json.Marshal(shareInfo)
if err != nil {
log.Error(r, "Error converting shareInfo to JSON", "config", shareInfo, err)
} else {
log.Trace(r, "Injecting shareInfo in index.html", "config", string(shareInfoJson))
}
shareInfoJson := marshalShareData(r.Context(), shareInfo)
log.Debug("UI configuration", "appConfig", appConfig)
version := consts.Version
@ -121,3 +117,25 @@ func getIndexTemplate(r *http.Request, fs fs.FS) (*template.Template, error) {
}
return t, nil
}
type shareData struct {
Description string `json:"description"`
Tracks []model.ShareTrack `json:"tracks"`
}
func marshalShareData(ctx context.Context, shareInfo *model.Share) []byte {
if shareInfo == nil {
return nil
}
data := shareData{
Description: shareInfo.Description,
Tracks: shareInfo.Tracks,
}
shareInfoJson, err := json.Marshal(data)
if err != nil {
log.Error(ctx, "Error converting shareInfo to JSON", "config", shareInfo, err)
} else {
log.Trace(ctx, "Injecting shareInfo in index.html", "config", string(shareInfoJson))
}
return shareInfoJson
}