From 84545dd9f192cac2ece9209292b3701959d09d02 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Sat, 23 Jan 2021 21:37:29 +0500
Subject: [PATCH] Rename -user-tree to -user-hypha

---
 README.md                 | 2 +-
 flag.go                   | 6 +++---
 history/history.go        | 2 +-
 history/information.go    | 2 +-
 templates/common.qtpl     | 2 +-
 templates/common.qtpl.go  | 2 +-
 templates/http_stuff.qtpl | 2 +-
 util/util.go              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index cc79e78..d672a18 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Options:
         Port to serve the wiki at (default "1737")
   -url string
         URL at which your wiki can be found. Used to generate feeds (default "http://0.0.0.0:$port")
-  -user-tree string
+  -user-hypha string
         Hypha which is a superhypha of all user pages (default "u")
 ```
 
diff --git a/flag.go b/flag.go
index e7ef67d..f3add19 100644
--- a/flag.go
+++ b/flag.go
@@ -15,7 +15,7 @@ func init() {
 	flag.StringVar(&util.HomePage, "home", "home", "The home page name")
 	flag.StringVar(&util.SiteNavIcon, "icon", "🍄", "What to show in the navititle in the beginning, before the colon")
 	flag.StringVar(&util.SiteName, "name", "wiki", "What is the name of your wiki")
-	flag.StringVar(&util.UserTree, "user-tree", "u", "Hypha which is a superhypha of all user pages")
+	flag.StringVar(&util.UserHypha, "user-hypha", "u", "Hypha which is a superhypha of all user pages")
 	flag.StringVar(&util.AuthMethod, "auth-method", "none", "What auth method to use. Variants: \"none\", \"fixed\"")
 	flag.StringVar(&util.FixedCredentialsPath, "fixed-credentials-path", "mycocredentials.json", "Used when -auth-method=fixed. Path to file with user credentials.")
 }
@@ -44,8 +44,8 @@ func parseCliArgs() {
 		log.Fatal("Error: you must use a proper name for the homepage")
 	}
 
-	if !isCanonicalName(util.UserTree) {
-		log.Fatal("Error: you must use a proper name for user tree")
+	if !isCanonicalName(util.UserHypha) {
+		log.Fatal("Error: you must use a proper name for user hypha")
 	}
 
 	switch util.AuthMethod {
diff --git a/history/history.go b/history/history.go
index dcd6268..f3d117d 100644
--- a/history/history.go
+++ b/history/history.go
@@ -118,7 +118,7 @@ func (rev Revision) RecentChangesEntry() (html string) {
 <li class="rc-entry__hash">%[2]s</li>
 <li class="rc-entry__links">%[5]s</li>
 <li class="rc-entry__msg">%[6]s <span class="rc-entry__author">by <a href="/page/%[3]s/%[4]s" rel="author">%[4]s</a></span></li>
-`, rev.TimeString(), rev.Hash, util.UserTree, rev.Username, rev.HyphaeLinks(), rev.Message)
+`, rev.TimeString(), rev.Hash, util.UserHypha, rev.Username, rev.HyphaeLinks(), rev.Message)
 	}
 	return fmt.Sprintf(`
 <li class="rc-entry__time"><time>%[1]s</time></li>
diff --git a/history/information.go b/history/information.go
index ef60b32..f2c0aad 100644
--- a/history/information.go
+++ b/history/information.go
@@ -142,7 +142,7 @@ func (rev *Revision) asHistoryEntry(hyphaName string) (html string) {
 	author := ""
 	if rev.Username != "anon" {
 		author = fmt.Sprintf(`
-		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, util.UserTree, rev.Username)
+		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, util.UserHypha, rev.Username)
 	}
 	return fmt.Sprintf(`
 <li class="history__entry">
diff --git a/templates/common.qtpl b/templates/common.qtpl
index 8a2b075..08fa7d2 100644
--- a/templates/common.qtpl
+++ b/templates/common.qtpl
@@ -52,7 +52,7 @@ var navEntries = []navEntry{
 			{% if u.Group == "anon" %}
 				<a href="/login">Login</a>
 			{% else %}
-				<a href="/page/{%s util.UserTree %}/{%s u.Name %}">{%s u.Name %}</a>
+				<a href="/page/{%s util.UserHypha %}/{%s u.Name %}">{%s u.Name %}</a>
 			{% endif %}
 			</li>
 	{% endif %}
diff --git a/templates/common.qtpl.go b/templates/common.qtpl.go
index a30040d..5895b1e 100644
--- a/templates/common.qtpl.go
+++ b/templates/common.qtpl.go
@@ -166,7 +166,7 @@ func streamuserMenuHTML(qw422016 *qt422016.Writer, u *user.User) {
 			qw422016.N().S(`
 				<a href="/page/`)
 //line templates/common.qtpl:55
-			qw422016.E().S(util.UserTree)
+			qw422016.E().S(util.UserHypha)
 //line templates/common.qtpl:55
 			qw422016.N().S(`/`)
 //line templates/common.qtpl:55
diff --git a/templates/http_stuff.qtpl b/templates/http_stuff.qtpl
index 4d10a9b..d5dacad 100644
--- a/templates/http_stuff.qtpl
+++ b/templates/http_stuff.qtpl
@@ -57,7 +57,7 @@
 			<li><b>Administrators:</b> {%- for i, username := range user.ListUsersWithGroup("admin") -%}
 				{%- if i > 0 -%}<span aria-hidden="true">, </span>
 				{%- endif -%}
-				<a href="/page/{%s util.UserTree %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li>
+				<a href="/page/{%s util.UserHypha %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li>
 		{%- else -%}
 			<li>This wiki does not use authorization</li>
 		{%- endif -%}
diff --git a/util/util.go b/util/util.go
index 5bbf9d7..6fc2ca0 100644
--- a/util/util.go
+++ b/util/util.go
@@ -14,7 +14,7 @@ var (
 	SiteNavIcon          string
 	SiteName             string
 	WikiDir              string
-	UserTree             string
+	UserHypha            string
 	AuthMethod           string
 	FixedCredentialsPath string
 )