From f92f16fd08c40ff56e6e31f0878859f40757e0c5 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sun, 11 Mar 2018 21:10:37 +0000
Subject: [PATCH] Add warning of too large interval for feedparser

To close #408
---
 social/feedparser/32-feedparse.html               | 7 ++++---
 social/feedparser/32-feedparse.js                 | 1 +
 social/feedparser/locales/en-US/32-feedparse.json | 5 +++--
 social/feedparser/package.json                    | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/social/feedparser/32-feedparse.html b/social/feedparser/32-feedparse.html
index 5d732881..3581c75e 100644
--- a/social/feedparser/32-feedparse.html
+++ b/social/feedparser/32-feedparse.html
@@ -6,7 +6,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-interval"><i class="fa fa-repeat"></i> <span data-i18n="feedparse.label.refresh"></span></label>
-        <input type="text" id="node-input-interval" style="width: 50px"> <span data-i18n="feedparse.label.minutes"></span>
+        <input type="text" id="node-input-interval" style="width:60px"> <span data-i18n="feedparse.label.minutes"></span>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
@@ -19,6 +19,7 @@
     <p>The <code>msg.topic</code> contains the original article link. The <code>msg.payload</code>
     contains the description, and <code>msg.article</code> contains the complete article object,
     which has properties such as <code>.title</code>, <code>.summary</code>, <code>.date</code> and so on.</p>
+    <p>The Refresh interval cannot be greater than 35790 minutes (approx 24.8 days).
 </script>
 
 <script type="text/javascript">
@@ -28,13 +29,13 @@
         defaults: {
             name: {value:""},
             url: {value:"", required:true},
-            interval: { value:15, required: true,validate:RED.validators.number()}
+            interval: { value:15, required:true, validate:function(v) {return (!isNaN(parseInt(v)) && (parseInt(v) <= 35790))} }
         },
         inputs:0,
         outputs:1,
         icon: "feed.png",
         label: function() {
-            return this.name||this.url;
+            return this.name||this.url||"feedparser";
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
diff --git a/social/feedparser/32-feedparse.js b/social/feedparser/32-feedparse.js
index 7a6bf88c..8d6a0001 100644
--- a/social/feedparser/32-feedparse.js
+++ b/social/feedparser/32-feedparse.js
@@ -8,6 +8,7 @@ module.exports = function(RED) {
     function FeedParseNode(n) {
         RED.nodes.createNode(this,n);
         this.url = n.url;
+        if (n.interval > 35790) { this.warn(RED._("feedparse.errors.invalidinterval")) }
         this.interval = (parseInt(n.interval)||15) * 60000;
         var node = this;
         this.interval_id = null;
diff --git a/social/feedparser/locales/en-US/32-feedparse.json b/social/feedparser/locales/en-US/32-feedparse.json
index 89efa3be..af751a4f 100644
--- a/social/feedparser/locales/en-US/32-feedparse.json
+++ b/social/feedparser/locales/en-US/32-feedparse.json
@@ -7,7 +7,8 @@
         },
         "errors": {
             "badstatuscode": "error - Bad status code",
-            "invalidurl": "Invalid url"
+            "invalidurl": "Invalid url",
+            "invalidinterval": "Repeat interval too large"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/social/feedparser/package.json b/social/feedparser/package.json
index e3be396f..7dcb87b7 100644
--- a/social/feedparser/package.json
+++ b/social/feedparser/package.json
@@ -1,10 +1,10 @@
 {
   "name": "node-red-node-feedparser",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "A Node-RED node to get RSS Atom feeds.",
   "dependencies": {
-    "feedparser": "1.1.3",
-    "request": "~2.74.0"
+    "feedparser": "^2.2.9",
+    "request": "^2.83.0"
   },
   "repository": {
     "type": "git",