ari/arimelody.me
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hide some information for visible but unreleased releases

Browse source 
Signed-off-by: ari melody <ari@arimelody.me>
This commit is contained in:
ari melody 2024-08-05 16:49:49 +01:00
parent 10f19d46db
commit 7914fba52a
6 changed files with 56 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

15
music/view/music.go
View file

@ -3,7 +3,6 @@ package view
import (
"net/http"
"arimelody.me/arimelody.me/admin"
"arimelody.me/arimelody.me/global"
"arimelody.me/arimelody.me/music/model"
)
@ -26,13 +25,15 @@ func Handler() http.Handler {
func ServeCatalog() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
releases := []*model.Release{}
authorised := admin.GetSession(r) != nil
for _, release := range global.Releases {
if !release.IsReleased() && !authorised {
continue
releases := []model.Release{}
for _, r := range global.Releases {
if r.Visible {
release := *r
if !release.IsReleased() {
release.ReleaseType = model.Upcoming
}
releases = append(releases, release)
}
releases = append(releases, release)
}
global.ServeTemplate("music.html", releases).ServeHTTP(w, r)

40
music/view/release.go
View file

@ -21,7 +21,8 @@ type (
gatewayRelease struct {
*model.Release
Tracks []gatewayTrack
Tracks []gatewayTrack
Authorised bool
}
)
@ -35,18 +36,23 @@ func ServeRelease() http.Handler {
}
releaseID := r.URL.Path[1:]
var release = global.GetRelease(releaseID)
if release == nil {
var releaseRef = global.GetRelease(releaseID)
if releaseRef == nil {
http.NotFound(w, r)
return
}
var release = *releaseRef
// only allow authorised users to view unreleased releases
authorised := admin.GetSession(r) != nil
if !release.IsReleased() && !authorised {
admin.MustAuthorise(ServeRelease()).ServeHTTP(w, r)
return
}
// only allow authorised users to view hidden releases
authorised := admin.GetSession(r) != nil
if !authorised && !release.Visible {
http.NotFound(w, r)
return
}
if !authorised && !release.IsReleased() {
release.Tracks = nil
release.Credits = nil
}
w.Header().Add("Content-Type", "application/json")
err := json.NewEncoder(w).Encode(release)
@ -71,6 +77,13 @@ func ServeGateway() http.Handler {
return
}
// only allow authorised users to view hidden releases
authorised := admin.GetSession(r) != nil
if !release.Visible && !authorised {
http.NotFound(w, r)
return
}
tracks := []gatewayTrack{}
for i, track := range release.Tracks {
tracks = append([]gatewayTrack{{
@ -80,16 +93,9 @@ func ServeGateway() http.Handler {
}}, tracks...)
}
// only allow authorised users to view unreleased releases
authorised := admin.GetSession(r) != nil
if !release.IsReleased() && !authorised {
admin.MustAuthorise(ServeGateway()).ServeHTTP(w, r)
return
}
lrw := global.LoggingResponseWriter{ResponseWriter: w, Code: http.StatusOK}
global.ServeTemplate("music-gateway.html", gatewayRelease{release, tracks}).ServeHTTP(&lrw, r)
global.ServeTemplate("music-gateway.html", gatewayRelease{release, tracks, authorised}).ServeHTTP(&lrw, r)
if lrw.Code != http.StatusOK {
fmt.Printf("Error rendering music gateway for %s\n", id)