0.2.18

chat v2

ChatServiceApp/funcs.py

@@ -15,7 +15,7 @@ def get_chat_page_content_Dict(request, receiver_id=None):
     except User.DoesNotExist:
         cur_receiver = None
 
-    receivers = get_chat_receivers_for_user(request.user)
+    receivers, unread_msgs_count = get_chat_receivers_for_user(request.user)
 
     Dict = {
         'cur_receiver': cur_receiver,
@@ -35,7 +35,7 @@ def get_msgs_for_chat_w_users(user1, user2):
     ).order_by('-modifiedDT')
     return msgs
 
-def get_chat_receivers_for_user(user):
+def get_chat_receivers_for_user(user, cur_receiver=None):
     msgs = Message.objects.filter(
         Q(sender=user) | Q(receiver=user),
         group=None
@@ -43,6 +43,7 @@ def get_chat_receivers_for_user(user):
 
     receivers_list = []
 
+    unread_msgs_count = 0
 
     for msg in msgs:
         if msg.receiver not in receivers_list and msg.receiver != user:
@@ -54,12 +55,13 @@ def get_chat_receivers_for_user(user):
             receivers_list.append(msg.sender)
             msg.sender.last_msg = msg.text
 
-        if msg.receiver == user:
+        if msg.receiver == user and (not cur_receiver or msg.sender != cur_receiver):
             if msg.status == 'sended':
                 i = receivers_list.index(msg.sender)
                 receivers_list[i].unread_msgs_count += 1
+                unread_msgs_count += 1
 
-    return receivers_list
+    return receivers_list, unread_msgs_count
 
     # receivers_list.extend((item.sender for item in receivers if item.sender != user))
     # receivers_list.extend((item.receiver for item in receivers if item.receiver != user))