stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-10-27 21:06:06 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

IMAP: Return the message UID in the destination mailbox if the message already exists (#1201)

Browse source
This commit is contained in:
mdecimus 2025-06-02 16:46:04 +02:00
parent d49e6e1945
commit fb1b95bb2a
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/imap/src/op/copy_move.rs
View file

@ -210,15 +210,45 @@ impl<T: SessionStream> SessionData<T> {
.mailboxes
.iter()
.any(|mailbox| mailbox.mailbox_id == src_mailbox.id.mailbox_id)
|| data
.inner
.mailboxes
.iter()
.any(|mailbox| mailbox.mailbox_id == dest_mailbox_id.mailbox_id)
{
continue;
}
// If the message is already in the destination mailbox, skip it.
if let Some(mailbox) = data
.inner
.mailboxes
.iter()
.find(|mailbox| mailbox.mailbox_id == dest_mailbox_id.mailbox_id)
{
copied_ids.push((imap_id.uid, mailbox.uid.to_native()));
if is_move {
let mut new_data = data
.deserialize()
.imap_ctx(&arguments.tag, trc::location!())?;
new_data.remove_mailbox(src_mailbox.id.mailbox_id);
batch
.with_account_id(account_id)
.with_collection(Collection::Email)
.update_document(id)
.custom(
ObjectIndexBuilder::new()
.with_current(data)
.with_changes(new_data),
)
.imap_ctx(&arguments.tag, trc::location!())?
.log_vanished_item(
VanishedCollection::Email,
(src_mailbox.id.mailbox_id, imap_id.uid),
)
.commit_point();
did_move = true;
}
continue;
}
// Prepare changes
let mut new_data = data
.deserialize()