From fd122e18893d6af7d4d343914ce9e1dddf53dd26 Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 16 Jan 2023 14:56:05 +0100 Subject: [PATCH 1/3] suppression d'un fichier inutile --- package-lock.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 48e341a0..00000000 --- a/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} From ebf903705032cdac2fe23c22b13b666e35e6da07 Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 16 Jan 2023 15:09:00 +0100 Subject: [PATCH 2/3] suppression du resize --- srcs/requirements/svelte/api_front/.env | 2 +- srcs/requirements/svelte/api_front/src/pieces/Header.svelte | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/srcs/requirements/svelte/api_front/.env b/srcs/requirements/svelte/api_front/.env index 1b450684..cd15d3c1 100644 --- a/srcs/requirements/svelte/api_front/.env +++ b/srcs/requirements/svelte/api_front/.env @@ -1,2 +1,2 @@ -WEBSITE_HOST=transcendance +WEBSITE_HOST=localhost WEBSITE_PORT=8080 diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte index 3c8431b0..df34757b 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte @@ -59,7 +59,6 @@ } .header { - resize: vertical; overflow: hidden; background: #FB8B24; box-sizing: border-box; From 3cd9a0b52eb5a02069856b27f17e58cc72bf14ed Mon Sep 17 00:00:00 2001 From: simplonco Date: Mon, 16 Jan 2023 16:08:56 +0100 Subject: [PATCH 3/3] will not show direct rooms if blocked --- .../api_back/src/chat/chat.controller.ts | 16 +++++++++++- .../nestjs/api_back/src/chat/chat.gateway.ts | 2 +- .../nestjs/api_back/src/chat/chat.service.ts | 25 +++++++++---------- .../src/pieces/chat/Request_rooms.ts | 2 +- .../api_front/src/pieces/chat/Socket_chat.ts | 4 +++ 5 files changed, 33 insertions(+), 16 deletions(-) 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 a0c0abcd..46e15292 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.controller.ts @@ -52,8 +52,22 @@ export class ChatController { let fields = ["name", "type", "users", "protection", "allowed_users"]; const rooms = await this.chatService.getMyRooms(req.user.username, fields); + const blocked = await this.chatService.getListBlockUser(req.user.username); - const ret_rooms = rooms.map(room => + let filtered_rooms = rooms.filter(room => + { + if (room.type === 'direct') + { + let roomname = room.users[0]; + if (roomname === req.user.username) + roomname = room.users[1]; + if (blocked.includes(roomname)) + return false; + } + return true; + }); + + const ret_rooms = filtered_rooms.map(room => { let new_room = this.format_room(room); if (room.protection) 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 80e2b589..554366f5 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.gateway.ts @@ -28,7 +28,7 @@ implements OnGatewayConnection, OnGatewayDisconnect socket.username = socket.handshake.query.username.toString(); this.sockets.set(socket.username, socket); - printCaller("socket.username:", socket.username); + printCaller("--- socket.username:", socket.username); let not_emit: string = `${socket.username}_not_emit`; socket.join(not_emit); 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 5225ad7d..a97d9004 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts @@ -306,26 +306,22 @@ export class ChatService { async findOneRelationshipByUsername(friendUsername : string, username : string) { + printCaller("-- in "); + const friendship = await this.friendshipRepository .createQueryBuilder('friendship') .leftJoinAndSelect('friendship.sender', 'sender') .leftJoinAndSelect('friendship.receiver', 'receiver') - .where - ( - new Brackets((qb) => - { - qb.where - ( - new Brackets((subAQb) => - { + .where ( + new Brackets((qb) => { + qb.where ( + new Brackets((subAQb) => { subAQb.where('sender.username = :username', {username : username}) .andWhere('receiver.username = :friendUsername', {friendUsername : friendUsername}) }) ) - .orWhere - ( - new Brackets((subBQb) => - { + .orWhere ( + new Brackets((subBQb) => { subBQb.where('sender.username = :friendUsername2', {friendUsername2 : friendUsername}) .andWhere('receiver.username = :username2', {username2 : username}) .andWhere('friendship.status != :status', {status : FriendshipStatus.BLOCKED}) @@ -333,11 +329,14 @@ export class ChatService { ) }), ) - .getOne() + .getOne(); + console.log("friendship:", friendship); if (!friendship) return null; return new SendableFriendship(friendship); + + printCaller("-- out "); } async addBlockUser(username: string, to_block_username: string): Promise diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts b/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts index 4bfdcfcb..2153c306 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts +++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Request_rooms.ts @@ -239,7 +239,7 @@ export async function remove_block_user(username: string): Promise await fetch_chat_request('unblock', FetchMethod.POST, {username: username} ); } -export async function list_block_user(username: string): Promise +export async function list_block_user(username: string): Promise { to_print("in list_block_user"); 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 c003c8ab..f658d1b5 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 @@ -6,8 +6,11 @@ const address = `http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}` export async function init_socket() { + to_print("in init_socket"); + console.log("here"); const response = await fetch(`${address}/api/v2/user`); const response_data = await response.json(); + to_print("-- response_data:", response_data); set_user(response_data); @@ -19,6 +22,7 @@ export async function init_socket() username: response_data.username, }, }); + console.log("horo"); set_socket(socket); socket_states(socket);