diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts index 07849ddf..4cfeca1b 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts @@ -471,7 +471,6 @@ export class ChatController { let server = this.chatGateway.server; await this.chatService.addMessageToRoom(room_name, "SERVER", message); await server.in(socket.room).emit('message', "SERVER", message); - //await server.to(socket.id).emit('muted'); const room = await this.chatService.getRoomByName(room_name); @@ -516,6 +515,12 @@ export class ChatController { await this.chatService.removeMute(username, room_name); + let message = `${req.user.username} has un-muted ${username}`; + let socket: socketDto = this.chatGateway.sockets.get(req.user.username); + let server = this.chatGateway.server; + await this.chatService.addMessageToRoom(room_name, "SERVER", message); + await server.in(socket.room).emit('message', "SERVER", message); + res.status(HttpStatus.OK).json({ message: "successfull unmute" }); printCaller("- out "); } diff --git a/srcs/requirements/nestjs/api_back/src/chat/dto/mute.dto.ts b/srcs/requirements/nestjs/api_back/src/chat/dto/mute.dto.ts index 49b6d088..0dc917c4 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/dto/mute.dto.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/dto/mute.dto.ts @@ -7,7 +7,8 @@ export class muteDto name: string; @IsDate() - date: Date; + @IsOptional() + date?: Date; } diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_mute.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_mute.svelte index 7123281d..e83a13ae 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_mute.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_mute.svelte @@ -14,16 +14,14 @@ let date_string: string; get_is_mute($settings_user).then(response => { - if (response && response.date) - { + if (response && response.name) is_mute = true; + if (response && response.date) mute_date = response.date; - } if (mute_date) date_string = stringify_date(new Date(mute_date)); else date_string = "eternity"; - date_string = date_string; }); let is_forever; diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Socket_chat.ts b/srcs/requirements/svelte/api_front/src/pieces/chat/Socket_chat.ts index 05ed1b05..c003c8ab 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/chat/Socket_chat.ts +++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Socket_chat.ts @@ -37,7 +37,7 @@ function socket_events(socket) socket.on('new_password', function() { - to_print("notification new password:"); + to_print("notification new password"); layout.set("password"); }); }