From 7db56272753a86db846500bb6bc41de9b96c49a3 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Fri, 12 Jan 2018 22:14:32 +0100
Subject: [PATCH] imap: better \Deleted flag support

---
 imap/mailbox.go | 13 +++++++++++--
 imap/message.go |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/imap/mailbox.go b/imap/mailbox.go
index 3d79946..980bda1 100644
--- a/imap/mailbox.go
+++ b/imap/mailbox.go
@@ -141,6 +141,14 @@ func (mbox *mailbox) reset() error {
 	return mbox.db.Reset()
 }
 
+func (mbox *mailbox) fetchFlags(msg *protonmail.Message) []string {
+	flags := fetchFlags(msg)
+	if _, ok := mbox.deleted[msg.ID]; ok {
+		flags = append(flags, imap.DeletedFlag)
+	}
+	return flags
+}
+
 func (mbox *mailbox) fetchMessage(isUid bool, id uint32, items []imap.FetchItem) (*imap.Message, error) {
 	var apiID string
 	var err error
@@ -175,7 +183,7 @@ func (mbox *mailbox) fetchMessage(isUid bool, id uint32, items []imap.FetchItem)
 			}
 			fetched.BodyStructure = bs
 		case imap.FetchFlags:
-			fetched.Flags = fetchFlags(msg)
+			fetched.Flags = mbox.fetchFlags(msg)
 		case imap.FetchInternalDate:
 			fetched.InternalDate = time.Unix(msg.Time, 0)
 		case imap.FetchRFC822Size:
@@ -271,7 +279,7 @@ func (mbox *mailbox) SearchMessages(isUID bool, c *imap.SearchCriteria) ([]uint3
 		}
 
 		flags := make(map[string]bool)
-		for _, flag := range fetchFlags(msg) {
+		for _, flag := range mbox.fetchFlags(msg) {
 			flags[flag] = true
 		}
 		for _, f := range c.WithFlags {
@@ -405,6 +413,7 @@ func (mbox *mailbox) UpdateMessagesFlags(uid bool, seqSet *imap.SeqSet, op imap.
 				err = mbox.u.c.UnlabelMessages(protonmail.LabelStarred, apiIDs)
 			}
 		case imap.DeletedFlag:
+			// TODO: send updates
 			switch op {
 			case imap.SetFlags, imap.AddFlags:
 				for _, apiID := range apiIDs {
diff --git a/imap/message.go b/imap/message.go
index 73344f4..48dab72 100644
--- a/imap/message.go
+++ b/imap/message.go
@@ -96,6 +96,7 @@ func hasLabel(msg *protonmail.Message, labelID string) bool {
 	return false
 }
 
+// Doesn't support imap.DeletedFlag.
 func fetchFlags(msg *protonmail.Message) []string {
 	var flags []string
 	if msg.IsRead != 0 {
@@ -112,7 +113,6 @@ func fetchFlags(msg *protonmail.Message) []string {
 			flags = append(flags, imap.DraftFlag)
 		}
 	}
-	// TODO: DeletedFlag
 	return flags
 }