From e76bb0299d8473f23b5352cf4678af8bf0e1d462 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Wed, 2 Oct 2024 10:21:32 +0300
Subject: [PATCH] new

---
 .../__pycache__/consumers.cpython-310.pyc     | Bin 19393 -> 19296 bytes
 osinaweb/osichat/consumers.py                 |   5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index 7c480ce2311c03087ea13c5eaca9ff9195555f07..074071d8b056aa8e913528e45ab68ae1bc815959 100644
GIT binary patch
delta 520
zcmX|+OK1~89LDFHoo<qCcH49}u}L4=QYG;qs23lB`Y6E%v@}xn;3L?<$5tz@MLo>o
zp$88dJPhce8%R(uD%CpR#fu(#s|vk{9z?uo?;cxlHi9#Jzxn3R_y05V;W2(Zf^*%r
zEuz=-pY@C1A1paVH=oki!&)~BAVd(KaO8=PV7r`f%XjOv*~zUILOM%12`TRs^a?^l
z2h%(~LxcO5NXP^oBWDkW9iqdxwH&Q3t!{2dEHt&tG<#YkOz3P<By@HtOo?RE6)E4-
z9Wk?Q=Gxp8%=|n3sowv#*U!&_6YfN;1&|vPA}LJXRVISzL1w$QS3j#T*XQ^1Zozma
zqH_bhr%t(B*BzXkXshJOd2cH%QTf8l4+m%T--GipY8oXLoQwVC7*jE-(#lpaC?~Vm
z<ZAYLW?UE3aP&68klaYidajR|>sCU(&JAHrt>$(Z_@z)-p|Itr{*NfCXrKn{k{g2!
z>{kn$Q@{cBY|BevTvdnP12yT6G_X@GjZ7N2BaPxB8tP5)w}q!_VfR~xc~#x>kYZZ>
z+_wfStCjL+imxgfeMdpn=|d+ewy9TRUw~0{uksBzr7j#f4)}8M=o8#l)niv--0~`a
E0m6-q<^TWy

delta 626
zcmYL_PiPZC7{%w!CfiNgY@1{gjr|)H+aQS8gOUcd7@|dNYy}bjkVYrgZktLskye<s
zh+cz-0llP>DBe`m0WV(c#gig<5qk1ikHLc=3eF~oGrZsT&EuQLFy9_x^AXIOp-_;h
z_2tL!>$3LR9E&Er^9iNOQ4qq3O&AiyhO=MfqnULUtZ9vI*4>0lmnkDIWj&lOz}3`f
z4+||)XJekYK2Edb%B<_>emkUOD)lP$aepKHFSLnjq#Cs~JIMXatf65w$vv>%y6);~
zHr9wYiQA>p4Bn;El5T*n8;u=2VDD6+9usZuYO~*QJJlZe-`Ru9V1)J6eNBL@6uH55
z7S0gvQ#pFuORMJ$Rfp{n7U4b?t<!3fSvAUHHFblLb8V&K)6O0BDWYTzpUkB+=aM>X
zMXuc_R?DUG)sj;vbn3-u$E#F|^QA&zp|X5yY00^)rk#R^IS)mJlrCObR+qEt8BA<i
zIqVijtQ_t*hG(yNI3k?bi}0*!dtj=q!w2J!DGtW_4HFjhUqM6U<4J7GmG}Wol}6$t
zg(=DdpOBIhgLA;Rs1I!*Bh$kHU{YpBo&$N=O1=k*;?1579Fk}E&S<zTo{YZ4V>vUn
z9mF%49)Ih@ec3wvfP%@p>F>Y?xtRG(u_Y&ty`#|N&&l%?qjEa?6*w;U<+gwe5~ofB
Si{i}GQ>@9>)DpB+EB6=kbgN4M

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 = []