makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect private setting with home page Reader

Browse source 
Ref T681
This commit is contained in:
Matt Baer 2019-08-09 14:57:09 -04:00
parent fda2929aed
commit d8405680b4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app.go
View file

@ -193,16 +193,20 @@ func handleViewHome(app *App, w http.ResponseWriter, r *http.Request) error {
return handleViewCollection(app, w, r) return handleViewCollection(app, w, r)
} }
if app.cfg.App.Chorus {
// This instance is focused on reading, so show Reader on home route
return viewLocalTimeline(app, w, r)
}
// Multi-user instance // Multi-user instance
forceLanding := r.FormValue("landing") == "1" forceLanding := r.FormValue("landing") == "1"
if !forceLanding { if !forceLanding {
// Show correct page based on user auth status and configured landing path // Show correct page based on user auth status and configured landing path
u := getUserSession(app, r) u := getUserSession(app, r)
if app.cfg.App.Chorus {
// This instance is focused on reading, so show Reader on home route if not
// private or a private-instance user is logged in.
if !app.cfg.App.Private || u != nil {
return viewLocalTimeline(app, w, r)
}
}
if u != nil { if u != nil {
// User is logged in, so show the Pad // User is logged in, so show the Pad
return handleViewPad(app, w, r) return handleViewPad(app, w, r)