From d2ce5c34c4864808c6c8c442f8f518e1cd151f77 Mon Sep 17 00:00:00 2001
From: mikestefanello <mike.stefanello@gmail.com>
Date: Sun, 19 Dec 2021 16:34:19 -0500
Subject: [PATCH] Minor cleanup.

---
 controller/controller.go | 4 ++--
 services/container.go    | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/controller/controller.go b/controller/controller.go
index 53a0c6e..e6f1a85 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -73,7 +73,7 @@ func (t *Controller) RenderPage(c echo.Context, p Page) error {
 	}
 
 	// Execute the parsed templates to render the page
-	buf, err := t.executeTemplates(c, p)
+	buf, err := t.executeTemplates(p)
 	if err != nil {
 		c.Logger().Errorf("failed to execute templates: %v", err)
 		return echo.NewHTTPError(http.StatusInternalServerError, "Internal server error")
@@ -164,7 +164,7 @@ func (t *Controller) parsePageTemplates(p Page) error {
 }
 
 // executeTemplates executes the cached templates belonging to Page and renders the Page within them
-func (t *Controller) executeTemplates(c echo.Context, p Page) (*bytes.Buffer, error) {
+func (t *Controller) executeTemplates(p Page) (*bytes.Buffer, error) {
 	tmpl, ok := templates.Load(p.Name)
 	if !ok {
 		return nil, errors.New("uncached page template requested")
diff --git a/services/container.go b/services/container.go
index 3f955a5..c48eb0f 100644
--- a/services/container.go
+++ b/services/container.go
@@ -5,8 +5,6 @@ import (
 	"database/sql"
 	"fmt"
 
-	"goweb/mail"
-
 	"entgo.io/ent/dialect"
 	entsql "entgo.io/ent/dialect/sql"
 	"github.com/eko/gocache/v2/cache"
@@ -27,7 +25,7 @@ type Container struct {
 	cacheClient *redis.Client
 	Database    *sql.DB
 	ORM         *ent.Client
-	Mail        *mail.Client
+	Mail        *MailClient
 	Auth        *AuthClient
 }
 
@@ -137,7 +135,7 @@ func (c *Container) initORM() {
 
 func (c *Container) initMail() {
 	var err error
-	c.Mail, err = mail.NewClient(c.Config)
+	c.Mail, err = NewMailClient(c.Config)
 	if err != nil {
 		panic(fmt.Sprintf("failed to create mail client: %v", err))
 	}