refactor(web): rename variables and functions

Author: ItsNotGoodName

web/controllers/controllers.go

@@ -71,7 +71,7 @@ func Vacuum(c *fiber.Ctx, cc *core.Context) error {
 	}
 
 	// Response
-	c.Set("HX-Trigger", "databaseVacuum")
+	c.Set("HX-Trigger", "vacuumed")
 	return c.SendStatus(http.StatusNoContent)
 }
 
@@ -83,6 +83,6 @@ func Trim(c *fiber.Ctx, cc *core.Context) error {
 	}
 
 	// Response
-	c.Set("HX-Trigger", "trim")
+	c.Set("HX-Trigger", "trimmed")
 	return c.SendStatus(http.StatusNoContent)
 }

web/controllers/envelopes.go

@@ -148,6 +148,6 @@ func EnvelopesDelete(c *fiber.Ctx, cc *core.Context) error {
 	}
 
 	// Response
-	c.Set("HX-Trigger", "deleteEnvelopes")
+	c.Set("HX-Trigger", "deletedEnvelopes")
 	return c.SendStatus(http.StatusNoContent)
 }

web/controllers/partials.go web/controllers/p.go

@@ -17,9 +17,9 @@ func PRecentEnvelopesTable(c *fiber.Ctx, cc *core.Context) error {
 	}
 
 	// Response
-	return c.Render("p/recent-envelopes-table", fiber.Map{
+	return partial(c, "p/recent-envelopes-table", fiber.Map{
 		"Messages": messages.Messages,
-	}, "")
+	})
 }
 
 func PStorageTable(c *fiber.Ctx, cc *core.Context) error {
@@ -30,7 +30,7 @@ func PStorageTable(c *fiber.Ctx, cc *core.Context) error {
 	}
 
 	// Response
-	return c.Render("p/storage-table", fiber.Map{
+	return partial(c, "p/storage-table", fiber.Map{
 		"Storage": storage,
-	}, "")
+	})
 }

web/controllers/rules.go

@@ -31,5 +31,5 @@ func RuleEnable(c *fiber.Ctx, cc *core.Context, id int64) error {
 	}
 
 	// Response
-	return c.Render("p/rule-enable-form", rule, "")
+	return partial(c, "p/rule-enable-form", rule)
 }

web/controllers/utils.go

@@ -11,3 +11,7 @@ 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/http.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
+// TODO: handle responses for HTMX requests
 func Error(c *fiber.Ctx, err error, code ...int) error {
 	if len(code) == 1 {
 		return c.Status(code[0]).Render("500", fiber.Map{"Error": err})

web/views/p/recent-envelopes-table.html

@@ -1,4 +1,5 @@
-<table hx-trigger="every 5s, deleteEnvelopes from:body" hx-get="/p/recent-envelopes-table" hx-swap="outerHTML">
+<table hx-trigger="every 5s, deletedEnvelopes from:body, trimmed from:body" hx-get="/p/recent-envelopes-table"
+  hx-swap="outerHTML">
   <tbody>
     {{range $val := .Messages}}
     <tr>

web/views/p/storage-table.html

@@ -1,4 +1,4 @@
-<table hx-trigger="every 5s, databaseVacuum from:body, trim from:body, deleteEnvelopes from:body"
+<table hx-trigger="every 5s, vacuumed from:body, trimmed from:body, deletedEnvelopes from:body"
   hx-get="/p/storage-table" hx-swap="outerHTML">
   <tbody>
     <tr>