fixed negative quota change on copy

This commit is contained in:
Andris Reinman 2018-12-03 11:29:41 +02:00
parent 1079d339f4
commit f8c49d40bd
2 changed files with 9 additions and 4 deletions

View file

@ -80,9 +80,10 @@ module.exports = (server, messageHandler) => (mailbox, update, session, callback
short_message: '[QUOTA CHANGE] Quota usage increased',
_mail_action: 'quota',
_user: mailboxData.user,
_inc: -copiedStorage,
_inc: copiedStorage,
_copied_messages: copiedMessages,
_storage_used: r.value.storageUsed,
_mailbox: targetData._id,
_session: session && session.id
});
}

View file

@ -292,7 +292,8 @@ class MessageHandler {
_user: mailboxData.user,
_inc: size,
_storage_used: r.value.storageUsed,
_session: options.session && options.session.id
_session: options.session && options.session.id,
_mailbox: mailboxData._id
});
}
@ -323,6 +324,7 @@ class MessageHandler {
_inc: -size,
_storage_used: r.value.storageUsed,
_session: options.session && options.session.id,
_mailbox: mailboxData._id,
_rollback: 'yes',
_error: err.message,
_code: err.code
@ -474,7 +476,8 @@ class MessageHandler {
_user: user,
_inc: inc.storageUsed,
_storage_used: r.value.storageUsed,
_session: options.session && options.session.id
_session: options.session && options.session.id,
_mailbox: inc.mailbox
});
}
callback(...args);
@ -540,7 +543,8 @@ class MessageHandler {
this.updateQuota(
messageData.user,
{
storageUsed: -messageData.size
storageUsed: -messageData.size,
mailbox: messageData.mailbox
},
options,
() => {