From b0bf09b98fc038c1bc9921d568c06260b7448a15 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 15 May 2019 19:41:21 -0400
Subject: Copy sent emails to the Sent folder

Or rather, to a user-specified folder
---
 worker/types/messages.go | 20 ++++++++++++++++++++
 worker/types/worker.go   | 16 ++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'worker/types')

diff --git a/worker/types/messages.go b/worker/types/messages.go
index e97ae02..8687b5e 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -12,10 +12,13 @@ import (
 
 type WorkerMessage interface {
 	InResponseTo() WorkerMessage
+	getId() int
+	setId(id int)
 }
 
 type Message struct {
 	inResponseTo WorkerMessage
+	id           int
 }
 
 func RespondTo(msg WorkerMessage) Message {
@@ -28,6 +31,14 @@ func (m Message) InResponseTo() WorkerMessage {
 	return m.inResponseTo
 }
 
+func (m Message) getId() int {
+	return m.id
+}
+
+func (m Message) setId(id int) {
+	m.id = id
+}
+
 // Meta-messages
 
 type Done struct {
@@ -103,6 +114,15 @@ type CopyMessages struct {
 	Uids        imap.SeqSet
 }
 
+type AppendMessage struct {
+	Message
+	Destination string
+	Flags       []string
+	Date        time.Time
+	Reader      io.Reader
+	Length      int
+}
+
 // Messages
 
 type CertificateApprovalRequest struct {
diff --git a/worker/types/worker.go b/worker/types/worker.go
index 0ed216a..e2af61f 100644
--- a/worker/types/worker.go
+++ b/worker/types/worker.go
@@ -5,6 +5,8 @@ import (
 	"sync"
 )
 
+var nextId int = 1
+
 type Backend interface {
 	Run()
 }
@@ -15,7 +17,7 @@ type Worker struct {
 	Messages chan WorkerMessage
 	Logger   *log.Logger
 
-	callbacks map[WorkerMessage]func(msg WorkerMessage) // protected by mutex
+	callbacks map[int]func(msg WorkerMessage) // protected by mutex
 	mutex     sync.Mutex
 }
 
@@ -24,16 +26,19 @@ func NewWorker(logger *log.Logger) *Worker {
 		Actions:   make(chan WorkerMessage, 50),
 		Messages:  make(chan WorkerMessage, 50),
 		Logger:    logger,
-		callbacks: make(map[WorkerMessage]func(msg WorkerMessage)),
+		callbacks: make(map[int]func(msg WorkerMessage)),
 	}
 }
 
 func (worker *Worker) setCallback(msg WorkerMessage,
 	cb func(msg WorkerMessage)) {
 
+	msg.setId(nextId)
+	nextId++
+
 	if cb != nil {
 		worker.mutex.Lock()
-		worker.callbacks[msg] = cb
+		worker.callbacks[msg.getId()] = cb
 		worker.mutex.Unlock()
 	}
 }
@@ -41,8 +46,11 @@ func (worker *Worker) setCallback(msg WorkerMessage,
 func (worker *Worker) getCallback(msg WorkerMessage) (func(msg WorkerMessage),
 	bool) {
 
+	if msg == nil {
+		return nil, false
+	}
 	worker.mutex.Lock()
-	cb, ok := worker.callbacks[msg]
+	cb, ok := worker.callbacks[msg.getId()]
 	worker.mutex.Unlock()
 
 	return cb, ok
-- 
cgit 1.4.1-2-gfad0