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

Added possibility for members to block broadcast messages from guests

Browse source
This commit is contained in:
NigeParis 2026-01-08 10:12:12 +01:00 • committed by Maix0
parent 2b9613fbfb
commit df192cf227
5 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/@shared/src/database/mixin/user.ts
View file

@ -211,9 +211,8 @@ export const UserImpl: Omit<IUserDb, keyof Database> = {
getGuestMessage(this: IUserDb, id: UserId): boolean | undefined {
const result = this.prepare('SELECT allow_guest_message FROM user WHERE id = @id').get({ id }) as {
allow_guest_message: number
} | undefined
return Boolean(result?.allow_guest_message)
} | undefined;
return Boolean(result?.allow_guest_message);
},
};

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

@ -263,28 +263,15 @@ async function onReady(fastify: FastifyInstance) {
const user: User | null = getUserByName(users, clientName);
if (!user) return;
if (clientName !== null) {
if (profile.guestmsg) {
//console.log('Data TRUE:', clientName);
console.log(user?.name);
console.log(user?.guest);
console.log(user?.allow_guest_message);
fastify.db.allowGuestMessage(user?.id);
}
else
{
//console.log('Data FALSE', clientName);
console.log(user?.name);
console.log(user?.guest);
console.log(user?.allow_guest_message);
}
else {
fastify.db.denyGuestMessage(user?.id);
};
}
});
socket.on('profilMessage', async (data: string) => {
const clientName: string = clientChat.get(socket.id)?.user || '';
const profilMessage: ClientMessage = JSON.parse(data) || '';

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

@ -29,10 +29,8 @@ export async function broadcast(fastify: FastifyInstance, data: ClientMessage, s
}
if (!user?.id) return;
const guestflag: User | null = getUserByName(Allusers,clientInfo.user);
const guestflag: User | null = getUserByName(Allusers, clientInfo.user);
if (!guestflag) return;
console.log('G Flag Allow:', guestflag?.allow_guest_message);
console.log('User:', guestflag?.name);
const boolGuestMsg = fastify.db.getGuestMessage(guestflag?.id);
if (!boolGuestMsg) continue;
if (!blockMsgFlag) {

5
src/chat/src/chatBackHelperFunctions/sendPrivMessage.ts
View file

@ -58,7 +58,6 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess
}
let blockMsgFlag: boolean = false;
const UserByID = getUserByName(allUsers, clientInfo.user) ?? '';
const userfiche: User | null = getUserByName(allUsers, clientInfo.user);
if (UserByID === '') {
return;
}
@ -73,10 +72,6 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess
if (socket.id === sender) {
continue;
}
if (!userfiche?.id) return;
const boolGuestMsg = fastify.db.getGuestMessage(userfiche?.id);
if (!boolGuestMsg&& userfiche.guest) continue;
if (!blockMsgFlag) {
socket.emit('MsgObjectServer', { message: data });
fastify.log.info({ senderID: `${UserID}`, msgPriv: data.text, target: `${UserByID.id}` });