From 832b7f8ce4f81e54e9cd1abfa4557d8246528377 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 25 Sep 2021 03:47:10 +0200 Subject: [PATCH] fds --- files/routes/front.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index a84428188..97ec1487c 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -150,13 +150,11 @@ def front_all(v): -#@cache.memoize(timeout=86400) +@cache.memoize(timeout=86400) def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', **kwargs): posts = g.db.query(Submission.id).options(lazyload('*')) - print(posts.all()) - if 'rdrama' in request.host and sort == "hot": cutoff = int(time.time()) - 86400 posts = posts.filter(Submission.created_utc >= cutoff) @@ -172,7 +170,6 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' cutoff = now - 2592000 elif t == 'year': cutoff = now - 31536000 - print(cutoff) posts = posts.filter(Submission.created_utc >= cutoff) posts = posts.filter_by(is_banned=False, stickied=None, private=False, deleted_utc = 0) @@ -201,6 +198,9 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' for word in filter_words: posts=posts.filter(not_(Submission.title.ilike(f'%{word}%'))) + gt = kwargs.get("gt") + lt = kwargs.get("lt") + if not (v and v.shadowbanned): posts = posts.join(Submission.author).filter(User.shadowbanned == False) @@ -295,6 +295,9 @@ def changeloglist(v=None, sort="new", page=1 ,t="all", **kwargs): cutoff = now - 31536000 posts = posts.filter(Submission.created_utc >= cutoff) + gt = kwargs.get("gt") + lt = kwargs.get("lt") + if sort == "new": posts = posts.order_by(Submission.created_utc.desc()) elif sort == "old":