From 828fe0e86ec14ff27a8fb9f50d5623f48e910b9a Mon Sep 17 00:00:00 2001
From: Jakub <jakub@cuth.sk>
Date: Thu, 1 Dec 2022 11:58:58 +0100
Subject: [PATCH] GODT-2170: Update draft event means delete old and create new
 message.

---
 internal/user/events.go | 33 +++++++++++++++++----------------
 internal/user/imap.go   |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/internal/user/events.go b/internal/user/events.go
index d027db89..4339128e 100644
--- a/internal/user/events.go
+++ b/internal/user/events.go
@@ -389,6 +389,18 @@ func (user *User) handleMessageEvents(ctx context.Context, messageEvents []proto
 			}
 
 		case proton.EventUpdate, proton.EventUpdateFlags:
+			// Draft update means to completely remove old message and upload the new data again.
+			if event.Message.IsDraft() {
+				if err := user.handleUpdateDraftEvent(
+					logging.WithLogrusField(ctx, "action", "update draft"),
+					event,
+				); err != nil {
+					return fmt.Errorf("failed to handle update draft event: %w", err)
+				}
+
+				return nil
+			}
+
 			// GODT-2028 - Use better events here. It should be possible to have 3 separate events that refrain to
 			// whether the flags, labels or read only data (header+body) has been changed. This requires fixing proton
 			// first so that it correctly reports those cases.
@@ -400,16 +412,6 @@ func (user *User) handleMessageEvents(ctx context.Context, messageEvents []proto
 				return fmt.Errorf("failed to handle update message event: %w", err)
 			}
 
-			// Only issue body updates if the message is a draft.
-			if event.Message.IsDraft() {
-				if err := user.handleUpdateDraftEvent(
-					logging.WithLogrusField(ctx, "action", "update draft"),
-					event,
-				); err != nil {
-					return fmt.Errorf("failed to handle update draft event: %w", err)
-				}
-			}
-
 		case proton.EventDelete:
 			if err := user.handleDeleteMessageEvent(
 				logging.WithLogrusField(ctx, "action", "delete message"),
@@ -485,6 +487,10 @@ func (user *User) handleUpdateDraftEvent(ctx context.Context, event proton.Messa
 			"subject":   logging.Sensitive(event.Message.Subject),
 		}).Info("Handling draft updated event")
 
+		for _, updateCh := range user.updateCh {
+			updateCh.Enqueue(imap.NewMessagesDeleted(imap.MessageID(event.ID)))
+		}
+
 		full, err := user.client.GetFullMessage(ctx, event.Message.ID)
 		if err != nil {
 			return fmt.Errorf("failed to get full draft: %w", err)
@@ -496,12 +502,7 @@ func (user *User) handleUpdateDraftEvent(ctx context.Context, event proton.Messa
 				return fmt.Errorf("failed to build RFC822 draft: %w", err)
 			}
 
-			user.updateCh[full.AddressID].Enqueue(imap.NewMessageUpdated(
-				buildRes.update.Message,
-				buildRes.update.Literal,
-				buildRes.update.MailboxIDs,
-				buildRes.update.ParsedMessage,
-			))
+			user.updateCh[full.AddressID].Enqueue(imap.NewMessagesCreated(buildRes.update))
 
 			return nil
 		})
diff --git a/internal/user/imap.go b/internal/user/imap.go
index 527e8085..33668627 100644
--- a/internal/user/imap.go
+++ b/internal/user/imap.go
@@ -516,7 +516,7 @@ func toIMAPMessage(message proton.MessageMetadata) imap.Message {
 	}
 }
 
-func (conn *imapConnector) createDraft(ctx context.Context, literal []byte, addrKR *crypto.KeyRing) (proton.Message, error) {
+func (conn *imapConnector) createDraft(ctx context.Context, literal []byte, addrKR *crypto.KeyRing) (proton.Message, error) { //nolint:funlen
 	// Create a new message parser from the reader.
 	parser, err := parser.New(bytes.NewReader(literal))
 	if err != nil {