feat: better than nothing HTMX error handling

Author: ItsNotGoodName

README.md

@@ -227,7 +227,6 @@ make dev-web
 - Reload on config change
 - Add [Apprise](https://github.com/caronc/apprise) endpoint
 - HTTP and SMTP auth
-- Better HTTP error handling with [HTMX](https://htmx.org/)
 - CRUD endpoints and rules
 - SQLite full text search
 - Read mailbox files

web/controllers/controllers.go

@@ -114,3 +114,7 @@ func Trim(c *fiber.Ctx, cc *core.Context) error {
 	c.Set("HX-Trigger", "trimmed")
 	return c.SendStatus(http.StatusNoContent)
 }
+
+func SomethingWentWrong(c *fiber.Ctx) error {
+	return c.Render("something-went-wrong", nil)
+}

web/controllers/rules.go

@@ -20,7 +20,7 @@ func Rules(c *fiber.Ctx, cc *core.Context) error {
 	})
 }
 
-func RuleEnable(c *fiber.Ctx, cc *core.Context, id int64) error {
+func RulePEnableForm(c *fiber.Ctx, cc *core.Context, id int64) error {
 	// Request
 	enable := c.FormValue("enable") == "on"
 

web/controllers/utils.go

@@ -9,9 +9,4 @@ func checkbox(c *fiber.Ctx, key string) bool {
 	}
 
 	return true
-
-}
-
-func partial(c *fiber.Ctx, name string, bind interface{}) error {
-	return c.Render(name, bind, "")
 }

web/helpers/helpers.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/build"
 	"github.com/ItsNotGoodName/smtpbridge/web"
 	"github.com/dustin/go-humanize"
+	"github.com/gofiber/fiber/v2"
 )
 
 var Map template.FuncMap = template.FuncMap{
@@ -41,3 +42,8 @@ var Map template.FuncMap = template.FuncMap{
 		return template.URL(Query(queries, vals...))
 	},
 }
+
+func IsHTMXRequest(c *fiber.Ctx) bool {
+	_, isHTMXRequest := c.GetReqHeaders()["Hx-Request"]
+	return isHTMXRequest
+}

web/http/http.go

@@ -29,6 +29,13 @@ func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit in
 		Views:       views,
 		ViewsLayout: "layouts/index",
 		BodyLimit:   bodyLimit,
+		ErrorHandler: func(c *fiber.Ctx, err error) error {
+			if helpers.IsHTMXRequest(c) {
+				c.Set("HX-Redirect", "/something-went-wrong")
+			}
+
+			return fiber.DefaultErrorHandler(c, err)
+		},
 	})
 
 	// Middleware

web/http/routes.go

@@ -41,13 +41,13 @@ func routes(http *fiber.App, app core.App, retentionPolicy models.RetentionPolic
 	http.Route("/rules", func(http fiber.Router) {
 		http.Get("/", middleware.App(app, controllers.Rules))
 		http.Route("/:id", func(http fiber.Router) {
-			http.Post("/enable", middleware.AppID(app, controllers.RuleEnable))
+			http.Post("/enable", middleware.AppID(app, controllers.RulePEnableForm))
 		})
 	})
 
 	http.Post("/send", middleware.App(app, controllers.Send))
 	http.Post("/vacuum", middleware.App(app, controllers.Vacuum))
 	http.Post("/trim", middleware.App(app, controllers.Trim))
 	http.Group("/files", controllers.Files(app))
-
+	http.Get("/something-went-wrong", controllers.SomethingWentWrong)
 }

web/views/something-went-wrong.html

@@ -0,0 +1,9 @@
+{{template "partials/header" .}}
+
+<main class="container">
+  <section>
+    Something went wrong.
+  </section>
+</main>
+
+{{template "partials/footer" .}}