diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index cf10a276..b638dd29 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index 1168c135..7a739fae 100644 Binary files a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc and b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc differ 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() {