42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

socket are working but it's not the right way

Browse Source
This commit is contained in:
hugogogo
2023-01-09 16:47:30 +01:00
parent e23699dd51
commit 3eb338d822
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts
View File

@@ -33,17 +33,18 @@ export class ChatGateway
async joinRoom(@ConnectedSocket() socket, @MessageBody() room_name: string): Promise<void> async joinRoom(@ConnectedSocket() socket, @MessageBody() room_name: string): Promise<void>
{ {
console.log('- in joinRoom gateway'); console.log('- in joinRoom gateway');
socket.leave(socket.room);
socket.join(room_name); socket.join(room_name);
socket.room = room_name;
} }
@SubscribeMessage('message') @SubscribeMessage('message')
async handleMessage(@ConnectedSocket() socket, @MessageBody() message: string): Promise<void> async handleMessage(@ConnectedSocket() socket, @MessageBody() message: string): Promise<void>
{ {
console.log('- in handleMessage gateway'); console.log('- in handleMessage gateway');
let room_name = await this.chatService.getCurrentRoom(socket.username); //let room_name = await this.chatService.getCurrentRoom(socket.username);
console.log("-- room_name :", room_name); console.log("-- room_name :", socket.room);
//socket.to(room_name).emit('message', socket.username, message); socket.to(socket.room).emit('message', socket.username, message);
socket.emit('message', socket.username, message);
this.chatService.addMessageToCurrentRoom(socket.username, message); this.chatService.addMessageToCurrentRoom(socket.username, message);
} }
} }

7
srcs/requirements/svelte/api_front/public/build/bundle.js
View File

@@ -3854,6 +3854,10 @@ var app = (function () {
} }
async function create_room(room_name, room_type) { async function create_room(room_name, room_type) {
console.log("in create_room"); console.log("in create_room");
let form_data = {
room_name: room_name,
room_type: room_type,
};
// send the new room // send the new room
const response = await fetch('/api/v2/chat/create', { const response = await fetch('/api/v2/chat/create', {
method: 'POST', method: 'POST',
@@ -3898,6 +3902,7 @@ var app = (function () {
let data = await response.json(); let data = await response.json();
console.log(data.message); console.log(data.message);
await get_room_messages(); await get_room_messages();
socket$1.emit('join', name);
room_name.set(name); room_name.set(name);
layout.set("room"); layout.set("room");
} }
@@ -7677,7 +7682,7 @@ var app = (function () {
if (!formIsValid) return; if (!formIsValid) return;
// send the new room // send the new room
const response = await create_room(); const response = await create_room(room_name, room_type);
// go to room // go to room
if (response.status === 200 && response.message === "successfull room creation") { if (response.status === 200 && response.message === "successfull room creation") {

2
srcs/requirements/svelte/api_front/public/build/bundle.js.map
View File

File diff suppressed because one or more lines are too long

3
srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts
View File

@@ -20,7 +20,7 @@ export async function create_room(room_name, room_type)
{ {
console.log("in create_room"); console.log("in create_room");
let formData = { let form_data = {
room_name: room_name, room_name: room_name,
room_type: room_type, room_type: room_type,
}; };
@@ -79,6 +79,7 @@ export async function change_room(name)
console.log(data.message); console.log(data.message);
await get_room_messages(); await get_room_messages();
socket.emit('join', name);
room_name.set(name); room_name.set(name);
layout.set("room"); layout.set("room");