From abf62a6df65d341e4cd26707954735ce80cfc004 Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Fri, 2 Jan 2026 20:00:53 -0700
Subject: [PATCH] Fix 1.5.x getChatroomMessages.php and sendChatroomMessage.php

---
 .../backported/1.5.1/getChatroomMessages.php  | 40 +++++++++++++------
 .../backported/1.5.1/sendChatroomMessage.php  |  4 +-
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/database/backported/1.5.1/getChatroomMessages.php b/database/backported/1.5.1/getChatroomMessages.php
index 6577cf5..eba1f7b 100644
--- a/database/backported/1.5.1/getChatroomMessages.php
+++ b/database/backported/1.5.1/getChatroomMessages.php
@@ -1,31 +1,46 @@
 <?php
-$conn = newConnection();
+$conn0 = newConnection(0);
+$conn1 = newConnection(1);
 
-$stmt = $conn->prepare("
-    SELECT c.id AS chat_id, c.content, u.username, u.id AS user_id, u.save_data 
-    FROM chats c
-    JOIN users u ON c.userId = u.id
-    WHERE u.banned = 0 AND c.deleted_at = 0 
-    ORDER BY c.id DESC LIMIT 50
+$stmt = $conn1  ->prepare("
+    SELECT id, content, userId 
+    FROM chats
+    WHERE deleted_at = 0 
+    ORDER BY id DESC LIMIT 50
 ");
 $stmt->execute();
 $result = $stmt->get_result();
 
 $rows = [];
 while ($row = $result->fetch_assoc()) {
-    $savedata = json_decode($row['save_data'], true);
+    $userId = $row["userId"];
+    $stmt2 = $conn1->prepare("SELECT save_data FROM userdata WHERE id = ? LIMIT 1");
+    $stmt2->bind_param("i", $userId);
+    $stmt2->execute();
+    $result2 = $stmt2->get_result();
+    if ($result2->num_rows != 1) continue;
+    $row2 = $result2->fetch_assoc();
+
+    $stmt3 = $conn0->prepare("SELECT username FROM users WHERE id = ? LIMIT 1");
+    $stmt3->bind_param("i", $userId);
+    $stmt3->execute();
+    $result3 = $stmt3->get_result();
+    if ($result3->num_rows != 1) continue;
+    $row3 = $result3->fetch_assoc();
+
+    $savedata = json_decode($row2['save_data'], true);
     $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];
 
     $rows[] = implode(";", [
-        $row['chat_id'],
-        base64_encode($row['username']),
+        $row['id'],
+        base64_encode($row3['username']),
         $row['content'],
         $icon,
         $overlay,
-        $row['user_id'],
+        $userId,
         $birdColor[0],
         $birdColor[1],
         $birdColor[2],
@@ -37,4 +52,5 @@ while ($row = $result->fetch_assoc()) {
 
 echo encrypt("1" . ":" . implode("|", array_reverse($rows)));
 
-$conn->close();
\ No newline at end of file
+$conn0->close();
+$conn1->close();
\ No newline at end of file
diff --git a/database/backported/1.5.1/sendChatroomMessage.php b/database/backported/1.5.1/sendChatroomMessage.php
index 59958e3..44614aa 100644
--- a/database/backported/1.5.1/sendChatroomMessage.php
+++ b/database/backported/1.5.1/sendChatroomMessage.php
@@ -7,9 +7,9 @@ if (!preg_match('/^[ a-zA-Z0-9!@#\$%\^&\*\(\)_\+\-=\[\]\{\};\':",\.<>\/\?\\\\|`~
     exitWithMessage("-1");
 }
 
-$conn = newConnection();
+$conn = newConnection(1);
 
-$stmt = $conn->prepare("SELECT * FROM users WHERE token = ?");
+$stmt = $conn->prepare("SELECT id FROM userdata WHERE token = ?");
 $stmt->bind_param("s", $token);
 $stmt->execute();
 $result = $stmt->get_result();