From b89fa8504a332fd5fe5b455acd1b3732ca8f622e Mon Sep 17 00:00:00 2001
From: NigeParis <nrobinso@student.42.fr>
Date: Thu, 8 Jan 2026 13:06:04 +0100
Subject: [PATCH] Small Bug fixed when member send msg to a member that blocked
 guest broadcasts

---
 frontend/src/pages/chat/chat.css              |  2 +-
 frontend/src/pages/chat/chat.html             |  2 +-
 frontend/src/pages/chat/chat.ts               |  3 +-
 .../src/chatBackHelperFunctions/broadcast.ts  | 34 ++++++++-----------
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/frontend/src/pages/chat/chat.css b/frontend/src/pages/chat/chat.css
index 3b3dbb9..9e27632 100644
--- a/frontend/src/pages/chat/chat.css
+++ b/frontend/src/pages/chat/chat.css
@@ -265,7 +265,7 @@ div-private {
   rounded-xl 
   shadow-xl 
   w-200
-  h-25
+  h-33
   p-6
   border 
   border-black
diff --git a/frontend/src/pages/chat/chat.html b/frontend/src/pages/chat/chat.html
index 4c90758..9bb3b3e 100644
--- a/frontend/src/pages/chat/chat.html
+++ b/frontend/src/pages/chat/chat.html
@@ -36,7 +36,7 @@
             </div>
           </div>
           <div id="game-modal" class="gamePopup hidden">
-            <div class="popUpMessage">
+            <div class="popUpMessage" >
               <div id="game-info">
                 <p class="modal-messages " id="modal-message"></p>
               </div>
diff --git a/frontend/src/pages/chat/chat.ts b/frontend/src/pages/chat/chat.ts
index 956806b..4b27873 100644
--- a/frontend/src/pages/chat/chat.ts
+++ b/frontend/src/pages/chat/chat.ts
@@ -187,9 +187,8 @@ async function openMessagePopup(message: string) {
 	if (modalmessage) {
 		const messageElement = document.createElement("div");
 		messageElement.innerHTML = `
-					<div class="profile-info"
             			<div id="profile-about">Next Game Message ${incrementCounter()}:  ${obj.link}</div>
-        			</div>`;
+        			`;
 		modalmessage.appendChild(messageElement);
 		modalmessage.scrollTop = modalmessage.scrollHeight;
 
diff --git a/src/chat/src/chatBackHelperFunctions/broadcast.ts b/src/chat/src/chatBackHelperFunctions/broadcast.ts
index feb3a96..8ce577a 100644
--- a/src/chat/src/chatBackHelperFunctions/broadcast.ts
+++ b/src/chat/src/chatBackHelperFunctions/broadcast.ts
@@ -9,30 +9,24 @@ import { whoBlockedMe } from './whoBlockedMe';
 export async function broadcast(fastify: FastifyInstance, data: ClientMessage, sender?: string) {
 
 	const Allusers: User[] = fastify.db.getAllUsers() ?? [];
-	const UserID = getUserByName(Allusers, data.user)?.id ?? '';
-	const list:BlockRelation[] = whoBlockedMe(fastify, UserID);
+	const senderUser = getUserByName(Allusers, data.user)
+	if (!senderUser) return;
+	const list:BlockRelation[] = whoBlockedMe(fastify, senderUser.id);
 	const sockets = await fastify.io.fetchSockets();
 	for (const socket of sockets) {
-		const clientInfo = clientChat.get(socket.id);
-		if (!clientInfo?.user) {
-			continue;
-		}
+		if (socket.id === sender) continue;
+
+		const socketClientInfo = clientChat.get(socket.id);
+		if (!socketClientInfo?.user) continue;
+
+		const receiverUser: User | null = getUserByName(Allusers, socketClientInfo.user);
+		if (!receiverUser) return;
+
 		let blockMsgFlag: boolean = false;
-		const UserByID = getUserByName(Allusers, clientInfo.user)?.id ?? '';
-		const user: User | null = getUserByName(Allusers, clientInfo.user);
+		blockMsgFlag = checkNamePair(list, senderUser.id, receiverUser.id) || false;
 
-		if (UserByID === '') return;
-		blockMsgFlag = checkNamePair(list, data.SenderUserID, UserByID) || false;
-
-		if (socket.id === sender) {
-			continue;
-		}
-
-		if (!user?.id) return;
-		const guestflag: User | null = getUserByName(Allusers, clientInfo.user);
-		if (!guestflag) return;
-		const boolGuestMsg = fastify.db.getGuestMessage(guestflag?.id);
-		if (!boolGuestMsg) continue;
+		const getReceiverGuestConfig = fastify.db.getGuestMessage(receiverUser?.id);
+		if (!getReceiverGuestConfig && senderUser?.guest) continue;
 		if (!blockMsgFlag) {
 
  			socket.emit('MsgObjectServer', { message: data });