From 033f5ea8795603a6d5364881e4b940ab8f697677 Mon Sep 17 00:00:00 2001 From: emile Date: Wed, 2 Oct 2024 10:18:52 +0300 Subject: [PATCH] new --- .../__pycache__/consumers.cpython-310.pyc | Bin 19332 -> 19393 bytes osinaweb/osichat/consumers.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index 22bffc97a6631ee36b23803e3955b032a075d0d7..7c480ce2311c03087ea13c5eaca9ff9195555f07 100644 GIT binary patch delta 2052 zcmZ{kdu-EH6vuz3>wYWigRNcHbr06E(XCGRg7H`;q^t}!5(vZi2L#%>U$?bv9o!Z* zrgOgj5uBJDClO%}6%j!PG=dTmss&KWZ_1!n(GEek zDx^}RZk3{osshlR!d-QWewB)CX_LCuQI%U-(Tw{{Wm-co3}y{UFM=`=|1ep4?A;Th znn6o+LNF(&7qklI3g)ryM3jTEJ*aq_2j*BLJ4+%V z#-KB@U9nJcrmAQ+`R*Y&2qheeG-@$VKoR@Iw&2^2nXm!RI+nm|_(;hWc`teHLwl(i z4xz2kF8A{a?338a(z~f}5LcA1gJXEP{AI&&%BEiJi?lmcYy^8Mmdj@-Hi4rRkLpKA zzQDoTeFPt>tg(_Mk=nM_AC8cX#?KSZ;nS5z`P zy6RBgD3=LCJzqw1S664V|H**=DK;M8S6vKW;{NJf7{Qa()8Kq8ed^5=7tPhFW<3-s z?wyD6P=4#gO$)OzKEUDxFTu~@l#_+q$gm0PXZR6o4E?UM$@dI_9_`>65?24 zELbKsL$s)9t}+^FCj zwRW>OGu`+$c@$s7$0P8TD<3Y$hH4jr{RsJr8H`!=$vU&;MpuVmK;#gld9}dUX z*Y$&ZjO^cH#q3;5oTQh~%fZ`d3h6%d&fZ{-lblD;5XSd6?y{pHU&gXI+0ch~T{&r5?9Dc@$jb>SNVGnmKhB1-y w5_UGW6<;Rz!-S)R6NJ-*QNl&SCHkj=1DM%V!a1wyj=YP^2e{dSOBYuC4U|zq*YkabE~)MI+4uRrKd+y) z!>V>LHJVH#b^IgUyi?`)(3EW+Z3mssudCImVAItCdl(-#7fcLDT?TbzH#AEPlB#Q# zRD)mgLUROnG^)m>5?fcTYmW3w#k#U0>@`m?m;%sc>DIM^8iUu(W6ENiNBH$!WBem( z6KYL@Ho-)7RA)ptfNpt(U+sxmJv1+;yHrG72YPV zuaT9jZl9ZVYKLrFA!XA&Gpit}ov@McHlYJwNy?G8khlX6Bo)isLZaTDGg`QI(Rd}H z0}JyVSYwYjY^R~9y#?3U`(d|M?U(>o3Jt=Otc?FFMiwBiZMZ%86zs(}#yfFS%5Sh& zTm4WRJR@q0&N|4elVh==+T$x9nt>v*abysU)sfV|p~SFRBv9+j303*QA{Q|j^HF5;;Zk1kG1{d|BixBa9>6n9K*uQH8Cf+H5j?f z?W^JIeH_ncJ|&-}fO9xCYntgei7#^~5!~3CHN{4nU{v+9o+cmZ$bOOV9iGZMCjUU< zkGN&hTZx~N*h2VED+{vCupd3y4N3jn9*mh;g3O$A*#&WT)9bCp&mV z3qfNg_badWG&Q-aJ-nTaoXK!etIYW$0#4x5xhe7>RqMl-aufMg>CE*^-x0}{kS=uB zC|8uXo(C(@BI9tQvB~GIs#?YxtGsm{b{kXkT8h?Dl$9zE6?Xf4?#h~aPlJ!$qTEBP zbDI40-llRDU)|HE$_=iSwt{8h#~39-$92;~a}cb1P{q4%-BhY6xD!LBcN_ z!DxOhcwH9i`u=R#@8oftkVO#n{v_!febxl(iiaJtVLqEGh`8P10OAMK)=>H+XiuTXL+EwTw;&=aL;3P+&!tJ2rlE2lD(#@ zl#ioK(kv&4XEZw0wK$P2JTMIgMTsl8v$T5JHS#-5I7&E4I78?sTqay0 cgrBtVo7Ic+=A=U}u9$OI?jfgMe12}pKd9mx=>Px# diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 284538f1..36a85588 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"]).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