diff --git a/files/routes/users.py b/files/routes/users.py index 03f32cc41..b1bb21463 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -358,9 +358,9 @@ def leaderboard(v): 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).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) - pos11 = g.db.query(User.id, sq.c.rank, sq.c.count).join(sq, User.id==sq.c.user_id).order_by(sq.c.count.desc(), User.id).filter(User.id == v.id).one_or_none() + pos11 = g.db.query(sq.c.rank, sq.c.count, User.id).join(sq, User.id==sq.c.user_id).order_by(sq.c.count.desc(), User.id).filter(User.id == v.id).one_or_none() print(pos11) - if pos11: pos11 = (pos11[1],pos11[2]) + if pos11: pos11 = (pos11[9],pos11[1]) else: pos11 = (users11.count()+1, 0) users11 = users11.limit(25).all()