From 82776814311fc29777984409c6bb953092316637 Mon Sep 17 00:00:00 2001
From: Partow Roshani <roshanipartow@gmail.com>
Date: Mon, 11 Aug 2025 21:29:34 +0330
Subject: [PATCH] Fixed save message

---
 .../to/telegramfinalproject/Server/ClientHandler.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java b/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
index 4a10df4..b57313e 100644
--- a/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
+++ b/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
@@ -2120,6 +2120,15 @@ public class ClientHandler implements Runnable {
                         userId = currentUser.getInternal_uuid();
 
                         UUID targetId = PrivateChatDatabase.getOtherUserInChat(chatId, userId);
+                        if (targetId == null) {
+                            PrivateChat chat = PrivateChatDatabase.findById(chatId);
+                            if (chat != null
+                                    && (userId.equals(chat.getUser1_id()) || userId.equals(chat.getUser2_id()))
+                                    && chat.getUser1_id().equals(chat.getUser2_id())) {
+                                targetId = userId;
+                            }
+                        }
+
                         if (targetId == null) {
                             response = new ResponseModel("error", "Could not find other user.");
                         } else {