diff --git a/src/lib/websocket.js b/src/lib/websocket.js index 5cb802d..ced2fac 100644 --- a/src/lib/websocket.js +++ b/src/lib/websocket.js @@ -5,6 +5,8 @@ export default function createWebSocket(url, token, onMessageCallback, maxRetrie token = token.split(" ")[1]; function connect() { + closeWebSocket(); + socket = new WebSocket(url, [token]); socket.addEventListener('message', (event) => { @@ -38,7 +40,16 @@ export default function createWebSocket(url, token, onMessageCallback, maxRetrie socket.onerror = (error) => { console.error('WebSocket error observed:', error) }; + + } + + function closeWebSocket() { + if (socket) { + socket.close(); + socket = null; + } + } connect() diff --git a/src/routes/Settings/+page.svelte b/src/routes/Settings/+page.svelte index 84e0779..89371d3 100644 --- a/src/routes/Settings/+page.svelte +++ b/src/routes/Settings/+page.svelte @@ -38,15 +38,12 @@ let submitButton onMount(async () => { - token = localStorage.getItem('BPChat') + token = localStorage.getItem('BPChat') userData = await UserCheck() - //console.log(userData) avatars = await getAvatarHistory(token) - console.log(avatars) oldName = userData.username oldEmail = userData.email - console.log(oldEmail) }) @@ -178,6 +175,7 @@ } async function existingUser(){ + if((newName.length <= 2) && (newName != "")){ nameError = "ник от 2 символов" } else{ @@ -328,6 +326,7 @@ .error{ color:var(--disable); + padding-top:0.25em; } .submitDiv{ diff --git a/src/routes/chat/+page.svelte b/src/routes/chat/+page.svelte index 944a092..5dd8a8a 100644 --- a/src/routes/chat/+page.svelte +++ b/src/routes/chat/+page.svelte @@ -139,8 +139,10 @@ if((messageText != "") || image != null){ console.log(`${messageText} - текст, ${image} - картинка`) - if(messageText == "жопа") + if(messageText == "жопа"){ messageText = "жопа съела трусы O.O" + image = "https://images.black-phoenix.ru/static/images/images/%D0%B6%D0%BE%D0%BF%D0%B0%20%D1%81%D1%8A%D0%B5%D0%BB%D0%B0%20%D1%82%D1%80%D1%83%D1%81%D1%8B.jpg" + } socket.send(JSON.stringify({flag: flag, message: messageText,