Work in progress - blocage working on it ./app 206

frontend/src/pages/chat/broadcastMsg.ts

@@ -1,7 +1,7 @@
 import { addMessage } from "./addMessage";
 import { Socket } from 'socket.io-client';
 import { getUser } from "@app/auth";
-
+import type { ClientMessage } from "./types_front";
 /**
  * function sends socket.emit to the backend to active and broadcast a message to all sockets
  * echos the message with addMessage to the sender
@@ -13,15 +13,21 @@ export function broadcastMsg (socket: Socket, msgCommand: string[]): void {
 	addMessage(msgText);
 	const user = getUser();
 	if (user && socket?.connected) {
-		const message = {
-			command: msgCommand,
+		const message:  ClientMessage = {
+			command: msgCommand[0],
 			destination: '',
 			type: "chat",
 			user: user.name,
 			token: document.cookie,
 			text: msgText,
 			timestamp: Date.now(),
-			SenderWindowID: socket.id,
+			SenderWindowID: socket.id ?? "",
+			SenderUserName: user.name,
+			SenderUserID: user.id,
+			userID: '', 
+			frontendUserName: '', 
+			frontendUser: '', 
+			Sendertext: '',
 			};
 		socket.emit('message', JSON.stringify(message));
 	}

frontend/src/pages/chat/chat.ts

@@ -193,6 +193,7 @@ function logout(socket: Socket) {
 
 async function connected(socket: Socket): Promise<void> {
 
+	setTimeout(async () => {
 	try {
 			const buddies = document.getElementById('div-buddies') as HTMLDivElement;
 			const loggedIn = isLoggedIn();
@@ -201,24 +202,23 @@ async function connected(socket: Socket): Promise<void> {
 			let oldUser = localStorage.getItem("oldName") ?? "";
 			console.log('%coldUser:',color.yellow, oldUser);
 			if (loggedIn?.name === undefined) {console.log('');return ;}
-			setTimeout(() => {
 				oldUser =  loggedIn.name ?? "";
-			}, 0);
-			// const res = await client.guestLogin();
-			let user = await updateUser();
-			console.log('%cUser?name:',color.yellow, user?.name);
-			localStorage.setItem("oldName", oldUser);
-			buddies.textContent = "";
-			socket.emit('list', {
-				oldUser: oldUser,
-				user: user?.name,
-			});
-	} catch (e) {
-		console.error("Login error:", e);
-		showError('Failed to login: Unknown error');
-	}
-};
-
+				// const res = await client.guestLogin();
+				let user = await updateUser();
+				console.log('%cUser?name:',color.yellow, user?.name);
+				localStorage.setItem("oldName", oldUser);
+				buddies.textContent = "";
+				socket.emit('list', {
+					oldUser: oldUser,
+					user: user?.name,
+				});
+			} catch (e) {
+				console.error("Login error:", e);
+				showError('Failed to login: Unknown error');
+			}
+		}, 16);
+	};
+		
 async function whoami(socket: Socket) {
 	try {
 		const chatWindow = document.getElementById("t-chatbox") as HTMLDivElement;
@@ -281,6 +281,8 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
 
 
 	let socket = getSocket();
+	let blockMessage: boolean;
+	setTimeout(async () => {
 
 	// Listen for the 'connect' event
 	socket.on("connect", async () => {
@@ -310,6 +312,7 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
     	systemWindow.appendChild(messageElement);
 		systemWindow.scrollTop = systemWindow.scrollHeight;
 	});
+}, 0);
 
 	// Listen for messages from the server "MsgObjectServer"
 	socket.on("MsgObjectServer", (data: { message: ClientMessage}) => {
@@ -321,8 +324,8 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
 		if (bconnected) {
 			connected(socket);
 		}
-
-		if (chatWindow && data.message.destination === "") {
+		console.log('stahe   eeee  :', blockMessage);
+		if (chatWindow && data.message.destination === "" && !blockMessage) {
 			const messageElement = document.createElement("div");
 			messageElement.textContent = `${data.message.user}: ${data.message.text}`;
 			chatWindow.appendChild(messageElement);
@@ -394,7 +397,7 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
 			console.log(' =================== >>> UserTarget:', data.userTarget);
 			console.log(' =================== >>> By:', data.by);
 			let message = "";
-			if (data.userState === "block") {message = "un-block"} else{message = "block"}
+			if (data.userState === "block") {message = "un-block", blockMessage = true} else{message = "block", blockMessage = false}
 			blockUserBtn.textContent = message;
 		}
 	});
@@ -587,5 +590,6 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
 			});
 		}
 	}
+	
 };
 addRoute('/chat', handleChat, { bypass_auth: true });

frontend/src/pages/chat/types_front.ts

@@ -1,9 +1,18 @@
 export type ClientMessage = {
 	command: string
 	destination: string;
+	type: string,
 	user: string;
+	userID: string,
+	token: string
+	frontendUserName: string,
+	frontendUser: string,
 	text: string;
-	SenderWindowID: string;
+	SenderWindowID: string,
+	SenderUserName: string,
+	SenderUserID: string,
+	timestamp: number,
+	Sendertext: string,
 };