From af74a752add8dc90df274490e0e43fbbceed1875 Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 5 May 2023 08:57:02 +0300 Subject: [PATCH] use new pagination system in /@/blockers --- files/routes/users.py | 10 +++++----- files/templates/userpage/blockers.html | 19 +------------------ 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/files/routes/users.py b/files/routes/users.py index 7b0df022f..29fc92ec0 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -750,12 +750,12 @@ def blockers(v:User, username:str): page = get_page() users = g.db.query(UserBlock, User).join(UserBlock, UserBlock.target_id == u.id) \ - .filter(UserBlock.user_id == User.id) \ - .order_by(UserBlock.created_utc.desc()) \ - .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() + .filter(UserBlock.user_id == User.id) - next_exists = (len(users) > PAGE_SIZE) - users = users[:PAGE_SIZE] + next_exists = users.count() + + users = users.order_by(UserBlock.created_utc.desc()) \ + .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE ).all() return render_template("userpage/blockers.html", v=v, u=u, users=users, page=page, next_exists=next_exists) diff --git a/files/templates/userpage/blockers.html b/files/templates/userpage/blockers.html index cfbde0ca0..1305ddb38 100644 --- a/files/templates/userpage/blockers.html +++ b/files/templates/userpage/blockers.html @@ -24,22 +24,5 @@ {% endblock %} {% block pagenav %} - +{% include "pagination.html" %} {% endblock %}