From 16130362fc0acaeed45aa48b1bb3812784ce0668 Mon Sep 17 00:00:00 2001
From: Luis Mario Domenzain <luismario.domenzain+github@gmail.com>
Date: Wed, 29 May 2019 13:45:54 +0200
Subject: [PATCH] email optionally uses criteria from message (#547)

* email optionally uses criteria from message

Allows for generation of detailed queries through flows when triggering an email
fetch in IMAP.

* use the same default as a new email node

When the criteria is set from a message, if there is no criteria use the same default as a new node.
---
 social/email/61-email.html               | 1 +
 social/email/61-email.js                 | 5 ++++-
 social/email/locales/en-US/61-email.json | 1 +
 social/email/locales/ja/61-email.json    | 3 ++-
 social/email/package.json                | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/social/email/61-email.html b/social/email/61-email.html
index e372f049..7c1b4621 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -182,6 +182,7 @@
             <option value="UNANSWERED" data-i18n="email.label.unanswered"></option>
             <option value="UNFLAGGED" data-i18n="email.label.unflagged"></option>
             <option value="UNSEEN" selected="selected" data-i18n="email.label.unseen"></option>
+            <option value="_msg_" data-i18n="email.label.criteriaFromMsg"></option>
             <!--
             <option value="DELETED" data-i18n="email.label.delete"></option>
             <option value="DRAFT" data-i18n="email.label.none"></option>
diff --git a/social/email/61-email.js b/social/email/61-email.js
index efe656c7..805b43f2 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -352,7 +352,10 @@ module.exports = function(RED) {
                         return;
                     }
                     else {
-                        imap.search([ node.criteria ], function(err, results) {
+                        var criteria = ((node.criteria === '_msg_')?
+                                        (msg.criteria || ["UNSEEN"]):
+                                        ([node.criteria]));
+                        imap.search(criteria, function(err, results) {
                             if (err) {
                                 node.status({fill:"red", shape:"ring", text:"email.status.foldererror"});
                                 node.error(RED._("email.errors.fetchfail", {folder:node.box}),err);
diff --git a/social/email/locales/en-US/61-email.json b/social/email/locales/en-US/61-email.json
index 4f8b4bdb..9bc3a8fc 100644
--- a/social/email/locales/en-US/61-email.json
+++ b/social/email/locales/en-US/61-email.json
@@ -22,6 +22,7 @@
             "read": "Mark Read",
             "delete": "Delete",
             "criteria": "Criteria",
+            "criteriaFromMsg": "- set from msg.criteria -",
             "all": "All",
             "answered": "Answered",
             "flagged": "Flagged",
diff --git a/social/email/locales/ja/61-email.json b/social/email/locales/ja/61-email.json
index db4821b3..08d04197 100644
--- a/social/email/locales/ja/61-email.json
+++ b/social/email/locales/ja/61-email.json
@@ -15,7 +15,8 @@
             "disposition": "受信後の処理",
             "none": "なし",
             "read": "既読",
-            "delete": "削除"
+            "delete": "削除",
+            "criteriaFromMsg": "- msg.criteriaから使用 -"
         },
         "default-message": "__description__\n\nNode-REDからファイルが添付されました: __filename__",
         "tip": {
diff --git a/social/email/package.json b/social/email/package.json
index f6537ebf..31cdada6 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-email",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Node-RED nodes to send and receive simple emails",
   "dependencies": {
     "imap": "^0.8.19",