From b13ec4f4c7a69ad46dc88760801e835a7db1ddc1 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 21 Jan 2023 05:59:53 +0200 Subject: [PATCH] give an error message in /comments to stop bad bug reports --- files/routes/front.py | 52 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index 63461cada..050eab98f 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -218,33 +218,35 @@ 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): + if SITE == 'rdrama.net': + abort(403, "Temporarily disabled!") - sort=request.values.get("sort", "new") - t=request.values.get("t", "hour") + try: page = max(int(request.values.get("page", 1)), 1) + except: page = 1 - try: gt=int(request.values.get("after", 0)) - except: gt=0 + sort=request.values.get("sort", "new") + t=request.values.get("t", "hour") - 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: gt=int(request.values.get("after", 0)) + except: gt=0 - comments = get_comments(idlist, v=v) - next_exists = len(idlist) > PAGE_SIZE - idlist = idlist[:PAGE_SIZE] + 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 + ) - 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) + 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)