From 2d8a3d23156883ff2e0c50d26bbb6d5a1a321e2f Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sat, 15 Jul 2023 20:59:32 -0400
Subject: [PATCH 01/32] localize community and user links, regex cleanup

---
 Makefile                 |  2 +-
 main.go                  | 35 ++++++++++++++++++++++++
 routes.go                | 59 ++++++++++++++++++++++++++++------------
 templates/community.html |  4 +--
 4 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index ca918f2..0ac9db1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ reload:
 
 serve:
 	#python  -m http.server --directory ./public 8081 &>/dev/null
-	watchexec -e go -r "go run . --addr 0.0.0.0:8008 -w"
+	DEBUG=true watchexec -e go -r "go run . --addr 0.0.0.0:8008 -w"
 
 style:
 	npm run watchcss > /dev/null 2>&1
diff --git a/main.go b/main.go
index ca577c2..b00f6cc 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"os"
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/yuin/goldmark"
@@ -64,6 +65,40 @@ func init() {
 			templates[name] = glob
 		}
 	}
+	if os.Getenv("DEBUG") != "" {
+		test()
+	}
+}
+func test() {
+	links := [][]string{
+		[]string{"https://lemmy.local/u/dude", "/lemmy.local/u/dude", "/u/dude"},
+		[]string{"https://lemmy.local/u/dude@lemmy.local", "/lemmy.local/u/dude", "/u/dude"},
+		[]string{"/u/dude", "/lemmy.local/u/dude", "/u/dude"},
+		[]string{"https://lemmy.world/c/dude", "/lemmy.local/c/dude@lemmy.world", "/c/dude@lemmy.world"},
+		[]string{"https://lemmy.world/u/dude", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
+		[]string{"https://lemmy.world/u/dude@lemmy.world", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
+		[]string{"https://lemmy.world/post/123", "/lemmy.world/post/123", "https://lemmy.world/post/123"},
+		[]string{"/post/123", "/lemmy.local/post/123", "/post/123"},
+		[]string{"/comment/123", "/lemmy.local/comment/123", "/comment/123"},
+		[]string{"https://lemmy.local/comment/123", "/lemmy.local/comment/123", "/comment/123"},
+	}
+	for _, url := range links {
+		output := LemmyLinkRewrite(`href="`+url[0]+`"`, "lemmy.local", "")
+		success := (output == (`href="` + url[1] + `"`))
+		if !success {
+			fmt.Println("\n!!!! Link rewrite failure !!!!")
+			fmt.Println(url)
+			fmt.Println(output)
+			fmt.Println("")
+		}
+		output = LemmyLinkRewrite(`href="`+url[0]+`"`, ".", "lemmy.local")
+		success = (output == (`href="` + url[2] + `"`))
+		if !success {
+			fmt.Println(success, url)
+			fmt.Println(output)
+			fmt.Println("")
+		}
+	}
 }
 func middleware(n httprouter.Handle) httprouter.Handle {
 	return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
diff --git a/routes.go b/routes.go
index 17c8355..a933b77 100644
--- a/routes.go
+++ b/routes.go
@@ -32,12 +32,12 @@ var funcMap = template.FuncMap{
 		}
 		return host
 	},
-	"proxy": func(s string) string {
+	"localize": func(s string) string {
 		u, err := url.Parse(s)
 		if err != nil {
 			return s
 		}
-		return "/" + u.Host + u.Path
+		return "." + u.Path + "@" + u.Host
 	},
 	"printer": func(n any) string {
 		p := message.NewPrinter(language.English)
@@ -137,22 +137,11 @@ var funcMap = template.FuncMap{
 			fmt.Println(err)
 			return template.HTML(body)
 		}
-		converted := buf.String()
-		converted = strings.Replace(converted, `<img `, `<img loading="lazy" `, -1)
-		re = regexp.MustCompile(`!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)[ $]?`)
-		converted = re.ReplaceAllString(converted, `<a href="https://$2/c/$1">!$1@$2</a> `)
-		if os.Getenv("LEMMY_DOMAIN") == "" {
-			re = regexp.MustCompile(`href="\/(c\/[a-zA-Z0-9\-]+|(post|comment)\/\d+)`)
-			converted = re.ReplaceAllString(converted, `href="https://`+host+`/$1`)
-			re := regexp.MustCompile(`href="https:\/\/([a-zA-Z0-9\.\-]+\/(c\/[a-zA-Z0-9]+|(post|comment)\/\d+))`)
-			converted = re.ReplaceAllString(converted, `href="/$1`)
-		} else {
-			re := regexp.MustCompile(`href="https:\/\/` + os.Getenv("LEMMY_DOMAIN") + `\/(c\/[a-zA-Z0-9]+|(post|comment)\/\d+)`)
-			converted = re.ReplaceAllString(converted, `href="/$1`)
-		}
-		re = regexp.MustCompile(`::: spoiler (.*?)\n([\S\s]*?):::`)
-		converted = re.ReplaceAllString(converted, "<details><summary>$1</summary>$2</details>")
-		return template.HTML(converted)
+		body = buf.String()
+		body = strings.Replace(body, `<img `, `<img loading="lazy" `, -1)
+		body = LemmyLinkRewrite(body, host, os.Getenv("LEMMY_DOMAIN"))
+		body = RegReplace(body, `::: spoiler (.*?)\n([\S\s]*?):::`, "<details><summary>$1</summary>$2</details>")
+		return template.HTML(body)
 	},
 	"rmmarkdown": func(body string) string {
 		var buf bytes.Buffer
@@ -173,6 +162,40 @@ var funcMap = template.FuncMap{
 	},
 }
 
+func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
+	body = input
+	// community bangs
+	body = RegReplace(body, `!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)[ $]?`, `<a href="/c/$1">!$1@$2</a> `)
+	// localize community and user links
+	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u)\/.*?)"`, `href="/$2@$1"`)
+	// remove extra instance tag
+	body = RegReplace(body, `href="\/((c|u)\/.*@.*?)@(.*?)"`, `href="/$1"`)
+	if lemmy_domain == "" {
+		// add domain to relative links
+		body = RegReplace(body, `href="\/(c\/[a-zA-Z0-9\-]+"|(post|comment)\/\d+"|(c|u)\/(.*?)")`, `href="/`+host+`/$1`)
+		// convert links to relative
+		body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+\/(c\/[a-zA-Z0-9]+"|(post|comment)\/\d+"|u\/(.*?)"))`, `href="/$1`)
+	} else {
+		// convert local links to relative
+		body = RegReplace(body, `href="https:\/\/`+lemmy_domain+`\/(c\/[a-zA-Z0-9]+"|(post|comment)\/\d+"|u\/(.*?)")`, `href="/$1`)
+		body = RegReplace(body, `href="(.*)@`+lemmy_domain+`"`, `href="$1"`)
+	}
+	// remove redundant instance tag
+	re := regexp.MustCompile(`href="\/([a-zA-Z0-9\.\-]+)\/(c|u)\/(.*?)@(.*?)"`)
+	matches := re.FindAllStringSubmatch(body, -1)
+	for _, match := range matches {
+		if match[1] == match[4] {
+			body = strings.Replace(body, match[0], `href="/`+strings.Join(match[1:4], "/")+`"`, -1)
+		}
+	}
+	return body
+}
+
+func RegReplace(input string, match string, replace string) string {
+	re := regexp.MustCompile(match)
+	return re.ReplaceAllString(input, replace)
+}
+
 func Initialize(Host string, r *http.Request) (State, error) {
 	state := State{
 		Host:   Host,
diff --git a/templates/community.html b/templates/community.html
index f1af3c6..42d3f26 100644
--- a/templates/community.html
+++ b/templates/community.html
@@ -3,11 +3,11 @@
       <input name="op" type="submit" value="{{ membership .Subscribed}}">
       <input type="hidden" name="communityid" value ="{{.Community.ID}}">
     </form>
-    <span class="title"><a href="{{proxy .Community.ActorID}}">c/{{fullcname .Community}}: {{.Community.Title}}</a></span>
+    <span class="title"><a href="{{localize .Community.ActorID}}">c/{{fullcname .Community}}: {{.Community.Title}}</a></span>
   <div class="details">
 {{ if .Community.Description.IsValid }}
     <div class="description">
-      {{markdown "poop" .Community.Description.String}}
+      {{markdown "" .Community.Description.String}}
     </div>
 {{ end }}
     <div class="gray">

From 23d08a730cd59a9c039fb73c0440710c8990489d Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sat, 15 Jul 2023 22:07:19 -0400
Subject: [PATCH 02/32] try remote instance link

---
 state.go                 | 34 ++++++++++++++++++++++++++++++++++
 templates/frontpage.html |  7 ++++++-
 templates/main.html      |  7 ++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/state.go b/state.go
index b271855..ed3ad28 100644
--- a/state.go
+++ b/state.go
@@ -11,6 +11,8 @@ import (
 	"mime/multipart"
 	"net/http"
 	"net/url"
+	"os"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -100,6 +102,37 @@ type State struct {
 	HideInstanceNames bool
 }
 
+func (s State) Unknown() string {
+	fmt.Println(fmt.Sprintf("%v", s.Error))
+	re := regexp.MustCompile(`(.*?)@(.*?)@`)
+	if strings.Contains(fmt.Sprintf("%v", s.Error), "couldnt_find_community") {
+		matches := re.FindAllStringSubmatch(s.CommunityName+"@", -1)
+		if len(matches) < 1 || len(matches[0]) < 3 {
+			return ""
+		}
+		if matches[0][2] != s.Host {
+			remote := "/" + matches[0][2] + "/c/" + matches[0][1]
+			if os.Getenv("LEMMY_DOMAIN") != "" {
+				remote = "https:/" + remote
+			}
+			return remote
+		}
+	}
+	if strings.Contains(fmt.Sprintf("%v", s.Error), "couldnt_find_that_username_or_email") {
+		matches := re.FindAllStringSubmatch(s.UserName+"@", -1)
+		if len(matches) < 1 || len(matches[0]) < 3 {
+			return ""
+		}
+		if matches[0][2] != s.Host {
+			remote := "/" + matches[0][2] + "/u/" + matches[0][1]
+			if os.Getenv("LEMMY_DOMAIN") != "" {
+				remote = "https:/" + remote
+			}
+			return remote
+		}
+	}
+	return ""
+}
 func (p State) SortBy(v string) string {
 	var q string
 	if p.Query != "" || p.SearchType == "Communities" {
@@ -411,6 +444,7 @@ func (state *State) GetUser(username string) {
 	})
 	if err != nil {
 		fmt.Println(err)
+		state.Error = err
 		state.Status = http.StatusInternalServerError
 		return
 	}
diff --git a/templates/frontpage.html b/templates/frontpage.html
index b812252..63637d1 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -34,7 +34,12 @@
   {{ end}}
 
   {{ if .Error }}
-      <div class="error">{{.Error}}</div>
+      <div class="error">
+        {{.Error}}.
+      {{ if .Unknown }}
+      try remote instance: <a href="{{ .Unknown }}">{{ .Unknown }}</a>
+      {{ end }}
+      </div>
   {{ end }}
 
   {{ range .Posts }}
diff --git a/templates/main.html b/templates/main.html
index ed08e98..e2d6390 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -56,7 +56,12 @@
   {{ end}}
 
   {{ if .Error }}
-      <div class="error">{{.Error}}</div>
+      <div class="error">
+        {{.Error}}.
+      {{ if .Unknown }}
+      try remote instance: <a href="{{ .Unknown }}">{{ .Unknown }}</a>
+      {{ end }}
+      </div>
   {{ end }}
 
   {{ range .Communities }}

From 9782144dcb041908113a306e183205de3eb525f5 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sat, 15 Jul 2023 22:41:39 -0400
Subject: [PATCH 03/32] rewrite fix

---
 main.go   | 2 ++
 routes.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index b00f6cc..c50efbe 100644
--- a/main.go
+++ b/main.go
@@ -74,6 +74,8 @@ func test() {
 		[]string{"https://lemmy.local/u/dude", "/lemmy.local/u/dude", "/u/dude"},
 		[]string{"https://lemmy.local/u/dude@lemmy.local", "/lemmy.local/u/dude", "/u/dude"},
 		[]string{"/u/dude", "/lemmy.local/u/dude", "/u/dude"},
+		[]string{"/u/dude@lemmy.world", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
+		[]string{"/u/dude@lemmy.local", "/lemmy.local/u/dude", "/u/dude"},
 		[]string{"https://lemmy.world/c/dude", "/lemmy.local/c/dude@lemmy.world", "/c/dude@lemmy.world"},
 		[]string{"https://lemmy.world/u/dude", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
 		[]string{"https://lemmy.world/u/dude@lemmy.world", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
diff --git a/routes.go b/routes.go
index a933b77..8ff74d1 100644
--- a/routes.go
+++ b/routes.go
@@ -165,11 +165,11 @@ var funcMap = template.FuncMap{
 func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
 	body = input
 	// community bangs
-	body = RegReplace(body, `!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)[ $]?`, `<a href="/c/$1">!$1@$2</a> `)
+	body = RegReplace(body, `!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)([ \n\r]+|<\/p>)`, `<a href="/c/$1@$2">!$1@$2</a> `)
 	// localize community and user links
 	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u)\/.*?)"`, `href="/$2@$1"`)
 	// remove extra instance tag
-	body = RegReplace(body, `href="\/((c|u)\/.*@.*?)@(.*?)"`, `href="/$1"`)
+	body = RegReplace(body, `href="(https:\/)?(\/[a-zA-Z0-9\.\-]+)?\/((c|u)\/[a-zA-Z0-9]+@[a-zA-Z0-9\.\-]+)@([a-zA-Z0-9\.\-]+)"`, `href="/$3"`)
 	if lemmy_domain == "" {
 		// add domain to relative links
 		body = RegReplace(body, `href="\/(c\/[a-zA-Z0-9\-]+"|(post|comment)\/\d+"|(c|u)\/(.*?)")`, `href="/`+host+`/$1`)

From 0f4242e61e645fbcb5d62625c32c6d7d12e38b9e Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 16 Jul 2023 09:00:49 -0400
Subject: [PATCH 04/32] localize post and comment links

---
 main.go   |  5 +--
 routes.go | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 state.go  | 28 ++++++++---------
 3 files changed, 103 insertions(+), 21 deletions(-)

diff --git a/main.go b/main.go
index c50efbe..a7aee4f 100644
--- a/main.go
+++ b/main.go
@@ -79,7 +79,7 @@ func test() {
 		[]string{"https://lemmy.world/c/dude", "/lemmy.local/c/dude@lemmy.world", "/c/dude@lemmy.world"},
 		[]string{"https://lemmy.world/u/dude", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
 		[]string{"https://lemmy.world/u/dude@lemmy.world", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
-		[]string{"https://lemmy.world/post/123", "/lemmy.world/post/123", "https://lemmy.world/post/123"},
+		[]string{"https://lemmy.world/post/123", "/lemmy.local/post/123@lemmy.world", "/post/123@lemmy.world"},
 		[]string{"/post/123", "/lemmy.local/post/123", "/post/123"},
 		[]string{"/comment/123", "/lemmy.local/comment/123", "/comment/123"},
 		[]string{"https://lemmy.local/comment/123", "/lemmy.local/comment/123", "/comment/123"},
@@ -88,7 +88,7 @@ func test() {
 		output := LemmyLinkRewrite(`href="`+url[0]+`"`, "lemmy.local", "")
 		success := (output == (`href="` + url[1] + `"`))
 		if !success {
-			fmt.Println("\n!!!! Link rewrite failure !!!!")
+			fmt.Println("\n!!!! multi instance link rewrite failure !!!!")
 			fmt.Println(url)
 			fmt.Println(output)
 			fmt.Println("")
@@ -96,6 +96,7 @@ func test() {
 		output = LemmyLinkRewrite(`href="`+url[0]+`"`, ".", "lemmy.local")
 		success = (output == (`href="` + url[2] + `"`))
 		if !success {
+			fmt.Println("\n!!!! single instance link rewrite failure !!!!")
 			fmt.Println(success, url)
 			fmt.Println(output)
 			fmt.Println("")
diff --git a/routes.go b/routes.go
index 8ff74d1..7f690f1 100644
--- a/routes.go
+++ b/routes.go
@@ -167,21 +167,21 @@ func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body stri
 	// community bangs
 	body = RegReplace(body, `!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)([ \n\r]+|<\/p>)`, `<a href="/c/$1@$2">!$1@$2</a> `)
 	// localize community and user links
-	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u)\/.*?)"`, `href="/$2@$1"`)
+	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/.*?)"`, `href="/$2@$1"`)
 	// remove extra instance tag
 	body = RegReplace(body, `href="(https:\/)?(\/[a-zA-Z0-9\.\-]+)?\/((c|u)\/[a-zA-Z0-9]+@[a-zA-Z0-9\.\-]+)@([a-zA-Z0-9\.\-]+)"`, `href="/$3"`)
 	if lemmy_domain == "" {
 		// add domain to relative links
-		body = RegReplace(body, `href="\/(c\/[a-zA-Z0-9\-]+"|(post|comment)\/\d+"|(c|u)\/(.*?)")`, `href="/`+host+`/$1`)
+		body = RegReplace(body, `href="\/((c|u|post|comment)\/(.*?)")`, `href="/`+host+`/$1`)
 		// convert links to relative
-		body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+\/(c\/[a-zA-Z0-9]+"|(post|comment)\/\d+"|u\/(.*?)"))`, `href="/$1`)
+		body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+\/((c|u|post|comment)\/[a-zA-Z0-9]+"))`, `href="/$1`)
 	} else {
 		// convert local links to relative
-		body = RegReplace(body, `href="https:\/\/`+lemmy_domain+`\/(c\/[a-zA-Z0-9]+"|(post|comment)\/\d+"|u\/(.*?)")`, `href="/$1`)
+		body = RegReplace(body, `href="https:\/\/`+lemmy_domain+`\/(c\/[a-zA-Z0-9]+"|(c|u|post|comment)\/(.*?)")`, `href="/$1`)
 		body = RegReplace(body, `href="(.*)@`+lemmy_domain+`"`, `href="$1"`)
 	}
 	// remove redundant instance tag
-	re := regexp.MustCompile(`href="\/([a-zA-Z0-9\.\-]+)\/(c|u)\/(.*?)@(.*?)"`)
+	re := regexp.MustCompile(`href="\/([a-zA-Z0-9\.\-]+)\/(c|u|post|comment)\/(.*?)@(.*?)"`)
 	matches := re.FindAllStringSubmatch(body, -1)
 	for _, match := range matches {
 		if match[1] == match[4] {
@@ -416,12 +416,67 @@ func GetFrontpage(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 	}
 }
 
+func ResolveId(r *http.Request, class string, id string, host string) string {
+	remoteAddr := r.RemoteAddr
+	if r.Header.Get("CF-Connecting-IP") != "" {
+		remoteAddr = r.Header.Get("CF-Connecting-IP")
+	}
+	client := http.Client{Transport: NewAddHeaderTransport(remoteAddr)}
+	c, err := lemmy.NewWithClient("https://"+host, &client)
+	if err != nil {
+		return ""
+	}
+	idn, _ := strconv.Atoi(id)
+	if class == "post" {
+		resp, err := c.Post(context.Background(), types.GetPost{
+			ID: types.NewOptional(idn),
+		})
+		if err != nil {
+			return ""
+		}
+		return resp.PostView.Post.ApID
+	}
+	resp, err := c.Comment(context.Background(), types.GetComment{
+		ID: idn,
+	})
+	if err != nil {
+		return ""
+	}
+	return resp.CommentView.Comment.ApID
+}
+
 func GetPost(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	state, err := Initialize(ps.ByName("host"), r)
 	if err != nil {
 		Render(w, "index.html", state)
 		return
 	}
+	if path := strings.Split(ps.ByName("postid"), "@"); len(path) > 1 {
+		apid := ResolveId(r, "post", path[0], path[1])
+		if apid != "" {
+			resp, err := state.Client.ResolveObject(context.Background(), types.ResolveObject{
+				Q: apid,
+			})
+			if err != nil {
+				dest := apid
+				if os.Getenv("LEMMY_DOMAIN") == "" {
+					dest = RegReplace(dest, `https:\/\/([a-zA-Z0-9\.\-]+\/post\/\d+)`, `/$1`)
+				}
+				http.Redirect(w, r, dest, 302)
+				return
+			}
+			post, _ := resp.Post.Value()
+			if post.Post.ID > 0 {
+				dest := RegReplace(r.URL.String(), `(([a-zA-Z0-9\.\-]+)?/post/)([a-zA-Z0-9\-\.@]+)`, `$1`)
+				dest += strconv.Itoa(post.Post.ID)
+				http.Redirect(w, r, dest, 302)
+				return
+			} else {
+				http.Redirect(w, r, apid, 302)
+				return
+			}
+		}
+	}
 	m, _ := url.ParseQuery(r.URL.RawQuery)
 	if len(m["edit"]) > 0 {
 		state.Op = "edit_post"
@@ -438,6 +493,32 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		Render(w, "index.html", state)
 		return
 	}
+	if path := strings.Split(ps.ByName("commentid"), "@"); len(path) > 1 {
+		apid := ResolveId(r, "comment", path[0], path[1])
+		if apid != "" {
+			resp, err := state.Client.ResolveObject(context.Background(), types.ResolveObject{
+				Q: apid,
+			})
+			if err != nil {
+				dest := apid
+				if os.Getenv("LEMMY_DOMAIN") == "" {
+					dest = RegReplace(dest, `https:\/\/([a-zA-Z0-9\.\-]+\/comment\/\d+)`, `/$1`)
+				}
+				http.Redirect(w, r, dest, 302)
+				return
+			}
+			comment, _ := resp.Comment.Value()
+			if comment.Comment.ID > 0 {
+				dest := RegReplace(r.URL.String(), `(([a-zA-Z0-9\.\-]+)?/comment/)([a-zA-Z0-9\-\.@]+)`, `$1`)
+				dest += strconv.Itoa(comment.Comment.ID)
+				http.Redirect(w, r, dest, 302)
+				return
+			} else {
+				http.Redirect(w, r, apid, 302)
+				return
+			}
+		}
+	}
 	m, _ := url.ParseQuery(r.URL.RawQuery)
 	if len(m["reply"]) > 0 {
 		state.Op = "reply"
diff --git a/state.go b/state.go
index ed3ad28..cdaa921 100644
--- a/state.go
+++ b/state.go
@@ -596,22 +596,22 @@ func (state *State) GetPost(postid int) {
 	})
 	if err != nil {
 		state.Status = http.StatusInternalServerError
+		state.Error = err
 		return
-	} else {
-		state.Posts = []Post{Post{
-			PostView: resp.PostView,
-			State:    state,
-		}}
-		if state.CommentID > 0 && len(state.Posts) > 0 {
-			state.Posts[0].Rank = -1
-		}
-		state.CommunityName = resp.PostView.Community.Name
-		cresp := types.GetCommunityResponse{
-			CommunityView: resp.CommunityView,
-			Moderators:    resp.Moderators,
-		}
-		state.Community = &cresp
 	}
+	state.Posts = []Post{Post{
+		PostView: resp.PostView,
+		State:    state,
+	}}
+	if state.CommentID > 0 && len(state.Posts) > 0 {
+		state.Posts[0].Rank = -1
+	}
+	state.CommunityName = resp.PostView.Community.Name
+	cresp := types.GetCommunityResponse{
+		CommunityView: resp.CommunityView,
+		Moderators:    resp.Moderators,
+	}
+	state.Community = &cresp
 }
 
 func (state *State) GetCommunity(communityName string) {

From 8c7aabab72e2a7409c4bd317d3047339b4cf2876 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 16 Jul 2023 13:45:40 -0400
Subject: [PATCH 05/32] spoiler fix, default search options

---
 routes.go                | 2 +-
 state.go                 | 2 +-
 templates/frontpage.html | 4 +---
 templates/main.html      | 3 ++-
 templates/nav.html       | 4 ++--
 templates/sidebar.html   | 1 +
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/routes.go b/routes.go
index 7f690f1..b3cec93 100644
--- a/routes.go
+++ b/routes.go
@@ -140,7 +140,7 @@ var funcMap = template.FuncMap{
 		body = buf.String()
 		body = strings.Replace(body, `<img `, `<img loading="lazy" `, -1)
 		body = LemmyLinkRewrite(body, host, os.Getenv("LEMMY_DOMAIN"))
-		body = RegReplace(body, `::: spoiler (.*?)\n([\S\s]*?):::`, "<details><summary>$1</summary>$2</details>")
+		body = RegReplace(body, `::: ?spoiler (.*?)\n([\S\s]*?):::`, "<details><summary>$1</summary>$2</details>")
 		return template.HTML(body)
 	},
 	"rmmarkdown": func(body string) string {
diff --git a/state.go b/state.go
index cdaa921..9b5afab 100644
--- a/state.go
+++ b/state.go
@@ -544,7 +544,7 @@ func (state *State) Search(searchtype string) {
 	search := types.Search{
 		Q:           state.Query,
 		Sort:        types.NewOptional(types.SortType(state.Sort)),
-		ListingType: types.NewOptional(types.ListingType("All")),
+		ListingType: types.NewOptional(types.ListingType(state.Listing)),
 		Type:        types.NewOptional(types.SearchType(searchtype)),
 		Limit:       types.NewOptional(int64(25)),
 		Page:        types.NewOptional(int64(state.Page)),
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 63637d1..ac291fd 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -29,9 +29,7 @@
   {{ template "nsfw.html" }}
 {{ else }}
     <main>
-  {{ if or (contains .Sort "Top") (and (not .PostID) (not .User) (not .Community) (not .Activities) (eq .Op ""))}}
-      {{ template "menu.html" . }}
-  {{ end}}
+    {{ template "menu.html" . }}
 
   {{ if .Error }}
       <div class="error">
diff --git a/templates/main.html b/templates/main.html
index e2d6390..5cf680d 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -27,12 +27,13 @@
   {{ template "nsfw.html" }}
 {{ else }}
     <main>
-  {{ if or (contains .Sort "Top") (and (not .PostID) (not .User) (not .Community) (not .Activities) (eq .Op ""))}}
+  {{ if or (.Query) (.SearchType) (and (not .PostID) (not .User) (not .Activities) (eq .Op ""))}}
     {{ template "menu.html" . }}
   {{ end}}
 
   {{ if or (ne .Query "") .Communities }}
       <form class="search" method="GET">
+        <input type="hidden" name="sort" value="{{.Sort}}">
         <div>search</div>
         <div class="query">
           <input type="text" name="q" value="{{.Query}}">
diff --git a/templates/nav.html b/templates/nav.html
index 769bb1e..e659f79 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -9,7 +9,7 @@
         <a href="/{{$host}}/c/{{fullcname $c.Community}}">{{$c.Community.Name}}</a>
         <span> - </span>
         {{ end }}
-        <a href="/{{$host}}/search?searchtype=Communities" class="more">more »</a>
+        <a href="/{{$host}}/search?searchtype=Communities&sort=TopAll" class="more">more »</a>
       </div>
       <div class="right">
 {{ if .Session }}
@@ -48,7 +48,7 @@
       <span>: search</span>
       {{ end }}
       <ul>
-        {{ if .User }}
+        {{ if and .User (not .Query)}}
         <li {{if eq .Op "" }}class="selected"{{end}}><a href="?">overview</a></li>
           {{ if and .Session (eq .User.PersonView.Person.ID .Session.UserID) }}
           <li {{if eq .Op "Saved"}}class="selected"{{end}}><a href="?view=Saved">saved</a></li>
diff --git a/templates/sidebar.html b/templates/sidebar.html
index ba3a5ce..87ce872 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -9,6 +9,7 @@
   {{ else if .Community }}
         <input type="hidden" name="communityname" value="{{fullcname .Community.CommunityView.Community}}">
   {{ end }}
+        <input type="hidden" name="sort" value="New">
       </form>
 {{ end }}
 

From 1eec1a7274b9771856bee29f0222e5c6bc3419ed Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Thu, 20 Jul 2023 19:35:42 -0400
Subject: [PATCH 06/32] fix user settings

---
 go.mod   | 24 ++++++++++++------------
 go.sum   | 31 +++++++------------------------
 state.go |  6 ++----
 3 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/go.mod b/go.mod
index 1eb85a5..062f0de 100644
--- a/go.mod
+++ b/go.mod
@@ -3,16 +3,16 @@ module mlmym
 go 1.19
 
 require (
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/sessions v1.2.1 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/julienschmidt/httprouter v1.3.0 // indirect
-	github.com/k3a/html2text v1.2.1 // indirect
-	github.com/rystaf/go-lemmy v0.0.0-20230704005320-c4b010dd339b // indirect
-	github.com/yuin/goldmark v1.5.4 // indirect
-	go.elara.ws/go-lemmy v0.17.3 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	github.com/dustin/go-humanize v1.0.1
+	github.com/julienschmidt/httprouter v1.3.0
+	github.com/k3a/html2text v1.2.1
+	github.com/rystaf/go-lemmy v0.0.0-20230720221045-c6d79b98e968
+	github.com/yuin/goldmark v1.5.4
+	golang.org/x/text v0.10.0
+)
+
+require (
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
 )
diff --git a/go.sum b/go.sum
index 7dfa6d5..984409b 100644
--- a/go.sum
+++ b/go.sum
@@ -2,45 +2,28 @@ github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+M
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/k3a/html2text v1.2.1 h1:nvnKgBvBR/myqrwfLuiqecUtaK1lB9hGziIJKatNFVY=
 github.com/k3a/html2text v1.2.1/go.mod h1:ieEXykM67iT8lTvEWBh6fhpH4B23kB9OMKPdIBmgUqA=
-github.com/rystaf/go-lemmy v0.0.0-20230622213726-c394de37235c h1:VxOcsDMWaqoBKbhoiSBxPl1zZ62YZ/VAW2nxlBRJiow=
-github.com/rystaf/go-lemmy v0.0.0-20230622213726-c394de37235c/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230622214853-5f2ab0756865 h1:xitFpcTOSP8RlZWR569yY75B2/7WX08rQQVG+0Mi4SA=
-github.com/rystaf/go-lemmy v0.0.0-20230622214853-5f2ab0756865/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230622215253-d38b61ec174f h1:EueAC5v+8oX9xK9bT36Tpgbz+c66wUZx5zmyxePurbw=
-github.com/rystaf/go-lemmy v0.0.0-20230622215253-d38b61ec174f/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230622222647-983d49e1d285 h1:tihBOF3ejTXzYVftaflwqRAXnaY4W9q3iNiE3YMF+D8=
-github.com/rystaf/go-lemmy v0.0.0-20230622222647-983d49e1d285/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230622230518-ee2cfdf288a4 h1:++T5SoZzghtfNJprWlXiRSpPPdnMSSZgIWWAnPoGx/w=
-github.com/rystaf/go-lemmy v0.0.0-20230622230518-ee2cfdf288a4/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230623185656-962f9bf8359d h1:ORS2KIBuT+wBn4wJncF1SoLDCVCAUPHASHpQ+Y3TnRI=
-github.com/rystaf/go-lemmy v0.0.0-20230623185656-962f9bf8359d/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230623191111-7ff8c74b1935 h1:zmzUz6PGRB8yQTT6BRaZNTgNlrk6L7e72dzTnWJTw+I=
-github.com/rystaf/go-lemmy v0.0.0-20230623191111-7ff8c74b1935/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230623191350-f39e3c8bdcb5 h1:MoI87uid2KqpLdUMZGK2HBOuxJMnPOJaar/4Og2PshM=
-github.com/rystaf/go-lemmy v0.0.0-20230623191350-f39e3c8bdcb5/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
-github.com/rystaf/go-lemmy v0.0.0-20230704005320-c4b010dd339b h1:6z+gOUUvKwKQfgqEbxXS229gjr5V3HYg9bYbL9VHFdQ=
-github.com/rystaf/go-lemmy v0.0.0-20230704005320-c4b010dd339b/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
+github.com/rystaf/go-lemmy v0.0.0-20230720221045-c6d79b98e968 h1:wfyB6wQzYMH2U8xQvdamExbyCyPhe4o8HP47FMZM5Jk=
+github.com/rystaf/go-lemmy v0.0.0-20230720221045-c6d79b98e968/go.mod h1:nRSkTD+ARAHXtqlSPdf5q3hjHLP1ALsS1m5D3o86o+4=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
 github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.elara.ws/go-lemmy v0.17.3 h1:644k23BS2xqKJHJ9cHd8eyt1INpb5myqsBQQL2chBiA=
-go.elara.ws/go-lemmy v0.17.3/go.mod h1:rurQND/HT3yWfX/T4w+hb6vEwRAeAlV+9bSGFkkx5rA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/state.go b/state.go
index 9b5afab..c5a44b8 100644
--- a/state.go
+++ b/state.go
@@ -257,16 +257,14 @@ func (state *State) GetCaptcha() {
 	}
 }
 func (state *State) GetSite() {
-	token := state.Client.Token
-	state.Client.Token = ""
 	resp, err := state.Client.Site(context.Background(), types.GetSite{})
 	if err != nil {
+		fmt.Println(err)
 		state.Status = http.StatusInternalServerError
 		state.Host = "."
-		state.Error = errors.New("site unreachable")
+		state.Error = errors.New("unable to retrieve site")
 		return
 	}
-	state.Client.Token = token
 	state.Site = resp
 }
 

From 5d778161ecb5fe77d3cc49d1a0d0981aadbe8cb9 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Thu, 20 Jul 2023 19:36:12 -0400
Subject: [PATCH 07/32] mark post read. fixes #20

---
 public/utils.js          |  4 ++++
 routes.go                | 16 ++++++++++++++++
 templates/frontpage.html |  2 +-
 templates/main.html      |  2 +-
 templates/post.html      | 13 ++++++++++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/public/utils.js b/public/utils.js
index ae67624..48a1e87 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -223,6 +223,10 @@ function formSubmit(e) {
   e.submitter.disabled = "disabled"
   request(targ.target, params,
     function(res){
+      if (data.get("op") == "read_post") {
+        document.getElementById("p"+data.get("postid")).remove()
+        return
+      }
       targ.outerHTML = res
       setup()
     },
diff --git a/routes.go b/routes.go
index b3cec93..88b5371 100644
--- a/routes.go
+++ b/routes.go
@@ -1102,6 +1102,22 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			r.URL.Path = "/" + state.Host + "/c/" + resp.PostView.Community.Name
 			r.URL.RawQuery = ""
 		}
+	case "read_post":
+		postid, _ := strconv.Atoi(r.FormValue("postid"))
+		post := types.MarkPostAsRead{
+			PostID: postid,
+			Read:   true,
+		}
+		if r.FormValue("submit") == "mark unread" {
+			post.Read = false
+		}
+		_, err := state.Client.MarkPostAsRead(context.Background(), post)
+		if err != nil {
+			fmt.Println(err)
+		} else if r.FormValue("xhr") != "" {
+			w.Write([]byte{})
+			return
+		}
 	case "vote_post":
 		var score int16
 		score = 1
diff --git a/templates/frontpage.html b/templates/frontpage.html
index ac291fd..7ca8f0a 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -59,6 +59,6 @@
       {{ template "sidebar.html" . }}
     </main>
 {{ end }}
-    <script src="/_/static/utils.js?v=19"></script>
+    <script src="/_/static/utils.js?v=20"></script>
   </body>
 </html>
diff --git a/templates/main.html b/templates/main.html
index 5cf680d..2b58c48 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -139,7 +139,7 @@
     {{ end }}
   {{ end }}
 
-    <script src="/_/static/utils.js?v=19"></script>
+    <script src="/_/static/utils.js?v=20"></script>
     {{ template "sidebar.html" . }}
     </main>
 {{ end }}
diff --git a/templates/post.html b/templates/post.html
index a404d4c..a562c4c 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -1,5 +1,5 @@
 {{ if and (ne .State.Op "vote_post") (ne .State.Op "save_post") }}
-<div class="post{{if .Post.Deleted}} deleted{{end}}{{ if .Post.FeaturedCommunity }} distinguished{{end}}{{if .Post.FeaturedLocal }} announcement{{end}}">
+<div class="post{{if .Post.Deleted}} deleted{{end}}{{ if .Post.FeaturedCommunity }} distinguished{{end}}{{if .Post.FeaturedLocal }} announcement{{end}}" id="p{{.Post.ID}}">
   {{ if gt .Rank 0 }}
         <div class="rank"> {{ .Rank }} </div>
   {{ end }}
@@ -91,6 +91,17 @@
           {{ if .State.PostID }}
             <a id="hidechildren" class="scripting" href="">hide all child comments</a>
           {{ end }}
+          {{ if and .State.Site .State.Site.MyUser.IsValid (not .State.Site.MyUser.MustValue.LocalUserView.LocalUser.ShowReadPosts) }}
+            <form class="link-btn" method="POST">
+              <input type="hidden" name="postid" value="{{.Post.ID }}">
+              <input type="hidden" name="op" value="read_post">
+              {{ if .Post.Deleted }}
+              <input type="submit" name="submit" value="mark unread">
+              {{ else }}
+              <input type="submit" name="submit" value="mark read">
+              {{ end }}
+            </form>
+          {{ end }}
           </div>
         </div>
         <div></div>

From ed7d9422d7dff5b4377807d4b0a32ae48e397925 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Thu, 20 Jul 2023 20:28:07 -0400
Subject: [PATCH 08/32] no comment jerk

---
 public/style.css    | 1 +
 public/utils.js     | 2 +-
 templates/main.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/style.css b/public/style.css
index b9eb6f9..6340191 100644
--- a/public/style.css
+++ b/public/style.css
@@ -292,6 +292,7 @@ form.savecomment {
 .children .morecomments {
 }
 .morecomments {
+  height: 20px;
   clear: left;
   margin: 0px 0px 10px 0px;
   font-size: 10px;
diff --git a/public/utils.js b/public/utils.js
index 48a1e87..802058e 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -145,7 +145,7 @@ function loadMoreComments(e) {
         e.target.parentNode.outerHTML = res + '<div class="morecomments"><a id="lmc" href="" data-page="'+(parseInt(page)+1)+'">load more comments</a></div>'
         setup()
       } else {
-        e.target.parentNode.outerHTML = ""
+        e.target.parentNode.innerHTML = ""
       }
     }, function() {
       e.target.innerHTML = "loading failed"
diff --git a/templates/main.html b/templates/main.html
index 2b58c48..110bd75 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -3,7 +3,7 @@
     <title>{{if and .Posts .PostID }}{{ (index .Posts 0).Post.Name}} : {{.CommunityName}}{{else if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=25">
+    <link rel="stylesheet" href="/_/static/style.css?v=26">
   </head>
   <body{{ if .Dark }} class="dark"{{end}}>
     <noscript>

From b6ce67329218a8c5ed911e12b07ecb21a190d501 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 13:53:02 -0400
Subject: [PATCH 09/32] fix search paging, empty subscribed community search,
 my subscriptions dropdown. fixes #39

---
 public/style.css         | 41 +++++++++++++++++++++++++++++++++++-----
 public/utils.js          | 21 ++++++++++++++++++++
 routes.go                |  8 ++++++++
 state.go                 | 17 +++++++++++++++++
 templates/community.html |  8 ++++----
 templates/frontpage.html |  4 ++--
 templates/main.html      |  5 +++--
 templates/nav.html       |  6 +++++-
 templates/sidebar.html   |  4 +---
 templates/xhr.html       | 12 +++++++++++-
 10 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/public/style.css b/public/style.css
index 6340191..4cef8b7 100644
--- a/public/style.css
+++ b/public/style.css
@@ -502,21 +502,52 @@ form.nsfw div {
   position: relative;
   color: #000;
 }
-#settingspopup {
+#mycommunities, #settingspopup {
   background-color: white;
   border: 1px solid #888;
   display: none;
   position: absolute;
+  z-index: 100;
+}
+#mycommunities {
+  top: 17px;
+  padding: 5px 0px;
+  border-width: 0px 1px 1px 0px;
+}
+#mycommunities div {
+  margin: 0px 5px;
+}
+#mycommunities a:first-child {
+  text-align: right;
+}
+#mycommunities a {
+  text-decoration: none;
+  color: #369;
+  text-transform: uppercase;
+  font-size: 9px;
+  display: block;
+  padding: 0px 3px;
+}
+.dark #mycommunities a {
+  color: #8cb3d9;
+}
+.dark #mycommunities a:hover {
+  background-color: #3e3e3e;
+}
+#mycommunities a:hover {
+  background-color: #c7def7;
+}
+#settingspopup {
   right: 10px;
   top: 45px;
 }
 #settingspopup form {
   margin: 0px;
 }
-.dark #settingspopup {
+.dark #settingspopup, .dark #mycommunities {
   background-color: #262626;
 }
-#settingspopup.open {
+#settingspopup.open, #mycommunities.open {
   display: inline-block;
 }
 .expando.open{
@@ -807,11 +838,11 @@ nav .communities a.more {
   color: orangered !important;
 }
 
-nav  a {
+nav .communities a {
   text-decoration: none;
   color: black;
 }
-nav > a:hover {
+nav .title a:hover {
   text-decoration: underline;
 }
 
diff --git a/public/utils.js b/public/utils.js
index 802058e..04c8a92 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -237,6 +237,24 @@ function formSubmit(e) {
   return false
 }
 
+function toggleMyCommunities(e) {
+  e.preventDefault()
+  var mycommunities = document.getElementById("mycommunities")
+  if (mycommunities.className.indexOf("open") > -1) {
+    mycommunities.className = ""
+    return false
+  }
+  mycommunities.className = "open"
+  mycommunities.innerHTML = "<div>loading</div>"
+  request(e.target.href + "&xhr=1", "", function(res) {
+    mycommunities.innerHTML = '<div><a href="'+e.target.href+'">view all »</a>'
+    mycommunities.innerHTML += res
+  }, function() {
+    mycommunities.className = ""
+  })
+  return false
+}
+
 function openSettings(e) {
   e.preventDefault()
   var settings = document.getElementById("settingspopup")
@@ -332,6 +350,9 @@ function setup() {
   if (settings = document.getElementById("opensettings")) {
     settings.addEventListener("click", openSettings)
   }
+  if (settings = document.getElementById("openmycommunities")) {
+    settings.addEventListener("click", toggleMyCommunities)
+  }
   if (hidechildren = document.getElementById("hidechildren")){
     hidechildren.addEventListener("click", hideAllChildComments)
   }
diff --git a/routes.go b/routes.go
index 88b5371..a0e4da3 100644
--- a/routes.go
+++ b/routes.go
@@ -416,6 +416,12 @@ func GetFrontpage(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 	}
 }
 
+func GetCommunities(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	r.URL.Path = "/search"
+	r.URL.RawQuery = "searchtype=Communities"
+	http.Redirect(w, r, r.URL.String(), 301)
+}
+
 func ResolveId(r *http.Request, class string, id string, host string) string {
 	remoteAddr := r.RemoteAddr
 	if r.Header.Get("CF-Connecting-IP") != "" {
@@ -1284,6 +1290,7 @@ func GetRouter() *httprouter.Router {
 		router.POST("/:host/create_post", middleware(UserOp))
 		router.GET("/:host/create_community", middleware(GetCreateCommunity))
 		router.POST("/:host/create_community", middleware(UserOp))
+		router.GET("/:host/communities", middleware(GetCommunities))
 	} else {
 		router.ServeFiles("/_/static/*filepath", http.Dir("public"))
 		router.GET("/", middleware(GetFrontpage))
@@ -1315,6 +1322,7 @@ func GetRouter() *httprouter.Router {
 		router.POST("/create_post", middleware(UserOp))
 		router.GET("/create_community", middleware(GetCreateCommunity))
 		router.POST("/create_community", middleware(UserOp))
+		router.GET("/communities", middleware(GetCommunities))
 	}
 	return router
 }
diff --git a/state.go b/state.go
index c5a44b8..630a9e1 100644
--- a/state.go
+++ b/state.go
@@ -527,7 +527,24 @@ func (state *State) GetPosts() {
 
 func (state *State) Search(searchtype string) {
 	if state.Query == "" && searchtype == "Communities" {
+		if state.Listing == "Subscribed" {
+			if state.Page > 1 {
+				return
+			}
+			state.GetSite()
+			for _, c := range state.Site.MyUser.MustValue().Follows {
+				state.Communities = append(state.Communities, types.CommunityView{
+					Community:  c.Community,
+					Subscribed: "Subscribed",
+				})
+			}
+			sort.Slice(state.Communities, func(a, b int) bool {
+				return state.Communities[a].Community.Name < state.Communities[b].Community.Name
+			})
+			return
+		}
 		resp, err := state.Client.Communities(context.Background(), types.ListCommunities{
+			Type:  types.NewOptional(types.ListingType(state.Listing)),
 			Sort:  types.NewOptional(types.SortType(state.Sort)),
 			Limit: types.NewOptional(int64(25)),
 			Page:  types.NewOptional(int64(state.Page)),
diff --git a/templates/community.html b/templates/community.html
index 42d3f26..287e868 100644
--- a/templates/community.html
+++ b/templates/community.html
@@ -1,17 +1,17 @@
 <div class="community">
     <form method="POST" class="member {{ membership .Subscribed }}">
       <input name="op" type="submit" value="{{ membership .Subscribed}}">
-      <input type="hidden" name="communityid" value ="{{.Community.ID}}">
+      <input type="hidden" name="communityid" value ="{{ .Community.ID }}">
     </form>
-    <span class="title"><a href="{{localize .Community.ActorID}}">c/{{fullcname .Community}}: {{.Community.Title}}</a></span>
+    <span class="title"><a href="{{ if .Community.Local }}./c/{{.Community.Name}}{{else}}{{ localize .Community.ActorID }}{{end}}">c/{{fullcname .Community}}: {{.Community.Title}}</a></span>
   <div class="details">
 {{ if .Community.Description.IsValid }}
     <div class="description">
-      {{markdown "" .Community.Description.String}}
+      {{ markdown "" .Community.Description.String }}
     </div>
 {{ end }}
     <div class="gray">
-      {{printer .Counts.Subscribers}} subscribers,
+      {{ if .Counts.Subscribers }}{{ printer .Counts.Subscribers }} subscribers,{{end}}
       a community founded {{ humanize .Community.Published.Time }}
     </div>
   </div>
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 7ca8f0a..14f746f 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -2,7 +2,7 @@
   <head>
     <title>{{ if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=25">
+    <link rel="stylesheet" href="/_/static/style.css?v=27">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark }}class="dark"{{end}}>
@@ -59,6 +59,6 @@
       {{ template "sidebar.html" . }}
     </main>
 {{ end }}
-    <script src="/_/static/utils.js?v=20"></script>
+    <script src="/_/static/utils.js?v=21"></script>
   </body>
 </html>
diff --git a/templates/main.html b/templates/main.html
index 110bd75..a110926 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -3,7 +3,7 @@
     <title>{{if and .Posts .PostID }}{{ (index .Posts 0).Post.Name}} : {{.CommunityName}}{{else if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=26">
+    <link rel="stylesheet" href="/_/static/style.css?v=27">
   </head>
   <body{{ if .Dark }} class="dark"{{end}}>
     <noscript>
@@ -34,6 +34,7 @@
   {{ if or (ne .Query "") .Communities }}
       <form class="search" method="GET">
         <input type="hidden" name="sort" value="{{.Sort}}">
+        <input type="hidden" name="listingType" value="{{.Listing}}">
         <div>search</div>
         <div class="query">
           <input type="text" name="q" value="{{.Query}}">
@@ -139,7 +140,7 @@
     {{ end }}
   {{ end }}
 
-    <script src="/_/static/utils.js?v=20"></script>
+    <script src="/_/static/utils.js?v=21"></script>
     {{ template "sidebar.html" . }}
     </main>
 {{ end }}
diff --git a/templates/nav.html b/templates/nav.html
index e659f79..d093b83 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,5 +1,8 @@
 <nav>
       <div class="communities">
+        {{ if .Session }}
+        <a id="openmycommunities" href="/{{.Host}}/search?searchtype=Communities&listingType=Subscribed&sort=TopMonth&page=0">my communities ▼</a>
+        {{ end }}
         <a href="/{{.Host}}">home</a>
         <span> - </span>
         <a href="/{{.Host}}?listingType=All">all</a>
@@ -9,8 +12,9 @@
         <a href="/{{$host}}/c/{{fullcname $c.Community}}">{{$c.Community.Name}}</a>
         <span> - </span>
         {{ end }}
-        <a href="/{{$host}}/search?searchtype=Communities&sort=TopAll" class="more">more »</a>
+        <a href="/{{$host}}/search?searchtype=Communities&sort=TopMonth" class="more">more »</a>
       </div>
+      <div id="mycommunities"></div>
       <div class="right">
 {{ if .Session }}
         <a href="/{{.Host}}/u/{{ .Session.UserName}}">{{ .Session.UserName }}</a>
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 87ce872..0e49d10 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -1,9 +1,8 @@
 {{ $host := .Host }}
     <div class="{{ if .User }}user {{end}}side">
 
-{{ if not .SearchType }}
       <form method="GET" action="/{{.Host}}/search">
-        <input type="text" placeholder="search" name="q" value="{{.Query}}">
+        <input type="text" placeholder="search" name="q" value="">
   {{ if .User }}
         <input type="hidden" name="username" value="{{.UserName}}">
   {{ else if .Community }}
@@ -11,7 +10,6 @@
   {{ end }}
         <input type="hidden" name="sort" value="New">
       </form>
-{{ end }}
 
 {{ if .User }}
       <h1>{{ .User.PersonView.Person.Name }}</h1>
diff --git a/templates/xhr.html b/templates/xhr.html
index 15e1d1f..0466ab8 100644
--- a/templates/xhr.html
+++ b/templates/xhr.html
@@ -1,11 +1,21 @@
+{{ $state := . }}
 {{ if or .PostID .CommentID }}
   {{ range $i, $comment := .Comments }}
       {{ template "comment.html" $comment }}
   {{ end }}
 {{ else if .Activities }}
   {{ template "activities.html" . }}
-{{ else }}
+{{ else if .Posts }}
   {{ range $post := .Posts }}
     {{ template "post.html" $post }}
   {{ end }}
+{{ else if .Communities }}
+  {{ range .Communities }}
+    {{ if not $state.Page }}
+<a href="/{{ $state.Host}}/{{ if .Community.Local }}c/{{.Community.Name}}{{else}}{{ localize .Community.ActorID }}{{end}}">{{fullcname .Community }}</a>
+    {{ else }}
+    {{ template "community.html" . }}
+    {{ end }}
+  {{ end }}
+{{ else }}
 {{ end }}

From 9525c1ff4d46c5d6670d619f1572929946d99549 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 15:05:31 -0400
Subject: [PATCH 10/32] redirect frontpage login errors

---
 routes.go            | 9 +++++++--
 templates/login.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/routes.go b/routes.go
index a0e4da3..ecd86d1 100644
--- a/routes.go
+++ b/routes.go
@@ -893,10 +893,15 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		if err != nil {
 			if strings.Contains(fmt.Sprintf("%v", err), "missing_totp_token") {
 				state.Op = "2fa"
-				Render(w, "login.html", state)
-				return
+			}
+			state.GetSite()
+			if state.Site != nil && state.Site.SiteView.LocalSite.CaptchaEnabled {
+				state.GetCaptcha()
 			}
 			state.Status = http.StatusUnauthorized
+			state.Error = err
+			Render(w, "login.html", state)
+			return
 		} else if resp.JWT.IsValid() {
 			state.GetUser(r.FormValue("username"))
 			if state.User != nil {
diff --git a/templates/login.html b/templates/login.html
index d310403..8a3356c 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -38,7 +38,7 @@
 {{ if ne .Op "2fa" }}
     <div>
       <h2>create a new account</h2>
-      <form method="POST">
+      <form method="POST" action="/{{ .Host}}/login">
         <label>
           username
           <div><input required name="username" type="text"></div>

From 3ce346d815bc72602c70c68c53735e2a12bf6d0c Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 15:18:14 -0400
Subject: [PATCH 11/32] communities redirect fix

---
 routes.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index ecd86d1..eea125b 100644
--- a/routes.go
+++ b/routes.go
@@ -418,7 +418,10 @@ func GetFrontpage(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 
 func GetCommunities(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	r.URL.Path = "/search"
-	r.URL.RawQuery = "searchtype=Communities"
+	if ps.ByName("host") != "" {
+		r.URL.Path = "/" + ps.ByName("host") + "/search"
+	}
+	r.URL.RawQuery = "searchtype=Communities&sort=TopMonth"
 	http.Redirect(w, r, r.URL.String(), 301)
 }
 

From 3ebf9b3793f42647c37e88e2dd3ae97070e54607 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 18:19:53 -0400
Subject: [PATCH 12/32] show mlmym version

---
 .gitignore              |  1 +
 Dockerfile              |  2 ++
 Makefile                | 23 ++++++++++++-----------
 main.go                 |  4 ++++
 public/style.css        |  3 +++
 routes.go               |  7 ++++---
 state.go                |  1 +
 templates/settings.html |  2 +-
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9a2389..3d7be86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 mlmym
+VERSION
 *.toml
 *.txt
diff --git a/Dockerfile b/Dockerfile
index 1bd6c58..9b9ab73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /app
 COPY go.* ./
 RUN go mod download
 COPY . ./
+RUN git describe --tag > VERSION
 RUN go build -v -o mlmym
 
 FROM debian:bullseye-slim
@@ -14,4 +15,5 @@ RUN set -x && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -
 COPY --from=builder /app/mlmym /app/mlmym
 COPY --from=builder /app/templates /app/templates
 COPY --from=builder /app/public /app/public
+COPY --from=builder /app/VERSION /app/VERSION
 CMD ["./mlmym", "--addr", "0.0.0.0:8080"]
diff --git a/Makefile b/Makefile
index 0ac9db1..701866f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
-.PHONY: dev reload serve style
+.PHONY: dev reload serve VERSION
 
-all: 
-	$(MAKE) -j3 --no-print-directory dev
+all: mlmym
 
-dev: reload serve style
+mlmym:
+	go build -v -o mlmym
+
+dev:
+	$(MAKE) -j2 --no-print-directory reload serve
 
 reload:
-	#websocketd --port=8080 watchexec -w public echo reload &>/dev/null
-	websocketd --loglevel=fatal --port=8009 watchexec --no-vcs-ignore -e html,css,js -d 500 -w public 'echo "$$WATCHEXEC_WRITTEN_PATH"'
+	websocketd --loglevel=fatal --port=8009 watchexec -e html,css,js -d 500 'echo "$$WATCHEXEC_WRITTEN_PATH"'
 
-serve:
-	#python  -m http.server --directory ./public 8081 &>/dev/null
-	DEBUG=true watchexec -e go -r "go run . --addr 0.0.0.0:8008 -w"
+VERSION:
+	git describe --tag > $@
 
-style:
-	npm run watchcss > /dev/null 2>&1
+serve: VERSION
+	DEBUG=true watchexec --no-vcs-ignore -e go -r "go run . --addr 0.0.0.0:8008 -w"
diff --git a/main.go b/main.go
index a7aee4f..b38cc10 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 	"github.com/yuin/goldmark/extension"
 )
 
+var version string
 var watch = flag.Bool("w", false, "watch for file changes")
 var addr = flag.String("addr", ":80", "http service address")
 var md goldmark.Markdown
@@ -68,6 +69,9 @@ func init() {
 	if os.Getenv("DEBUG") != "" {
 		test()
 	}
+	if data, err := os.ReadFile("VERSION"); err == nil {
+		version = string(data)
+	}
 }
 func test() {
 	links := [][]string{
diff --git a/public/style.css b/public/style.css
index 4cef8b7..d3f0be1 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1057,6 +1057,9 @@ form.create input[type=file], form.create select {
   font-size: 13px;
   margin: 10px;
 }
+.preferences div:last-child label {
+  text-align: left;
+}
 .preferences label{
   display: inline-block;
   width: 130px;
diff --git a/routes.go b/routes.go
index eea125b..fbe20f4 100644
--- a/routes.go
+++ b/routes.go
@@ -198,9 +198,10 @@ func RegReplace(input string, match string, replace string) string {
 
 func Initialize(Host string, r *http.Request) (State, error) {
 	state := State{
-		Host:   Host,
-		Page:   1,
-		Status: http.StatusOK,
+		Host:    Host,
+		Page:    1,
+		Status:  http.StatusOK,
+		Version: version,
 	}
 	lemmyDomain := os.Getenv("LEMMY_DOMAIN")
 	if lemmyDomain != "" {
diff --git a/state.go b/state.go
index 630a9e1..0b8a6bc 100644
--- a/state.go
+++ b/state.go
@@ -64,6 +64,7 @@ type Session struct {
 }
 
 type State struct {
+	Version           string
 	Client            *lemmy.Client
 	HTTPClient        *http.Client
 	Session           *Session
diff --git a/templates/settings.html b/templates/settings.html
index 655b61b..151e208 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -129,7 +129,7 @@
         <input type="checkbox" name="hideInstanceNames" {{ if .HideInstanceNames }}checked{{end}}>
       </div>
       <div>
-        <label></label>
+        <label>mlmym: {{ .Version }}</label>
         <input type="submit" value="save">
         {{ if .XHR }}<input id="closesettings" type="submit" value="close">{{ end }}
       </div>

From d5a96181d2183e4781f4ad012a9c7686d574e822 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 22:12:01 -0400
Subject: [PATCH 13/32] remove excess community api calls

---
 public/utils.js          | 20 +++++++++++++-------
 state.go                 | 29 ++++++++++++++++++-----------
 templates/frontpage.html |  2 +-
 templates/main.html      |  2 +-
 templates/nav.html       | 10 +++++++++-
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/public/utils.js b/public/utils.js
index 04c8a92..1ff1c50 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -245,19 +245,25 @@ function toggleMyCommunities(e) {
     return false
   }
   mycommunities.className = "open"
-  mycommunities.innerHTML = "<div>loading</div>"
-  request(e.target.href + "&xhr=1", "", function(res) {
-    mycommunities.innerHTML = '<div><a href="'+e.target.href+'">view all »</a>'
-    mycommunities.innerHTML += res
-  }, function() {
-    mycommunities.className = ""
-  })
+  if (mycommunities.innerHTML == "") {
+    mycommunities.innerHTML = "<div>loading</div>"
+    request(e.target.href + "&xhr=1", "", function(res) {
+      mycommunities.innerHTML = '<div><a href="'+e.target.href+'">view all »</a>'
+      mycommunities.innerHTML += res
+    }, function() {
+      mycommunities.className = ""
+    })
+  }
   return false
 }
 
 function openSettings(e) {
   e.preventDefault()
   var settings = document.getElementById("settingspopup")
+  if (settings.className == "open") {
+    settings.className = ""
+    return false
+  }
   settings.className = "open"
   request(e.target.href + "?xhr=1", "", function(res) {
     settings.innerHTML = res
diff --git a/state.go b/state.go
index 0b8a6bc..474d893 100644
--- a/state.go
+++ b/state.go
@@ -59,8 +59,9 @@ type Post struct {
 }
 
 type Session struct {
-	UserName string
-	UserID   int
+	UserName    string
+	UserID      int
+	Communities []types.CommunityView
 }
 
 type State struct {
@@ -267,6 +268,18 @@ func (state *State) GetSite() {
 		return
 	}
 	state.Site = resp
+	if !state.Site.MyUser.IsValid() {
+		return
+	}
+	for _, c := range state.Site.MyUser.MustValue().Follows {
+		state.Session.Communities = append(state.Session.Communities, types.CommunityView{
+			Community:  c.Community,
+			Subscribed: "Subscribed",
+		})
+	}
+	sort.Slice(state.Session.Communities, func(a, b int) bool {
+		return state.Session.Communities[a].Community.Name < state.Session.Communities[b].Community.Name
+	})
 }
 
 func (state *State) GetComment(commentid int) {
@@ -532,16 +545,10 @@ func (state *State) Search(searchtype string) {
 			if state.Page > 1 {
 				return
 			}
-			state.GetSite()
-			for _, c := range state.Site.MyUser.MustValue().Follows {
-				state.Communities = append(state.Communities, types.CommunityView{
-					Community:  c.Community,
-					Subscribed: "Subscribed",
-				})
+			if state.Site == nil {
+				state.GetSite()
 			}
-			sort.Slice(state.Communities, func(a, b int) bool {
-				return state.Communities[a].Community.Name < state.Communities[b].Community.Name
-			})
+			state.Communities = state.Session.Communities
 			return
 		}
 		resp, err := state.Client.Communities(context.Background(), types.ListCommunities{
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 14f746f..85a4af5 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -59,6 +59,6 @@
       {{ template "sidebar.html" . }}
     </main>
 {{ end }}
-    <script src="/_/static/utils.js?v=21"></script>
+    <script src="/_/static/utils.js?v=22"></script>
   </body>
 </html>
diff --git a/templates/main.html b/templates/main.html
index a110926..893f703 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -140,7 +140,7 @@
     {{ end }}
   {{ end }}
 
-    <script src="/_/static/utils.js?v=21"></script>
+    <script src="/_/static/utils.js?v=22"></script>
     {{ template "sidebar.html" . }}
     </main>
 {{ end }}
diff --git a/templates/nav.html b/templates/nav.html
index d093b83..f455ace 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,3 +1,4 @@
+{{ $state := . }}
 <nav>
       <div class="communities">
         {{ if .Session }}
@@ -14,7 +15,14 @@
         {{ end }}
         <a href="/{{$host}}/search?searchtype=Communities&sort=TopMonth" class="more">more »</a>
       </div>
-      <div id="mycommunities"></div>
+      <div id="mycommunities">
+{{- if and .Session .Session.Communities }}
+<a href="/{{.Host}}/search?searchtype=Communities&listingType=Subscribed&sort=TopMonth&page=0">view all »</a>
+  {{ range .Session.Communities }}
+<a href="/{{ $state.Host}}/{{ if .Community.Local }}c/{{.Community.Name}}{{else}}{{ localize .Community.ActorID }}{{end}}">{{fullcname .Community }}</a>
+  {{ end }}
+{{ end -}}
+      </div>
       <div class="right">
 {{ if .Session }}
         <a href="/{{.Host}}/u/{{ .Session.UserName}}">{{ .Session.UserName }}</a>

From 556cc785f510a46f7c57e02533618cd57ec522ae Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 23:07:57 -0400
Subject: [PATCH 14/32] ignore old subdomain when rewriting lemmy links

---
 routes.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/routes.go b/routes.go
index fbe20f4..7efd843 100644
--- a/routes.go
+++ b/routes.go
@@ -165,7 +165,7 @@ var funcMap = template.FuncMap{
 func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
 	body = input
 	// community bangs
-	body = RegReplace(body, `!([a-zA-Z0-9]+)@([a-zA-Z0-9\.\-]+)([ \n\r]+|<\/p>)`, `<a href="/c/$1@$2">!$1@$2</a> `)
+	body = RegReplace(body, `!([a-zA-Z0-9_]+)@([a-zA-Z0-9\.\-]+)([ \n\r]+|<\/p>)`, `<a href="/c/$1@$2">!$1@$2</a> `)
 	// localize community and user links
 	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/.*?)"`, `href="/$2@$1"`)
 	// remove extra instance tag
@@ -180,9 +180,21 @@ func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body stri
 		body = RegReplace(body, `href="https:\/\/`+lemmy_domain+`\/(c\/[a-zA-Z0-9]+"|(c|u|post|comment)\/(.*?)")`, `href="/$1`)
 		body = RegReplace(body, `href="(.*)@`+lemmy_domain+`"`, `href="$1"`)
 	}
-	// remove redundant instance tag
-	re := regexp.MustCompile(`href="\/([a-zA-Z0-9\.\-]+)\/(c|u|post|comment)\/(.*?)@(.*?)"`)
+
+	re := regexp.MustCompile(`href="\/?([a-zA-Z0-9\.\-]*)\/(c|u|post|comment)\/(.*?)@(.*?)"`)
+	// assume "old." subdomain is mlmym and remove
 	matches := re.FindAllStringSubmatch(body, -1)
+	for _, match := range matches {
+		if match[4][0:4] == "old." {
+			s := 1
+			if match[1] == "" {
+				s += 1
+			}
+			body = strings.Replace(body, match[0], `href="/`+strings.Join(match[s:4], "/")+"@"+match[4][4:]+`"`, -1)
+		}
+	}
+	// remove redundant instance tag
+	matches = re.FindAllStringSubmatch(body, -1)
 	for _, match := range matches {
 		if match[1] == match[4] {
 			body = strings.Replace(body, match[0], `href="/`+strings.Join(match[1:4], "/")+`"`, -1)

From f7c2910b07ca111942599d8e3dfc730bdbc912da Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 23:19:49 -0400
Subject: [PATCH 15/32] fix community bangs

---
 routes.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes.go b/routes.go
index 7efd843..ad645f6 100644
--- a/routes.go
+++ b/routes.go
@@ -133,6 +133,8 @@ var funcMap = template.FuncMap{
 		var buf bytes.Buffer
 		re := regexp.MustCompile(`\s---\s`)
 		body = re.ReplaceAllString(body, "\n***\n")
+		// community bangs
+		body = RegReplace(body, `!([a-zA-Z0-9_]+)@([a-zA-Z0-9\.\-]+)`, `[!$1@$2](/c/$1@$2)`)
 		if err := md.Convert([]byte(body), &buf); err != nil {
 			fmt.Println(err)
 			return template.HTML(body)
@@ -164,8 +166,6 @@ var funcMap = template.FuncMap{
 
 func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
 	body = input
-	// community bangs
-	body = RegReplace(body, `!([a-zA-Z0-9_]+)@([a-zA-Z0-9\.\-]+)([ \n\r]+|<\/p>)`, `<a href="/c/$1@$2">!$1@$2</a> `)
 	// localize community and user links
 	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/.*?)"`, `href="/$2@$1"`)
 	// remove extra instance tag

From dd4f76a393f55961f15e6bae6909436308116694 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Sun, 23 Jul 2023 23:26:25 -0400
Subject: [PATCH 16/32] shrink version size

---
 public/style.css         | 1 +
 templates/frontpage.html | 2 +-
 templates/login.html     | 2 +-
 templates/main.html      | 2 +-
 templates/settings.html  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/style.css b/public/style.css
index d3f0be1..46719af 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1059,6 +1059,7 @@ form.create input[type=file], form.create select {
 }
 .preferences div:last-child label {
   text-align: left;
+  font-size: 10px;
 }
 .preferences label{
   display: inline-block;
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 85a4af5..c57ced0 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -2,7 +2,7 @@
   <head>
     <title>{{ if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=27">
+    <link rel="stylesheet" href="/_/static/style.css?v=28">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark }}class="dark"{{end}}>
diff --git a/templates/login.html b/templates/login.html
index 8a3356c..5bd9028 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -2,7 +2,7 @@
   <head>
     <title>{{ host .Host }}: sign up or log in</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=7">
+    <link rel="stylesheet" href="/_/static/style.css?v=28">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark }}class="dark"{{end}}>
diff --git a/templates/main.html b/templates/main.html
index 893f703..053b4ce 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -3,7 +3,7 @@
     <title>{{if and .Posts .PostID }}{{ (index .Posts 0).Post.Name}} : {{.CommunityName}}{{else if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=27">
+    <link rel="stylesheet" href="/_/static/style.css?v=28">
   </head>
   <body{{ if .Dark }} class="dark"{{end}}>
     <noscript>
diff --git a/templates/settings.html b/templates/settings.html
index 151e208..c683790 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -3,7 +3,7 @@
   <head>
     <title>{{  host .Host }}: preferences</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=15">
+    <link rel="stylesheet" href="/_/static/style.css?v=28">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark}}class="dark"{{end}}>

From 1858f1aec020365121b1b0b8856601f3e97a9aac Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Mon, 24 Jul 2023 00:24:29 -0400
Subject: [PATCH 17/32] fix community bangs. fixes #44

---
 routes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index ad645f6..5bd0c32 100644
--- a/routes.go
+++ b/routes.go
@@ -134,7 +134,7 @@ var funcMap = template.FuncMap{
 		re := regexp.MustCompile(`\s---\s`)
 		body = re.ReplaceAllString(body, "\n***\n")
 		// community bangs
-		body = RegReplace(body, `!([a-zA-Z0-9_]+)@([a-zA-Z0-9\.\-]+)`, `[!$1@$2](/c/$1@$2)`)
+		body = RegReplace(body, `([^\[])!([a-zA-Z0-9_]+)@([a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+)`, `$1[!$2@$3](/c/$2@$3)`)
 		if err := md.Convert([]byte(body), &buf); err != nil {
 			fmt.Println(err)
 			return template.HTML(body)

From 3fe31bd5b3760208b112feb0c5119b4f1018aa56 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 16:53:06 -0400
Subject: [PATCH 18/32] livereload

---
 Makefile            |  2 +-
 public/ws.js        | 33 +++++++++++++++++++++++++++++++++
 routes.go           |  3 +++
 state.go            |  1 +
 templates/main.html |  3 +++
 5 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 public/ws.js

diff --git a/Makefile b/Makefile
index 701866f..a7e0a0c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ dev:
 	$(MAKE) -j2 --no-print-directory reload serve
 
 reload:
-	websocketd --loglevel=fatal --port=8009 watchexec -e html,css,js -d 500 'echo "$$WATCHEXEC_WRITTEN_PATH"'
+	websocketd --loglevel=fatal --port=8009 watchexec --no-vcs-ignore -e html,css,js 'echo "$$WATCHEXEC_WRITTEN_PATH"'
 
 VERSION:
 	git describe --tag > $@
diff --git a/public/ws.js b/public/ws.js
new file mode 100644
index 0000000..08ac7c3
--- /dev/null
+++ b/public/ws.js
@@ -0,0 +1,33 @@
+var ok = false
+var t = 800
+var ws
+var prot = location.protocol == 'https:' ? "wss://":"ws://"
+let port = ":8009"
+
+function start(){
+  let url = prot + document.location.hostname + port + document.location.pathname + document.location.search;
+  console.log('connecting to ', url);
+  ws = new WebSocket(url);
+  ws.onopen = function(){
+    console.log("open");
+    t = 800
+  }
+  ws.onmessage = function(msg){
+    console.log("reload:", msg.data)
+    if (msg.data == "") {
+      return
+    }
+    window.location.reload()
+  }
+  ws.onclose = function(){
+    console.log("close");
+    setTimeout(function(){
+      //start()
+      if (t < 10 * 1000) t += 200
+    }, t);
+  };
+}
+console.log("ws");
+if (typeof WebSocket != 'undefined') {
+  start()
+}
diff --git a/routes.go b/routes.go
index 5bd0c32..e8af5f0 100644
--- a/routes.go
+++ b/routes.go
@@ -215,6 +215,9 @@ func Initialize(Host string, r *http.Request) (State, error) {
 		Status:  http.StatusOK,
 		Version: version,
 	}
+	if watch != nil {
+		state.Watch = *watch
+	}
 	lemmyDomain := os.Getenv("LEMMY_DOMAIN")
 	if lemmyDomain != "" {
 		state.Host = "."
diff --git a/state.go b/state.go
index 474d893..181417f 100644
--- a/state.go
+++ b/state.go
@@ -65,6 +65,7 @@ type Session struct {
 }
 
 type State struct {
+	Watch             bool
 	Version           string
 	Client            *lemmy.Client
 	HTTPClient        *http.Client
diff --git a/templates/main.html b/templates/main.html
index 053b4ce..a421bcb 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -141,6 +141,9 @@
   {{ end }}
 
     <script src="/_/static/utils.js?v=22"></script>
+    {{ if .Watch }}
+    <script src="/_/static/ws.js"></script>
+    {{ end }}
     {{ template "sidebar.html" . }}
     </main>
 {{ end }}

From 463b3fe49da46c9518de7bbf51c1237bddff02e3 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 17:02:19 -0400
Subject: [PATCH 19/32] don't try to rewrite links with anchors. fixes #45

---
 main.go   | 1 +
 routes.go | 2 +-
 state.go  | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/main.go b/main.go
index b38cc10..4c49046 100644
--- a/main.go
+++ b/main.go
@@ -84,6 +84,7 @@ func test() {
 		[]string{"https://lemmy.world/u/dude", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
 		[]string{"https://lemmy.world/u/dude@lemmy.world", "/lemmy.local/u/dude@lemmy.world", "/u/dude@lemmy.world"},
 		[]string{"https://lemmy.world/post/123", "/lemmy.local/post/123@lemmy.world", "/post/123@lemmy.world"},
+		[]string{"https://lemmy.world/post/123#123", "https://lemmy.world/post/123#123", "https://lemmy.world/post/123#123"},
 		[]string{"/post/123", "/lemmy.local/post/123", "/post/123"},
 		[]string{"/comment/123", "/lemmy.local/comment/123", "/comment/123"},
 		[]string{"https://lemmy.local/comment/123", "/lemmy.local/comment/123", "/comment/123"},
diff --git a/routes.go b/routes.go
index e8af5f0..b727261 100644
--- a/routes.go
+++ b/routes.go
@@ -167,7 +167,7 @@ var funcMap = template.FuncMap{
 func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
 	body = input
 	// localize community and user links
-	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/.*?)"`, `href="/$2@$1"`)
+	body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/[^#\?]*?)"`, `href="/$2@$1"`)
 	// remove extra instance tag
 	body = RegReplace(body, `href="(https:\/)?(\/[a-zA-Z0-9\.\-]+)?\/((c|u)\/[a-zA-Z0-9]+@[a-zA-Z0-9\.\-]+)@([a-zA-Z0-9\.\-]+)"`, `href="/$3"`)
 	if lemmy_domain == "" {
diff --git a/state.go b/state.go
index 181417f..19dfd6c 100644
--- a/state.go
+++ b/state.go
@@ -314,6 +314,9 @@ func (state *State) GetComment(commentid int) {
 			state.Comments = append(state.Comments, comment)
 		}
 	}
+	if len(state.Comments) == 0 {
+		return
+	}
 	ctx, err := state.GetContext(state.Context, state.Comments[0])
 	if err != nil {
 		fmt.Println(err)

From 6c80f67535aedd6abc2d7ed2fb9cbf64a82d46c6 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 21:07:39 -0400
Subject: [PATCH 20/32] comment preview, image upload, versioned assets

---
 public/style.css         | 53 +++++++++++++++++++++++++--
 public/utils.js          | 41 ++++++++++++++-------
 routes.go                | 77 ++++++++++++++++++++++++++++++++++++++--
 state.go                 |  1 +
 templates/comment.html   | 39 ++++++--------------
 templates/frontpage.html | 20 ++---------
 templates/login.html     |  2 +-
 templates/main.html      | 28 ++++-----------
 templates/settings.html  | 10 ++----
 9 files changed, 179 insertions(+), 92 deletions(-)

diff --git a/public/style.css b/public/style.css
index 46719af..7b8a084 100644
--- a/public/style.css
+++ b/public/style.css
@@ -219,6 +219,27 @@ summary {
   font-size: 10px;
   margin-bottom: 6px;
 }
+.preview h3 {
+  background-color: #f0f3fc;
+  border: 0px solid #e6e6e6;
+  border-bottom-width: 1px;
+  color: black;
+  margin: 0px;
+  padding: 10px;
+  font-size: 14px;
+}
+.dark .preview h3 {
+  background-color: #333;
+  border-color: #333;
+  color: #ccc;
+}
+.preview .comment {
+  margin-top: 5px;
+  padding: 0px;
+}
+.preview .comment .content {
+  padding: 5px 10px;
+}
 .meta a, .activity .meta a {
   color: #369;
   text-decoration: none;
@@ -262,6 +283,7 @@ summary {
 }
 form.savecomment {
   margin: 0px 0px 10px 0px;
+  width: 500px;
 }
 .comment > .children > form.savecomment {
   margin: 0px 0px 10px 20px;
@@ -270,9 +292,34 @@ form.savecomment {
   margin: 5px 0px 10px 15px;
 }
 .savecomment textarea {
-  width: 500px;
+  margin: 5px 0px;
+  width: 100%;
   height: 100px;
 }
+
+.savecomment .upload label div {
+  display: inline-block;
+  border: 1px solid #ccc;
+  height: 20px;
+  line-height: 20px;
+  width: 32px;
+  position: relative;
+  background-color: #999;
+  color: #000;
+  text-align: center;
+  cursor: pointer;
+}
+.savecomment .upload input {
+  display: none;
+}
+.savecomment .right {
+  float:right;
+}
+.savecomment .right a {
+  line-height: 28px;
+  font-size: 10px;
+}
+
 .comment .meta a.minimize {
   color: #369;
   font-size: 10px;
@@ -956,11 +1003,11 @@ nav .right a.mailbox {
   top: 4px;
   color: gray;
 }
-nav .right a, .right input[type=submit] {
+nav .right a, nav .right input[type=submit] {
   color: #369;
   text-decoration: none;
 }
-.dark nav .right a, .dark .right input[type=submit]{
+.dark nav .right a, .dark nav .right input[type=submit]{
   color: #dadada;
 }
 nav .right form, .comment form, form.link-btn {
diff --git a/public/utils.js b/public/utils.js
index 1ff1c50..3087828 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -10,8 +10,6 @@ function request(url, params, callback, errorcallback = function(){}) {
   var method = "GET"
   if (params) method = "POST"
   xmlHttp.open(method, url, true);
-  if (method = "POST")
-    xmlHttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
   xmlHttp.send(params);
 }
 function postClick(e) {
@@ -34,25 +32,31 @@ function postClick(e) {
     }
   }
 }
+function uptil (el, f) { 
+  if (el) return f(el) ? el : uptil(el.parentNode, f) 
+}
 function commentClick(e) {
   e = e || window.event;
   var targ = e.currentTarget || e.srcElement || e;
   if (targ.nodeType == 3) targ = targ.parentNode;
   if (e.target.name=="submit") {
     e.preventDefault()
-    var form = e.target.parentNode
+    var form = uptil(e.target, function(el){ return el.tagName == "FORM" })
     if (form) {
       data = new FormData(form)
+      data.set(e.target.name, e.target.value)
+      data.set("xhr", 1)
       if (("c"+data.get("commentid")) == targ.id) {
-        
+        targ.action = form.action
+        if (e.target.value == "preview") {
+          targ = form
+        }
+        console.log("ok")
       } else if (("c"+data.get("parentid")) == targ.id) {
         targ = form
       } else { return }
-      params = new URLSearchParams(data).toString()
-      params += "&" + e.target.name + "=" + e.target.value
-      params += "&xhr=1"
       e.target.disabled = "disabled"
-      request(targ.target || "", params,
+      request(targ.action || "", data,
         function(res){
           targ.outerHTML = res
           setup()
@@ -217,11 +221,10 @@ function formSubmit(e) {
   var targ = e.currentTarget || e.srcElement || e;
   e.preventDefault()
   var data = new FormData(targ)
-  params = new URLSearchParams(data).toString()
-  params += "&" + e.submitter.name + "=" + e.submitter.value
-  params += "&xhr=1"
+  data.set(e.submitter.name, e.submitter.value)
+  data.set("xhr", "1")
   e.submitter.disabled = "disabled"
-  request(targ.target, params,
+  request(targ.target, data,
     function(res){
       if (data.get("op") == "read_post") {
         document.getElementById("p"+data.get("postid")).remove()
@@ -349,6 +352,16 @@ function toggleImages(open) {
   }
 }
 
+function insertImg(e) {
+  e = e || window.event;
+  var form = uptil(e.target, function(el){ return el.tagName == "FORM" })
+  form.querySelector("input[value=preview]").click()
+  var inputs = form.getElementsByTagName("input")
+  for (var i = 0; i < inputs.length; i++) {
+    inputs[i].disabled = "disabled"
+  }
+}
+
 function setup() {
   if (showimages = document.getElementById("se")) {
     showimages.addEventListener("click", showImages)
@@ -369,6 +382,10 @@ function setup() {
     }
     lmc.addEventListener("click", loadMoreComments)
   }
+  var imgUpload = document.getElementsByClassName("imgupload")
+  for (var i = 0; i < imgUpload.length; i++) {
+    imgUpload[i].addEventListener("change", insertImg)
+  }
   var posts = document.getElementsByClassName("post")
   for (var i = 0; i < posts.length; i++) {
     posts[i].addEventListener("click", postClick)
diff --git a/routes.go b/routes.go
index b727261..02e38ed 100644
--- a/routes.go
+++ b/routes.go
@@ -507,6 +507,9 @@ func GetPost(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		state.Op = "edit_post"
 		state.GetSite()
 	}
+	if len(m["content"]) > 0 {
+		state.Content = m["content"][0]
+	}
 	postid, _ := strconv.Atoi(ps.ByName("postid"))
 	state.GetPost(postid)
 	state.GetComments()
@@ -551,6 +554,9 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	if len(m["edit"]) > 0 {
 		state.Op = "edit"
 	}
+	if r.Method == "POST" && len(m["content"]) > 0 {
+		state.Content = m["content"][0]
+	}
 	if len(m["source"]) > 0 {
 		state.Op = "source"
 	}
@@ -560,6 +566,10 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	}
 	commentid, _ := strconv.Atoi(ps.ByName("commentid"))
 	state.GetComment(commentid)
+	if state.XHR && len(m["content"]) > 0 {
+		Render(w, "create_comment.html", state)
+		return
+	}
 	state.GetPost(state.PostID)
 	Render(w, "index.html", state)
 }
@@ -1201,9 +1211,20 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			parentid, _ := strconv.Atoi(r.FormValue("parentid"))
 			state.GetComment(parentid)
 		}
+		content := r.FormValue("content")
+		file, handler, err := r.FormFile("file")
+		if err == nil {
+			pres, err := state.UploadImage(file, handler)
+			if err != nil {
+				state.Error = err
+				Render(w, "index.html", state)
+				return
+			}
+			content += ("![](https://" + state.Host + "/pictrs/image/" + pres.Files[0].Filename + ")")
+		}
 		if r.FormValue("submit") == "save" {
 			createComment := types.CreateComment{
-				Content: r.FormValue("content"),
+				Content: content,
 				PostID:  state.PostID,
 			}
 			if state.CommentID > 0 {
@@ -1225,6 +1246,22 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			} else {
 				fmt.Println(err)
 			}
+		} else if r.FormValue("submit") == "preview" {
+			q := r.URL.Query()
+			q.Set("content", content)
+			q.Set("reply", "")
+			if r.FormValue("xhr") != "" {
+				q.Set("xhr", "1")
+			}
+			r.URL.RawQuery = q.Encode()
+			if ps.ByName("postid") != "" {
+				GetPost(w, r, ps)
+				return
+			}
+			if ps.ByName("commentid") != "" {
+				GetComment(w, r, ps)
+				return
+			}
 		} else if r.FormValue("xhr") != "" {
 			w.Write([]byte{})
 			return
@@ -1234,10 +1271,23 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		}
 	case "edit_comment":
 		commentid, _ := strconv.Atoi(r.FormValue("commentid"))
+		q := r.URL.Query()
+		content := r.FormValue("content")
+		file, handler, err := r.FormFile("file")
+		if err == nil {
+			pres, err := state.UploadImage(file, handler)
+			if err != nil {
+				state.Error = err
+				Render(w, "index.html", state)
+				return
+			}
+			content += ("![](https://" + state.Host + "/pictrs/image/" + pres.Files[0].Filename + ")")
+		}
+
 		if r.FormValue("submit") == "save" {
 			resp, err := state.Client.EditComment(context.Background(), types.EditComment{
 				CommentID: commentid,
-				Content:   types.NewOptional(r.FormValue("content")),
+				Content:   types.NewOptional(content),
 			})
 			if err != nil {
 				fmt.Println(err)
@@ -1246,6 +1296,29 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 				r.URL.Fragment = "c" + commentid
 				r.URL.RawQuery = ""
 			}
+		} else if r.FormValue("submit") == "preview" {
+			q.Set("content", content)
+			q.Set("edit", "")
+			if r.FormValue("xhr") != "" {
+				q.Set("xhr", "1")
+			}
+			r.URL.RawQuery = q.Encode()
+			if ps.ByName("commentid") != "" {
+				GetComment(w, r, ps)
+				return
+			}
+		} else if r.FormValue("submit") == "cancel" {
+			if ps.ByName("commentid") != "" {
+				if r.FormValue("xhr") != "" {
+					q.Set("xhr", "1")
+				}
+				r.URL.RawQuery = q.Encode()
+				GetComment(w, r, ps)
+				return
+			}
+		} else if r.FormValue("xhr") != "" {
+			w.Write([]byte{})
+			return
 		}
 		if r.FormValue("xhr") != "" {
 			state.XHR = true
diff --git a/state.go b/state.go
index 19dfd6c..b45dfc0 100644
--- a/state.go
+++ b/state.go
@@ -98,6 +98,7 @@ type State struct {
 	Op                string
 	Site              *types.GetSiteResponse
 	Query             string
+	Content           string
 	SearchType        string
 	Captcha           *types.CaptchaResponse
 	Dark              bool
diff --git a/templates/comment.html b/templates/comment.html
index fb686b8..230f78a 100644
--- a/templates/comment.html
+++ b/templates/comment.html
@@ -15,11 +15,11 @@
 {{ end }}
     <div class="meta">
       <a class="minimize" href="" for="c{{.P.Comment.ID}}">
-{{if or (lt .P.Counts.Score -5) .P.Comment.Deleted }}
+{{- if or (lt .P.Counts.Score -5) .P.Comment.Deleted -}}
         [+]
-{{ else }}
+{{- else -}}
         [-]
-{{ end }}
+{{- end -}}
       </a>
       <a {{ if .P.Comment.Distinguished}}class="{{if .P.Creator.Admin}}admin {{end}}distinguished"{{ else if .Submitter }}class="submitter"{{end}} href="/{{.State.Host}}/u/{{fullname .P.Creator}}">
         {{- if .State.HideInstanceNames -}}
@@ -33,26 +33,17 @@
             * (last edited <span title="{{.P.Comment.Updated.Time}}">{{ humanize .P.Comment.Updated.Time }}</span>)
             {{ end }}
     </div>
+    <div class="content">
 {{ if eq .Op "edit" }}
-    <div class="content">
-      <form class="savecomment" method="POST">
-        <div>
-          <textarea required name="content">{{ .P.Comment.Content }}</textarea>
-        </div>
-        <input type="hidden" name="commentid" value="{{.P.Comment.ID}}">
-        <input type="hidden" name="op" value="edit_comment">
-        <input name="submit" type="submit" value="save">
-        <input name="submit" type="submit" value="cancel">
-      </form>
+  {{ template "create_comment.html" .State }}
 {{ else }}
-    <div class="content">
-      {{if .P.Comment.Deleted}}
+    {{if .P.Comment.Deleted}}
       [removed]
-      {{else}}
+    {{else}}
       <div {{ if and .Selected (not .State.XHR) (ne .State.Op "reply")}}class="highlight" {{end}}>
         {{ markdown .State.Host .P.Comment.Content }}
       </div>
-      {{end}}
+    {{end}}
   {{ if eq .Op "source" }}
       <div><textarea>{{.P.Comment.Content}}</textarea></div>
   {{end}}
@@ -93,7 +84,7 @@
           </a>
         </li>
 {{ end }}
-{{ if and .ParentID .State.CommentID }}
+{{ if and .ParentID .State.CommentID (not .State.XHR) }}
         <li>
           <a href="/{{.State.Host}}/comment/{{.ParentID}}">parent</a>
         </li>
@@ -110,15 +101,7 @@
     </div>
     <div class="children">
 {{ if and (eq .State.Op "reply") (eq .State.CommentID .P.Comment.ID)}}
-      <form class="savecomment" method="POST">
-        <div>
-          <textarea name="content"></textarea>
-        </div>
-        <input type="hidden" name="parentid" value="{{.P.Comment.ID}}">
-        <input type="hidden" name="op" value="create_comment">
-        <input type="submit" name="submit" value="save">
-        <input type="submit" name="submit" value="cancel">
-      </form>
+  {{ template "create_comment.html" .State }}
 {{ end}}
       {{ range $ci, $child := .C }}{{ template "comment.html" $child }}{{end}}
 {{ if and (ne .P.Counts.ChildCount .ChildCount) (not .State.Activities) (not .State.Query) }}
@@ -128,4 +111,4 @@
       </div>
 {{end}}
     </div>
-  </div>
+</div>
diff --git a/templates/frontpage.html b/templates/frontpage.html
index c57ced0..bce44e6 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -2,26 +2,12 @@
   <head>
     <title>{{ if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=28">
+    <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark }}class="dark"{{end}}>
     <noscript>
-      <style>
-      .expando-button,
-      .minimize,
-      #loadmore,
-      #showimages,
-      .hidechildren {
-        display: none;
-      }
-      div.pager {
-        display: block;
-      }
-      .post .expando .image img {
-        visibility: visible;
-      }
-      </style>
+      <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>
 
     {{ template "nav.html" . -}}
@@ -59,6 +45,6 @@
       {{ template "sidebar.html" . }}
     </main>
 {{ end }}
-    <script src="/_/static/utils.js?v=22"></script>
+    <script src="/_/static/utils.js?v={{ .Version }}"></script>
   </body>
 </html>
diff --git a/templates/login.html b/templates/login.html
index 5bd9028..2ecb7bd 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -2,7 +2,7 @@
   <head>
     <title>{{ host .Host }}: sign up or log in</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=28">
+    <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark }}class="dark"{{end}}>
diff --git a/templates/main.html b/templates/main.html
index a421bcb..a8c78d9 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -3,23 +3,11 @@
     <title>{{if and .Posts .PostID }}{{ (index .Posts 0).Post.Name}} : {{.CommunityName}}{{else if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=28">
+    <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
   </head>
   <body{{ if .Dark }} class="dark"{{end}}>
     <noscript>
-      <style>
-      .scripting,
-      .expando-button,
-      .minimize,
-      #showimages,
-      #lmc,
-      .hidechildren {
-        display: none !important;
-      }
-      .post .expando .image img {
-        visibility: visible;
-      }
-      </style>
+      <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>
 
     {{ template "nav.html" . -}}
@@ -99,13 +87,9 @@
         </div>
       </div>
       {{ if and .Session (ne .Op "edit_post") }}
-      <form class="savecomment" method="POST">
-        <div>
-          <textarea required name="content" {{ if (index .Posts 0).Post.Deleted }} disabled {{end}}></textarea>
-        </div>
-        <input type="hidden" name="op" value="create_comment">
-        <input type="submit" name="submit" value="save"{{ if (index .Posts 0).Post.Deleted }} disabled {{end}}>
-      </form>
+      <div class="create_comment">
+        {{ template "create_comment.html" .}}
+      </div>
       {{ end }}
     {{ end }}
   {{ end}}
@@ -140,7 +124,7 @@
     {{ end }}
   {{ end }}
 
-    <script src="/_/static/utils.js?v=22"></script>
+    <script src="/_/static/utils.js?v={{ .Version }}"></script>
     {{ if .Watch }}
     <script src="/_/static/ws.js"></script>
     {{ end }}
diff --git a/templates/settings.html b/templates/settings.html
index c683790..969f969 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -3,16 +3,12 @@
   <head>
     <title>{{  host .Host }}: preferences</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
-    <link rel="stylesheet" href="/_/static/style.css?v=28">
+    <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
   </head>
   <body {{ if .Dark}}class="dark"{{end}}>
     <noscript>
-      <style>
-      .scripting {
-        display: none;
-      }
-      </style>
+      <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>
     <nav>
       <div class="communities">
@@ -135,7 +131,7 @@
       </div>
     </form>
 {{ if not .XHR}}
-    <script src="/_/static/utils.js?v=8"></script>
+    <script src="/_/static/utils.js?v={{ .Version }}"></script>
   </body>
 </html>
 {{ end }}

From a689604470048fe18719ca9b8cd46b2814394193 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 21:25:55 -0400
Subject: [PATCH 21/32] hide removed posts. fixes #53

---
 templates/comment.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/comment.html b/templates/comment.html
index 230f78a..631132c 100644
--- a/templates/comment.html
+++ b/templates/comment.html
@@ -1,4 +1,4 @@
-<div class="comment{{if or (lt .P.Counts.Score -5) .P.Comment.Deleted }} hidden{{end}}" id="c{{.P.Comment.ID}}">
+<div class="comment{{if or (lt .P.Counts.Score -5) .P.Comment.Deleted .P.Comment.Removed }} hidden{{end}}" id="c{{.P.Comment.ID}}">
 {{ if .State.Session }}
       <div class="score">
       <form class="link-btn{{ if eq .P.MyVote.String "1"}} like{{ else if eq .P.MyVote.String "-1"}} dislike{{end}}" method="POST">
@@ -38,7 +38,9 @@
   {{ template "create_comment.html" .State }}
 {{ else }}
     {{if .P.Comment.Deleted}}
-      [removed]
+      [deleted]
+    {{else if .P.Comment.Removed }}
+      [removed by mod]
     {{else}}
       <div {{ if and .Selected (not .State.XHR) (ne .State.Op "reply")}}class="highlight" {{end}}>
         {{ markdown .State.Host .P.Comment.Content }}

From 2bea76c7f07d2b8fc7cae3ada97601e3eb665dd1 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 21:27:53 -0400
Subject: [PATCH 22/32] fix expando classname spacing. fixes #42

---
 templates/post.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/post.html b/templates/post.html
index a562c4c..5bdd3ab 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -33,7 +33,7 @@
             <a class="url" href="{{ if .Post.URL.IsValid }}{{ .Post.URL }}{{ else }}/{{ .State.Host }}/post/{{ .Post.ID }}{{ end }}">{{ rmmarkdown .Post.Name }}</a>
             ({{ domain . }})
           </div>
-          <div class="expando-button {{ if and (not (and .Post.Body.IsValid .Post.Body.String )) (not (isImage .Post.URL.String)) }}hidden{{else if eq .Rank 0}}open{{ end }}"></div>
+          <div class="expando-button{{ if and (not (and .Post.Body.IsValid .Post.Body.String )) (not (isImage .Post.URL.String)) }} hidden{{else if eq .Rank 0}} open{{ end }}"></div>
           <div class="meta">
             submitted
             <span title="{{.Post.Published.Time}}">{{ humanize .Post.Published.Time -}}</span>
@@ -106,7 +106,7 @@
         </div>
         <div></div>
         <div class="clearleft"></div>
-          <div class="expando {{ if eq .Rank 0 }}open{{ end}}">
+          <div class="expando{{ if eq .Rank 0 }} open{{ end}}">
 {{ if (and .Post.Body.IsValid (ne .Post.Body.String "")) }}
             <div class="md">{{ markdown .State.Host .Post.Body.String }}</div>
 {{ end }}

From dd58cb7e5583563015120e973d1df0bfa33336e2 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 21:30:19 -0400
Subject: [PATCH 23/32] added new files

---
 public/noscript.css           | 17 +++++++++++++
 templates/create_comment.html | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 public/noscript.css
 create mode 100644 templates/create_comment.html

diff --git a/public/noscript.css b/public/noscript.css
new file mode 100644
index 0000000..8b24e2a
--- /dev/null
+++ b/public/noscript.css
@@ -0,0 +1,17 @@
+.scripting,
+.expando-button,
+.minimize,
+#showimages,
+#lmc,
+.hidechildren {
+  display: none !important;
+}
+.post .expando .image img {
+  visibility: visible;
+}
+div.pager {
+  display: block;
+}
+.savecomment input[type=file] {
+  display: inline-block;
+}
diff --git a/templates/create_comment.html b/templates/create_comment.html
new file mode 100644
index 0000000..081d8eb
--- /dev/null
+++ b/templates/create_comment.html
@@ -0,0 +1,45 @@
+      <form class="savecomment" method="POST" enctype="multipart/form-data"
+        {{- if .CommentID }} action="/{{.Host}}/comment/{{.CommentID}}"
+        {{- else }} action="/{{.Host}}/post/{{.PostID}}"
+        {{- end -}}
+        >
+        <div class="upload">
+          <label title="upload photo"><div>📷</div>
+          <input class="imgupload" type="file" name="file" accept="image/*">
+          </label>
+        </div>
+        <div>
+          <textarea name="content">
+          {{- if .Content }}
+          {{- .Content -}}
+          {{ else if and (eq .Op "edit") .Comments }}
+          {{- (index .Comments 0).P.Comment.Content -}}
+          {{ end -}}
+          </textarea>
+        </div>
+      {{ if eq .Op "edit" }}
+        <input type="hidden" name="op" value="edit_comment">
+        <input type="hidden" name="commentid" value="{{.CommentID}}">
+      {{ else }}
+        <input type="hidden" name="op" value="create_comment">
+      {{ end }}
+        <input type="hidden" name="parentid" value="{{.CommentID}}">
+        <input type="submit" name="submit" value="save">
+        {{ if or .Op .Content }}
+        <input type="submit" name="submit" value="cancel">
+        {{ end }}
+        <div class="right">
+          <a href="https://join-lemmy.org/docs/users/02-media.html" target="_blank">formatting help</a>
+          <input name="submit" type="submit" value="preview">
+        </div>
+        {{ if .Content }}
+        <div class="preview">
+          <div class="comment">
+            <h3>Preview</h3>
+            <div class="content">
+              {{ markdown .Host .Content }}
+            </div>
+          </div>
+        </div>
+        {{ end }}
+      </form>

From 669749c12e93ea987764b48a1745251f9e844388 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Wed, 26 Jul 2023 22:33:06 -0400
Subject: [PATCH 24/32] fix settings save

---
 public/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/utils.js b/public/utils.js
index 3087828..df8c22a 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -296,8 +296,7 @@ function saveSettings(e) {
   var targ = e.currentTarget || e.srcElement || e;
   var data = new FormData(targ)
   e.preventDefault()
-  var params = new URLSearchParams(data).toString()
-  request(targ.target, params, function(res) {
+  request(targ.target, data, function(res) {
     ["endlessScrolling", "autoLoad"].map(function(x) {
       localStorage.setItem(x, data.get(x)=="on")
     })

From c5a53c79da1bef6f2faf402c0e91f16cd6f98124 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Fri, 28 Jul 2023 12:51:17 -0400
Subject: [PATCH 25/32] show lemmy back end version

---
 routes.go               | 1 +
 templates/settings.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index 02e38ed..da65011 100644
--- a/routes.go
+++ b/routes.go
@@ -687,6 +687,7 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		Render(w, "index.html", state)
 		return
 	}
+	state.GetSite()
 	switch r.Method {
 	case "POST":
 		for _, name := range []string{"DefaultSortType", "DefaultListingType", "DefaultCommentSortType"} {
diff --git a/templates/settings.html b/templates/settings.html
index 969f969..43091e5 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -125,7 +125,7 @@
         <input type="checkbox" name="hideInstanceNames" {{ if .HideInstanceNames }}checked{{end}}>
       </div>
       <div>
-        <label>mlmym: {{ .Version }}</label>
+        <label>lemmy: {{ .Site.Version }}<br>mlmym: {{ .Version }}</label>
         <input type="submit" value="save">
         {{ if .XHR }}<input id="closesettings" type="submit" value="close">{{ end }}
       </div>

From f5a423f2d547daaba452063e741af7c3dfc72299 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Fri, 28 Jul 2023 13:04:41 -0400
Subject: [PATCH 26/32] remove mailto links from title

---
 routes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index da65011..754739b 100644
--- a/routes.go
+++ b/routes.go
@@ -152,7 +152,7 @@ var funcMap = template.FuncMap{
 			return body
 		}
 		text := html2text.HTML2TextWithOptions(buf.String(), html2text.WithLinksInnerText())
-		re := regexp.MustCompile(`\<https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)\>`)
+		re := regexp.MustCompile(`\<(https?:\/\/|mailto)(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)\>`)
 		return re.ReplaceAllString(text, "")
 	},
 	"contains": strings.Contains,

From c935ffabea981e88446097585364dcb617873357 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Fri, 28 Jul 2023 13:36:03 -0400
Subject: [PATCH 27/32] add version to make

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a7e0a0c..1b88d82 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 all: mlmym
 
-mlmym:
+mlmym: VERSION
 	go build -v -o mlmym
 
 dev:

From 624b7e48470eed2dfcc015a483388f05d2c84457 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Fri, 28 Jul 2023 17:00:58 -0400
Subject: [PATCH 28/32] add fedilink. fixes #57

---
 templates/comment.html | 1 +
 templates/post.html    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/templates/comment.html b/templates/comment.html
index 631132c..c33d77a 100644
--- a/templates/comment.html
+++ b/templates/comment.html
@@ -52,6 +52,7 @@
 {{ end }}
       <ul class="buttons">
         <li><a href="/{{.State.Host}}/comment/{{.P.Comment.ID}}">permalink</a></li>
+        <li><a href="{{.P.Comment.ApID}}">fedilink</a></li>
 {{ if ne .Op "source"}}
         <li><a class="source" for="c{{.P.Comment.ID}}" href="/{{.State.Host}}/comment/{{.P.Comment.ID}}?source">source</a></li>
 {{ else }}
diff --git a/templates/post.html b/templates/post.html
index 5bdd3ab..b3696be 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -60,6 +60,7 @@
           <div class="buttons">
             {{ if .Post.NSFW }}<span class="nsfw">NSFW</span>{{end}}
             <a href="/{{ .State.Host }}/post/{{ .Post.ID }}">{{ .Counts.Comments }} comments</a>
+            <a href="{{ .Post.ApID}}">fedilink</a>
           {{ if and .State.Session (eq .State.Session.UserID .Post.CreatorID) }}
             {{ if not .Post.Deleted }}<a href="/{{ .State.Host }}/post/{{ .Post.ID }}?edit">edit</a>{{end}}
             <form class="link-btn" method="POST">

From a91b08547b174ba8ab75357bff8f37be16be1873 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Mon, 31 Jul 2023 14:41:55 -0400
Subject: [PATCH 29/32] fix reply preview 500

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 4c49046..95e0f3d 100644
--- a/main.go
+++ b/main.go
@@ -56,7 +56,7 @@ func init() {
 	))
 	templates = make(map[string]*template.Template)
 	if !*watch {
-		for _, name := range []string{"index.html", "login.html", "frontpage.html", "root.html", "settings.html", "xhr.html"} {
+		for _, name := range []string{"index.html", "login.html", "frontpage.html", "root.html", "settings.html", "xhr.html", "create_comment.html"} {
 			t := template.New(name).Funcs(funcMap)
 			glob, err := t.ParseGlob("templates/*")
 			if err != nil {

From 3e1e3868f4d0d026bf41a7c9e87cf4c497ae47ae Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Tue, 8 Aug 2023 17:26:30 -0400
Subject: [PATCH 30/32] default settings, hide thumbnails option, github link.
 fixes #64, fixes #66, fixes #67

---
 README.md               | 13 +++++++++++--
 public/style.css        |  2 +-
 routes.go               | 35 +++++++++++++++++++++++++++++------
 state.go                |  1 +
 templates/post.html     |  2 ++
 templates/settings.html |  8 +++++++-
 6 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ee99f9e..c2bde67 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,23 @@ a familiar desktop experience for [lemmy](https://join-lemmy.org).
 
 ![screenshot](https://raw.githubusercontent.com/rystaf/mlmym/main/screenshot1.png?raw=true)
 
-### deployment
+## deployment
 
 ```bash
 docker run -it -p "8080:8080" ghcr.io/rystaf/mlmym:latest
 ```
 
-### config
+## config
 Set the environment variable `LEMMY_DOMAIN` to run in single instance mode
 ```bash
 docker run -it -e LEMMY_DOMAIN='lemmydomain.com' -p "8080:8080" ghcr.io/rystaf/mlmym:latest
 ```
+#### default user settings
+| environment variable | default |
+| -------------------- | ------- |
+| DARK | false |
+| HIDE_THUMBNAILS | false |
+| LISTING | All |
+| SORT | Hot |
+| COMMENT_SORT | Hot |
+
diff --git a/public/style.css b/public/style.css
index 7b8a084..7522f61 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1110,7 +1110,7 @@ form.create input[type=file], form.create select {
 }
 .preferences label{
   display: inline-block;
-  width: 130px;
+  width: 150px;
   margin-right: 5px;
   text-align: right;
  
diff --git a/routes.go b/routes.go
index 754739b..5eb9c94 100644
--- a/routes.go
+++ b/routes.go
@@ -208,6 +208,14 @@ func RegReplace(input string, match string, replace string) string {
 	return re.ReplaceAllString(input, replace)
 }
 
+func getenv(key, fallback string) string {
+	value := os.Getenv(key)
+	if len(value) == 0 {
+		return fallback
+	}
+	return value
+}
+
 func Initialize(Host string, r *http.Request) (State, error) {
 	state := State{
 		Host:    Host,
@@ -252,18 +260,27 @@ func Initialize(Host string, r *http.Request) (State, error) {
 	state.Listing = getCookie(r, "DefaultListingType")
 	state.Sort = getCookie(r, "DefaultSortType")
 	state.CommentSort = getCookie(r, "DefaultCommentSortType")
-	state.Dark = getCookie(r, "Dark") != ""
+	if dark := getCookie(r, "Dark"); dark != "" {
+		state.Dark = dark != "0"
+	} else {
+		state.Dark = os.Getenv("DARK") != "0"
+	}
 	state.ShowNSFW = getCookie(r, "ShowNSFW") != ""
 	state.HideInstanceNames = getCookie(r, "HideInstanceNames") != ""
+	if hide := getCookie(r, "HideThumbnails"); hide != "" {
+		state.HideThumbnails = hide != "0"
+	} else {
+		state.HideThumbnails = os.Getenv("HIDE_THUMBNAILS") != "0"
+	}
 	state.ParseQuery(r.URL.RawQuery)
 	if state.Sort == "" {
-		state.Sort = "Hot"
+		state.Sort = getenv("SORT", "Hot")
 	}
 	if state.CommentSort == "" {
-		state.CommentSort = "Hot"
+		state.CommentSort = getenv("COMMENT_SORT", "Hot")
 	}
 	if state.Listing == "" || state.Session == nil && state.Listing == "Subscribed" {
-		state.Listing = "All"
+		state.Listing = getenv("LISTING", "All")
 	}
 	return state, nil
 }
@@ -698,8 +715,7 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			setCookie(w, "", "Dark", "1")
 			state.Dark = true
 		} else {
-			deleteCookie(w, state.Host, "Dark")
-			deleteCookie(w, "", "Dark")
+			setCookie(w, "", "Dark", "0")
 			state.Dark = false
 		}
 		if r.FormValue("shownsfw") != "" {
@@ -717,6 +733,13 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			deleteCookie(w, "", "HideInstanceNames")
 			state.HideInstanceNames = false
 		}
+		if r.FormValue("hideThumbnails") != "" {
+			setCookie(w, "", "HideThumbnails", "1")
+			state.HideInstanceNames = true
+		} else {
+			setCookie(w, "", "HideThumbnails", "0")
+			state.HideInstanceNames = false
+		}
 		state.Listing = r.FormValue("DefaultListingType")
 		state.Sort = r.FormValue("DefaultSortType")
 		state.CommentSort = r.FormValue("DefaultCommentSortType")
diff --git a/state.go b/state.go
index b45dfc0..1e2085a 100644
--- a/state.go
+++ b/state.go
@@ -104,6 +104,7 @@ type State struct {
 	Dark              bool
 	ShowNSFW          bool
 	HideInstanceNames bool
+	HideThumbnails    bool
 }
 
 func (s State) Unknown() string {
diff --git a/templates/post.html b/templates/post.html
index b3696be..185e4b5 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -23,11 +23,13 @@
 {{ end }}
 {{ if and (ne .State.Op "vote_post") (ne .State.Op "save_post") }}
         </div>
+        {{ if not .State.HideThumbnails }}
         <div class="thumb">
           <a class="url" href="{{ if .Post.URL.IsValid }}{{ .Post.URL }}{{ else }}/{{ .State.Host }}/post/{{ .Post.ID }}{{ end }}">
             <div {{ if and .Post.NSFW (not (and .State.Community .State.Community.CommunityView.Community.NSFW))}}class="img-blur"{{end}} style="background-image: url({{thumbnail .Post}})"></div>
           </a>
         </div>
+        {{ end }}
         <div class="entry">
           <div class="title">
             <a class="url" href="{{ if .Post.URL.IsValid }}{{ .Post.URL }}{{ else }}/{{ .State.Host }}/post/{{ .Post.ID }}{{ end }}">{{ rmmarkdown .Post.Name }}</a>
diff --git a/templates/settings.html b/templates/settings.html
index 43091e5..badbaa0 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -125,7 +125,13 @@
         <input type="checkbox" name="hideInstanceNames" {{ if .HideInstanceNames }}checked{{end}}>
       </div>
       <div>
-        <label>lemmy: {{ .Site.Version }}<br>mlmym: {{ .Version }}</label>
+        <label>
+          hide thumbnails
+        </label>
+        <input type="checkbox" name="hideThumbnails" {{ if .HideThumbnails }}checked{{end}}>
+      </div>
+      <div>
+        <label>lemmy: {{ .Site.Version }}<br><a href="https://github.com/rystaf/mlmym">mlmym</a>: {{ .Version }}</label>
         <input type="submit" value="save">
         {{ if .XHR }}<input id="closesettings" type="submit" value="close">{{ end }}
       </div>

From d8292bb9bea7ed6e689639d28db9f44655f839f3 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Tue, 8 Aug 2023 17:57:47 -0400
Subject: [PATCH 31/32] fix thumbnail default

---
 routes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index 5eb9c94..0503178 100644
--- a/routes.go
+++ b/routes.go
@@ -270,7 +270,7 @@ func Initialize(Host string, r *http.Request) (State, error) {
 	if hide := getCookie(r, "HideThumbnails"); hide != "" {
 		state.HideThumbnails = hide != "0"
 	} else {
-		state.HideThumbnails = os.Getenv("HIDE_THUMBNAILS") != "0"
+		state.HideThumbnails = os.Getenv("HIDE_THUMBNAILS") != ""
 	}
 	state.ParseQuery(r.URL.RawQuery)
 	if state.Sort == "" {

From a96b5b1cd20801b79455835db995d8fa10509215 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Tue, 8 Aug 2023 18:03:03 -0400
Subject: [PATCH 32/32] fix dark default

---
 routes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes.go b/routes.go
index 0503178..d72d653 100644
--- a/routes.go
+++ b/routes.go
@@ -263,7 +263,7 @@ func Initialize(Host string, r *http.Request) (State, error) {
 	if dark := getCookie(r, "Dark"); dark != "" {
 		state.Dark = dark != "0"
 	} else {
-		state.Dark = os.Getenv("DARK") != "0"
+		state.Dark = os.Getenv("DARK") != ""
 	}
 	state.ShowNSFW = getCookie(r, "ShowNSFW") != ""
 	state.HideInstanceNames = getCookie(r, "HideInstanceNames") != ""