Fix FCM

backend/services/main/routes/envelope_messaging.py

@@ -38,6 +38,7 @@ from ..service_calls import (
     delete_resumable_upload_in_storage,
 )
 from .messaging import messagingManager, convert_dm_envelope
+from ..push_service import push_service
 
 logger = logging.getLogger("uvicorn.error")
 
@@ -367,6 +368,11 @@ async def send_encrypted_message(
             sender_payload["client_message_id"] = request.client_message_id
         await messagingManager.send_update_to_user(dm_envelope.sender_id, "dmNew", sender_payload, db)
 
+        try:
+            await push_service.send_dm_notification(db, dm_envelope, current_user)
+        except Exception as e:
+            logger.error("Failed to send push notification for DM %s: %s", dm_envelope.id, e)
+
         return {
             "id": dm_envelope.id,
             "sender_id": dm_envelope.sender_id,

backend/services/main/routes/messaging.py

@@ -284,6 +284,7 @@ def convert_dm_envelope(db: Session, envelope: DMEnvelope, user_id: int | None =
         "id": envelope.id,
         "senderId": envelope.sender_id,
         "recipientId": envelope.recipient_id,
+        "sender_username": sender.username if sender else f"user_{envelope.sender_id}",
         "iv_b64": envelope.iv_b64,
         "ciphertext_b64": envelope.ciphertext_b64,
         "wrapped_mek_b64": wrapped_mek_b64,