fyp

app/models/message.py

@@ -22,6 +22,9 @@ class Message:
         content: Optional[str] = None,
         media: Optional[dict] = None,
         property_card: Optional[dict] = None,
+        replied_to_message_id: Optional[str] = None,
+        replied_to_content: Optional[str] = None,
+        replied_to_sender: Optional[str] = None,
     ) -> dict:
         """Create message document for insertion"""
         now = datetime.utcnow()
@@ -34,6 +37,10 @@ class Message:
             "content": content,
             "media": media,  # {url, filename, size, mime_type, duration, thumbnail_url}
             "property_card": property_card,  # {listing_id, title, price, currency, bedrooms, bathrooms, location, image_url, listing_type}
+            # Reply-to fields
+            "replied_to_message_id": replied_to_message_id,
+            "replied_to_content": replied_to_content,  # Preview of replied message (truncated)
+            "replied_to_sender": replied_to_sender,  # Name of original sender
             "is_read": False,
             "read_at": None,
             # Edit tracking
@@ -139,6 +146,10 @@ class Message:
             "content": message_doc.get("content") if not is_deleted else None,
             "media": message_doc.get("media") if not is_deleted else None,
             "property_card": message_doc.get("property_card") if not is_deleted else None,
+            # Reply-to fields
+            "replied_to_message_id": message_doc.get("replied_to_message_id"),
+            "replied_to_content": message_doc.get("replied_to_content"),
+            "replied_to_sender": message_doc.get("replied_to_sender"),
             "is_read": message_doc.get("is_read", False),
             "read_at": Message._serialize_datetime(message_doc.get("read_at")),
             # Edit fields

app/routes/conversations.py

@@ -265,6 +265,9 @@ async def send_message(
         content=dto.content,
         media=media,
         property_card=dto.property_card.dict() if dto.property_card else None,
+        replied_to_message_id=dto.replied_to_message_id,
+        replied_to_content=dto.replied_to_content,
+        replied_to_sender=dto.replied_to_sender,
     )
 
 

app/routes/websocket_chat.py

@@ -238,6 +238,10 @@ async def handle_send_message(user_id: str, user_name: str, user_avatar: Optiona
     content = data.get("content")
     media = data.get("media")
     property_card = data.get("property_card")
+    # Reply-to fields
+    replied_to_message_id = data.get("replied_to_message_id")
+    replied_to_content = data.get("replied_to_content")
+    replied_to_sender = data.get("replied_to_sender")
     
     # Auto-detect message type based on content
     if property_card:
@@ -270,6 +274,9 @@ async def handle_send_message(user_id: str, user_name: str, user_avatar: Optiona
         content=content,
         media=media,
         property_card=property_card,
+        replied_to_message_id=replied_to_message_id,
+        replied_to_content=replied_to_content,
+        replied_to_sender=replied_to_sender,
     )
     
     # DEBUG: Log message_doc before inserting

app/schemas/conversation.py

@@ -124,6 +124,10 @@ class SendMessageDto(BaseModel):
     content: Optional[str] = None
     media_url: Optional[str] = None
     property_card: Optional[PropertyCardDto] = None
+    # Reply-to fields
+    replied_to_message_id: Optional[str] = None
+    replied_to_content: Optional[str] = None
+    replied_to_sender: Optional[str] = None
 
 
 class CallDto(BaseModel):

app/services/conversation_service.py

@@ -388,6 +388,9 @@ class ConversationService:
         content: Optional[str] = None,
         media: Optional[dict] = None,
         property_card: Optional[dict] = None,
+        replied_to_message_id: Optional[str] = None,
+        replied_to_content: Optional[str] = None,
+        replied_to_sender: Optional[str] = None,
     ) -> dict:
         """
         Send a message in a conversation.
@@ -428,6 +431,9 @@ class ConversationService:
             content=content,
             media=media,
             property_card=property_card,
+            replied_to_message_id=replied_to_message_id,
+            replied_to_content=replied_to_content,
+            replied_to_sender=replied_to_sender,
         )
         
         result = await db.messages.insert_one(message_doc)