This commit is contained in:
Andris Reinman 2018-09-28 12:19:01 +03:00
parent ca39ba4791
commit ccd8f704f9
6 changed files with 15 additions and 5 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
define({ "name": "wildduck", "version": "1.0.0", "description": "WildDuck API docs", "title": "WildDuck API", "url": "https://api.wildduck.email", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2018-09-27T06:13:11.365Z", "url": "http://apidocjs.com", "version": "0.17.6" } });
define({ "name": "wildduck", "version": "1.0.0", "description": "WildDuck API docs", "title": "WildDuck API", "url": "https://api.wildduck.email", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2018-09-28T09:18:43.978Z", "url": "http://apidocjs.com", "version": "0.17.6" } });

View file

@ -1 +1 @@
{ "name": "wildduck", "version": "1.0.0", "description": "WildDuck API docs", "title": "WildDuck API", "url": "https://api.wildduck.email", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2018-09-27T06:13:11.365Z", "url": "http://apidocjs.com", "version": "0.17.6" } }
{ "name": "wildduck", "version": "1.0.0", "description": "WildDuck API docs", "title": "WildDuck API", "url": "https://api.wildduck.email", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2018-09-28T09:18:43.978Z", "url": "http://apidocjs.com", "version": "0.17.6" } }

View file

@ -513,6 +513,7 @@ module.exports = (db, server, messageHandler) => {
*
* @apiParam {String} user ID of the User
* @apiParam {String} [mailbox] ID of the Mailbox
* @apiParam {String} [thread] Thread ID
* @apiParam {String} [query] Search string, uses MongoDB fulltext index. Covers data from mesage body and also common headers like from, to, subject etc.
* @apiParam {String} [datestart] Datestring for the earliest message storing time
* @apiParam {String} [dateend] Datestring for the latest message storing time
@ -621,6 +622,10 @@ module.exports = (db, server, messageHandler) => {
.hex()
.length(24)
.empty(''),
thread: Joi.string()
.hex()
.length(24)
.empty(''),
query: Joi.string()
.trim()
.max(255)
@ -697,6 +702,7 @@ module.exports = (db, server, messageHandler) => {
let user = new ObjectID(result.value.user);
let mailbox = result.value.mailbox ? new ObjectID(result.value.mailbox) : false;
let thread = result.value.thread ? new ObjectID(result.value.thread) : false;
let query = result.value.query;
let datestart = result.value.datestart || false;
let dateend = result.value.dateend || false;
@ -758,6 +764,10 @@ module.exports = (db, server, messageHandler) => {
filter.mailbox = mailbox;
}
if (thread) {
filter.thread = thread;
}
if (filterFlagged) {
// mailbox is not needed as there's a special index for flagged messages
filter.flagged = true;

View file

@ -1,6 +1,6 @@
{
"name": "wildduck",
"version": "1.4.20",
"version": "1.4.21",
"description": "IMAP/POP3 server built with Node.js and MongoDB",
"main": "server.js",
"scripts": {