refactor: envelope new with struct

Author: ItsNotGoodName

internal/envelope/message.go

@@ -7,15 +7,24 @@ import (
 	"github.com/samber/lo"
 )
 
-func NewMessage(from string, to []string, subject, text, html string, date time.Time) *Message {
+type CreateMessage struct {
+	Date    time.Time
+	Subject string
+	From    string
+	To      []string
+	Text    string
+	HTML    string
+}
+
+func NewMessage(r CreateMessage) *Message {
 	return &Message{
-		From:      from,
-		To:        lo.Uniq(to),
+		From:      r.From,
+		To:        lo.Uniq(r.To),
 		CreatedAt: time.Now(),
-		Subject:   subject,
-		Text:      text,
-		HTML:      html,
-		Date:      date,
+		Subject:   r.Subject,
+		Text:      r.Text,
+		HTML:      r.HTML,
+		Date:      r.Date,
 	}
 }
 

internal/files/files.go

@@ -16,6 +16,10 @@ func CreateFile(cc *core.Context, datt envelope.DataAttachment) error {
 
 func GetFileData(cc *core.Context, att *envelope.Attachment) (envelope.DataAttachment, error) {
 	data, err := os.ReadFile(filePath(cc, att))
+	if err != nil {
+		return envelope.DataAttachment{}, err
+	}
+
 	return envelope.DataAttachment{Attachment: att, Data: data}, err
 }
 

internal/procs/endpoint.go

@@ -39,7 +39,12 @@ func EndpointTest(cc *core.Context, id int64) error {
 		return err
 	}
 
-	env := envelope.Envelope{Message: envelope.NewMessage("", []string{}, "Test Subject", "Test Text", "", time.Now())}
+	msg := envelope.NewMessage(envelope.CreateMessage{
+		Subject: "Test Subject",
+		Text:    "Test Text",
+		Date:    time.Now(),
+	})
+	env := envelope.Envelope{Message: msg}
 
 	return parsedEnd.Send(cc, env)
 }

smtp/backend.go

@@ -91,7 +91,14 @@ func (s *session) Data(r io.Reader) error {
 	for _, a := range e.Attachments {
 		datts = append(datts, envelope.NewDataAttachment(a.FileName, a.Content))
 	}
-	msg := envelope.NewMessage(s.from, to, e.GetHeader("Subject"), e.Text, e.HTML, date)
+	msg := envelope.NewMessage(envelope.CreateMessage{
+		From:    s.from,
+		To:      to,
+		Subject: e.GetHeader("Subject"),
+		Text:    e.Text,
+		HTML:    e.HTML,
+		Date:    date,
+	})
 
 	// Create envelope
 	id, err := procs.EnvelopeCreate(s.ctx, msg, datts)

web/controllers/envelopes.go

@@ -110,14 +110,13 @@ func EnvelopeNewPost(c *fiber.Ctx, cc *core.Context) error {
 		datts = append(datts, envelope.NewDataAttachment(fh.Filename, data))
 	}
 
-	msg := envelope.NewMessage(
-		c.FormValue("from"),
-		strings.Split(c.FormValue("to"), ","),
-		c.FormValue("subject"),
-		c.FormValue("body"),
-		"",
-		time.Now(),
-	)
+	msg := envelope.NewMessage(envelope.CreateMessage{
+		From:    c.FormValue("from"),
+		To:      strings.Split(c.FormValue("to"), ","),
+		Subject: c.FormValue("subject"),
+		Text:    c.FormValue("body"),
+		Date:    time.Now(),
+	})
 
 	// Execute
 	_, err = procs.EnvelopeCreate(cc, msg, datts)