Finish Rooms Socket & start Working on DM (#76)

Wadie-ess · Nov 5, 2023 · b912392 · b912392
2 parents 301dbe4 + a9c43d6
commit b912392
Show file tree

Hide file tree

Showing 27 changed files with 1,140 additions and 457 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/backend/.DS_Store b/backend/.DS_Store
diff --git a/backend/code/src/friends/friends.service.ts b/backend/code/src/friends/friends.service.ts
@@ -223,29 +223,29 @@ export class FriendsService {
  },
  });
 
- return friends.map((friend: any) => {
+ return friends.map((friend) => {
  if (friend.from.userId === userId) {
- friend = friend.to as any;
  const avatar: PICTURE = {
- thumbnail: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_48,w_48/${friend.avatar}`,
- medium: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_72,w_72/${friend.avatar}`,
- large: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_128,w_128/${friend.avatar}`,
+ thumbnail: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_48,w_48/${friend.to.avatar}`,
+ medium: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_72,w_72/${friend.to.avatar}`,
+ large: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_128,w_128/${friend.to.avatar}`,
  };
- delete friend.avatar;
  return {
- ...friend.to,
+ id: friend.to.userId,
+ firstname: friend.to.firstName,
+ lastname: friend.to.lastName,
  avatar,
  };
  } else {
- friend = friend.from as any;
  const avatar: PICTURE = {
- thumbnail: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_48,w_48/${friend.avatar}`,
- medium: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_72,w_72/${friend.avatar}`,
- large: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_128,w_128/${friend.avatar}`,
+ thumbnail: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_48,w_48/${friend.from.avatar}`,
+ medium: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_72,w_72/${friend.from.avatar}`,
+ large: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_128,w_128/${friend.from.avatar}`,
  };
- delete friend.avatar;
  return {
- ...friend.from,
+ id: friend.from.userId,
+ firstname: friend.from.firstName,
+ lastname: friend.from.lastName,
  avatar,
  };
  }

diff --git a/backend/code/src/gateways/gateways.gateway.ts b/backend/code/src/gateways/gateways.gateway.ts
@@ -47,6 +47,7 @@ export class Gateways implements OnGatewayConnection {
 
  @OnEvent('sendMessages')
  sendMessage(message: MessageFormatDto) {
+ console.log("recive msg !")
  const chanellname: string = `Romm:${message.roomId}`;
  this.server.to(chanellname).emit('message', message);
  }

diff --git a/backend/code/src/rooms/rooms.service.ts b/backend/code/src/rooms/rooms.service.ts
@@ -407,9 +407,11 @@ export class RoomsService {
  },
  },
  is_banned: true,
+ is_mueted: true,
  },
  });
- return members.map((member) => {
+ const filtredmembers = members.filter((member) => !member.is_banned || user.is_admin)
+ return filtredmembers.map((member) => {
  if (!member.is_banned || user.is_admin) {
  const avatar: PICTURE = {
  thumbnail: `https://res.cloudinary.com/trandandan/image/upload/c_thumb,h_48,w_48/${member.user.avatar}`,
@@ -421,6 +423,8 @@ export class RoomsService {
  firstname: member.user.firstName,
  lastname: member.user.lastName,
  avatar: avatar,
+ isBaned: member.is_banned,
+ isMuted: member.is_mueted,
  };
  }
  });

diff --git a/frontend/.DS_Store b/frontend/.DS_Store
diff --git a/frontend/code/package-lock.json b/frontend/code/package-lock.json
diff --git a/frontend/code/package.json b/frontend/code/package.json
@@ -26,6 +26,7 @@
  "react-hot-toast": "^2.4.1",
  "react-icons": "^4.10.1",
  "react-konva": "^18.2.10",
+ "socket.io-client": "^4.7.2",
  "react-scripts": "^5.0.1",
  "typescript": "^4.9.5",
  "web-vitals": "^2.1.4",