nandi/glean · 9ed5b26

modified internal/server/articles_handler.go +1 -1 Viewed

@@ -144,7 +144,7 @@ func (s Server) handleArticles(w http.ResponseWriter, r http.Request) {
144	144	}
145	145	}
146	146
147		- if r.Header.Get("HX-Request") == htmxRequestHeader {
	147	+ if isHXRequest(r) {
148	148	s.render(w, r, "articles-content.html", data)
149	149	return
150	150	}

  		}
  	}
--	if r.Header.Get("HX-Request") == htmxRequestHeader {
++	if isHXRequest(r) {
  		s.render(w, r, "articles-content.html", data)
  		return
  	}

modified internal/server/digest_handler.go +1 -1 Viewed

@@ -282,6 +282,6 @@ func (s Server) handleDigestMarkRead(w http.ResponseWriter, r http.Request) {
282	282	consumed: true,
283	283	})
284	284
285		- w.Header().Set("HX-Refresh", "true")
	285	+ w.Header().Set(HXRefresh, "true")
286	286	s.renderDigest(w, &digestCtx{Consumed: true})
287	287	}

  		consumed: true,
  	})
--	w.Header().Set("HX-Refresh", "true")
++	w.Header().Set(HXRefresh, "true")
  	s.renderDigest(w, &digestCtx{Consumed: true})
  }

modified internal/server/feeds_handler.go +2 -2 Viewed

@@ -332,7 +332,7 @@ func (s Server) handleClearAllSubscriptions(w http.ResponseWriter, r http.Requ
332	332	return
333	333	}
334	334
335		- w.Header().Set("HX-Redirect", "/feeds")
	335	+ w.Header().Set(HXRedirect, "/feeds")
336	336	w.WriteHeader(http.StatusOK)
337	337	}
338	338
@@ -416,7 +416,7 @@ func (s Server) handleOPMLUpload(w http.ResponseWriter, r http.Request) {
416	416	}
417	417	}()
418	418
419		- w.Header().Set("HX-Redirect", "/feeds")
	419	+ w.Header().Set(HXRedirect, "/feeds")
420	420	w.WriteHeader(http.StatusOK)
421	421	}
422	422

  		return
  	}
--	w.Header().Set("HX-Redirect", "/feeds")
++	w.Header().Set(HXRedirect, "/feeds")
  	w.WriteHeader(http.StatusOK)
  }
  		}
  	}()
--	w.Header().Set("HX-Redirect", "/feeds")
++	w.Header().Set(HXRedirect, "/feeds")
  	w.WriteHeader(http.StatusOK)
  }

added internal/server/htmx.go +13 -0 Viewed

new file mode 100644
@@ -0,0 +1,13 @@
	1	+package server
	2	+
	3	+import "net/http"
	4	+
	5	+const (
	6	+ HXRequest = "HX-Request"
	7	+ HXRedirect = "HX-Redirect"
	8	+ HXRefresh = "HX-Refresh"
	9	+)
	10	+
	11	+func isHXRequest(r *http.Request) bool {
	12	+ return r.Header.Get(HXRequest) == "true"
	13	+}

++package server
++
++import "net/http"
++
++const (
++	HXRequest  = "HX-Request"
++	HXRedirect = "HX-Redirect"
++	HXRefresh  = "HX-Refresh"
++)
++
++func isHXRequest(r *http.Request) bool {
++	return r.Header.Get(HXRequest) == "true"
++}

modified internal/server/middleware.go +1 -1 Viewed

@@ -73,7 +73,7 @@ func (s *Server) csrfMiddleware(next http.Handler) http.Handler {
73	73	return
74	74	}
75	75
76		- if r.Header.Get("HX-Request") == htmxRequestHeader {
	76	+ if isHXRequest(r) {
77	77	origin := r.Header.Get("Origin")
78	78	if origin != "" && !sameOrigin(origin, r.Host) {
79	79	http.Error(w, "forbidden", http.StatusForbidden)

  			return
  		}
--		if r.Header.Get("HX-Request") == htmxRequestHeader {
++		if isHXRequest(r) {
  			origin := r.Header.Get("Origin")
  			if origin != "" && !sameOrigin(origin, r.Host) {
  				http.Error(w, "forbidden", http.StatusForbidden)

modified internal/server/server.go +2 -3 Viewed

@@ -34,7 +34,6 @@ import (
34	34	"pkg.rbrt.fr/glean/static"
35	35	)
36	36
37		-const htmxRequestHeader = "true"
38	37
39	38	var oauthScopes = []string{
40	39	"atproto",
@@ -574,7 +573,7 @@ func (s Server) handleNotFound(w http.ResponseWriter, r http.Request) {
574	573	}
575	574
576	575	func (s Server) renderError(w http.ResponseWriter, r http.Request, code int, title, message string) {
577		- if r.Header.Get("HX-Request") == htmxRequestHeader {
	576	+ if isHXRequest(r) {
578	577	w.WriteHeader(code)
579	578	w.Write([]byte(message))
580	579	return
@@ -597,7 +596,7 @@ func (s Server) render(w http.ResponseWriter, r http.Request, name string, dat
597	596	data["CSRFToken"] = cookie.Value
598	597	}
599	598
600		- if r.Header.Get("HX-Request") == htmxRequestHeader {
	599	+ if isHXRequest(r) {
601	600	if err := s.templates.ExecuteTemplate(w, name, data); err != nil {
602	601	s.logger.Error("template error", "error", err, "template", name)
603	602	http.Error(w, err.Error(), http.StatusInternalServerError)

  	"pkg.rbrt.fr/glean/static"
  )
--const htmxRequestHeader = "true"
  var oauthScopes = []string{
  	"atproto",
  }
  func (s *Server) renderError(w http.ResponseWriter, r *http.Request, code int, title, message string) {
--	if r.Header.Get("HX-Request") == htmxRequestHeader {
++	if isHXRequest(r) {
  		w.WriteHeader(code)
  		w.Write([]byte(message))
  		return
  		data["CSRFToken"] = cookie.Value
  	}
--	if r.Header.Get("HX-Request") == htmxRequestHeader {
++	if isHXRequest(r) {
  		if err := s.templates.ExecuteTemplate(w, name, data); err != nil {
  			s.logger.Error("template error", "error", err, "template", name)
  			http.Error(w, err.Error(), http.StatusInternalServerError)

modified internal/server/settings_handler.go +1 -1 Viewed

@@ -50,7 +50,7 @@ func (s Server) handleToggleLanguage(w http.ResponseWriter, r http.Request) {
50	50	return
51	51	}
52	52
53		- w.Header().Set("HX-Redirect", "/profile/"+user.DID)
	53	+ w.Header().Set(HXRedirect, "/profile/"+user.DID)
54	54	w.WriteHeader(http.StatusOK)
55	55	}
56	56

  		return
  	}
--	w.Header().Set("HX-Redirect", "/profile/"+user.DID)
++	w.Header().Set(HXRedirect, "/profile/"+user.DID)
  	w.WriteHeader(http.StatusOK)
  }

Extract HTMX constants and helper functionUnverified