Finish chatroom backporting for 1.5.1

database/backported/1.5.1/getChatroomMessages.php

@@ -5,8 +5,8 @@ $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
-    ORDER BY c.id ASC LIMIT 50
+    WHERE u.banned = 0 AND c.deleted_at = 0 
+    ORDER BY c.id DESC LIMIT 50
 ");
 $stmt->execute();
 $result = $stmt->get_result();
@@ -35,6 +35,6 @@ while ($row = $result->fetch_assoc()) {
     ]);
 }
 
-echo encrypt("1" . ":" . implode("|", $rows));
+echo encrypt("1" . ":" . implode("|", array_reverse($rows)));
 
 $conn->close();

database/backported/1.5.1/sendChatroomMessage.php

@@ -0,0 +1,31 @@
+<?php
+$post = getPostData();
+$request_content = $post['content'] ?? '';
+$token = $post['gameSession'] ?? '';
+
+if (!preg_match('/^[ a-zA-Z0-9!@#\$%\^&\*\(\)_\+\-=\[\]\{\};\':",\.<>\/\?\\\\|`~]+$/', $request_content)) {
+    exitWithMessage("-1");
+}
+
+$conn = newConnection();
+
+$stmt = $conn->prepare("SELECT * FROM users WHERE token = ?");
+$stmt->bind_param("s", $token);
+$stmt->execute();
+$result = $stmt->get_result();
+$row = $result->fetch_assoc();
+if (!$row) exitWithMessage("-1");
+$stmt->close();
+
+$id = $row["id"];
+$content = base64_encode($request_content);
+$time = time();
+
+$stmt = $conn->prepare("INSERT INTO chats (userId, content, timestamp) VALUES (?, ?, ?)");
+$stmt->bind_param("isi", $id, $content, $time);
+$stmt->execute();
+$stmt->close();
+
+echo encrypt("1");
+
+$conn->close();

database/getChatroomMessages.php

@@ -1,12 +1,12 @@
 <?php
 require __DIR__ . '/../incl/util.php';
 setPlainHeader();
-if (isAllowedDatabaseVersion(getClientVersion())) {
-    if (getClientVersion() == "1.5.1" || getClientVersion() == "1.5.2") {
+// if (isAllowedDatabaseVersion(getClientVersion())) {
+    // if (getClientVersion() == "1.5.1" || getClientVersion() == "1.5.2") {
         require __DIR__ . '/backported/1.5.1/getChatroomMessages.php';
         exit;
-    }
-}
+    // }
+// }
 checkClientDatabaseVersion();
 $conn = newConnection();
 
@@ -14,7 +14,7 @@ $stmt = $conn->prepare("
     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
+    WHERE u.banned = 0 AND c.deleted_at = 0 
     ORDER BY c.id DESC
     LIMIT 50
 ");

database/sendChatroomMessage.php

@@ -1,6 +1,12 @@
 <?php
 require __DIR__ . '/../incl/util.php';
 setPlainHeader();
+if (isAllowedDatabaseVersion(getClientVersion())) {
+    if (getClientVersion() == "1.5.1" || getClientVersion() == "1.5.2") {
+        require __DIR__ . '/backported/1.5.1/sendChatroomMessage.php';
+        exit;
+    }
+}
 checkClientDatabaseVersion();
 
 $post = getPostData();