Make icon marketplace icons show up in chatroom and leaderboards
This commit is contained in:
@@ -18,9 +18,24 @@ $result = $stmt->get_result();
|
|||||||
$rows = $result->fetch_all(MYSQLI_ASSOC);
|
$rows = $result->fetch_all(MYSQLI_ASSOC);
|
||||||
|
|
||||||
$mapped = [];
|
$mapped = [];
|
||||||
|
$icons = [];
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$savedata = json_decode($row['save_data'], true);
|
$savedata = json_decode($row['save_data'], true);
|
||||||
|
|
||||||
|
$customIcon = $savedata['bird']['customIcon']['selected'] ?? null;
|
||||||
|
|
||||||
|
if ($customIcon != null && strlen($customIcon) == 36 && $icons[$customIcon] == null) {
|
||||||
|
$stmt = $conn->prepare("SELECT data FROM marketplaceicons WHERE uuid = ?");
|
||||||
|
$stmt->bind_param("s", $customIcon);
|
||||||
|
$stmt->execute();
|
||||||
|
$result = $stmt->get_result();
|
||||||
|
$rowData = $result->fetch_assoc();
|
||||||
|
if ($rowData) {
|
||||||
|
$stmt->close();
|
||||||
|
$icons[$customIcon] = $rowData["data"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$mapped[] = [
|
$mapped[] = [
|
||||||
'username' => $row['username'],
|
'username' => $row['username'],
|
||||||
'userid' => $row['user_id'],
|
'userid' => $row['user_id'],
|
||||||
@@ -31,9 +46,10 @@ foreach ($rows as $row) {
|
|||||||
'overlay' => $savedata['bird']['overlay'] ?? 0,
|
'overlay' => $savedata['bird']['overlay'] ?? 0,
|
||||||
'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
|
'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
|
||||||
'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
|
'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
|
||||||
|
'customIcon' => $customIcon,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
echo encrypt(json_encode(array_reverse($mapped)));
|
echo encrypt(json_encode(["messages" => array_reverse($mapped), "customIcons" => $icons]));
|
||||||
|
|
||||||
$conn->close();
|
$conn->close();
|
||||||
@@ -35,6 +35,7 @@ $result = $stmt->get_result();
|
|||||||
$rows = $result->fetch_all(MYSQLI_ASSOC);
|
$rows = $result->fetch_all(MYSQLI_ASSOC);
|
||||||
|
|
||||||
$mapped = [];
|
$mapped = [];
|
||||||
|
$icons = [];
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$savedata = json_decode($row['save_data'], true);
|
$savedata = json_decode($row['save_data'], true);
|
||||||
if (!$savedata) continue;
|
if (!$savedata) continue;
|
||||||
@@ -42,6 +43,20 @@ foreach ($rows as $row) {
|
|||||||
$value = $savedata['gameStore'][$request_value] ?? 0;
|
$value = $savedata['gameStore'][$request_value] ?? 0;
|
||||||
if ($value <= 0) continue;
|
if ($value <= 0) continue;
|
||||||
|
|
||||||
|
$customIcon = $savedata['bird']['customIcon']['selected'] ?? null;
|
||||||
|
|
||||||
|
if ($customIcon != null && strlen($customIcon) == 36 && $icons[$customIcon] == null) {
|
||||||
|
$stmt = $conn->prepare("SELECT data FROM marketplaceicons WHERE uuid = ?");
|
||||||
|
$stmt->bind_param("s", $customIcon);
|
||||||
|
$stmt->execute();
|
||||||
|
$result = $stmt->get_result();
|
||||||
|
$rowData = $result->fetch_assoc();
|
||||||
|
if ($rowData) {
|
||||||
|
$stmt->close();
|
||||||
|
$icons[$customIcon] = $rowData["data"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$mapped[] = [
|
$mapped[] = [
|
||||||
'username' => $row['username'],
|
'username' => $row['username'],
|
||||||
'userid' => $row['id'],
|
'userid' => $row['id'],
|
||||||
@@ -50,12 +65,13 @@ foreach ($rows as $row) {
|
|||||||
'overlay' => $savedata['bird']['overlay'] ?? 0,
|
'overlay' => $savedata['bird']['overlay'] ?? 0,
|
||||||
'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
|
'birdColor' => $savedata['settings']['colors']['icon'] ?? [255,255,255],
|
||||||
'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
|
'overlayColor' => $savedata['settings']['colors']['overlay'] ?? [255,255,255],
|
||||||
|
'customIcon' => $customIcon
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
usort($mapped, fn($a,$b) => $b['value'] <=> $a['value']);
|
usort($mapped, fn($a,$b) => $b['value'] <=> $a['value']);
|
||||||
$limited = array_slice($mapped, 0, 500);
|
$limited = array_slice($mapped, 0, 500);
|
||||||
|
|
||||||
echo encrypt(json_encode($limited));
|
echo encrypt(json_encode(["entries" => $limited, "customIcons" => $icons]));
|
||||||
|
|
||||||
$conn->close();
|
$conn->close();
|
||||||
Reference in New Issue
Block a user