From 1fec5731a1822503e51a6b6eb82430001fc580e4 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 3 Feb 2024 19:51:38 +0300 Subject: [PATCH 1/4] changed url to registration --- luckydiamond/src/components/HeaderComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index e56b08c..8faca8c 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -160,7 +160,7 @@ export default {
Date: Sat, 3 Feb 2024 22:47:38 +0100 Subject: [PATCH 2/4] Add if check for soket --- luckydiamond/src/assets/js/chat/ChatLogic.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 7e6cf50..650b048 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -16,7 +16,11 @@ export function ConnectToChat() { webSocket.onmessage = function (event) { - eventBus.emit('dataChat', event.data) + const dataObject = JSON.parse(event.data); + + if (dataObject && dataObject.hasOwnProperty('SpUserName') && dataObject.hasOwnProperty('Message')) { + eventBus.emit('dataChat', dataObject); + } console.log('Message from Server:', event.data); }; From 54168501611ea2d6e11c878f8f7e10871d47e2e2 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 3 Feb 2024 22:50:10 +0100 Subject: [PATCH 3/4] fix error --- luckydiamond/src/assets/js/chat/ChatLogic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 650b048..82402c6 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -18,7 +18,7 @@ export function ConnectToChat() { const dataObject = JSON.parse(event.data); - if (dataObject && dataObject.hasOwnProperty('SpUserName') && dataObject.hasOwnProperty('Message')) { + if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { eventBus.emit('dataChat', dataObject); } From 64a9ae8da2af1bb89a41bcc26469847f32957a86 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 3 Feb 2024 22:58:33 +0100 Subject: [PATCH 4/4] update --- luckydiamond/src/assets/js/chat/ChatLogic.js | 2 +- luckydiamond/src/components/ChatComponent.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 82402c6..8e35440 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -19,7 +19,7 @@ export function ConnectToChat() { const dataObject = JSON.parse(event.data); if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { - eventBus.emit('dataChat', dataObject); + eventBus.emit('dataChat', event.data); } console.log('Message from Server:', event.data); diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index d60f212..3103651 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -71,6 +71,7 @@ export default { eventBus.on("dataChat", (dataFromServer) => { try { const dataObject = JSON.parse(dataFromServer); + let imageUrl = "https://avatar.spworlds.ru/face/55/" + dataObject.SpUserName;