Merge remote-tracking branch 'origin/main'

ChatServiceApp/js_views.py

@@ -29,9 +29,12 @@ def show_chat_w_user_ajax(request):
         from AuthApp.models import User
         cur_receiver = User.objects.get(id=data['user_id'])
 
+        receivers = get_chat_receivers_for_user(request.user)
+
         Dict = {
             'cur_receiver': cur_receiver,
             'messages': get_msgs_for_chat_w_users(request.user, cur_receiver),
+            'receivers': receivers,
         }
 
         tpl_name = 'blocks/profile/b_chats.html'
@@ -87,7 +90,7 @@ def update_chat_ajax(request):
 
         if (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT):
             Dict.update({
-                'msgs_count': len(msgs)
+                'required_beep': False
             })
             return JsonResponse(Dict, status=200)
 
@@ -102,7 +105,7 @@ def update_chat_ajax(request):
 
         Dict.update({
             'html': html,
-            'msgs_count': len(msgs)
+            'required_beep': True,
         })
         return JsonResponse(Dict, status=200)