diff --git a/files/routes/admin.py b/files/routes/admin.py index 507eb8281..c2d3a5bf7 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -341,7 +341,7 @@ def shadowbanned(v): .filter( User.shadowbanned != None, ) \ - .order_by(nullslast(User.last_active.desc())).all() + .order_by(User.truescore.desc()).all() return render_template("admin/shadowbanned.html", v=v, users=users) diff --git a/files/routes/users.py b/files/routes/users.py index f2590ac0f..3c2783c12 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -176,7 +176,7 @@ def banned(v:User): or_(User.unban_utc == 0, User.unban_utc > time.time()), ) if v.admin_level >= PERMS['VIEW_LAST_ACTIVE']: - users = users.order_by(nullslast(User.last_active.desc())) + users = users.order_by(User.truescore.desc()) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) users = users.all() @@ -201,7 +201,7 @@ def chuds(v:User): or_(User.agendaposter == 1, User.agendaposter > time.time()), ) if v.admin_level >= PERMS['VIEW_LAST_ACTIVE']: - users = users.order_by(nullslast(User.last_active.desc())) + users = users.order_by(User.truescore.desc()) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) users = users.order_by(User.username).all()