diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index f5b5bd2c..eff56d1e 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 459c30ea..531ece2e 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/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc index 172a84a6..f49ad8cd 100644 Binary files a/osinaweb/osichat/__pycache__/models.cpython-310.pyc and b/osinaweb/osichat/__pycache__/models.cpython-310.pyc differ diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index f95e9dc2..07143c1b 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -258,7 +258,7 @@ class Osichat(WebsocketConsumer): class OsitcomChatRoom(WebsocketConsumer): def connect(self): - self.domain = 'https://osina.ositcom.com' + self.domain = 'http://192.168.1.106:8000' self.session_id = self.scope['url_route']['kwargs']['session_id'] self.visitor = Visitor.objects.filter(session_id=self.session_id).last() if not self.visitor: diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py index 11350a43..ec3683a0 100644 --- a/osinaweb/osichat/models.py +++ b/osinaweb/osichat/models.py @@ -14,14 +14,12 @@ def send_notification(notification): 'title': notification.title, 'body': mark_safe(notification.message), } - sound = "default" if notification.image: FCMDevice.objects.send_message( Message(notification=NotificationFB( title=notification_data['title'], body=notification_data['body'], image= notification.image, - sound=sound ), data={"image": notification.image}) ) else: @@ -29,7 +27,6 @@ def send_notification(notification): Message(notification=NotificationFB( title=notification_data['title'], body=notification_data['body'], - sound=sound )) ) diff --git a/osinaweb/static/js/osichat-admin/osichat.js b/osinaweb/static/js/osichat-admin/osichat.js index 246fd19c..8266e7ca 100644 --- a/osinaweb/static/js/osichat-admin/osichat.js +++ b/osinaweb/static/js/osichat-admin/osichat.js @@ -1,6 +1,6 @@ let admin_chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws"; let protocol = window.location.protocol === "https:" ? "https" : "http"; -let admin_chat_domain = "osina.ositcom.com"; +let admin_chat_domain = "192.168.1.106:8000"; let userId = document.getElementById('userId').textContent.trim(); let osichatadminroomSocket = null; let currentChatId = null; diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js index 2e3fed1a..cd6901de 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 = "192.168.1.106:8000"; +const ositcomDomain = "192.168.1.106:3000"; async function fetchClientData() {