Merge remote-tracking branch 'origin/main'

ChatServiceApp/js_views.py

@@ -27,19 +27,6 @@ def show_chat_w_user_ajax(request):
         data = json.loads(request.body)
         Dict = get_chat_page_content_Dict(request, data['user_id'])
 
-        # from AuthApp.models import User
-        # cur_receiver = User.objects.get(id=data['user_id'])
-        #
-        # receivers = get_chat_receivers_for_user(request.user)
-        #
-        # msgs = get_msgs_for_chat_w_users(request.user, cur_receiver)
-        # msgs.filter(receiver=request.user).update(status='seen')
-        #
-        # Dict = {
-        #     'cur_receiver': cur_receiver,
-        #     'messages': msgs,
-        #     'receivers': receivers,
-        # }
 
         tpl_name = 'blocks/profile/b_chats.html'
 
@@ -92,7 +79,7 @@ def update_chat_ajax(request):
         else:
             msgs = get_msgs_for_chat_w_users(sender, receiver)
 
-        if (request.user != msgs[0].receiver) or (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT):
+        if not msgs or (request.user != msgs[0].receiver) or (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT):
             Dict.update({
                 'required_beep': False
             })