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

Small Bug fixed when member send msg to a member that blocked guest broadcasts

Browse source
This commit is contained in:
NigeParis 2026-01-08 13:06:04 +01:00 • committed by Nigel
parent 7eaa66637a
commit b89fa8504a
4 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/pages/chat/chat.css
View file

@ -265,7 +265,7 @@ div-private {
rounded-xl rounded-xl
shadow-xl shadow-xl
w-200 w-200
h-25 h-33
p-6 p-6
border border
border-black border-black

2
frontend/src/pages/chat/chat.html
View file

@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<div id="game-modal" class="gamePopup hidden"> <div id="game-modal" class="gamePopup hidden">
<div class="popUpMessage"> <div class="popUpMessage" >
<div id="game-info"> <div id="game-info">
<p class="modal-messages " id="modal-message"></p> <p class="modal-messages " id="modal-message"></p>
</div> </div>

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

@ -187,9 +187,8 @@ async function openMessagePopup(message: string) {
if (modalmessage) { if (modalmessage) {
const messageElement = document.createElement("div"); const messageElement = document.createElement("div");
messageElement.innerHTML = ` messageElement.innerHTML = `
<div class="profile-info"
<div id="profile-about">Next Game Message ${incrementCounter()}: ${obj.link}</div> <div id="profile-about">Next Game Message ${incrementCounter()}: ${obj.link}</div>
</div>`; `;
modalmessage.appendChild(messageElement); modalmessage.appendChild(messageElement);
modalmessage.scrollTop = modalmessage.scrollHeight; modalmessage.scrollTop = modalmessage.scrollHeight;

34
src/chat/src/chatBackHelperFunctions/broadcast.ts
View file

@ -9,30 +9,24 @@ import { whoBlockedMe } from './whoBlockedMe';
export async function broadcast(fastify: FastifyInstance, data: ClientMessage, sender?: string) { export async function broadcast(fastify: FastifyInstance, data: ClientMessage, sender?: string) {
const Allusers: User[] = fastify.db.getAllUsers() ?? []; const Allusers: User[] = fastify.db.getAllUsers() ?? [];
const UserID = getUserByName(Allusers, data.user)?.id ?? ''; const senderUser = getUserByName(Allusers, data.user)
const list:BlockRelation[] = whoBlockedMe(fastify, UserID); if (!senderUser) return;
const list:BlockRelation[] = whoBlockedMe(fastify, senderUser.id);
const sockets = await fastify.io.fetchSockets(); const sockets = await fastify.io.fetchSockets();
for (const socket of sockets) { for (const socket of sockets) {
const clientInfo = clientChat.get(socket.id); if (socket.id === sender) continue;
if (!clientInfo?.user) {
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; let blockMsgFlag: boolean = false;
const UserByID = getUserByName(Allusers, clientInfo.user)?.id ?? ''; blockMsgFlag = checkNamePair(list, senderUser.id, receiverUser.id) || false;
const user: User | null = getUserByName(Allusers, clientInfo.user);
if (UserByID === '') return; const getReceiverGuestConfig = fastify.db.getGuestMessage(receiverUser?.id);
blockMsgFlag = checkNamePair(list, data.SenderUserID, UserByID) || false; if (!getReceiverGuestConfig && senderUser?.guest) continue;
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;
if (!blockMsgFlag) { if (!blockMsgFlag) {
socket.emit('MsgObjectServer', { message: data }); socket.emit('MsgObjectServer', { message: data });