new

osinaweb/osichat/consumers.py

@@ -189,10 +189,13 @@ class Osichat(WebsocketConsumer):
 
 
     def get_dms_handler(self, event):
-        chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),order_key=Case(
+        if self.scope["user"].is_authenticated:
-                When(last_update__isnull=True, then=F('date_created')),
+            chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),order_key=Case(
-                default=F('last_update'),
+                    When(last_update__isnull=True, then=F('date_created')),
-                output_field=DateTimeField(),)).filter(chatroomguest__isnull=True).order_by('-order_key')
+                    default=F('last_update'),
+                    output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.scope["user"]).order_by('-order_key')
+        else:
+            chat_rooms = None
         context = {
             'chat_rooms': chat_rooms,
         }
@@ -214,7 +217,7 @@ class Osichat(WebsocketConsumer):
                         'id': member.member.id,
                         'first_name': member.member.first_name,
                         'last_name': member.member.last_name,
-                        'image': member.member.staffprofile.image.url if member.member.staffprofile and member.member.staffprofile.image else None
+                       
                     })
                 
                 chat_room_data['members'] = member_data