From 671fbe34d395a7eae826a263dfcae988fad88533 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Tue, 23 Jul 2024 10:12:06 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1691648 -> 1699840 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 4838 -> 4742 bytes
 osinaweb/osichat/consumers.py                 |   7 +------
 osinaweb/static/js/osichat/visitors.js        |  17 ++++++++++++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index fb427076d2bd1a16226e77628790ccd9dfe5097c..bf1e6eadf557ffb8edd506558c03fbd5492e9ab4 100644
GIT binary patch
delta 4558
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
T)1A<A6mj2Xp?&NhLIe6YNyS~v

delta 2873
zcmeHJ`)?FQ9KX4noxQ!iox9uK(r#3&LV*HZ_Wd}j*cf@#fK|XBFd|VwgIcLE7EwwM
z@tPnnc{mV?76KI^;USTcMv+9L0Syqu_&^aM(O88xfF?>5XO9-OHU0y-xzEhpe&_R@
z&v(Ax@8z0LJ=EOx(28rM+DHU!i1a)!4)Z|m?isBk!1z7Cjd%-yt<QB-(T*wr7UJqe
zz_vzF3`9o>3&_EpV00Ou>R?Q8U+U-7kEzqC&r*j|@1;6YN9eV?!0Hs))s;+Snf)Fv
zCPb4L*eV{b5{KyFcYvFY=Wu&S-$0T_!IP`<a~4sUft#e3_LG1i$`E6K3>*Vu;2Gi!
z0z-m9WJofE98B9!rluQk9=9z*T4m0qH>cD4qkHmmc0}nmB|U8#ya>lf$hC9gkI}|-
zygoMbQ8)|EfYaa<I0=r&Yw=3F1P+D+VHqw!876TvM7SBu6HD0mq?ifCi)mZ{4~w|C
zmWpE%F9COp#n42)_y!e6t~f$^c#Gl!(%n?b)3Ks(7_>}oOw-AYncZ)~1zbyn=#!HJ
z$jLK`O!QNnNS5zG9I4NwTj>&A9v<q?M`?>A*9oyvLI+)$O)H?KYmCfLLc7Lf<rTar
zft|6JBBb1q>(cS_!a3nP;gs;Xa7_4+J3)q}x$8<d;q`bmUWyBN0iKH+@NE2m^r>`|
z#*bzXMakOZS&gp#ID30EcB@!MPk)ll#$wfpR`Sbd*<<7mN7l)u&$9=~`Z4l^a+b4=
ztQx{fs80A-Chy8r$<mo8Yh3wx`ud6Nz$gq~ljC1ymy<SIu8oZoDf!lxXVC#)XMZ?Q
zispk0Py&1tKbL=kf0Uoa&)}!=Q;I1fjddlZBw_JQq|gw5Im=Jv$MH4%Xx`yR@s<1_
z{yM&txTlr(N5TqtJyc-{l=uwKGJr0lU(f|~7JY}lK_}2B=m<K9-bHUCiguG_btP?S
zv>k0hub_2k6<Uf~P@a^_xSZ@Td7a!M<1%v6<jXS5yb`^D7NPkpVD`v#?pCEK3dQCK
zB#Sx~hg57;W|CjGDLxR%QBJVQi|3RHq_R`FkGk8Hx>%C2s-<LD29ikLIIGxX^=7uC
zVhiJq=~57Zok|7S*QxA_CSTb5sxlbR#XFRz0NKw8^4?tv(D`HnbjB_M@}<e!H2ID4
zD<BI`DGQ^qi{zual4nWn8KwQkNjMQ+^du}?nd0FjbrlN`&kn!P-_Iz&arA>uwGm*c
zShs%_wit#|$+FE#HBFpV=Kv6)&F9o+P^@HJNou;3f#j#})s2O2rO-W~&|SK>y9};K
z#&AO<wG>~*4bmB!ZdT7rWXEFl){%P7@ik93eMdKS)2`CJD$^)8f}F!Fmgal9rR!7c
zAE|%5v7R<8Q<sAw9FqW2m%?#f>JsLpCP_{<iJjv8i7yg&35SGx<K6M+=#UlaYjIMy
zN)^kPJHyTy>>$^7OsmJ;BNl1fuTCvmt(<9Sff<;V*=se6RyE}6IosD<)3W_uDS6Hy
z3s$OAtsb+d`GFo--qje)Fb17{EX@jB&+k1n&*^=MzG>?AKNC&Q?A4R!MqMR_eoZa#
z%)sqS^mA6AIi6>^PER0tPAd{e_XuJ{*U|e)?IGH(?)4HgRYGLq(3+Z>p+sM!-auxx
zsLsu{n{#Z<GhN4V|0>$g*>=v-H9PQp-!nX4Gb~3l0?iEanUVb+Ic&QbXzXS@JLu!c
z%GsXgx|VC}e{(c@1i7h2onC62In&gb(Q)iN9Ny!c{Xq7rG{PN*<^{Iru-omaE0z<c
z(q#E$IWhFW$-~P2T$T%#IL$JwAk56)xO&cH5wgH^<H2E!TAHb;xpM4S!(`7h^ZOCl
z4Y<1R^mS$VVF;GzI<B6FL;J~KoSbfJmTh}h9~G7vmZQfG^jHK#`ceHs%xqb{-#0;w
z$cn>febahddz+dbBC#GSkIajtp2p|#lK(sD&s?(x`@fUIe*bTG((r%pB;7GwCv2i&
Us6hAw>YeOAn1*QKeRZDj2gW7wegFUf

diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index 2874f51a506d09229082c2673f1ebb11e4be6513..d5c596bcb7941d0567479face6dccd2f89cace3c 100644
GIT binary patch
delta 1633
zcmZ`&O>Y}T7~Wa$Zr1BKvE8~52u|BHDN9N}NYeum3L;PlfrPZQRe`c~cE{;Pwl|tt
z2Z{m_iU4t*BS>v-_(;ncZb;lX!g56FFW|(9_ZhcIFx1jMo_Rm!ecrDJ6JJgYCB>p=
z&~NVAoyN`T_d{3N5~FL5zIpoOBtdFy8S8A_++h);Q*Os(B)Mzt8qA336xfk*+31=}
zSt*fm8YZn^Gp0i#r0=M*IagqrC3&;aHAGq6G&>eTsz1$iTjc5F=fyDnWo}eYc^bEP
zmTM;;W%(v=qyc2)UEk!wAtO<MWpPa;osA%hWmp%HD3YveiV{>_*i0l3!X)CN3<nJr
zt%7~hZu2lbM0Yu8sNZt)tf5A&nt3i#FI&f++cNK(k-N*H{I|}hR+^)Ht#z9+_qHtL
zjZE?R1+`<HEqIbk87J)^j?_JCda;IxV}PT8V}RoTWb8YcwJwu(W;c_1B(vNaPY)#J
z^^%gj9d&I{QZx40%qY2KHs9p!v_G2x!9yNz@~6l|!p>tJbD3$n>TCO}*?lIO#8EQP
zOngT`m3i?-P>&)({58#NAWS+G<+eDk7M<~zGA9(AYA+7MvkE|y{G2Ycn0h4Wqa~gp
z#gzKaY0RR=;%UGs02Bv|_u3*{QlLB%;2JJ--TMmzD=eSc)UFLKCe^Mxa!Mz(Hv(c1
z&!O>Rh=7KLN*aW>>M12yQV-nohyUGu0XnnlbpEsFF+$==fPPayGJ<QL2e>b)-}6m2
zt}c4DGurRuBR{`4aJ@?OdCrm1ic;P$Y*gJSTq}&j>2<&x>Zii=0`8f$nnbt#0dWHI
z2>_ODe;~wODDf;5eKAnf>uPrJ4^~r86t7efla@eFjCCt*HM>ms>hof?c8)Ze(}<hY
z&0h1ZW?iP@ZM?dyeke|^fJ0_Soz{jVMp&d?UduSW1LZJk8;FFKd#%IC`w~>|0{V!(
z3YnT3`g^;VF<pJD7wkhiXT?^s8aH{+?zC1P5~5n_Na)8WW!h2Nc3Dqpu}&isv4SUG
z16&4NA@B>CJ5Q7@5hH;N#R~x4(T5{Tyv0=rZNU2gUF#3%geieQ&#{hu1J}nUb&<4R
zsK17PKJpg4b2=aFOgqJHE~#Hj{<fyMfOqz3dg3|+`wVrk{iXUpZnXXI(cD6u9!u*@
z(tbmq#5k*u%dhZh*q;Z?05J8vCB%I6Hc>YS2?@9#XkQuE3g804i}Xnl(K}gk9oKb7
e+(Uy$#0520Im1q<<;r_iSpMe;^<(8EJNploLqiS#

delta 1711
zcmZ`(O>7%Q6yDiCuh(^Ax3$|KNRu`{ER>|84ODPwplYEYLejLUR6$nG?l@gzd#yKX
zS3xd0R4NkJ=@E%=jKl?c;K&WBDndPP@8QTDfy8^WN!=Q1YrmcMH}k!p*?ZG_(<5=Q
z=xX@8zw%vOul_i)#<q174SX)*BbE^QT0;xjn0ANtS%ZmEpY7=1YfQtpk-ZzNulZ(T
zp{L!*-DRPUE9b6`KH5&6d_r9LZm6wlp0SkX1Q#NT+i58lQ4+*0zZc;m2H_RvQcDDJ
zho^;oC;tn+mD&ODTEbIP)OtL14@^-ge_|I(I_i0|4tZp|t3g%%&AKB;QE-{f9QBu7
zJ=ym3C7^V@JdibYLfkWnT0Aw{@$EF<<n_cS9gLtEY=ROw7B?a8cKk3BK@CDUjJjPN
zDr9nlW-PcL#36?&1t>VCOynQ8+dN2)qby|IxWqQ(55~AX9~xL9`I|9$GIYMR@0f{+
zvemG$c=^6brK4i0g1PdTc}A|9Z!VA0{wE1e5lj(G6R4zeso4-%RI3@+LXjGqJOLFk
z$ivO@5WF4kT2PUX%@Yd~xIt?19&abZ3FLqWJnHci=ptT5aG8tM)OAx%Szo_9pre>5
zPDIDE)w!t~b^KZw0ybN5O>;rq#Z$ImTJBk=-hm=I!x+I!1k@AHP-TU=1H}+0m_)-F
zdD*T{QB8rU!8`#Oo^j6FARpURR($Y>y~1)(AP-Nz=Zu|xzAjKE3w0HaAmAWi1^wVw
zEx}YO@}6_<=<}@wI(t$6?tJwI%?D6zvRbQ6ULkQPf`~55t$dTs$i4jdyo!76AkNFC
zDNB1OauJ=@<XQJ2n~?vwHwrTp^dZ3&=@-skAvrZS;&98$!7S-tCGZHIwjQ1y1+SA~
z=nSghx_nZ2!bauKhptx^QN{_Mz*lPCN?Ofb2B+m@u`+&+RCYaT;w{PAY&L5m0s2zF
zvb<KDSs@Oo6?R)4fsE*uWO*&qYK4rWR9hcny!o45j?t@Rx=t`e>=Np3%SXk(wzG^;
z^vvuqAJ=KI6>mgM?zg+GjeSB`OLY?U_{%b0z#a!tOYnO$N14D?)Wc<hYXoZuULkcZ
zBBiUy2q?pBG}V;s&nIpPH^^cUd`6&Z{W-2^N=TuGR-L_0;tP}d0IlE1`=h^BKcQ$t
z<wLilozN}(RCY?<wxanF?K7b1!c9^P7^=etH|YPk;XS7q#Vw@O3u%3f)*XBVO}9K=
zexEPk0^TBcn_zI`7D=R`0csFXLO|iqv`;mXzJqWc;Q~IQgy3lSK`uGA<2Yl^kwaBD
ZFMlb|vsw9P`DTSY|FeZ$KRnA8{sqq@Ttol>

diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py
index 4baaf48a..3f121e10 100644
--- a/osinaweb/osichat/consumers.py
+++ b/osinaweb/osichat/consumers.py
@@ -9,11 +9,6 @@ import requests
 
 class OsitcomVisitor(WebsocketConsumer):
     def connect(self):
-        session = self.scope["session"]
-        if not session.session_key:
-            session.create()
-            session.save()
-        self.session_id = session.session_key
 
         async_to_sync(self.channel_layer.group_add)(
             'ositcom_visitors', self.channel_name
@@ -34,7 +29,7 @@ class OsitcomVisitor(WebsocketConsumer):
         if event_type == 'new_visitor':
             event = {
                 'type': 'new_visitor_handler',
-                'session_id': self.session_id ,
+                'session_id': text_data_json.get('session_id'),
                 'client_ip': text_data_json.get('client_ip'),
                 'client_country': text_data_json.get('client_country'),
                 'referrer':  text_data_json.get('referrer'),
diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js
index 87b122a9..594f8d7c 100644
--- a/osinaweb/static/js/osichat/visitors.js
+++ b/osinaweb/static/js/osichat/visitors.js
@@ -19,10 +19,20 @@ document.addEventListener('DOMContentLoaded', () => {
             });
     }
 
+    function fetchSessionID() {
+        return fetch('https://ositcom.com/get-client-session/')
+            .then(response => response.json())
+            .then(data => data.session_id)
+            .catch(error => {
+                console.error('Error fetching session ID:', error);
+                return 'Unknown';
+            });
+    }
+
     function initializeWebSocket() {
         const referrer = document.referrer;
 
-        fetchClientData().then(({ client_ip, client_country }) => {
+        Promise.all([fetchClientData(), fetchSessionID()]).then(([clientData, session_id]) => {
             const visitorsSocket = new WebSocket(visitorsSocketUrl);
 
             visitorsSocket.onopen = () => {
@@ -32,8 +42,9 @@ document.addEventListener('DOMContentLoaded', () => {
                     'event_type': 'new_visitor',
                     'referrer': referrer,
                     'url': window.location.href,
-                    'client_ip': client_ip,
-                    'client_country': client_country
+                    'client_ip': clientData.client_ip,
+                    'client_country': clientData.client_country,
+                    'session_id': session_id
                 };
                 visitorsSocket.send(JSON.stringify(event_message));
             };