diff --git a/database/getChatroomMessages.php b/database/getChatroomMessages.php index 7b47423..fd61bc4 100644 --- a/database/getChatroomMessages.php +++ b/database/getChatroomMessages.php @@ -5,7 +5,7 @@ checkClientDatabaseVersion(); $conn = newConnection(); $stmt = $conn->prepare(" - SELECT c.id, c.content, u.username, u.icon, u.overlay, u.id, u.birdR, u.birdG, u.birdB, u.overlayR, u.overlayG, u.overlayB + SELECT c.id, c.content, u.username, u.icon, u.overlay, u.id, u.birdColor, u.overlayColor FROM chats c JOIN users u ON c.userId = u.id WHERE u.banned = 0 AND c.deleted = 0 @@ -14,6 +14,6 @@ $stmt = $conn->prepare(" $stmt->execute(); $result = $stmt->get_result(); -echo encrypt(json_encode(array_map(fn($row) => ['username' => $row['username'], 'userid' => $row['id'], 'content' => $row['content'], 'id' => $row['id'], 'icon' => $row['icon'], 'overlay' => $row['overlay'], 'birdColor' => [$row['birdR'], $row['birdG'], $row['birdB']], 'overlayColor' => [$row['overlayR'], $row['overlayG'], $row['overlayB']]], $result->fetch_all(MYSQLI_ASSOC)), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); +echo encrypt(json_encode(array_map(fn($row) => ['username' => $row['username'], 'userid' => $row['id'], 'content' => $row['content'], 'id' => $row['id'], 'icon' => $row['icon'], 'overlay' => $row['overlay'], 'birdColor' => json_decode($row['birdColor']), 'overlayColor' => json_decode($row['overlayColor'])], $result->fetch_all(MYSQLI_ASSOC)), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); $conn->close(); \ No newline at end of file diff --git a/database/getTopPlayers.php b/database/getTopPlayers.php index be56a6c..c3b6573 100644 --- a/database/getTopPlayers.php +++ b/database/getTopPlayers.php @@ -22,11 +22,11 @@ if ($request_type === "0") { exitWithMessage(json_encode([])); } -$stmt = $conn->prepare("SELECT username, `$request_value`, icon, overlay, id, birdR, birdG, birdB, overlayR, overlayG, overlayB FROM users WHERE `$request_value` != 0 AND banned = 0 AND leaderboardsBanned = 0 ORDER BY `$request_value` DESC LIMIT 500"); +$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->execute(); $result = $stmt->get_result(); -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' => [$row['birdR'], $row['birdG'], $row['birdB']], 'overlayColor' => [$row['overlayR'], $row['overlayG'], $row['overlayB']]], $result->fetch_all(MYSQLI_ASSOC)), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); +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)), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); $conn->close(); \ No newline at end of file diff --git a/database/loginAccount.php b/database/loginAccount.php index d139146..5e7107c 100644 --- a/database/loginAccount.php +++ b/database/loginAccount.php @@ -55,8 +55,8 @@ if ($loginType === "0") { "totalUltraBerries" => (string)$user['totalUltraBerries'], "totalSpeedyBerries" => (string)$user['totalSpeedyBerries'], "totalAttempts" => (string)$user['totalAttempts'], - "birdColor" => [(int)$user['birdR'], (int)$user['birdG'], (int)$user['birdB']], - "overlayColor" => [(int)$user['overlayR'], (int)$user['overlayG'], (int)$user['overlayB']] + "birdColor" => json_encode((string)$user['birdColor']), + "overlayColor" => json_encode((string)$user['overlayColor']) ]; } elseif ($loginType === "1") { $data += [