From 151ec71163aec86b3f7d24c12cb2f150a9aa6c7f Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Mon, 2 Mar 2020 16:32:04 -0600
Subject: [PATCH] Land on login form for private instances

---
 app.go              | 4 ++++
 templates/base.tmpl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app.go b/app.go
index dd05c95..048c8d0 100644
--- a/app.go
+++ b/app.go
@@ -221,6 +221,10 @@ func handleViewHome(app *App, w http.ResponseWriter, r *http.Request) error {
 			return handleViewPad(app, w, r)
 		}
 
+		if app.cfg.App.Private {
+			return viewLogin(app, w, r)
+		}
+
 		if land := app.cfg.App.LandingPath(); land != "/" {
 			return impart.HTTPError{http.StatusFound, land}
 		}
diff --git a/templates/base.tmpl b/templates/base.tmpl
index 3826917..ef44121 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -48,7 +48,7 @@
 						{{ end }}
 					{{if and (and  .LocalTimeline .CanViewReader) (not .Chorus)}}<a href="/read"{{if eq .Path "/read"}} class="selected"{{end}}>Reader</a>{{end}}
 					{{if and (and (and  .Chorus .OpenRegistration) (not .Username)) (or (not .Private) (ne .Landing ""))}}<a href="/signup"{{if eq .Path "/signup"}} class="selected"{{end}}>Sign up</a>{{end}}
-					{{if not .Username}}<a href="/login"{{if eq .Path "/login"}} class="selected"{{end}}>Log in</a>{{else if .SimpleNav}}<a href="/me/logout">Log out</a>{{end}}
+					{{if and (not .Username) (not .Private)}}<a href="/login"{{if eq .Path "/login"}} class="selected"{{end}}>Log in</a>{{else if .SimpleNav}}<a href="/me/logout">Log out</a>{{end}}
 					{{ end }}
 				</nav>
 				{{if .Chorus}}{{if .Username}}<div class="right-side" style="font-size: 0.86em;">