diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index 7c480ce2..074071d8 100644 Binary files a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc and b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc differ diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 36a85588..1b9a9266 100644 --- a/osinaweb/osichat/consumers.py +++ b/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"], chatmessage__isnull=False).order_by('-order_key') + output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.scope["user"]).order_by('-order_key') else: chat_rooms = None context = { @@ -207,8 +207,7 @@ class Osichat(WebsocketConsumer): 'name': chat_room.name, 'last_update': chat_room.last_updated, 'date_created': chat_room.date_created, - 'unread_messages': chat_room.unread_messages(self.scope["user"]), - 'last_message': model_to_dict(ChatMessage.objects.filter(room=chat_room).last()) + } members = chat_room.chatmember_set.all() member_data = []