From 4f77234854791178365fddeb71b9dca4b4c1adc2 Mon Sep 17 00:00:00 2001
From: Ryan Stafford <ryan@nanorex.net>
Date: Fri, 30 Jun 2023 22:10:24 -0400
Subject: [PATCH] lazy loading, autofocus, cf ip

---
 routes.go              | 22 ++++++++++++----------
 state.go               |  2 +-
 templates/menu.html    |  2 +-
 templates/root.html    |  2 +-
 templates/sidebar.html |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/routes.go b/routes.go
index c041a1c..a59d7c2 100644
--- a/routes.go
+++ b/routes.go
@@ -110,6 +110,7 @@ var funcMap = template.FuncMap{
 			panic(err)
 		}
 		converted := strings.Replace(buf.String(), `href="https://`+host, `href="/`+host, -1)
+		converted = strings.Replace(converted, `<img `, `<img loading="lazy" `, -1)
 		return template.HTML(converted)
 	},
 	"contains": strings.Contains,
@@ -126,7 +127,11 @@ func Initialize(Host string, r *http.Request) (State, error) {
 		Status: http.StatusOK,
 	}
 	state.ParseQuery(r.URL.RawQuery)
-	client := http.Client{Transport: NewAddHeaderTransport(r.RemoteAddr)}
+	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://"+state.Host, &client)
 	if err != nil {
 		fmt.Println(err)
@@ -237,21 +242,19 @@ func PostRoot(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		w.Write([]byte("500 - Server Error"))
 		return
 	}
-
-	var dest url.URL
+	input := r.FormValue("destination")
 	re := regexp.MustCompile(`^(([a-zA-Z]{1})|([a-zA-Z]{1}[a-zA-Z]{1})|([a-zA-Z]{1}[0-9]{1})|([0-9]{1}[a-zA-Z]{1})|([a-zA-Z0-9][a-zA-Z0-9-_]{1,61}[a-zA-Z0-9]))\.([a-zA-Z]{2,6}|[a-zA-Z0-9-]{2,30}\.[a-zA-Z
- ]{2,3})$`)
-	if re.MatchString(r.FormValue("destination")) {
-		dest.Host = r.FormValue("destination")
-	} else if u, err := url.Parse(r.FormValue("destination")); err == nil && u.Host != "" {
-		dest.Parse(u.String())
+ ]{2,3})`)
+	if re.MatchString(input) {
+		input = "https://" + input
 	}
+	dest, err := url.Parse(input)
 	if dest.Host != "" && IsLemmy(dest.Host) {
 		redirectUrl := "/" + dest.Host + dest.Path
 		if dest.RawQuery != "" {
 			redirectUrl = redirectUrl + "?" + dest.RawQuery
 		}
-		http.Redirect(w, r, redirectUrl, 301)
+		http.Redirect(w, r, redirectUrl, 302)
 		return
 	}
 	data["Error"] = "Invalid destination"
@@ -548,7 +551,6 @@ func Search(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 			state.SearchType = "Comments"
 		case "Communities":
 			state.SearchType = "Communities"
-			state.Listing = "All"
 		}
 	}
 	state.Search(state.SearchType)
diff --git a/state.go b/state.go
index 29b0960..512e294 100644
--- a/state.go
+++ b/state.go
@@ -473,7 +473,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(state.Listing)),
+		ListingType: types.NewOptional(types.ListingType("All")),
 		Type:        types.NewOptional(types.SearchType(searchtype)),
 		Limit:       types.NewOptional(int64(25)),
 		Page:        types.NewOptional(int64(state.Page)),
diff --git a/templates/menu.html b/templates/menu.html
index 83a935a..46657a6 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -11,7 +11,7 @@
       <span>-</span>
       <a {{ if eq .Sort "TopAll"}}class="selected"{{end}} href="{{ .SortBy "TopAll"}}">all time</a>
       {{ end }}
-      {{ if and (ne .SearchType "Communities") (not (and .Session (not .Posts) (not .Community) (and .Listing "Subscribed"))) }}
+      {{ if and (not .SearchType ) (not (and .Session (not .Posts) (not .Community) (and .Listing "Subscribed"))) }}
       popular in:
       <a href="{{ .ListBy "All"}}" {{if eq .Listing "All"}}class="selected"{{end}}>Everywhere</a>
       <span>-</span>
diff --git a/templates/root.html b/templates/root.html
index f111a90..749b411 100644
--- a/templates/root.html
+++ b/templates/root.html
@@ -12,7 +12,7 @@
     <form class="root" method="POST">
       <label>Enter a <a href="https://join-lemmy.org/instances" target="blank_">lemmy</a> domain or url
         <div>
-          <input type="text" name="destination">
+          <input type="text" name="destination" autofocus>
           <input type="submit" value="GO">
         </div>
       </label>
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 41279c2..449fcf8 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -1,7 +1,7 @@
 {{ $host := .Host }}
     <div class="{{ if .User }}user {{end}}side">
 
-{{ if eq .Query "" }}
+{{ if not .SearchType }}
       <form method="GET" action="/{{.Host}}/search">
         <input type="text" placeholder="search" name="q" value="{{.Query}}">
   {{ if .User }}