From 46a1b99ed14e693dc8edc77c2aa00218a05666bc Mon Sep 17 00:00:00 2001 From: NigeParis Date: Thu, 18 Dec 2025 20:18:45 +0100 Subject: [PATCH] Merge conflicts --- frontend/src/pages/chat/chat.ts | 1 - src/chat/src/app.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/chat/chat.ts b/frontend/src/pages/chat/chat.ts index 2998eef..a1070bf 100644 --- a/frontend/src/pages/chat/chat.ts +++ b/frontend/src/pages/chat/chat.ts @@ -31,7 +31,6 @@ export type blockedUnBlocked = by: string, }; - // get the name of the machine used to connect const machineHostName = window.location.hostname; console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow); diff --git a/src/chat/src/app.ts b/src/chat/src/app.ts index 7e8e10f..75aebf2 100644 --- a/src/chat/src/app.ts +++ b/src/chat/src/app.ts @@ -388,6 +388,7 @@ async function onReady(fastify: FastifyInstance) { console.log(color.yellow, UserToBlock); console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`); console.log(color.yellow, UserAskingToBlock); + console.log(color.red, clientName); if (!UserAskingToBlock || !UserToBlock) return;