From cc8a3211d96991241ea5f3c62f0e81b4fe9ad5f0 Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 20 Jan 2023 23:55:06 +0200 Subject: [PATCH] restore /comments --- files/routes/front.py | 49 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index 0e9279766..36a0f0264 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -218,33 +218,32 @@ def comment_idlist(v=None, page=1, sort="new", t="day", gt=0, lt=0, site=None): comments = comments.offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() return [x[0] for x in comments] -if SITE != 'rdrama.net': - @app.get("/comments") - @auth_required - def all_comments(v:User): - try: page = max(int(request.values.get("page", 1)), 1) - except: page = 1 +@app.get("/comments") +@auth_required +def all_comments(v:User): + try: page = max(int(request.values.get("page", 1)), 1) + except: page = 1 - sort=request.values.get("sort", "new") - t=request.values.get("t", DEFAULT_TIME_FILTER) + sort=request.values.get("sort", "new") + t=request.values.get("t", "hour") - try: gt=int(request.values.get("after", 0)) - except: gt=0 + try: gt=int(request.values.get("after", 0)) + except: gt=0 - try: lt=int(request.values.get("before", 0)) - except: lt=0 - idlist = comment_idlist(v=v, - page=page, - sort=sort, - t=t, - gt=gt, - lt=lt, - site=SITE - ) + try: lt=int(request.values.get("before", 0)) + except: lt=0 + idlist = comment_idlist(v=v, + page=page, + sort=sort, + t=t, + gt=gt, + lt=lt, + site=SITE + ) - comments = get_comments(idlist, v=v) - next_exists = len(idlist) > PAGE_SIZE - idlist = idlist[:PAGE_SIZE] + comments = get_comments(idlist, v=v) + next_exists = len(idlist) > PAGE_SIZE + idlist = idlist[:PAGE_SIZE] - if v.client: return {"data": [x.json(g.db) for x in comments]} - return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists) + if v.client: return {"data": [x.json(g.db) for x in comments]} + return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists)