Merge remote-tracking branch 'origin/main'

ChatServiceApp/funcs.py

@@ -1,3 +1,5 @@
+import copy
+
 from .models import *
 from django.db.models import Q, Value as V, Count, OuterRef, Subquery
 from django.http import HttpResponse, Http404, JsonResponse
@@ -50,18 +52,25 @@ def get_update_chat_Dict(data):
         receiver = None
         if 'receiver' in data and data['receiver']:
             receiver = User.objects.get(id=data['receiver'])
-        #
+
-        # if data['sender'] == data['cur_user']:
+        if data['sender'] == data['cur_user']:
-        #     context_Dict.update({'user': sender})
+            user = copy.copy(sender)
-        # else:
+            cur_receiver = copy.copy(receiver)
-        #     context_Dict.update({'user': receiver})
+            # context_Dict.update({'user': sender})
-        #
+        else:
+            user = copy.copy(receiver)
+            cur_receiver = copy.copy(sender)
+            # context_Dict.update({'user': receiver})
+
         # context_Dict.update({'cur_receiver': receiver})
         context_Dict.update({
-            'cur_receiver': sender,
+            'cur_receiver': cur_receiver,
-            'user': receiver
+            'user': user
         })
 
+        if sender == receiver:
+            print('!')
+
         required_beep = data['required_beep']
 
 

ChatServiceApp/templatetags/tt_chat.py

@@ -41,6 +41,10 @@ def get_filesize(size):
 @register.simple_tag
 def get_msg_side(cur_user, ticket, msg):
     if msg:
+        # if msg.sender == cur_user:
+        #     return 'left'
+        # else:
+        #     return 'right'
         if msg.sender == cur_user:
             return 'right'
         else: