|
|
|
@ -145,7 +145,7 @@ class Osichat(WebsocketConsumer):
|
|
|
|
|
chat_rooms_data.append(room_data)
|
|
|
|
|
|
|
|
|
|
self.send(text_data=json.dumps({
|
|
|
|
|
'event_type': 'get_dms',
|
|
|
|
|
'event_type': 'get_chats',
|
|
|
|
|
'chat_rooms_data': chat_rooms_data,
|
|
|
|
|
}, cls=DjangoJSONEncoder))
|
|
|
|
|
else:
|
|
|
|
@ -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 = {
|
|
|
|
|