nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2024-09-20 23:36:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed negative quota change on copy

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/handlers/on-copy.js
View file

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

10
lib/message-handler.js
View file

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