From fc7069ca573c2b8c3e5cc0630ac728478ad1102f Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Mon, 28 Nov 2022 10:34:52 -0600
Subject: [PATCH] fix bugs introduced by reversion please test on localhost!
 thx <3 https://i.imgur.com/Kb3V1Yb.png

---
 files/assets/js/sort_table.js                   | 17 +++++++++++++----
 .../templates/event/worldcup22_leaderboard.html |  2 +-
 files/templates/user_in_table.html              |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/files/assets/js/sort_table.js b/files/assets/js/sort_table.js
index 60c5b80d8..40c299142 100644
--- a/files/assets/js/sort_table.js
+++ b/files/assets/js/sort_table.js
@@ -7,15 +7,24 @@ function sort_table(n) {
 	for (let i = 1; i < rows.length; i++) {
 		const ele = rows[i];
 		let x = rows[i].getElementsByTagName("TD")[n];
-		x = x.getElementsByTagName('a')[0] || x;
-		const attr = x.dataset.time ? parseInt(x.dataset.time) : parseInt(x.innerHTML.replace(/,/g, ''));
+		if (!('sortKey' in x.dataset)) {
+			x = x.getElementsByTagName('a')[0] || x;
+		}
+		var attr;
+		if ('sortKey' in x.dataset) {
+			attr = x.dataset.sortKey;
+		} else if ('time' in x.dataset) {
+			attr = parseInt(x.dataset.time);
+		} else {
+			attr = parseInt(x.innerHTML.replace(/,/g, ''));
+		}
 		items.push({ ele, attr });
 	}
 	if (sortAscending[n]) {
-		items.sort((a, b) => a.attr - b.attr);
+		items.sort((a, b) => a.attr > b.attr);
 		sortAscending[n] = false;
 	} else {
-		items.sort((a, b) => b.attr - a.attr);
+		items.sort((a, b) => a.attr < b.attr);
 		sortAscending[n] = true;
 	}
 
diff --git a/files/templates/event/worldcup22_leaderboard.html b/files/templates/event/worldcup22_leaderboard.html
index 0c5bb3e66..a1c2a0cf6 100644
--- a/files/templates/event/worldcup22_leaderboard.html
+++ b/files/templates/event/worldcup22_leaderboard.html
@@ -23,7 +23,7 @@
 		<td>{{r[1]}}</td>
 		<td>{{r[2]}}</td>
 		{% set ratio = (r[1]/r[2])|string %}
-		<td>{{ratio[:3]}}</td>
+		<td data-sort-key="{{ratio[:3]}}">{{ratio[:3]}}</td>
 		<td>{{r[3]}}</td>
 	</tr>
 	{% endfor %}
diff --git a/files/templates/user_in_table.html b/files/templates/user_in_table.html
index a48fa2295..29b542f95 100644
--- a/files/templates/user_in_table.html
+++ b/files/templates/user_in_table.html
@@ -1,6 +1,6 @@
 {%- include 'admin/shadowbanned_tooltip.html' -%}
 {% if user and (not user.shadowbanned or v.can_see_shadowbanned) %}
-<a style="color:#{{user.name_color}};font-weight:bold" href="/@{{user.username}}">
+<a data-sort-key="{{user.username.lower()}}" style="color:#{{user.name_color}};font-weight:bold" href="/@{{user.username}}">
 	<div class="profile-pic-20-wrapper mb-2">
 		<img loading="lazy" src="{{user.profile_url}}" class="pp20">
 		{% if user.hat_active -%}