lint

Author: Josh-XT

agixt/Conversations.py

@@ -4527,11 +4527,12 @@ def get_group_conversations_for_company(self, company_id):
                     notification_mode = (
                         getattr(participant, "notification_mode", None) or "all"
                     )
+                notification_count = 0
                 if notification_mode == "none":
                     # User muted this channel — never show notification dot
                     has_notifications = False
                 elif participant and participant.last_read_at:
-                    unread_count = (
+                    notification_count = (
                         session.query(Message)
                         .filter(
                             Message.conversation_id == conv_id,
@@ -4542,18 +4543,18 @@ def get_group_conversations_for_company(self, company_id):
                         )
                         .count()
                     )
-                    has_notifications = unread_count > 0
+                    has_notifications = notification_count > 0
                 else:
                     # Check notify flag as fallback
-                    has_notifications = (
+                    notification_count = (
                         session.query(Message)
                         .filter(
                             Message.conversation_id == conv_id,
                             Message.notify == True,
                         )
                         .count()
-                        > 0
                     )
+                    has_notifications = notification_count > 0
 
                 # Count participants
                 participant_count = (
@@ -4590,6 +4591,7 @@ def get_group_conversations_for_company(self, company_id):
                         conversation.updated_at, user_id=user_id
                     ),
                     "has_notifications": has_notifications,
+                    "notification_count": notification_count,
                     "summary": conversation.summary or "None available",
                     "attachment_count": conversation.attachment_count or 0,
                     "pin_order": conversation.pin_order,

agixt/endpoints/Conversation.py

@@ -2963,10 +2963,29 @@ async def notify_conversation_participants_message_added(
     Also sends targeted 'mention' and 'reply' notifications to @mentioned and replied-to users.
     """
     try:
-        from DB import get_session, ConversationParticipant
+        from DB import get_session, ConversationParticipant, User, Conversation
         import re
 
         preview = message[:100] + "..." if len(message) > 100 else message
+
+        # Look up sender display name and conversation's company_id
+        sender_name = "Someone"
+        company_id = None
+        with get_session() as session:
+            sender = session.query(User).filter(User.id == sender_user_id).first()
+            if sender:
+                first = getattr(sender, "first_name", "") or ""
+                last = getattr(sender, "last_name", "") or ""
+                sender_name = f"{first} {last}".strip() or "Someone"
+            # Look up company_id from the conversation
+            conv = (
+                session.query(Conversation)
+                .filter(Conversation.id == conversation_id)
+                .first()
+            )
+            if conv and conv.company_id:
+                company_id = str(conv.company_id)
+
         notification_data = {
             "type": "message_added",
             "data": {
@@ -2976,6 +2995,8 @@ async def notify_conversation_participants_message_added(
                 "message_preview": preview,
                 "role": role,
                 "sender_user_id": sender_user_id,
+                "sender_name": sender_name,
+                "company_id": company_id,
                 "timestamp": datetime.now().isoformat(),
             },
         }
@@ -3027,6 +3048,8 @@ async def notify_conversation_participants_message_added(
                     "message_preview": preview,
                     "role": role,
                     "sender_user_id": sender_user_id,
+                    "sender_name": sender_name,
+                    "company_id": company_id,
                     "timestamp": datetime.now().isoformat(),
                 },
             }
@@ -3044,6 +3067,8 @@ async def notify_conversation_participants_message_added(
                         "message_preview": preview,
                         "role": role,
                         "sender_user_id": sender_user_id,
+                        "sender_name": sender_name,
+                        "company_id": company_id,
                         "timestamp": datetime.now().isoformat(),
                     },
                 }