From bf6aff7344a170a9b139b7e285e09d1255647257 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 18 Feb 2022 21:38:45 +0200 Subject: [PATCH] xcv --- files/routes/users.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/files/routes/users.py b/files/routes/users.py index f9935c5aa..21acf7af1 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -356,10 +356,9 @@ def leaderboard(v): sq = g.db.query(User.id, func.rank().over(order_by=User.truecoins.desc()).label("rank")).subquery() pos10 = g.db.query(sq.c.id, sq.c.rank).filter(sq.c.id == v.id).limit(1).one()[1] - sq = g.db.query(Badge.user_id, func.count(Badge.user_id).label("count"), func.rank().over(order_by=func.count(Badge.user_id).desc()).label("rank")).group_by(Badge.user_id).order_by(func.count(Badge.user_id).desc(), Badge.user_id.desc()).subquery() - users11 = g.db.query(User, sq.c.count).join(sq, User.id==sq.c.user_id).order_by(sq.c.count.desc(), User.id.desc()) - pos11 = g.db.query(User.id, sq.c.rank, sq.c.count).join(sq, User.id==sq.c.user_id).filter(User.id == v.id).order_by(sq.c.count.desc(), User.id.desc()).one_or_none() - print(pos11) + sq = g.db.query(Badge.user_id, func.count(Badge.user_id).label("count"), func.rank().over(order_by=func.count(Badge.user_id).desc()).label("rank")).group_by(Badge.user_id).subquery() + users11 = g.db.query(User, sq.c.count).join(sq, User.id==sq.c.user_id).order_by(sq.c.count.desc()) + pos11 = g.db.query(User.id, sq.c.rank, sq.c.count).join(sq, User.id==sq.c.user_id).filter(User.id == v.id).one_or_none() if pos11: pos11 = (pos11[1],pos11[2]) else: pos11 = (users11.count()+1, 0) users11 = users11.limit(25).all()