yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

GODT-966 Do nothing if message APPEND to All Mail is already in Archive.

Browse Source
This commit is contained in:
Xavier Michelon
2021-09-20 16:47:24 +02:00
committed by Jakub Cuth
parent bb90ed5446
commit 6b7e706100
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/imap/mailbox_append.go
View File

@ -165,10 +165,14 @@ func (im *imapMailbox) labelExistingMessage(msg storeMessageProvider) error { //
// Outlook Uses APPEND instead of COPY. There is no need to copy to All Mail because messages are already there. // Outlook Uses APPEND instead of COPY. There is no need to copy to All Mail because messages are already there.
// If the message is copied from Spam or Trash, it must be moved otherwise we will have data loss. // If the message is copied from Spam or Trash, it must be moved otherwise we will have data loss.
// If the message is moved from any folder, the moment when expunge happens on source we will move message trash unless we move it to archive. // If the message is moved from any folder, the moment when expunge happens on source we will move message trash unless we move it to archive.
// If the message is already in Archive we should not call API at all. // If the message is already in Archive we should not call API at all.
// Otherwise the message is already in All mail, Return OK. // Otherwise the message is already in All mail, Return OK.
if pmapi.AllMailLabel == storeMBox.LabelID() { if pmapi.AllMailLabel == storeMBox.LabelID() {
if msg.Message().HasLabelID(pmapi.ArchiveLabel) {
return uidplus.AppendResponse(im.storeMailbox.UIDValidity(), im.storeMailbox.GetUIDList([]string{msg.ID()}))
}
foundArchive := false foundArchive := false
for _, mBox := range im.storeAddress.ListMailboxes() { for _, mBox := range im.storeAddress.ListMailboxes() {
if mBox.LabelID() == pmapi.ArchiveLabel { if mBox.LabelID() == pmapi.ArchiveLabel {