From ae0276c9007d9125a015254ae2f0e9422c731f1c Mon Sep 17 00:00:00 2001
From: urec56 <yur.afonin2017@yandex.ru>
Date: Mon, 12 Feb 2024 17:43:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat_test/app/templates/chat.html     | 6 ++++--
 chat_test/app/users/chat/router.py    | 2 +-
 chat_test/app/users/chat/websocket.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/chat_test/app/templates/chat.html b/chat_test/app/templates/chat.html
index 385742e..c9b1a90 100644
--- a/chat_test/app/templates/chat.html
+++ b/chat_test/app/templates/chat.html
@@ -13,7 +13,7 @@
 </div>
 <script>
     async function getLastMessages() {
-        const url = 'http://localhost:8000/chat/last_messages'
+        const url = 'http://localhost:8000/api/chat/get_last_message/2'
         const response = await fetch(url, {
             method: 'GET'
         })
@@ -41,7 +41,9 @@
     document.querySelector("#ws-id").textContent = chat_id;
     let ws = new WebSocket(`ws://localhost:8000/chat/ws/${chat_id}?user_id=1`);
     ws.onmessage = function (event) {
-        appendMessage(event.data)
+        const data = JSON.parse(event.data)
+        appendMessage(data.message);
+        console.log(data)
     };
 
     function sendMessage(event) {
diff --git a/chat_test/app/users/chat/router.py b/chat_test/app/users/chat/router.py
index f47b61b..2325b3e 100644
--- a/chat_test/app/users/chat/router.py
+++ b/chat_test/app/users/chat/router.py
@@ -15,7 +15,7 @@ router = APIRouter(
 )
 
 
-@router.get('')
+@router.get("")
 async def get_all_chats(user: Users = Depends(get_current_user)):
     return await UserDAO.get_user_allowed_chats(user.id)
 
diff --git a/chat_test/app/users/chat/websocket.py b/chat_test/app/users/chat/websocket.py
index c62093a..09f5f03 100644
--- a/chat_test/app/users/chat/websocket.py
+++ b/chat_test/app/users/chat/websocket.py
@@ -26,7 +26,7 @@ class ConnectionManager(WebSocket):
     async def broadcast(self, user_id: int, chat_id: int, message: str):
         await self.add_message_to_database(user_id=user_id, chat_id=chat_id, message=message)
         for websocket in self.active_connections[chat_id]:
-            await websocket.send_text('{"message": ' + message + "}")
+            await websocket.send_json({'message': message})
 
     @staticmethod
     async def add_message_to_database(user_id: int, chat_id: int, message: str):