From 606369e6a5ef78d789780fd4c4c8476cefbe9416 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 18 Jan 2022 18:46:04 +0200
Subject: [PATCH] fds

---
 files/routes/users.py            | 37 ++++++++++++++++----------------
 files/templates/leaderboard.html |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/files/routes/users.py b/files/routes/users.py
index eeba63e184..774850c78e 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -28,8 +28,26 @@ users5 = users.order_by(User.received_award_count.desc()).limit(25).all()
 if SITE == 'pcmemes.net': users6 = users.order_by(User.basedcount.desc()).limit(25).all()
 else: users6 = None
 users7 = users.order_by(User.coins_spent.desc()).limit(25).all()
+
+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)
+userss9 = users9[:25]
+
 users10 = users.order_by(User.truecoins.desc()).limit(25).all()
 
+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()
+users12 = []
+for user in users11: users12.append((user, badges[user.id]))
+users12 = sorted(users12, key=lambda x: x[1], reverse=True)[:25]
+userss12 = users12[:1]
+
 if site == 'rdrama.net':
 	topmakers = {}
 	for k, val in marseys.items():
@@ -42,25 +60,6 @@ if site == 'rdrama.net':
 	for user in topmakers2:
 		topmakers3.append((user, topmakers[user.username.lower()]))
 	topmakers = sorted(topmakers3, 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()
-users12 = []
-for user in users11: users12.append((user, badges[user.id]))
-users12 = sorted(users12, key=lambda x: x[1], reverse=True)[:25]
-userss12 = users12[: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)
-userss9 = users9[:25]
-
-if SITE == 'rdrama.net':
 	users13 = topmakers
 	userss13 = users13[:25]
 else: userss13 = None
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index 31e153b664..9cff16d68c 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -370,7 +370,7 @@
 				<td style="font-weight: bold">{{user[1]}}</td>
 			</tr>
 		{% endfor %}
-		{% if pos13 and pos13[0] > 25 %}
+		{% if pos13 and pos13[0] > 1 %}
 			<tr style="border-top:2px solid var(--primary)">
 				<td style="font-weight:bold;">{{pos13[0]}}</td>
 				<td><a style="color:#{{v.namecolor}};  font-weight:bold;" href="/@{{v.username}}"><img alt="@{{v.username}}'s profile picture" loading="lazy" src="{{v.profile_url}}" class="pp20"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}}"{% endif %}>{{v.username}}</span></a></td>