diff --git a/src/chat/src/chatBackHelperFunctions/broadcast.ts b/src/chat/src/chatBackHelperFunctions/broadcast.ts index 88bd2b7..16e569a 100644 --- a/src/chat/src/chatBackHelperFunctions/broadcast.ts +++ b/src/chat/src/chatBackHelperFunctions/broadcast.ts @@ -10,7 +10,7 @@ export async function broadcast(fastify: FastifyInstance, data: ClientMessage, s const Allusers: User[] = fastify.db.getAllUsers() ?? []; if (!data.user) return; - const senderUser = getUserByName(Allusers, data.user) + const senderUser = getUserByName(Allusers, data.user); if (!senderUser) return; const list:BlockRelation[] = whoBlockedMe(fastify, senderUser.id); const sockets = await fastify.io.fetchSockets(); diff --git a/src/chat/src/chatBackHelperFunctions/sendPrivMessage.ts b/src/chat/src/chatBackHelperFunctions/sendPrivMessage.ts index ecb5ff2..9fc1629 100644 --- a/src/chat/src/chatBackHelperFunctions/sendPrivMessage.ts +++ b/src/chat/src/chatBackHelperFunctions/sendPrivMessage.ts @@ -35,7 +35,7 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess let blockMsgFlag: boolean = false; const receiverUser: User | null = getUserByName(allUsers, clientInfo.user); if (!receiverUser) return; - + const user: string = clientChat.get(socket.id)?.user ?? ''; const targetUser = `@${user}`; @@ -44,7 +44,7 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess } blockMsgFlag = checkNamePair(list, UserID, receiverUser.id) || false; - + if (!blockMsgFlag) { socket.emit('MsgObjectServer', { message: data }); fastify.log.info({ senderID: `${UserID}`, msgPriv: data.text, target: `${receiverUser.id}` });