rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge conflicts

Browse source
This commit is contained in:
NigeParis 2025-12-18 20:18:45 +01:00
parent a7fcb351f8
commit 46a1b99ed1
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/pages/chat/chat.ts
View file

@ -31,7 +31,6 @@ export type blockedUnBlocked =
by: string, by: string,
}; };
// get the name of the machine used to connect // get the name of the machine used to connect
const machineHostName = window.location.hostname; const machineHostName = window.location.hostname;
console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow); console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow);

1
src/chat/src/app.ts
View file

@ -388,6 +388,7 @@ async function onReady(fastify: FastifyInstance) {
console.log(color.yellow, UserToBlock); console.log(color.yellow, UserToBlock);
console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`); console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`);
console.log(color.yellow, UserAskingToBlock); console.log(color.yellow, UserAskingToBlock);
console.log(color.red, clientName);
if (!UserAskingToBlock || !UserToBlock) return; if (!UserAskingToBlock || !UserToBlock) return;