diff --git a/files/routes/users.py b/files/routes/users.py index 426b5283e2..5457a24746 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -40,14 +40,6 @@ if site == 'rdrama.net': topmakers3.append((user, topmakers[user.username.lower()])) topmakers = sorted(topmakers3, key=lambda x: x[1], reverse=True)[:25] -votes1 = db.query(Submission.author_id, func.count(Submission.author_id)).join(Vote, Vote.submission_id==Submission.id).filter(Vote.vote_type==-1).group_by(Submission.author_id).order_by(func.count(Submission.author_id).desc()).all() -votes2 = db.query(Comment.author_id, func.count(Comment.author_id)).join(CommentVote, CommentVote.comment_id==Comment.id).filter(CommentVote.vote_type==-1).group_by(Comment.author_id).order_by(func.count(Comment.author_id).desc()).all() -votes3 = Counter(dict(votes1)) + Counter(dict(votes2)) -users8 = db.query(User).filter(User.id.in_(votes3.keys())).all() -users9 = [] -for user in users8: users9.append((user, votes3[user.id])) -users9 = sorted(users9, key=lambda x: x[1], reverse=True)[:25] - badges = db.query(Badge.user_id, func.count(Badge.user_id)).group_by(Badge.user_id).order_by(func.count(Badge.user_id).desc()).all() badges = dict(badges) users11 = db.query(User).filter(User.id.in_(badges.keys())).all() @@ -356,7 +348,18 @@ 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] - return render_template("leaderboard.html", v=v, users1=users1, pos1=pos1, users2=users2, pos2=pos2, users3=users3, pos3=pos3, users4=users4, pos4=pos4, users5=users5, pos5=pos5, users6=users6, pos6=pos6, users7=users7, pos7=pos7, users9=users9, users10=users10, pos10=pos10, users12=users12, users13=users13, users15=users15) + votes1 = db.query(Submission.author_id, func.count(Submission.author_id)).join(Vote, Vote.submission_id==Submission.id).filter(Vote.vote_type==-1).group_by(Submission.author_id).order_by(func.count(Submission.author_id).desc()).all() + votes2 = db.query(Comment.author_id, func.count(Comment.author_id)).join(CommentVote, CommentVote.comment_id==Comment.id).filter(CommentVote.vote_type==-1).group_by(Comment.author_id).order_by(func.count(Comment.author_id).desc()).all() + votes3 = Counter(dict(votes1)) + Counter(dict(votes2)) + users8 = db.query(User).filter(User.id.in_(votes3.keys())).all() + users9 = [] + for user in users8: users9.append((user, votes3[user.id])) + users9 = sorted(users9, key=lambda x: x[1], reverse=True) + pos9 = [x[0].id for x in users9].index(v.id) + pos9 = (pos9, users9[pos9][1]) + users9 = users9[:25] + + return render_template("leaderboard.html", v=v, users1=users1, pos1=pos1, users2=users2, pos2=pos2, users3=users3, pos3=pos3, users4=users4, pos4=pos4, users5=users5, pos5=pos5, users6=users6, pos6=pos6, users7=users7, pos7=pos7, users9=users9, pos9=pos9, users10=users10, pos10=pos10, users12=users12, users13=users13, users15=users15) @app.get("/@/css") diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html index f52b483a30..5da175103d 100644 --- a/files/templates/leaderboard.html +++ b/files/templates/leaderboard.html @@ -259,6 +259,13 @@ {{user[1]}} {% endfor %} + {% if pos9[0] > 25 %} + + {{pos9[0]}} + @{{v.username}}'s profile picture{{v.username}} + {{pos9[1]}} + + {% endif %}