From 7a80cf6310fe5fcba14e70eb4e2cf80042dff54a Mon Sep 17 00:00:00 2001 From: simplonco Date: Fri, 13 Jan 2023 11:59:59 +0100 Subject: [PATCH] pbm double message join fixed --- .../nestjs/api_back/src/chat/chat.gateway.ts | 12 +++++++----- .../nestjs/api_back/src/chat/chat.service.ts | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts index b3963f1b..4fad5b41 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts @@ -34,12 +34,12 @@ implements OnGatewayConnection, OnGatewayDisconnect async joinRoom(@ConnectedSocket() socket: socketDto, @MessageBody() room_name: string): Promise { console.log('- in joinRoom gateway'); - socket.leave(socket.room); - socket.join(room_name); - socket.room = room_name; - let message = `${socket.username} has join the room`; - await socket.to(socket.room).emit('message', "SERVER", message); + + await this.chatService.socketJoinRoom(socket, room_name) + let message = `${socket.username} joined the room`; await this.chatService.addMessageToRoom(room_name, "SERVER", message); + + console.log('- out joinRoom gateway'); } @SubscribeMessage('change') @@ -47,6 +47,7 @@ implements OnGatewayConnection, OnGatewayDisconnect { console.log('- in changeRoom gateway'); await this.chatService.socketChangeRoom(socket, room_name); + console.log('- out changeRoom gateway'); } @SubscribeMessage('message') @@ -54,6 +55,7 @@ implements OnGatewayConnection, OnGatewayDisconnect { console.log('- in handleMessage gateway'); await this.chatService.socketIncommingMessage(socket, message); + console.log('- out handleMessage gateway'); } } diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts index 776c6a5d..db27d8b0 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts @@ -379,7 +379,6 @@ export class ChatService { socket.room = room_name; let message = `${socket.username} joined the room`; await socket.to(socket.room).emit('message', "SERVER", message); - await this.addMessageToRoom(room_name, "SERVER", message); console.log('- out socketJoinRoom service'); }