From 36f113187aacab0b2b6234d6d9641cc501a057c3 Mon Sep 17 00:00:00 2001
From: UNIKNOW <000-drakon@mail.ru>
Date: Mon, 6 May 2024 21:02:33 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=BF=D0=BE=D1=87=D0=B8?=
=?UTF-8?q?=D0=BD=D0=B8=D0=BB,=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=82?=
=?UTF-8?q?=D0=BE=D0=B3=D0=BE,=20=D0=BA=D0=B0=D0=BA=20=D0=B2=D1=81=D0=B5?=
=?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB.=20=D1=80=D0=B0=D0=B1?=
=?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D1=87=D0=B0=D1=82=20+=20?=
=?UTF-8?q?=D0=BE=D1=82=D0=B2=D0=B5=D1=82=20=D0=BD=D0=B0=20=D1=81=D0=BE?=
=?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B0?=
=?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1?=
=?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=20=D0=BF=D0=BE=D1=81=D0=BB?=
=?UTF-8?q?=D0=B5=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
=?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF?=
=?UTF-8?q?=D0=BE=20=D0=B2=D0=B5=D0=B1=20=D1=81=D0=BE=D1=81=D0=BE=D0=BA?=
=?UTF-8?q?=D0=B5=D1=82=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/lib/chat.js | 3 +--
src/routes/chatPage/+page.svelte | 18 ++++++++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/lib/chat.js b/src/lib/chat.js
index 3c328be..ab17d7d 100644
--- a/src/lib/chat.js
+++ b/src/lib/chat.js
@@ -21,7 +21,7 @@
if(msgMassive[i].answer_id != null){
- let answer = await getMessageById(chatId,msgMassive[i].message_id)
+ let answer = await getMessageById(chatId,msgMassive[i].answer_id)
msgMassive[i].answerMessage = answer.message
console.log(answer.message)
@@ -42,7 +42,6 @@
if(response.ok){
let data = await response.json();
return data;
-
}
else{
console.log(response.status)
diff --git a/src/routes/chatPage/+page.svelte b/src/routes/chatPage/+page.svelte
index 361d1ef..f2bb76d 100644
--- a/src/routes/chatPage/+page.svelte
+++ b/src/routes/chatPage/+page.svelte
@@ -24,7 +24,6 @@
let answer = null
let chats = [] //массив чатов, доступных юзеру
- $: console.log(chats, " чаты")
let pinnedMsg = []
onMount(async () => {
@@ -39,13 +38,19 @@
pinnedMsg = await getPinnedMsg(chatId)
-
chats = await getAllChats()
- console.log(chats, "жопа ")
messages = await getLastMessages(chatId,msgLoaded);
console.log(messages)
- socket = createWebSocket(websocketUrl, (message) => {
+ socket = createWebSocket(websocketUrl, async (message) => {
+
+ if(message.answer_id != null){
+
+ let answer = await getMessageById(chatId,message.answer_id)
+ message.answerMessage = answer.message
+ console.log(answer.message)
+ }
+
messages = [...messages, message];
});
@@ -244,14 +249,15 @@ function helperDivShow(event, id) {
Тут ничего нет
Но если ты закрепишь сообщение,
тут что то изменится
- {/if}
-
+ {:else}
{#each pinnedMsg as msg}
{msg.message}
{/each}
+ {/if}
+