From badd23ac84dafde7c24b71a0ce2b6a36a145ae2f Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Sat, 17 Aug 2024 15:51:55 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1957888 -> 1957888 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 9757 -> 10102 bytes
 osinaweb/osichat/models.py                    |  28 +++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 0284574f40716b2f51880b63f1e0ce67dcd7c152..526c883cdf15aa3c682d1dc954bb69d74000ec49 100644
GIT binary patch
delta 693
zcmaja%WD%+6bImWq@84vOxmVRI++<rrH}+kI+K}99*Xz?!G$Glh`2N{&AUm=vlWE|
ztJzdZaB-nsl?b{mr3|=`7V!@d6zr~05tqf4n}Ww+6mj9=<6gMuoO^!lgI4>X)#LE9
zK7S2A+r9J2MO7W0b7UAtmtV5B=W%xykL|s2f7aoiM+0wn;Kcy}NT35_U>s0D4-9|?
zMqmPFzyJ%F0Fz(}Siv-y0XAR<v)aJRCX%F;jv%VX&XZ5+i013DCfXO>@EEb1E)K&m
zc7{_j)k31K)Y9vz^+rPqrW5x|!GPqimr@O>mTn=-HtPt-7jN8-mkOnFtF*M?{@rfp
z3dv+aPPJ<Jra!yZSS_T&tC?akC70E_D29r6hwbR$Hp_HRwpi_C%Q3e?zMzlyDegK>
zex;AKD9-f^6BJ1hgolg`PdB;TJ*7FoYp1j@y-&^(JBT_Eyt<#ay~%ctAnQ+Js4ejh
zB=%Xx7V=6#r{s?W#E2B~g~MVn5F$Ki=baG7mr+0Xt4<u%DS=2p@yQTW4){gC;{EfY
zMikMfO0ukogc}_)LI~|%<hkKL+Q+xTg2~BHo0uifd|)n_Uzw*&4~$=oQTjDKZ+NEv
zuD?oc!iHJO*paJx>_X>!{0fJdHQqk9xYBYq(NcxCqW4Wci12Ux+(M<4`Fnv;1X&f;
mTe(`UUaofJd;g#0`e)K8r0Q3d(IjgH^^b(dTKh<7kN*JegU=cO

delta 479
zcmYk#K}aG|9LMqZeAbN5Q5$V-r*SS7=tY^aw4{iIU=Irm1$i$kO^Z<+O<fk6i1M;5
z${rqc3Gz^M2qI!&4<U8!*r5)45SGqfvX1=^(eB~H@ATzowku}4(vWel8JNSp^QHSB
zR~X(IAqmVr9ZUXS$<R7pxVQ@awd3G!D_n1dF|Yvw?4S?y0}k-O0Vr?+0l0u0c)$P<
zffx9|Aou|MU<iD)T48B9MMT<RTtgZoKI*d~4N0Kv%b_H0C-n_IU(pfjJ40WCGD4_W
zPUp08CZ?C7YIS2`B~>w|V&g`6GHa~r+GbTtL?c>!DxyU+ZQ@^^f6FtqZ?)K3*%;49
zQ<@Ri<LYKw&7^B;G+UZ1#S{PKY9cxGey>6=!hN>5lB*W#ode1091M@Hkt5o@<mAto
zEns<?En(Si{lM~~V*nwWil1>0HiVz>Q@u-N5U{#b8N4KZa>}^2621`4En+L}v-6pN
z%+#jjX1CW0Z~eJZf<i#xUyvu~zH`sIPF!B$yYtaGPk+-f$4~wR%6p#d_zJA~pzK-Z
IgJSl-0y-j@rT_o{

diff --git a/osinaweb/osichat/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc
index 412b8c2f1d7450a1c6ba9f6fc69111cfcf98f71e..a66f184e90245dab69804f0dc71fc1846f44cc59 100644
GIT binary patch
delta 2092
zcmaKs>u(fQ6u{^1&OX|Gb|2kWce`B{>=db@5r{xEK{3R#JX%o7qi%Mlb++4CxI3-1
zY~@i68bFYf_<~~V3j`ww(F8Do82<r388?ym!I<#D4~7I25{c*BU7+&8-Q3@tIdkTm
zdmeYDdv52vWsj#>!rz6H*9UV8zwxegu{)P~TvN=ILv78PFO~QPsJYj&9nk4n#`-Sh
zJsyjFBR=G>LQ6UW@A)>e18_YPIqu&c^r~*v^9Jh=9+YIMKh!HJJ}~@ujb5_fMA%Gt
ziSROE3qo=74J2<RY$I$Z>>vyfULoWWX!#_`1%i04lB5v^2}6WF$a{kDXG@Q_32$Xw
zK3tV6@IqjCZ&fNvMOJj-)uB3$uo<`NoMkhfS!vQyb?_~y_f{Q6Z&aFeR-L9#ZBm<$
zuwj{R#V5_GOLZS%Oj4!Z`%CfUIKu$_4$V*pO68$`hoQYj0@qQ^i-ZzFVcZa#UW+$3
zZFLRpxKClVCcQGiwVhhtRQxr^m|oG%GUuWRwnBN-FzYp1jOP3a0_DXG0(s(PL@frt
zhGOkChqk*=8dWvEj-IS1h>B7%l_ppcOsyIw<t_q8^gB!WiYfN)GxZT|K-C8aHLe*2
zjV~di4nl@Nu|L68>4a)9xwp+CGdJ@xKa>BFEfc=Y^^NzGhq^2IF>Q6hg0}a5v{5^*
zRk$i+h$`bzl}%cxDcq}y>j`PvGHEs1QO9^hwbHer3#)R&Hmlm`ofCWO#!bR_kx({_
zO-s>Ql&h91Ij|M&svWy6Ps-Fe#hIJvdVaTFF?C}o-KcdMo0iTObW<PG&GB^ENUy^l
z6v`tV6X8ZyX(K<T59LiwO`GNPL};__7Hvv%%^c+hbcNaz6R{lnx$krC3$P~ibYwrK
z&3h1vtv<{9Na2TLp=5Fj#ml%VS%l1FX2;6fvA&jlvIV{mEtlD9B@Bx*A#jHiesWcF
zZra$hTGvV{e-oC5lX1~#ah!JJWBxip%*zxQ;UpV}!{M|Xi12aPl?uU+;WKOxjI=I@
z?IA;jJi577q8tZ|{D{V@@Kx(Idwq~#SL6}44L*#lK++kz8S${6;qOR=y#vG1h2dl5
zBt>|a@CM-koR2=veuv+p=Uj9O_y}Pq3<M+W5BNIvjD3_82jNz1J_Crwvo5jo_euK^
zePV2fQ2YtX@gzGWc0C(k@0mcIV&Pq6wFmCTyW(WU-y$3(93%t@`=OkPhEJjR7p@9T
zpi>I4R>n^WcT<VsC9|khEH&2}<KF0-oW>k=*516zKSjBZQ_!2Dnu}1v+GN`n`9CIc
zPH@P#Jr$cl<!xLQ`no!?nE{)h1sI<Z5oeN}a3kY`J8cOpe`;PLE_QnoZR;6)K$7rz
z6kberMNZ?r#3bpK6R%FmkLS(J`00kT4e}XOLpNsm@MchtrOl+C^_@l0jxP9@q&thR
zR$HiF^{n_|(pKSaYTLpSC@K!Vm^30;@u?9-{qOgt(Zv>+ZeO`nWH6@;^tMQ7nk13X
z3Y2P&LfJ4i{GP2O{c&n=g7)FYy;a;OP;Wvw_)a80)=04lu4Pj2c6u2*13#p{U@6c$
zOm-1&bYxivSTm~>k+~Q^F#~PnodWWUgl`FAt}fFwB+lb~;z2||MsqTY)yw$#IT8CX
zT4>(<tjO&l-y%1W)^hUwIk}BoL2&`Oeb6UA<5$pS6h50blA=EKDON5{o0wfXa(ohz
zQ@nVx!|nec>l75SkHxN{{i777K3#sSR0v0cUxjnoPWuIN`5pX{z1}@eqG$?@Kc6Ac
nEOD9!E;6D@aN0M%UCu<{#{BM<=K|?~EzlgW<KGu>wc7s$`F-X%

delta 1718
zcmaJ>TWl0%6rO)Cvs-2_)4gB1m)72<1XPHKLIVjA(zq<pR!u5Rvv#Is%XYW?vxV9V
zG+HBuR!j~WffhxjHZd5rCW0Z6=nMGZqcIy}jK0_>q9%>Lpy&KsL(>O$_k4TKne(6f
zKdae=jHl#wZ<6q1T(~`OtMyY)yTZnoGs??MIf&YdHCHI`!%%S@WWCVp-pRU_b8fdq
zK7tSVAY6?%z+2u<HVrG@a;>7fW~3hftCCIX33N%C8%EUoawnN~L#Z}gqdECul6v5L
zZG8($+evzXpqHSZKqoK=1_-(!=k~+B+Kk76q7BK5WEP;qcU;#c4CBahhN>QiQPlei
zrNJIY(Ktm6KZa_aCpeCvDHX@byqPbTI2Xm)`%9z6ay6w#$!Z$`h2X;kc7h_z`jZyT
z0eAgLWr#E*1SjBLEG)l=tXT(bfy5cxKjYqKtKKuE!L4TQq|r}l{r9mVBO~oYGWR3s
zY>G`vLlSrC7W%&|Em)>lu?Bg@gF?ruy0T@+I%LzWlVoonl69MIpR-L_MD=pEB8^A0
zU<M=bTrdjff={|nqkEn~(5!qr{1{Alr&0I}$qXUb7=%K*SP+h+0+0{I50HJu`AlbK
zf8HqQ{3R6mE&^3N;KqQ#IsV#7ca%Vk@f2}W1fp@%P^wR`F<1$uZK}%0V6QU(_2DHp
z4&R2G5q}Sd*#y)?zLK+a=n#AtX<^U9YGgMePTAus<jiv4=!l*x8~R=7j+*Qo+=*_E
z&XIkR;B|zG!x-x?jOqqI1J2kZ?0a}3_K`v(<^_Th&4&E|j`$wAOo|!E#GBX~z~haI
zNcsY4-=_7opGEc?xD!vXvzTxMey+2FweEobMbv8+-bR+=2w6>`ezjHHhl)mb38C67
zI?rDrm?fAY@DrSdbW1qI=aK&v$)w>sB_9hhKED=eaK}5S)GQUHqp0Txu*(MS<GWRz
zwJWFdtH^hA%4J3LcnflT0;UpM)CFSKMTajFk43Mb@;4-tF0~UU?X#=Q$M_X73~yr%
zG$lK56s2T5CQ`jbUPStD5-0r4!UxH=@HLeGK>E{(;FMIRG8g05);UT+eM)1C@N_C3
z+?WkHn}LbcUhfjJf06hh!IC)tQ|efNW?C(czeZ0c5TG{}gK~P$=8Gt34!+@5iVm;4
znslr>Y%8p$+aDJdi4q<RL=<?LEJcC4k*hfROT{v^S}gQ=+JiWyb05icA<&!x%)^|B
zd~U7e7Wk!pCzcy;SY#@E-B5OZf~Fe7D~8Lf)C}YcMqe>EZ1~~mL;Ez*5%OAXZyj+I
zozp44Odxjg3)+)9ejOEVd||A`S24DeS*#w$udl`L#n{7*O^u?;4UR>XqCjzP-zT3D
zegl0*$mfF*s*K+d{{C(}kzB;*-T026{jP4hM%*MqR`cMx2UGtaY#wekJsiD>_DKp;
zT{;z;7Qk)cH^J82Dt}BaKZkA2x3`WFE9Ns#94#xSHRH4+T$Ds@5P9S2bjwq<JA7%M
O-M7gn<Jap`Lh`?*qlgdy

diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py
index ad8e5c7f..b629a37e 100644
--- a/osinaweb/osichat/models.py
+++ b/osinaweb/osichat/models.py
@@ -175,14 +175,28 @@ class VisitorLog(models.Model):
         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}"
+        else:
+            last_log = self.visitor.visitorlog_set.exclude(id=self.id).order_by('-visit_date').first()
+            if last_log:
+                time_difference = self.visit_date - last_log.visit_date
+                if time_difference > timedelta(minutes=5):
+                    self.send_visitor_notification(is_repeat=True)
+    
+    def send_visitor_notification(self, is_repeat=False):
+        if is_repeat:
+            title = "Existing visitor new acitivity on Ositcom!"
+            if self.title:
+                body = f"Visitor navigated to {self.title}"
+            elif self.url:
+                body = f"Visitor returned to {self.url}"
+        else:
+            title = "New visitor on Ositcom!"
+            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!",
+            title=title,
             message =  body,
             image = self.visitor.notification_flag_image_url,
             type = "Visitor"