new

osinaweb/osichat/consumers.py

@@ -193,7 +193,7 @@ class Osichat(WebsocketConsumer):
             chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),order_key=Case(
                     When(last_update__isnull=True, then=F('date_created')),
                     default=F('last_update'),
-                    output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.scope["user"]).order_by('-order_key')
+                    output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.scope["user"], chatmessage__isnull=False).order_by('-order_key')
         else:
             chat_rooms = None
         context = {
@@ -217,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