nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-10-09 21:37:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Only sort searhc by date if order is set

Browse source
This commit is contained in:
Louis Laureys 2022-12-10 16:20:51 +00:00
parent 1a210d184d
commit 35ac8e74cf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/openapi.yml
View file

@ -2023,7 +2023,7 @@ paths:
type: number type: number
- name: order - name: order
in: query in: query
description: Ordering of the records by insert date description: Ordering of the records by insert date. If no order is supplied, results are sorted by heir mongoDB ObjectId.
schema: schema:
$ref: '#/components/schemas/Order' $ref: '#/components/schemas/Order'
- name: page - name: page

8
lib/api/messages.js
View file

@ -536,7 +536,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
const schema = searchSchema.keys({ const schema = searchSchema.keys({
threadCounters: booleanSchema.default(false), threadCounters: booleanSchema.default(false),
limit: Joi.number().default(20).min(1).max(250), limit: Joi.number().default(20).min(1).max(250),
order: Joi.any().empty('').allow('asc', 'desc').default('desc'), order: Joi.any().empty('').allow('asc', 'desc').optional(),
next: nextPageCursorSchema, next: nextPageCursorSchema,
previous: previousPageCursorSchema, previous: previousPageCursorSchema,
page: pageNrSchema page: pageNrSchema
@ -570,7 +570,7 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
let page = result.value.page; let page = result.value.page;
let pageNext = result.value.next; let pageNext = result.value.next;
let pagePrevious = result.value.previous; let pagePrevious = result.value.previous;
let sortAscending = result.value.order === 'asc'; let order = result.value.order;
let { filter, query } = await prepareSearchFilter(db, user, result.value); let { filter, query } = await prepareSearchFilter(db, user, result.value);
@ -611,8 +611,8 @@ module.exports = (db, server, messageHandler, userHandler, storageHandler, setti
flags: true flags: true
} }
}, },
paginatedField: 'idate', paginatedField: order !== undefined ? 'idate' : "_id",
sortAscending sortAscending: order === 'asc' ? true : undefined
}; };
if (pageNext) { if (pageNext) {