From 864c513a3c67a2d9da02ef5bb5a49f0e76450d97 Mon Sep 17 00:00:00 2001 From: emile Date: Fri, 13 Sep 2024 20:49:02 +0300 Subject: [PATCH] new --- osinaweb/db.sqlite3 | Bin 1974272 -> 1974272 bytes .../__pycache__/consumers.cpython-310.pyc | Bin 17956 -> 17962 bytes osinaweb/osichat/consumers.py | 2 +- .../js/osichat-admin/inner-conversation.js | 2 +- osinaweb/static/js/osichat/visitors.js | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index cf10a276a0a6c9683a4164475c9aff52bd228548..b638dd2904a6ecafd0c731c5d5642b2dbc64426a 100644 GIT binary patch delta 157 zcmWN_I}(C06a~KSrWR8?Y@>I4v{K-!W2#;)xc9L9|&RlXwO0kxt!IbyK}l zm3{PGWlso{pd;uCdV;=SAQ%cFK`a;v#)8Qg$s_1Ea>m_q<8y1z)|J+mwzwEuc;jDf eNO;OKp7Vm2yy7))c*{H9^MQ|?vi`N!4kvE^0mx}=io>e_btJ=sbqsZtmSxa#Xdrb{P7Ee*l>%E&0R`L?pB5&&IY6VLzv delta 56 zcmZ40!?>h}kvE^0mx}=iR?dBxmcEf!Mv>8KvX&Z073F~>tCA{X$7XG%t&EI3 Kn;$BBDggl43=qBm diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 63a42aaa..7479cfae 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -342,7 +342,7 @@ class OsitcomChatRoom(WebsocketConsumer): else: self.chat_room = None - if self.scope["user"].is_authenticated: #If a user add him as a chat_member + if self.scope["user"].is_authenticated and self.chat_room: #If a user add him as a chat_member self.chat_member = ChatMember.objects.filter(member=self.scope["user"]).last() if not self.chat_member: self.chat_member = ChatMember.objects.create( diff --git a/osinaweb/static/js/osichat-admin/inner-conversation.js b/osinaweb/static/js/osichat-admin/inner-conversation.js index 155a25dd..ce914e00 100644 --- a/osinaweb/static/js/osichat-admin/inner-conversation.js +++ b/osinaweb/static/js/osichat-admin/inner-conversation.js @@ -3,7 +3,7 @@ const chatId = event.currentTarget.getAttribute('data-roomid'); if (chatId && chatId !== currentChatId) { showLoader(); - openConversation(sessionId, chatId); + openConversation(chatId); currentChatId = chatId; } } diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js index 2e3fed1a..6752f371 100644 --- a/osinaweb/static/js/osichat/visitors.js +++ b/osinaweb/static/js/osichat/visitors.js @@ -1,7 +1,7 @@ const wsScheme = window.location.protocol === "https:" ? "wss" : "ws"; const protocol = window.location.protocol === "https:" ? "https" : "http"; -const osinaDomain = "osina.ositcom.com"; -const ositcomDomain = "ositcom.com"; +const osinaDomain = "https://osina.ositcom.com"; +const ositcomDomain = "https://ositcom.com"; async function fetchClientData() {