channelJoined emitted

VallienneDiane · Apr 6, 2023 · 29def02 · 29def02
1 parent 9c6fec1
commit 29def02
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/back/nest_project/src/chat/chat.classes.ts b/back/nest_project/src/chat/chat.classes.ts
@@ -218,7 +218,7 @@ export class UserRoomHandler {
 
     public roomKill(channelId: string) {
         let locGeneral: ChannelEntity = {
-            id: "general",
+            id: "00000000-0000-0000-0000-000000000000",
             name: "general",
             date: new Date(),
             password: false,
@@ -282,4 +282,15 @@ export class UserRoomHandler {
             return {room: found.room, isChannel: found.isChannel};
         return undefined;
     }
+
+    public emitToUserHavingThisSocket(socket: Socket, ev: string, ...args: any[]) {
+        let socketFound = this.socketMap.sockets.get(socket);
+        if (socketFound != undefined) {
+            let userFound = this.userMap.get(socketFound.userId);
+            if (userFound != undefined) {
+                userFound.emit(ev, ...args);
+            }
+        }
+    }
+
 }
diff --git a/back/nest_project/src/chat/chat.gateway.ts b/back/nest_project/src/chat/chat.gateway.ts
@@ -1,18 +1,13 @@
 import { MessageBody, SubscribeMessage, WebSocketGateway, ConnectedSocket, OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit } from "@nestjs/websockets";
 import { Server, Socket, Namespace } from 'socket.io';
 import { Logger, UseGuards, UsePipes, ValidationPipe } from "@nestjs/common";
-import { AuthGuard } from "@nestjs/passport";
 import { IChannelToEmit, IMessageChat, IToken } from "./chat.interface";
 import * as jsrsasign from 'jsrsasign';
 import { ChatService } from "./chat.service";
 import { UserRoomHandler } from "./chat.classes";
-import { useContainer } from "class-validator";
 import { UserService } from "src/user/user.service";
-import { UserDto } from "src/user/user.dto";
 import { JwtService } from '@nestjs/jwt';
-import { ChannelEntity } from "./channel/channel.entity";
 import { UserEntity } from "src/user/user.entity";
-import { ChannelDto } from "./channel/channel.dto";
 import { addMessageDto, changeLocDto, channelIdDto, createChannelDto, inviteUserDto, joinChannelDto, kickUserDto, makeHimNoOpDto, makeHimOpDto } from "./chat.gateway.dto";
 
 @UsePipes(ValidationPipe)

diff --git a/back/nest_project/src/chat/chat.service.ts b/back/nest_project/src/chat/chat.service.ts
@@ -48,7 +48,7 @@ export class ChatService {
 
     private goBackToGeneral(client: Socket) {
         let locGeneral: ChannelEntity = {
-            id: "general",
+            id: "00000000-0000-0000-0000-000000000000",
             name: "general",
             date: new Date(),
             password: false,
@@ -156,7 +156,7 @@ export class ChatService {
     public changeLocEvent(client: Socket, user: UserEntity, loc: string, isChannel: boolean, roomHandler: UserRoomHandler) {
         if (isChannel)
         {
-            if (loc == 'general') {
+            if (loc == '00000000-0000-0000-0000-000000000000') {
                 roomHandler.joinRoom(user.id, client, loc, true, false, false, false);
                 this.goBackToGeneral(client);
                 return;
@@ -274,7 +274,7 @@ export class ChatService {
                                                 let room = roomHandler.roomMap.of(channel.id);
                                                 if (room != undefined)
                                                     room.emit("newUserInChannel", user.id, user.login);
-                                                this.listMyChannelEvent(client, user.id);
+                                                roomHandler.emitToUserHavingThisSocket(client, "channelJoined", channel.id, channel.name);
                                                 this.changeLocEvent(client, user, data.channelId, true, roomHandler);
                                             })
                                     }
@@ -310,14 +310,17 @@ export class ChatService {
                                                 room.emit("newUserInChannel", userEntity.id, userEntity.login);
                                             let logged = roomHandler.userMap.get(userToInvite);
                                             if (logged != undefined) {
-                                                logged.sockets.forEach(({}, socket) => {
-                                                    this.listMyChannelEvent(socket, userToInvite);
+                                                this.channelService.getOneById(channelId)
+                                                .then((channelEntity) => {
+                                                    logged.sockets.forEach(({}, socket) => {
+                                                        socket.emit("channelJoined", channelEntity.id, channelEntity.name);
+                                                    })
                                                 })
                                             }
                                         })
                                     }
                                     else
-                                        client.emit("notice", `The user ${userToInvite} already belong to this channel.`);
+                                        client.emit("notice", `The user ${userEntity.login} already belong to this channel.`);
                                 }
                             )
                         }
@@ -345,7 +348,7 @@ export class ChatService {
                                                         let logged = roomHandler.userMap.get(userToInvite);
                                                         if (logged != undefined) {
                                                             logged.sockets.forEach(({}, socket) => {
-                                                                this.listMyChannelEvent(socket, userToInvite);
+                                                                socket.emit("channelJoined", chanOpts.id, chanOpts.name);
                                                             })
                                                         }
                                                     })

diff --git a/back/nest_project/src/user/user.service.ts b/back/nest_project/src/user/user.service.ts
@@ -98,7 +98,7 @@ export class UserService {
         const user = await this.findById(userId);
         let arrayOfChannels: {channel: ChannelEntity, status: string}[] = [{
             channel: {
-                id: "general",
+                id: "00000000-0000-0000-0000-000000000000",
                 date: new Date(),
                 name: "general",
                 password: false,