From 6cca4e1a31d0b5165319d9d524e1b9ceb6fe4375 Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Mon, 25 Aug 2025 16:32:40 -0700
Subject: [PATCH] Fix leaderboards / chatroom

---
 database/getChatroomMessages.php | 34 +++++++++++++++++++++++++-------
 database/getTopPlayers.php       | 29 +++++++++++++++++++++++++--
 database/getTopPlayersAPI.php    | 25 +++++++++++++++++++++--
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/database/getChatroomMessages.php b/database/getChatroomMessages.php
index 9172338..451c11f 100644
--- a/database/getChatroomMessages.php
+++ b/database/getChatroomMessages.php
@@ -5,15 +5,35 @@ checkClientDatabaseVersion();
 $conn = newConnection();
 
 $stmt = $conn->prepare("
-    SELECT c.id AS chat_id, c.content, u.username, u.icon, u.overlay, u.id AS user_id, u.birdColor, u.overlayColor, c.deleted_at 
-    FROM chats c 
-    JOIN users u ON c.userId = u.id 
-    WHERE u.banned = 0 
-    ORDER BY c.id DESC LIMIT 50
+    SELECT c.id AS chat_id, c.content, c.deleted_at, u.id AS user_id, u.username, u.save_data
+    FROM chats c
+    JOIN users u ON c.userId = u.id
+    WHERE u.banned = 0
+    ORDER BY c.id DESC
+    LIMIT 50
 ");
 $stmt->execute();
-$result = $stmt->get_result();
 
-echo encrypt(json_encode(array_reverse(array_map(fn($row) => ['username' => $row['username'], 'userid' => $row['user_id'], 'content' => (int)$row['deleted_at'] == 0 ? $row['content'] : null, 'deleted' => (int)$row['deleted_at'] != 0, 'id' => $row['chat_id'], 'icon' => $row['icon'], 'overlay' => $row['overlay'], 'birdColor' => json_decode($row['birdColor']), 'overlayColor' => json_decode($row['overlayColor'])], $result->fetch_all(MYSQLI_ASSOC)))));
+$result = $stmt->get_result();
+$rows = $result->fetch_all(MYSQLI_ASSOC);
+
+$mapped = [];
+foreach ($rows as $row) {
+    $savedata = json_decode($row['save_data'], true);
+
+    $mapped[] = [
+        'username' => $row['username'],
+        'userid' => $row['user_id'],
+        'content' => (int)$row['deleted_at'] == 0 ? $row['content'] : null,
+        'deleted' => (int)$row['deleted_at'] != 0,
+        'id' => $row['chat_id'],
+        'icon' => $savedata['bird']['icon'] ?? 1,
+        'overlay' => $savedata['bird']['overlay'] ?? 0,
+        'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
+        'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
+    ];
+}
+
+echo encrypt(json_encode(array_reverse($mapped)));
 
 $conn->close();
\ No newline at end of file
diff --git a/database/getTopPlayers.php b/database/getTopPlayers.php
index 0bd241a..6607d25 100644
--- a/database/getTopPlayers.php
+++ b/database/getTopPlayers.php
@@ -26,11 +26,36 @@ if ($request_type === "0") {
     exitWithMessage(json_encode([]));
 }
 
-$stmt = $conn->prepare("SELECT username, `$request_value`, icon, overlay, id, birdColor, overlayColor FROM users WHERE `$request_value` != 0 AND banned = 0 AND leaderboardsBanned = 0 ORDER BY `$request_value` DESC LIMIT 500");
+$stmt = $conn->prepare("SELECT username, id, save_data 
+  FROM users 
+  WHERE banned = 0 AND leaderboardsBanned = 0");
 $stmt->execute();
 
 $result = $stmt->get_result();
+$rows = $result->fetch_all(MYSQLI_ASSOC);
 
-echo encrypt(json_encode(array_map(fn($row) => ['username' => $row['username'], 'userid' => $row['id'], 'value' => $row[$request_value], 'icon' => $row['icon'], 'overlay' => $row['overlay'], 'birdColor' => json_decode($row['birdColor']), 'overlayColor' => json_decode($row['overlayColor'])], $result->fetch_all(MYSQLI_ASSOC))));
+$mapped = [];
+foreach ($rows as $row) {
+    $savedata = json_decode($row['save_data'], true);
+    if (!$savedata) continue;
+
+    $value = $savedata['gameStore'][$request_value] ?? 0;
+    if ($value <= 0) continue;
+
+    $mapped[] = [
+        'username' => $row['username'],
+        'userid' => $row['id'],
+        'value' => $value,
+        'icon' => $savedata['bird']['icon'] ?? 1,
+        'overlay' => $savedata['bird']['overlay'] ?? 0,
+        'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
+        'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
+    ];
+}
+
+usort($mapped, fn($a,$b) => $b['value'] <=> $a['value']);
+$limited = array_slice($mapped, 0, 500);
+
+echo encrypt(json_encode($limited));
 
 $conn->close();
\ No newline at end of file
diff --git a/database/getTopPlayersAPI.php b/database/getTopPlayersAPI.php
index 092651c..a61486f 100644
--- a/database/getTopPlayersAPI.php
+++ b/database/getTopPlayersAPI.php
@@ -3,11 +3,32 @@ require __DIR__ . '/../incl/util.php';
 setJsonHeader();
 $conn = newConnection();
 
-$stmt = $conn->prepare("SELECT username, highScore FROM users WHERE highScore != 0 AND banned = 0 AND leaderboardsBanned = 0 ORDER BY highScore DESC LIMIT 500");
+$stmt = $conn->prepare("SELECT username, id, save_data 
+  FROM users 
+  WHERE banned = 0 AND leaderboardsBanned = 0");
 $stmt->execute();
 
 $result = $stmt->get_result();
+$rows = $result->fetch_all(MYSQLI_ASSOC);
 
-echo json_encode(array_map(fn($row) => ['username' => $row['username'], 'score' => $row['highScore'], 'scoreFormatted' => number_format($row['highScore'])], $result->fetch_all(MYSQLI_ASSOC)), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+$mapped = [];
+foreach ($rows as $row) {
+    $savedata = json_decode($row['save_data'], true);
+    if (!$savedata) continue;
+
+    $value = $savedata['gameStore']['highScore'] ?? 0;
+    if ($value <= 0) continue;
+
+    $mapped[] = [
+        'username' => $row['username'],
+        'score' => (int)$value,
+        'scoreFormatted' => number_format($value)
+    ];
+}
+
+usort($mapped, fn($a,$b) => $b['score'] <=> $a['score']);
+$limited = array_slice($mapped, 0, 500);
+
+echo json_encode($limited);
 
 $conn->close();
\ No newline at end of file