From b4eb09d5e9f2de69c416dce5f3171989231c9a99 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 30 May 2018 17:16:45 +0200
Subject: [PATCH] Rev3468, Ignore newsfeed items with invalid date_added value

---
 plugins/Newsfeed/NewsfeedPlugin.py | 5 ++++-
 src/Config.py                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/Newsfeed/NewsfeedPlugin.py b/plugins/Newsfeed/NewsfeedPlugin.py
index 596a0d34..3d7434bf 100644
--- a/plugins/Newsfeed/NewsfeedPlugin.py
+++ b/plugins/Newsfeed/NewsfeedPlugin.py
@@ -78,10 +78,13 @@ class UiWebsocketPlugin(object):
 
                 for row in res:
                     row = dict(row)
+                    if not isinstance(row["date_added"], (int, long, float, complex)):
+                        self.log.debug("Invalid date_added from site %s: %r" % (address, row["date_added"]))
+                        continue
                     if row["date_added"] > 1000000000000:  # Formatted as millseconds
                         row["date_added"] = row["date_added"] / 1000
                     if "date_added" not in row or row["date_added"] > time.time() + 120:
-                        self.log.debug("Newsfeed from the future from from site %s" % address)
+                        self.log.debug("Newsfeed item from the future from from site %s" % address)
                         continue  # Feed item is in the future, skip it
                     row["site"] = address
                     row["feed_name"] = name
diff --git a/src/Config.py b/src/Config.py
index 0c00c84d..2662be7d 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.6.2"
-        self.rev = 3467
+        self.rev = 3468
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"