Swap out email.ServerError() for email.Send()

2 files changed, 12 insertions, 8 deletions

diff --git a/src/email/email.go b/src/email/email.go
index 33b30e0..a1f7f0b 100644
--- a/src/email/email.go
+++ b/src/email/email.go
@@ -6,6 +6,8 @@ import (
 	"crypto/tls"
 	"fmt"
 	"math/rand/v2"
+	"log"
+	"errors"
 	"net/smtp"
 	"strconv"
 	"time"
@@ -29,14 +31,20 @@ Message-ID: <%s>
 
 %s`
 
-func ServerError(fault error) error {
+func Send(subject, body string) {
+	if err := send(subject, body); err != nil {
+		log.Print(err)
+	}
+}
+
+func send(subject, body string) error {
 	if Config.Disabled {
-		return fault
+		return errors.New(body)
 	}
 
 	msgid := strconv.FormatInt(rand.Int64(), 10) + "@" + Config.Host
 	msg := fmt.Sprintf(emailTemplate, Config.FromAddr, Config.ToAddr,
-		"Error Report", time.Now().Format(time.RFC1123Z), msgid, fault)
+		subject, time.Now().Format(time.RFC1123Z), msgid, body)
 
 	tlsConfig := &tls.Config{
 		InsecureSkipVerify: false,
diff --git a/src/http.go b/src/http.go
index b785bca..b0d5bcd 100644
--- a/src/http.go
+++ b/src/http.go
@@ -179,11 +179,7 @@ func setUserLanguage(w http.ResponseWriter, r *http.Request) {
 
 func throwError(status int, err error, w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(status)
-	go func() {
-		if err := email.ServerError(err); err != nil {
-			log.Println(err)
-		}
-	}()
+	go email.Send("Server Error", err.Error())
 	errorTmpl.Execute(w, struct {
 		Code int
 		Msg  string