feat: Add AllowCreate to imap.MessageUpdated

connector/dummy_simulate.go

@@ -155,7 +155,7 @@ func (conn *Dummy) MessageUpdated(message imap.Message, literal []byte, mboxIDs
 		mboxIDs: mboxIDMap,
 	}
 
-	conn.pushUpdate(imap.NewMessageUpdated(message, literal, mboxIDs, parsedMessage))
+	conn.pushUpdate(imap.NewMessageUpdated(message, literal, mboxIDs, parsedMessage, false))
 
 	return nil
 }

imap/update_message_updated.go

@@ -6,8 +6,10 @@ import (
 	"github.com/bradenaw/juniper/xslices"
 )
 
-// MessageUpdated replaces the previous behavior of MessageDelete followed by MessageCreate. Furthermore, it guarantees
-// that the operation is executed atomically.
+// MessageUpdated replaces the previous behavior of MessageDelete followed by MessageCreate.
+// If the message does exist, it is updated.
+// If the message does not exist, it can optionally be created.
+// Furthermore, it guarantees that the operation is executed atomically.
 type MessageUpdated struct {
 	updateBase
 	*updateWaiter
@@ -16,24 +18,33 @@ type MessageUpdated struct {
 	Literal       []byte
 	MailboxIDs    []MailboxID
 	ParsedMessage *ParsedMessage
+	AllowCreate   bool
 }
 
-func NewMessageUpdated(message Message, literal []byte, mailboxIDs []MailboxID, parsedMessage *ParsedMessage) *MessageUpdated {
+func NewMessageUpdated(
+	message Message,
+	literal []byte,
+	mailboxIDs []MailboxID,
+	parsedMessage *ParsedMessage,
+	allowCreate bool,
+) *MessageUpdated {
 	return &MessageUpdated{
 		updateWaiter:  newUpdateWaiter(),
 		Message:       message,
 		Literal:       literal,
 		MailboxIDs:    mailboxIDs,
 		ParsedMessage: parsedMessage,
+		AllowCreate:   allowCreate,
 	}
 }
 
 func (u *MessageUpdated) String() string {
-	return fmt.Sprintf("MessageUpdate: ID:%v Mailboxes:%v Flags:%s",
+	return fmt.Sprintf("MessageUpdated: ID:%v Mailboxes:%v Flags:%s AllowCreate:%v",
 		u.Message.ID.ShortID(),
 		xslices.Map(u.MailboxIDs, func(mboxID MailboxID) string {
 			return mboxID.ShortID()
 		}),
 		u.Message.Flags.ToSlice(),
+		u.AllowCreate,
 	)
 }

internal/backend/connector_updates.go

@@ -602,12 +602,19 @@ func (user *user) applyMessageUpdated(ctx context.Context, update *imap.MessageU
 		return db.GetMessageIDFromRemoteID(ctx, client, update.Message.ID)
 	})
 	if ent.IsNotFound(err) {
-		return user.applyMessagesCreated(ctx, imap.NewMessagesCreated(true, &imap.MessageCreated{
-			Message:       update.Message,
-			Literal:       update.Literal,
-			MailboxIDs:    update.MailboxIDs,
-			ParsedMessage: update.ParsedMessage,
-		}))
+		if update.AllowCreate {
+			log.Warn("Message not found, creating it instead")
+
+			return user.applyMessagesCreated(ctx, imap.NewMessagesCreated(true, &imap.MessageCreated{
+				Message:       update.Message,
+				Literal:       update.Literal,
+				MailboxIDs:    update.MailboxIDs,
+				ParsedMessage: update.ParsedMessage,
+			}))
+		} else {
+			log.Warn("Message not found, skipping update")
+			return nil
+		}
 	} else if err != nil {
 		return err
 	}