mirror of
https://github.com/nodemailer/wildduck.git
synced 2024-09-20 15:26:03 +08:00
use object for sorting
This commit is contained in:
parent
1676c7336f
commit
fafc124f83
|
@ -55,7 +55,7 @@ module.exports = (server, messageHandler) => (mailbox, update, session, callback
|
||||||
mailbox: mailboxData._id,
|
mailbox: mailboxData._id,
|
||||||
uid: tools.checkRangeQuery(update.messages)
|
uid: tools.checkRangeQuery(update.messages)
|
||||||
}) // no projection as we need to copy the entire message
|
}) // no projection as we need to copy the entire message
|
||||||
.sort([['uid', 1]])
|
.sort({ uid: 1 })
|
||||||
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
||||||
|
|
||||||
let copiedMessages = 0;
|
let copiedMessages = 0;
|
||||||
|
|
|
@ -78,7 +78,7 @@ module.exports = (server, messageHandler) => (mailbox, update, session, callback
|
||||||
let cursor = db.database
|
let cursor = db.database
|
||||||
.collection('messages')
|
.collection('messages')
|
||||||
.find(query)
|
.find(query)
|
||||||
.sort([['uid', 1]])
|
.sort({ uid: 1 })
|
||||||
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
||||||
|
|
||||||
let processNext = () => {
|
let processNext = () => {
|
||||||
|
|
|
@ -130,11 +130,12 @@ module.exports = (server, messageHandler, userCache) => (mailbox, options, sessi
|
||||||
return callback(...args);
|
return callback(...args);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let sort = { uid: 1 };
|
||||||
let cursor = db.database
|
let cursor = db.database
|
||||||
.collection('messages')
|
.collection('messages')
|
||||||
.find(query)
|
.find(query)
|
||||||
.project(projection)
|
.project(projection)
|
||||||
.sort([['uid', 1]])
|
.sort(sort)
|
||||||
.setReadPreference('secondaryPreferred')
|
.setReadPreference('secondaryPreferred')
|
||||||
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES);
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ module.exports = server => (path, session, callback) => {
|
||||||
.project({
|
.project({
|
||||||
uid: true
|
uid: true
|
||||||
})
|
})
|
||||||
//.sort([['uid', 1]])
|
//.sort({ uid: 1 })
|
||||||
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
|
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
|
||||||
.toArray((err, messages) => {
|
.toArray((err, messages) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
|
@ -92,7 +92,7 @@ module.exports = server => (mailbox, update, session, callback) => {
|
||||||
modseq: true
|
modseq: true
|
||||||
})
|
})
|
||||||
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
|
.maxTimeMS(consts.DB_MAX_TIME_MESSAGES)
|
||||||
.sort([['uid', 1]]);
|
.sort({ uid: 1 });
|
||||||
|
|
||||||
let shouldExpunge = false;
|
let shouldExpunge = false;
|
||||||
let updateEntries = [];
|
let updateEntries = [];
|
||||||
|
|
2
pop3.js
2
pop3.js
|
@ -126,7 +126,7 @@ const serverOptions = {
|
||||||
flags: true,
|
flags: true,
|
||||||
unseen: true
|
unseen: true
|
||||||
})
|
})
|
||||||
.sort([['uid', -1]])
|
.sort({ uid: -1 })
|
||||||
.limit(config.pop3.maxMessages || MAX_MESSAGES)
|
.limit(config.pop3.maxMessages || MAX_MESSAGES)
|
||||||
.toArray((err, messages) => {
|
.toArray((err, messages) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in a new issue