From 8865d257fcba861224906376845f54655f6b6975 Mon Sep 17 00:00:00 2001 From: emile Date: Sat, 17 Aug 2024 15:04:24 +0300 Subject: [PATCH] new --- .../__pycache__/models.cpython-310.pyc | Bin 9770 -> 9778 bytes osinaweb/osichat/models.py | 31 +++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/osinaweb/osichat/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc index a9783a52fc04affc95539a471d873c1797234813..d7522f1dba15cd53182d428896c9b81180fea5a3 100644 GIT binary patch delta 1829 zcmaJ?U2GIp6rMXfJ3H;pZfAdHyMJBEc3W5w2r6I#ND~4HNdp9`F*S+}v&G$%Eu0wv z%PxgfG#HA)K@+8g)({X9Aq6#pK9Kli#6V0mW?xPG32*x11OA+Iw+i9Got!Uc&YgSC z{l0T%_Hy5~zR*Z0)T+>L;^eKN+q0pqhPaC_8eg}*p=ioLe7jOiTwmRCPQ!)s@_0X# z#B8`@_;XVf-fFj(5@qUXS!gouFgBrVPaXD<8TZi5?f?G@gw;JrVk&hX-TNWpsCBKXI=;H*>ElWzP!naPrk)okgit(V zT&epVjdxaBYMSGp^wo8*wdSt`$AzQU^l?=vH6N_1DbwbRA{0m2u0$D%fz3tH2<&T; z#5M8!h7cT}vp|lZp%0aZy%NA7c~d%2c0Cui^73+q#~GLc>}K#YR0$d>+-s$C0eFHV zPcp0^7%JfD z?88n$JO2Io$kEBxlerrS98nh}g#xC-Vk&2pDYY)DE#wQZWlS_EAWGd4mYrQ{Oct8#JSQ%ksBx9pyr!A?u@yxcqjpfp?1LL^VUSRF#>~#jI z{Skc0?&#)zO_0et22HRbEUIPFMKy#OvMe}&)Ako)6kka6q(*svk)UBhX_#0zJF0`b zOK=b;6QBBFj8<@<{kZrFe{OfhaeO|xICz5h@JzrMo=o&*L)k^3dq(jDR$y(>w)mhKC^O0l8}i}%M!Q{?_g=5ouKYeK-3Om{l7YvnWri)tgdsp^!6hDuPXdN9+B z`L+)_z~j~rT=Z9|-xBhO_VVl!>nytu6~}6JMd};{e<5@Et71?Oqkc<71)QUbalD(| zMv5-(%B1Bf&u|8L@^{#ixhC+rjz#Sk=>9jd-wgsov8X+!fD3a;7UFjuMRAc%VPkKX zZa;bwPIeTR<$BvLk^2YVe#mf1?mv}#InK>#(t~gx31@Xx+w-8ePN}z zyZPbfTPyqM!^`v5u99RPQi30n+$PzR+}4oS2<#lGdaUqTj=#k{&hSb8B6CdwZcm&B z(IA8qb8K7ic0Pyic0NUn?{r=e7VewxiCMfizaV00<<}P^e>rbbO#V6m7lc`cj~Vvk zo$hQFu8<$1Z^2wOiz*pH^@Rmod8k@HRhr+`U68yU$t!tDN~<~Vd7iQM8{{TA?Spn% z0&d8ZA9d}`U8MDXdf(-HBuBT%n`;D{i(&qYnD_s+rf^STS?VS|pW`yk;j&1jI86rJ z#Lo%~^{brn6a1-gYpMJm%ZBju0}mzeNCD3SNJgv#@VROCmP|X|>wYY@GP*L_8TCh7 MqdHw}(O^RV2jC%@Yi#MY=4i8VDQ6bV!`q}rmhG`rHp+}&V9 zcljwwV@qqod9X@<*oL;o)KtMxo(!ok#y7v~W$;FM9qjQ(VXC}+OvidYrZQPpn9S5Q-R@>1?%q^3 zl^f!_v;D)#HyQ1@{!{R-;y8dK`zk_SN=tLhVnsG57o`HT zn*Z2Ci$B7G&=L#4TKPE3KvQ+h>Bq&dP?cRU=WS5kUfsq0P>dPyo!!As!bEjwMnB>d zz3?Lq*J4JWX6zdLwWIAANkjx2qTG)ZATyUu(t5e>n; zgaf{c#b;uT*ubV(G$IcF5mga{fFe=vEF6n9hUW4AZ#W)k2pYbZI(mW6KH3U7>rl< zvg>fa`UdmDXiZMLjnhoVTcO|M2T#I@dWI7R4hr7F%|gCPoW=JO(0sl?AY8aak?_L? zBq(c8^T Bim?Cy diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py index d1d01a38..61d83a41 100644 --- a/osinaweb/osichat/models.py +++ b/osinaweb/osichat/models.py @@ -133,22 +133,8 @@ class Visitor(models.Model): 'action': 'new_visitor' } async_to_sync(channel_layer.group_send)("osichat", event) - self.send_visitor_notification() - def send_visitor_notification(self): - first_log = self.visitorlog_set.order_by('visit_date').first() - body = "" - if first_log: - if first_log.title: - body = f"New visitor navigated to {first_log.title}" - elif first_log.url: - body = f"New visitor navigated to {first_log.url}" - notification = ChatNotification.objects.create( - title="New visitor on Ositcom!", - body = body, - image = self.notification_flag_image_url, - type = "Visitor" - ) + @@ -174,6 +160,7 @@ class VisitorLog(models.Model): return f"{int(minutes):02}:{int(seconds):02}" def save(self, *args, **kwargs): + is_first_log = not VisitorLog.objects.filter(visitor=self.visitor).exists() if self.left_date: action = 'end_log' else: @@ -186,6 +173,20 @@ class VisitorLog(models.Model): 'action': action } async_to_sync(channel_layer.group_send)("osichat", event) + if is_first_log: + self.send_visitor_notification() + def send_visitor_notification(self): + body = "" + if self.title: + body = f"New visitor navigated to {self.title}" + elif self.url: + body = f"New visitor navigated to {self.url}" + notification = ChatNotification.objects.create( + title="New visitor on Ositcom!", + body = body, + image = self.visitor.notification_flag_image_url, + type = "Visitor" + )