Update routes/sendnotifications.py

routes/sendnotifications.py

@@ -146,23 +146,30 @@ async def send_notification(
     if data.keyword == "like":
         post_info = await get_post_info(data.reference)
         target_user_id = post_info["user_id"]
+
     elif data.keyword == "newmessage":
         # Get last message in the chat
-        messages = await fetch_supabase("messages", "sender_id,content", {"chat_id": data.reference})
+        messages = await fetch_supabase("messages", "sender_id,content,file", {
+            "chat_id": data.reference
+        })
         if not messages:
             raise HTTPException(status_code=404, detail="No messages found in chat")
 
         last_message = messages[0]
         sender_id = last_message["sender_id"]
-        content = last_message["content"]
+        content = (last_message.get("content") or "").strip()
+        file_url = last_message.get("file")
 
         # Get participants
-        chats = await fetch_supabase("chats", "client_id,stylist_id", {"id": data.reference})
+        chats = await fetch_supabase("chats", "client_id,stylist_id", {
+            "id": data.reference
+        })
         if not chats:
             raise HTTPException(status_code=404, detail="Chat not found")
 
         chat = chats[0]
         target_user_id = chat["stylist_id"] if sender_id == chat["client_id"] else chat["client_id"]
+
     else:
         target_user_id = data.target_user_id
 
@@ -193,23 +200,36 @@ async def send_notification(
     collapse_id = short_collapse_key(data.keyword, sender_id, target_user_id)
 
     # Notification content
+    title = image_url = None
+
     if data.keyword == "follow":
         title = "🎉 New Follower!"
         body = f"{actor_name} started following you."
-        image_url = None
+
     elif data.keyword == "like":
         desc = post_info["description"]
         title = "❤️ New Like!"
         body = f"{actor_name} liked your post" + (f": \"{desc}\"" if desc else ".")
         image_url = post_info["image_url"]
+
     elif data.keyword == "subscriber":
         title = "💼 New Subscriber!"
         body = f"{actor_name} just subscribed to your styling services."
-        image_url = None
+
     elif data.keyword == "newmessage":
         title = "💬 New Message"
-        body = f"{actor_name}: {content}"
-        image_url = None
+        if content:
+            body = f"{actor_name}: {content}"
+        elif file_url:
+            is_image = file_url.lower().endswith((".jpg", ".jpeg", ".png", ".gif", ".webp"))
+            if is_image:
+                body = f"{actor_name} sent you a photo"
+                image_url = file_url
+            else:
+                body = f"{actor_name} sent you a file"
+        else:
+            body = f"{actor_name} sent you a message"
+
     else:
         raise HTTPException(status_code=400, detail="Unsupported keyword")