2 files changed, 16 insertions(+), 69 deletions(-)

M email/send.go
M email/worker.go

@@ 6,7 6,6 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/mail"
 	"github.com/emersion/go-sasl"


@@ 132,48 131,3 @@ func Send(ctx context.Context, msg io.Reader, rcpts []string) error {
 	}
 	return err
 }
-
-// Sends a raw email. Blocks until it's sent or an error occurs.
-func SendRaw(ctx context.Context, email *message.Entity, to []string) error {
-	worker := ForContext(ctx)
-
-	if worker.client == nil || worker.client.Noop() != nil {
-		worker.client = nil
-
-		c, sender, err := mailSetup(ctx)
-		if err != nil {
-			return err
-		}
-		worker.client = c
-		worker.sender = sender
-	}
-
-	var writer io.WriteCloser
-	var err error
-
-	err = worker.client.Mail(worker.sender.Address, nil)
-	if err != nil {
-		goto end
-	}
-	for _, rcpt := range to {
-		if err := worker.client.Rcpt(rcpt, nil); err != nil {
-			return err
-		}
-	}
-	writer, err = worker.client.Data()
-	if err != nil {
-		goto end
-	}
-	err = email.WriteTo(writer)
-	if err != nil {
-		writer.Close()
-		goto end
-	}
-	err = writer.Close()
-end:
-	if err != nil {
-		worker.client.Close()
-		worker.client = nil
-	}
-	return err
-}

@@ 15,7 15,6 @@ import (
 	"git.sr.ht/~sircmpwn/core-go/config"
 	work "git.sr.ht/~sircmpwn/dowork"
 	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
 	"github.com/emersion/go-message/mail"
 	"github.com/emersion/go-pgpmail"


@@ 38,20 37,26 @@ type workerContext struct {
 // Returns a task which will send this email for the work queue. If the caller
 // does not need to customize the task parameters, the Enqueue function may be
 // more desirable.
-func NewTask(msg *bytes.Buffer, rcpts []string) *work.Task {
+func NewTask(data []byte, rcpts []string) *work.Task {
 	return work.NewTask(func(ctx context.Context) error {
-		err := Send(ctx, msg, rcpts)
+		err := Send(ctx, bytes.NewReader(data), rcpts)
 		if err != nil {
 			log.Printf("Error sending mail: %v", err)
 		}
 		return err
 	}).Retries(10).After(func(ctx context.Context, task *work.Task) {
+		var to string
+		if len(rcpts) == 1 {
+			to = rcpts[0]
+		} else {
+			to = fmt.Sprintf("%d recipients", len(rcpts))
+		}
 		if task.Result() == nil {
 			log.Printf("Mail to %s sent after %d attempts",
-				strings.Join(rcpts, ", "), task.Attempts())
+				to, task.Attempts())
 		} else {
 			log.Printf("Mail to %s failed after %d attempts: %v",
-				strings.Join(rcpts, ", "), task.Attempts(), task.Result())
+				to, task.Attempts(), task.Result())
 		}
 	})
 }


@@ 170,27 175,15 @@ func EnqueueStd(ctx context.Context, header mail.Header,
 		log.Fatal(err)
 	}
 
-	return queue.Enqueue(NewTask(&buf, rcpts))
+	return queue.Enqueue(NewTask(buf.Bytes(), rcpts))
 }
 
-func EnqueueRaw(ctx context.Context, email *message.Entity, to []string) error {
+func EnqueueRaw(ctx context.Context, data []byte, to []string) error {
+	if len(to) == 0 {
+		panic("recipients list cannot be empty")
+	}
 	queue := ForContext(ctx).queue
-	return queue.Enqueue(work.NewTask(func(ctx context.Context) error {
-		err := SendRaw(ctx, email, to)
-		if err != nil {
-			log.Printf("Error sending mail: %v", err)
-		}
-		return err
-	}).Retries(10).After(func(ctx context.Context, task *work.Task) {
-		msgID := email.Header.Get("Message-ID")
-		if task.Result() == nil {
-			log.Printf("Mail %s sent to %d recipients after %d attempts",
-				msgID, len(to), task.Attempts())
-		} else {
-			log.Printf("Mail %s failed after %d attempts: %v",
-				msgID, task.Attempts(), task.Result())
-		}
-	}))
+	return queue.Enqueue(NewTask(data, to))
 }
 
 type nopWriteCloser struct {