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

Conflicts

Browse source
This commit is contained in:
NigeParis 2025-12-18 20:28:13 +01:00
parent d9cc54ade9
commit 0128ec5f69
2 changed files with 0 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,41 +41,6 @@ interface ClientInfo {
lastSeen: number; lastSeen: number;
} }
<<<<<<< HEAD
=======
export type blockedUnBlocked =
{
userState: string,
userTarget: string,
by: string,
};
export type obj =
{
command: string,
destination: string,
type: string,
user: string,
frontendUserName: string,
frontendUser: string,
token: string,
text: string,
timestamp: number,
SenderWindowID: string,
Sendertext: string,
};
// function setAboutPlayer(about: string): string {
// if (!about) {
// about = 'Player is good Shape - This is a default description';
// }
// return about;
// };
>>>>>>> refs/remotes/origin/nigel/functionBlockMessage
export type blockedUnBlocked = export type blockedUnBlocked =
{ {
@ -209,7 +174,6 @@ async function onReady(fastify: FastifyInstance) {
<<<<<<< HEAD
// fastify.io.fetchSockets().then((sockets) => { // fastify.io.fetchSockets().then((sockets) => {
// for (const socket of sockets) { // for (const socket of sockets) {
// const clientInfo = clientChat.get(socket.id); // const clientInfo = clientChat.get(socket.id);
@ -225,23 +189,6 @@ async function onReady(fastify: FastifyInstance) {
// } // }
// }); // });
=======
fastify.io.fetchSockets().then((sockets) => {
for (const socket of sockets) {
const clientInfo = clientChat.get(socket.id);
if (!clientInfo?.user) {
console.log(color.yellow, `Skipping socket ${socket.id} (no user found)`);
continue;
}
console.log('DEBUG: UserIDWindow :', getUserByName(users, clientInfo.user)?.id);
const IDUser = getUserByName(users, clientInfo.user)?.id;
console.log(filter_Blocked_user(fastify, obj, IDUser?? ""));
}
});
>>>>>>> refs/remotes/origin/nigel/functionBlockMessage

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

@ -1,7 +1,6 @@
import type { ClientMessage } from './chat_types'; import type { ClientMessage } from './chat_types';
import { clientChat, color } from './app'; import { clientChat, color } from './app';
import { FastifyInstance } from 'fastify'; import { FastifyInstance } from 'fastify';
<<<<<<< HEAD
import type { BlockedData } from '@shared/database/mixin/blocked'; import type { BlockedData } from '@shared/database/mixin/blocked';
import { getUserByName } from './getUserByName'; import { getUserByName } from './getUserByName';
import type { User } from '@shared/database/mixin/user'; import type { User } from '@shared/database/mixin/user';
@ -31,9 +30,6 @@ function whoBlockedMe(
=======
import { getUserById } from './getUserById';
>>>>>>> refs/remotes/origin/nigel/functionBlockMessage
export function broadcast(fastify: FastifyInstance, data: ClientMessage, sender?: string) { export function broadcast(fastify: FastifyInstance, data: ClientMessage, sender?: string) {