From 276cbc0ace90e294d7b4e2aa912c862bcda0e4a1 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 25 Jan 2019 14:26:38 +0100 Subject: [PATCH] Rev3817, Support limits for feed search --- plugins/Newsfeed/NewsfeedPlugin.py | 9 +++++++-- src/Config.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/Newsfeed/NewsfeedPlugin.py b/plugins/Newsfeed/NewsfeedPlugin.py index b2fc78b0..802fa50b 100644 --- a/plugins/Newsfeed/NewsfeedPlugin.py +++ b/plugins/Newsfeed/NewsfeedPlugin.py @@ -104,7 +104,7 @@ class UiWebsocketPlugin(object): filters = {} return [search_text, filters] - def actionFeedSearch(self, to, search): + def actionFeedSearch(self, to, search, limit=30, day_limit=30): if "ADMIN" not in self.site.settings["permissions"]: return self.response(to, "FeedSearch not allowed") @@ -152,9 +152,14 @@ class UiWebsocketPlugin(object): if filters.get("type") and filters["type"] not in query: continue + if day_limit: + db_query.wheres.append( + "%s > strftime('%%s', 'now', '-%s day')" % (db_query.fields.get("date_added", "date_added"), day_limit) + ) + # Order db_query.parts["ORDER BY"] = "date_added DESC" - db_query.parts["LIMIT"] = "30" + db_query.parts["LIMIT"] = str(limit) res = site.storage.query(str(db_query), params) except Exception, err: diff --git a/src/Config.py b/src/Config.py index a3a0f233..fedab41e 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.4" - self.rev = 3815 + self.rev = 3817 self.argv = argv self.action = None self.pending_changes = {}