diff --git a/database/getAccountProfile.php b/database/getAccountProfile.php index efafbfd..e0c346e 100644 --- a/database/getAccountProfile.php +++ b/database/getAccountProfile.php @@ -1,20 +1,31 @@ prepare("SELECT * FROM users WHERE id = ?"); +$stmt = $conn0->prepare("SELECT username, id FROM users WHERE id = ?"); $stmt->bind_param("i", $uesrId); $stmt->execute(); $result = $stmt->get_result(); if ($result->num_rows > 0) { $row = $result->fetch_assoc(); - $savedata = json_decode($row['save_data'], true); + + $stmt2 = $conn1->prepare("SELECT save_data FROM userdata WHERE id = ?"); + $stmt2->bind_param("i", $row['id']); + $stmt2->execute(); + $result2 = $stmt2->get_result(); + $row2 = $result2->fetch_assoc(); + + $savedata = json_decode($row2['save_data'], true); $custom = null; if (isset($savedata['bird']['customIcon']['selected'])) { $selected = $savedata['bird']['customIcon']['selected']; @@ -48,4 +59,5 @@ if ($result->num_rows > 0) { } $stmt->close(); -$conn->close(); \ No newline at end of file +$conn0->close(); +$conn1->close(); \ No newline at end of file diff --git a/database/getAccountProfileMessages.php b/database/getAccountProfileMessages.php index 4f1a12d..4e74bb6 100644 --- a/database/getAccountProfileMessages.php +++ b/database/getAccountProfileMessages.php @@ -7,16 +7,24 @@ $post = getPostData(); $targetId = (int)$post['targetId'] ?? 0; $stmt = $conn->prepare(" - SELECT p.id, p.content, p.timestamp, p.likes, u.id as userId - FROM userposts p - JOIN users u ON p.userId = u.id - WHERE u.id = ? AND p.deleted_at = 0 - ORDER BY p.id DESC + SELECT id, content, timestamp, likes, userId + FROM userposts + WHERE userId = ? AND deleted_at = 0 + ORDER BY id DESC "); $stmt->bind_param("i", $targetId); $stmt->execute(); $result = $stmt->get_result(); -echo encrypt(json_encode(array_map(fn($row) => ['id' => $row['id'], 'userId' => $row['userId'], 'content' => $row['content'], 'timestamp' => genTimestamp($row['timestamp']) . " ago", 'likes' => $row['likes']], $result->fetch_all(MYSQLI_ASSOC)))); +echo encrypt(json_encode(array_map( + fn($row) => [ + 'id' => $row['id'], + 'userId' => $row['userId'], + 'content' => $row['content'], + 'timestamp' => genTimestamp($row['timestamp']) . " ago", + 'likes' => $row['likes'] + ], + $result->fetch_all(MYSQLI_ASSOC) +))); $conn->close(); \ No newline at end of file