From a1df0e978c38a4c6e46be3f86e02abbefb28b14d Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 25 Jul 2021 00:03:02 +0200 Subject: [PATCH] niggasss --- drama/helpers/get.py | 11 ++++++----- drama/routes/front.py | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drama/helpers/get.py b/drama/helpers/get.py index afbb185aa..4b04fb3f8 100644 --- a/drama/helpers/get.py +++ b/drama/helpers/get.py @@ -165,22 +165,23 @@ def get_posts(pids, sort="hot", v=None): ).join( blocked, blocked.c.user_id == Submission.author_id, - isouter=True) + isouter=True + ) output = [p[0] for p in query] for i in range(len(output)): output[i]._voted = query[i][1] or 0 output[i]._is_blocking = query[i][2] or 0 output[i]._is_blocked = query[i][3] or 0 - return output + else: - query = g.db.query( + output = g.db.query( Submission ).filter(Submission.id.in_(pids) ).order_by(Submission.id.desc()).all() - return query + return sorted(output, key=lambda x: pids.index(x.id)) def get_post_with_comments(pid, sort="top", v=None): @@ -443,7 +444,7 @@ def get_comments(cids, v=None, sort="new", output = g.db.query(Comment).options().filter(Comment.id.in_(cids)).order_by(Comment.id.desc()).all() - return output + output = sorted(output, key=lambda x: cids.index(x.id)) def get_board(bid, graceful=False): diff --git a/drama/routes/front.py b/drama/routes/front.py index ed57a538b..5ea14e189 100644 --- a/drama/routes/front.py +++ b/drama/routes/front.py @@ -72,8 +72,7 @@ def notifications(v): @cache.memoize(timeout=1500) def frontlist(v=None, sort="hot", page=1,t="all", ids_only=True, filter_words='', **kwargs): - posts = g.db.query(Submission).options(lazyload('*')).filter_by(is_banned=False,stickied=False,private=False).filter(Submission.deleted_utc == 0).order_by(Submission.id.desc()) - + posts = g.db.query(Submission).options(lazyload('*')).filter_by(is_banned=False,stickied=False,private=False).filter(Submission.deleted_utc == 0) if v and v.admin_level == 0: blocking = g.db.query( UserBlock.target_id).filter_by(