Gorilla is fully operational

- All mailbox actions working: index, list, show, html, source and delete - Cleaned up extra files from Revel - Took a guess at install process for README.md This closes #4
2025-12-19 02:27:03 +00:00 · 2012-10-21 13:42:34 -07:00
parent 71bb52a64a
commit 2c7419c661
14 changed files with 110 additions and 200 deletions
--- a/web/mailbox_controller.go
+++ b/web/mailbox_controller.go
@@ -2,6 +2,8 @@ package web

 import (
 	"github.com/jhillyerd/inbucket"
+	"html/template"
+	"io"
 	"net/http"
 )

@@ -44,124 +46,139 @@ func MailboxList(w http.ResponseWriter, req *http.Request, ctx *Context) (err er
 	})
 }

-/*
-func (c Mailbox) Show(name string, id string) rev.Result {
 func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
-	c.Validation.Required(name).Message("Account name is required")
-	c.Validation.Required(id).Message("Message ID is required")
-
-	if c.Validation.HasErrors() {
-		c.Validation.Keep()
-		c.FlashParams()
-		return c.Redirect(Application.Index)
+	name := ctx.Vars["name"]
+	id := ctx.Vars["id"]
+	if len(name) == 0 {
+		ctx.Session.AddFlash("Account name is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
+	}
+	if len(id) == 0 {
+		ctx.Session.AddFlash("Message ID is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
 	}

-	ds := inbucket.NewDataStore()
-	mb, err := ds.MailboxFor(name)
+	mb, err := ctx.DataStore.MailboxFor(name)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	message, err := mb.GetMessage(id)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	_, mime, err := message.ReadBody()
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	body := template.HTML(inbucket.TextToHtml(mime.Text))
 	htmlAvailable := mime.Html != ""

-	c.Response.Out.Header().Set("Expires", "-1")
-	return c.Render(name, message, body, htmlAvailable)
+	return RenderPartial("mailbox/_show.html", w, map[string]interface{}{
+		"ctx":           ctx,
+		"name":          name,
+		"message":       message,
+		"body":          body,
+		"htmlAvailable": htmlAvailable,
+	})
 }

-func (c Mailbox) Delete(name string, id string) rev.Result {
-func MailboxDelete(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
-	c.Validation.Required(name).Message("Account name is required")
-	c.Validation.Required(id).Message("Message ID is required")
-
-	if c.Validation.HasErrors() {
-		c.Validation.Keep()
-		c.FlashParams()
-		return c.Redirect(Application.Index)
-	}
-
-	ds := inbucket.NewDataStore()
-	mb, err := ds.MailboxFor(name)
-	if err != nil {
-		return c.RenderError(err)
-	}
-	message, err := mb.GetMessage(id)
-	if err != nil {
-		return c.RenderError(err)
-	}
-	err = message.Delete()
-	if err != nil {
-		return c.RenderError(err)
-	}
-	c.Response.Out.Header().Set("Expires", "-1")
-	return c.RenderText("OK")
-}
-
-func (c Mailbox) Html(name string, id string) rev.Result {
 func MailboxHtml(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
-	c.Validation.Required(name).Message("Account name is required")
-	c.Validation.Required(id).Message("Message ID is required")
-
-	if c.Validation.HasErrors() {
-		c.Validation.Keep()
-		c.FlashParams()
-		return c.Redirect(Application.Index)
+	name := ctx.Vars["name"]
+	id := ctx.Vars["id"]
+	if len(name) == 0 {
+		ctx.Session.AddFlash("Account name is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
+	}
+	if len(id) == 0 {
+		ctx.Session.AddFlash("Message ID is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
 	}

-	ds := inbucket.NewDataStore()
-	mb, err := ds.MailboxFor(name)
+	mb, err := ctx.DataStore.MailboxFor(name)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	message, err := mb.GetMessage(id)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	_, mime, err := message.ReadBody()
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
-	// Mark as safe to render HTML
-	// TODO: It is not really safe to render, need to sanitize.
-	body := template.HTML(mime.Html)

-	c.Response.Out.Header().Set("Expires", "-1")
-	return c.Render(name, message, body)
+	return RenderPartial("mailbox/_html.html", w, map[string]interface{}{
+		"ctx":     ctx,
+		"name":    name,
+		"message": message,
+		// TODO: It is not really safe to render, need to sanitize.
+		"body": template.HTML(mime.Html),
+	})
 }

-func (c Mailbox) Source(name string, id string) rev.Result {
 func MailboxSource(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
-	c.Validation.Required(name).Message("Account name is required")
-	c.Validation.Required(id).Message("Message ID is required")
-
-	if c.Validation.HasErrors() {
-		c.Validation.Keep()
-		c.FlashParams()
-		return c.Redirect(Application.Index)
+	name := ctx.Vars["name"]
+	id := ctx.Vars["id"]
+	if len(name) == 0 {
+		ctx.Session.AddFlash("Account name is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
+	}
+	if len(id) == 0 {
+		ctx.Session.AddFlash("Message ID is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
 	}

-	ds := inbucket.NewDataStore()
-	mb, err := ds.MailboxFor(name)
+	mb, err := ctx.DataStore.MailboxFor(name)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	message, err := mb.GetMessage(id)
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}
 	raw, err := message.ReadRaw()
 	if err != nil {
-		return c.RenderError(err)
+		return err
 	}

-	c.Response.Out.Header().Set("Expires", "-1")
-	return c.RenderText(*raw)
+	w.Header().Set("Content-Type", "text/plain")
+	io.WriteString(w, *raw)
+	return nil
+}
+
+func MailboxDelete(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
+	name := ctx.Vars["name"]
+	id := ctx.Vars["id"]
+	if len(name) == 0 {
+		ctx.Session.AddFlash("Account name is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
+	}
+	if len(id) == 0 {
+		ctx.Session.AddFlash("Message ID is required", "errors")
+		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
+		return nil
+	}
+
+	mb, err := ctx.DataStore.MailboxFor(name)
+	if err != nil {
+		return err
+	}
+	message, err := mb.GetMessage(id)
+	if err != nil {
+		return err
+	}
+	err = message.Delete()
+	if err != nil {
+		return err
+	}
+	w.Header().Set("Content-Type", "text/plain")
+	io.WriteString(w, "OK")
+	return nil
 }
-*/