From 7aef7069778cb6ea69112a6138334f9efd38ff07 Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Wed, 12 Feb 2020 15:29:44 -0500
Subject: [PATCH 1/3] Fix Reader nav link on WFModesty + Private instance

(that is, hide the footer nav link when logged out)
---
 templates/include/footer.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/include/footer.tmpl b/templates/include/footer.tmpl
index 16434b9..0f258e7 100644
--- a/templates/include/footer.tmpl
+++ b/templates/include/footer.tmpl
@@ -6,7 +6,7 @@
 				<a class="home" href="/">{{.SiteName}}</a>
 				{{if not .SingleUser}}
 					<a href="/about">about</a>
-					{{if .LocalTimeline}}<a href="/read">reader</a>{{end}}
+					{{if and .LocalTimeline .CanViewReader}}<a href="/read">reader</a>{{end}}
 					{{if .Username}}<a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a>{{end}}
 					<a href="/privacy">privacy</a>
 					<p style="font-size: 0.9em">powered by <a href="https://writefreely.org">writefreely</a></p>

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 2/3] 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;">

From 2db6c33a410202eb441352dba53632db9540fdc9 Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Mon, 2 Mar 2020 16:34:44 -0600
Subject: [PATCH 3/3] Consolidate /signup page link logic

This moves logic for determining whether or not to show a "Sign up" page
on /signup (i.e. because the `/` route shows another, non-signup page)
into the AppCfg.SignupPath() method. It also changes various signup
links to use this value.
---
 config/config.go    | 10 ++++++++++
 pages/login.tmpl    |  2 +-
 templates/base.tmpl |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/config.go b/config/config.go
index 78892bf..a616401 100644
--- a/config/config.go
+++ b/config/config.go
@@ -183,6 +183,16 @@ func (ac *AppCfg) LandingPath() string {
 	return ac.Landing
 }
 
+func (ac AppCfg) SignupPath() string {
+	if !ac.OpenRegistration {
+		return ""
+	}
+	if ac.Chorus || ac.Private || (ac.Landing != "" && ac.Landing != "/") {
+		return "/signup"
+	}
+	return "/"
+}
+
 // Load reads the given configuration file, then parses and returns it as a Config.
 func Load(fname string) (*Config, error) {
 	if fname == "" {
diff --git a/pages/login.tmpl b/pages/login.tmpl
index 345b171..79875c6 100644
--- a/pages/login.tmpl
+++ b/pages/login.tmpl
@@ -65,7 +65,7 @@ hr.short {
 		<input type="submit" id="btn-login" value="Login" />
 	</form>
 
-	{{if and (not .SingleUser) .OpenRegistration}}<p style="text-align:center;font-size:0.9em;margin:3em auto;max-width:26em;">{{if .Message}}{{.Message}}{{else}}<em>No account yet?</em> <a href="/">Sign up</a> to start a blog.{{end}}</p>{{end}}
+	{{if and (not .SingleUser) .OpenRegistration}}<p style="text-align:center;font-size:0.9em;margin:3em auto;max-width:26em;">{{if .Message}}{{.Message}}{{else}}<em>No account yet?</em> <a href="{{.SignupPath}}">Sign up</a> to start a blog.{{end}}</p>{{end}}
 
 <script type="text/javascript">
 function disableSubmit() {
diff --git a/templates/base.tmpl b/templates/base.tmpl
index ef44121..556dfba 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -47,7 +47,7 @@
 					{{if not .DisableDrafts}}<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>{{end}}
 						{{ 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 eq .SignupPath "/signup"}}<a href="/signup"{{if eq .Path "/signup"}} class="selected"{{end}}>Sign up</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>