From b9a5c9492369e80807b96a1dde5b325e0dd8a653 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 22 Feb 2017 11:29:07 +0100 Subject: [PATCH] Newsfeed plugin support date_added in ms --- plugins/Newsfeed/NewsfeedPlugin.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/Newsfeed/NewsfeedPlugin.py b/plugins/Newsfeed/NewsfeedPlugin.py index 4f44a38d..feaf8542 100644 --- a/plugins/Newsfeed/NewsfeedPlugin.py +++ b/plugins/Newsfeed/NewsfeedPlugin.py @@ -59,12 +59,17 @@ class UiWebsocketPlugin(object): res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit, params) else: res = site.storage.query(query + " ORDER BY date_added DESC LIMIT %s" % limit) + except Exception, err: # Log error self.log.error("%s feed query %s error: %s" % (address, name, err)) continue + for row in res: row = dict(row) + 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) continue # Feed item is in the future, skip it row["site"] = address row["feed_name"] = name