Show forwarded replied messages and reactions

src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java

@@ -1344,6 +1344,160 @@ public class ClientHandler implements Runnable {
                         break;
                     }
 
+                    case "get_messages_UI": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            final String receiverId   = requestJson.getString("receiver_id");
+                            final String receiverType = requestJson.getString("receiver_type").toLowerCase();
+                            final int offset          = requestJson.optInt("offset", 0);
+                            final int limit           = requestJson.optInt("limit", 50);
+
+                            List<Message> messages = new ArrayList<>();
+
+                            switch (receiverType) {
+                                case "private" -> {
+                                    // receiver_id = private_chat.chat_id
+                                    UUID chatId = UUID.fromString(receiverId);
+                                    List<UUID> members = PrivateChatDatabase.getMembers(chatId);
+                                    if (members == null || !members.contains(currentUser.getInternal_uuid())) {
+                                        response = new ResponseModel("error", "You're not a member of this private chat.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.privateChatHistory(chatId, currentUser.getInternal_uuid());
+                                }
+                                case "group" -> {
+                                    Group group = GroupDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (group == null) {
+                                        response = new ResponseModel("error", "Group not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.groupChatHistory(group.getInternal_uuid(), currentUser.getInternal_uuid());
+                                }
+                                case "channel" -> {
+                                    Channel channel = ChannelDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (channel == null) {
+                                        response = new ResponseModel("error", "Channel not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.channelChatHistory(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+                                }
+                                default -> {
+                                    response = new ResponseModel("error", "Invalid receiver type.");
+                                    break;
+                                }
+                            }
+                            if (response != null) break;
+
+                            if (offset > 0 || limit > 0) {
+                                int from = Math.max(0, Math.min(offset, messages.size()));
+                                int to   = Math.max(from, Math.min(from + limit, messages.size()));
+                                messages = messages.subList(from, to);
+                            }
+
+                            JSONArray messageArray = new JSONArray();
+
+                            for (Message m : messages) {
+                                JSONObject obj = new JSONObject();
+
+                                obj.put("message_id", m.getMessage_id().toString());
+                                obj.put("sender_id",  m.getSender_id().toString());
+
+                                User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                                obj.put("sender_name", senderUser != null ? senderUser.getProfile_name() : "Unknown");
+
+                                obj.put("receiver_id",   m.getReceiver_id().toString());
+                                obj.put("receiver_type", m.getReceiver_type());
+
+                                String receiverName = switch (m.getReceiver_type()) {
+                                    case "group" -> {
+                                        Group g = GroupDatabase.findByInternalUUID(m.getReceiver_id());
+                                        yield g != null ? g.getGroup_name() : "Unknown group";
+                                    }
+                                    case "channel" -> {
+                                        Channel c = ChannelDatabase.findByInternalUUID(m.getReceiver_id());
+                                        yield c != null ? c.getChannel_name() : "Unknown channel";
+                                    }
+                                    case "private" -> {
+                                        UUID otherId = PrivateChatDatabase.getOtherParticipant(m.getReceiver_id(), currentUser.getInternal_uuid());
+                                        User other   = userDatabase.findByInternalUUID(otherId);
+                                        yield other != null ? other.getProfile_name() : "Unknown user";
+                                    }
+                                    default -> "Unknown";
+                                };
+                                obj.put("receiver_name", receiverName);
+
+                                obj.put("content",       m.getContent());
+                                obj.put("message_type",  m.getMessage_type());      // TEXT/IMAGE/AUDIO/VIDEO/FILE
+                                obj.put("send_at",       m.getSend_at().toString());
+
+                                obj.put("is_edited",           m.isIs_edited());
+                                obj.put("is_deleted_globally", m.isIs_deleted_globally());
+                                obj.put("edited_at",           m.getEdited_at() != null ? m.getEdited_at().toString() : JSONObject.NULL);
+
+                                if (m.getReply_to_id() != null) {
+                                    obj.put("reply_to_id", m.getReply_to_id().toString());
+
+                                    Message replied = MessageDatabase.findById(m.getReply_to_id());
+                                    if (replied != null) {
+                                        User rSender = userDatabase.findByInternalUUID(replied.getSender_id());
+                                        obj.put("reply_to_sender",  rSender != null ? rSender.getProfile_name() : "Unknown");
+                                        obj.put("reply_to_content", replied.getContent());
+                                        obj.put("reply_to_type",    replied.getMessage_type());
+                                    }
+                                } else {
+                                    obj.put("reply_to_id", JSONObject.NULL);
+                                }
+
+                                if (m.getOriginal_message_id() != null && m.getForwarded_from() != null) {
+                                    User originalSender = userDatabase.findByInternalUUID(m.getForwarded_from());
+                                    obj.put("is_forwarded", true);
+                                    obj.put("forwarded_from", originalSender != null
+                                            ? originalSender.getProfile_name()
+                                            : m.getForwarded_from().toString());
+                                    obj.put("forwarded_by", senderUser != null ? senderUser.getProfile_name() : "Unknown");
+                                    obj.put("forwarded_from_id", m.getForwarded_from().toString());
+                                } else {
+                                    obj.put("is_forwarded",   false);
+                                    obj.put("forwarded_from", JSONObject.NULL);
+                                    obj.put("forwarded_by",   JSONObject.NULL);
+                                }
+
+                                JSONArray reactionsArr = new JSONArray();
+                                try {
+                                    List<String> reactions = MessageReactionDatabase.getReactions(m.getMessage_id());
+                                    if (reactions != null && !reactions.isEmpty()) {
+                                        Map<String, Integer> counter = new HashMap<>();
+                                        for (String r : reactions) {
+                                            counter.put(r, counter.getOrDefault(r, 0) + 1);
+                                        }
+                                        for (Map.Entry<String, Integer> e : counter.entrySet()) {
+                                            JSONObject ro = new JSONObject();
+                                            ro.put("emoji", e.getKey());
+                                            ro.put("count", e.getValue());
+                                            reactionsArr.put(ro);
+                                        }
+                                    }
+                                } catch (Exception ignore) {}
+                                obj.put("reactions", reactionsArr);
+
+                                messageArray.put(obj);
+                            }
+
+                            JSONObject data = new JSONObject();
+                            data.put("messages", messageArray);
+
+                            response = new ResponseModel("success", "Messages fetched.", data);
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching messages: " + e.getMessage());
+                        }
+                        break;
+                    }
+
                     case "toggle_block": {
                         if (currentUser == null) {
                             response = new ResponseModel("error", "Unauthorized. Please login first.");
@@ -2795,7 +2949,6 @@ public class ClientHandler implements Runnable {
 
 
     private void enrichChatEntry(ChatEntry e, UUID me) {
-        // آخرین پیام
         Message last = MessageDatabase.getLastMessage(e.getId(), e.getType());
         if (last != null) {
             e.setLastMessageTime(String.valueOf(last.getSend_at()));
@@ -2804,7 +2957,6 @@ public class ClientHandler implements Runnable {
             e.setLastMessageSenderId(last.getSender_id());
         }
 
-        // تعداد نخوانده‌ها
         int unread = MessageDatabase.getUnreadCount(me, e.getId(), e.getType());
         e.setUnreadCount(unread);
     }
@@ -2814,7 +2966,6 @@ public class ClientHandler implements Runnable {
         if ("TEXT".equalsIgnoreCase(t)) {
             String c = m.getContent();
             if (c == null) return "";
-            // پیش‌نمایش کوتاه
             return c.length() > 120 ? c.substring(0, 120) + "…" : c;
         }
         switch (t) {

src/main/java/org/to/telegramfinalproject/UI/ChatPageController.java

@@ -81,6 +81,17 @@ public class ChatPageController {
     private ChatEntry currentChat;
     private UUID me;
 
+    // ----- helpers for safe strings -----
+    private static String nz(String s) {
+        return s == null ? "" : s.trim();
+    }
+    private static boolean hasVal(String s) {
+        if (s == null) return false;
+        String t = s.trim();
+        return !t.isEmpty() && !"null".equalsIgnoreCase(t);
+    }
+
+
     private void initCurrentUserId() {
         try {
             String meStr = org.to.telegramfinalproject.Client.Session
@@ -394,7 +405,7 @@ public class ChatPageController {
 
     private void loadMessages(ChatEntry entry) {
         JSONObject req = new JSONObject();
-        req.put("action", "get_messages");
+        req.put("action", "get_messages_UI");
         req.put("receiver_id", String.valueOf(entry.getId()));
         req.put("receiver_type", entry.getType());
         req.put("limit", 50);
@@ -482,47 +493,51 @@ public class ChatPageController {
     private void renderMessages(org.json.JSONArray list) {
         messageContainer.getChildren().clear();
 
+        // برای reply-preview: ایندکس کردن پیام‌ها با message_id
         msgIndex.clear();
-        for (int i=0; i<list.length(); i++) {
+        for (int i = 0; i < list.length(); i++) {
             org.json.JSONObject m = list.getJSONObject(i);
             String mid = str(m, "message_id");
             if (!mid.isEmpty()) msgIndex.put(mid, m);
         }
 
-        String myId = (Session.currentUser!=null && Session.currentUser.has("internal_uuid"))
+        String myId = (Session.currentUser != null && Session.currentUser.has("internal_uuid"))
                 ? Session.currentUser.getString("internal_uuid") : "";
 
-        for (int i=0;i<list.length();i++){
+        for (int i = 0; i < list.length(); i++) {
             org.json.JSONObject m = list.getJSONObject(i);
-            String senderId   = str(m,"sender_id");
-            String senderName = str(m,"sender_name");
-            String type       = str(m,"message_type");
-            String content    = str(m,"content");
-            String whenStr    = str(m,"send_at");
-            String msgId      = str(m,"message_id");
 
-            // فوروارد/ریپلای/ادیت/ری‌اکشن
+            String senderId    = str(m, "sender_id");
-            String fwdFrom    = str(m,"forwarded_from"); // نام یا آیدی منبع
+            String senderName  = str(m, "sender_name");
-            String fwdBy      = str(m,"forwarded_by");   // چه کسی فوروارد کرده
+            String type        = str(m, "message_type");
-            String replyToId  = str(m,"reply_to_id");
+            String content     = str(m, "content");
-            boolean edited    = bool(m,"is_edited");
+            String whenStr     = str(m, "send_at");
-            org.json.JSONArray reactions = arr(m,"reactions"); // [{emoji:"👍", count:3, by_me:true}, ...]
+            String msgId       = str(m, "message_id");
+
+            // فوروارد / ریپلای / ادیت / ری‌اکشن
+            String fwdFrom     = nz(str(m, "forwarded_from"));
+            String fwdBy       = nz(str(m, "forwarded_by"));
+            String replyToId   = nz(str(m, "reply_to_id"));
+            boolean edited     = bool(m, "is_edited");
+            org.json.JSONArray reactions = arr(m, "reactions");
 
             boolean outgoing = senderId.equalsIgnoreCase(myId);
-            if (senderName.isEmpty()) senderName = outgoing ? "You" : shortId(senderId);
+            if (senderName == null || senderName.isBlank()) {
+                senderName = outgoing ? "You"
+                        : (senderId == null || senderId.isBlank()
+                        ? "Unknown"
+                        : senderId.substring(0, Math.min(8, senderId.length())));
+            }
 
             java.time.LocalDateTime ts = parseWhen(whenStr);
 
-            // مثلا داخل renderMessages قبل از addBubble:
+            // نمایش
-            if (!"TEXT".equalsIgnoreCase(type) && content != null && !content.isBlank()) {
-                System.out.println("DEBUG type='" + type + "' -> showing bracket for msgId=" + msgId);
-            }
-
-
             addBubble(outgoing, senderName, type, content, ts, msgId,
                     fwdFrom, fwdBy, replyToId, edited, reactions);
         }
 
+        // کمی فاصله بین پیام‌ها
+        messageContainer.setSpacing(8);
         messageScrollPane.layout();
         messageScrollPane.setVvalue(1.0);
     }
@@ -592,20 +607,17 @@ public class ChatPageController {
             boolean edited,
             org.json.JSONArray reactions
     ) {
-        // --- meta (نام فرستنده + زمان [+ edited]) ---
+        // meta (فرستنده + زمان [+ edited])
         String metaText = (displayName == null ? "" : displayName) + " • " + formatWhen(sentAt);
         if (edited) metaText += " (edited)";
         Label meta = new Label(metaText);
         meta.setStyle("-fx-font-size: 11; -fx-text-fill: #7e8a97;");
         meta.setWrapText(true);
 
-        // --- نرمال‌سازی نوع پیام + fallback ---
+        // نرمال‌سازی نوع پیام و متن
-        String t = (type == null) ? "" : type.trim().toUpperCase();
+        String t = type == null ? "" : type.trim().toUpperCase();
-        // اگر type نامعتبر/خالی بود ولی content متن داشت، فرض کن TEXT است.
         boolean isText = t.isEmpty() ? (content != null && !content.isBlank()) : "TEXT".equals(t);
-
+        String bodyText = isText ? (content == null ? "" : content) : bracketLabel(t);
-        String bodyText = isText ? (content == null ? "" : content)
-                : bracketLabel(t); // [Image] / [Audio] / ...
 
         Label msg = new Label(bodyText);
         msg.setWrapText(true);
@@ -623,28 +635,38 @@ public class ChatPageController {
         );
         msg.setMinHeight(Region.USE_PREF_SIZE);
 
-        VBox bubble = new VBox(6);
+        // بدنه حباب
+        VBox bubble = new VBox(4); // spacing عمودی داخل حباب
         bubble.getChildren().add(meta);
 
-        if (notBlank(forwardedFrom) || notBlank(forwardedBy)) {
+        // Forward header (اختیاری)
+        if (hasVal(forwardedFrom) || hasVal(forwardedBy)) {
             bubble.getChildren().add(buildForwardHeader(forwardedFrom, forwardedBy));
         }
-        if (notBlank(replyToId)) {
+
+        // Reply preview (اختیاری)
+        if (hasVal(replyToId)) {
             bubble.getChildren().add(buildReplyBoxFromIndex(replyToId));
         }
 
+        // متن اصلی
         bubble.getChildren().add(msg);
 
+        // Reactions (اختیاری)
         if (reactions != null && reactions.length() > 0) {
             bubble.getChildren().add(buildReactionsBarFromJson(reactions, dark));
         }
 
+        // چیدمان راست/چپ
         javafx.scene.layout.HBox row = new javafx.scene.layout.HBox(bubble);
         row.setFillHeight(true);
-        row.setSpacing(6);
+        row.setSpacing(4);
         row.setAlignment(outgoing ? javafx.geometry.Pos.CENTER_RIGHT
                 : javafx.geometry.Pos.CENTER_LEFT);
 
+        // کمی padding اطراف هر پیام برای کاهش فاصله‌های ناخوشایند
+        row.setPadding(new javafx.geometry.Insets(2, 6, 2, 6));
+
         messageContainer.getChildren().add(row);
     }
 
@@ -662,16 +684,14 @@ public class ChatPageController {
 
 
     private javafx.scene.Node buildForwardHeader(String forwardedFrom, String forwardedBy) {
-        String txt;
+        String from = hasVal(forwardedFrom) ? forwardedFrom.trim() : null;
-        if (notBlank(forwardedFrom) && notBlank(forwardedBy)) {
+        String by   = hasVal(forwardedBy)   ? forwardedBy.trim()   : null;
-            txt = "Forwarded from " + forwardedFrom + " by " + forwardedBy;
+
-        } else if (notBlank(forwardedFrom)) {
+        String txt = (from != null && by != null) ? ("Forwarded from " + from + " by " + by)
-            txt = "Forwarded from " + forwardedFrom;
+                : (from != null) ? ("Forwarded from " + from)
-        } else if (notBlank(forwardedBy)) {
+                : (by   != null) ? ("Forwarded by "   + by)
-            txt = "Forwarded by " + forwardedBy;
+                : "Forwarded";
-        } else {
+
-            txt = "Forwarded";
-        }
         Label l = new Label(txt);
         l.setStyle("-fx-font-size: 11; -fx-text-fill: #5b8bb1;");
         l.setWrapText(true);
@@ -687,7 +707,7 @@ public class ChatPageController {
             String rType    = r.optString("message_type", "TEXT");
             String rContent = r.optString("content", "");
             String rSender  = r.optString("sender_name", "");
-            if (!rSender.isEmpty()) from = rSender;
+            if (hasVal(rSender)) from = rSender;
 
             preview = "TEXT".equalsIgnoreCase(rType) ? rContent : bracketLabel(rType);
         } else {
@@ -710,6 +730,7 @@ public class ChatPageController {
         return box;
     }
 
+
     private javafx.scene.Node buildReactionsBarFromJson(org.json.JSONArray arr, boolean dark) {
         javafx.scene.layout.HBox bar = new javafx.scene.layout.HBox(6);
         bar.setAlignment(javafx.geometry.Pos.CENTER_LEFT);