Merge branch 'master' of https://github.com/walidmoovin/transcendance

back/volume/src/chat/chat.controller.ts

@@ -38,21 +38,25 @@ export class ChatController {
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
     const user: User | null = await this.usersService.findUser(target.id)
-    if (user == null)
+    if (user == null) {
       throw new NotFoundException(`User #${target.id} not found`)
-    if (channel.isPrivate && channel.password === '')
+    }
+    if (channel.isPrivate && channel.password === '') {
       throw new BadRequestException('You cannot add more users to a DM')
+    }
     if (!(await this.channelService.isUser(channel.id, +profile.id))) {
       throw new BadRequestException(
         'You are not allowed to invite users to this channel'
       )
     }
-    if (await this.channelService.isUser(channel.id, target.id))
+    if (await this.channelService.isUser(channel.id, target.id)) {
       throw new BadRequestException('User is already in this channel')
-    if (await this.channelService.isBanned(channel.id, target.id))
+    }
+    if (await this.channelService.isBanned(channel.id, target.id)) {
       throw new BadRequestException('User is banned from this channel')
+    }
     channel.users.push(user)
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Delete(':id/kick')
@@ -67,14 +71,16 @@ export class ChatController {
         'You are not allowed to kick users from this channel'
       )
     }
-    if (!(await this.channelService.isUser(channel.id, target.id)))
+    if (!(await this.channelService.isUser(channel.id, target.id))) {
       throw new BadRequestException('User is not in this channel')
-    if (await this.channelService.isOwner(channel.id, target.id))
+    }
+    if (await this.channelService.isOwner(channel.id, target.id)) {
       throw new BadRequestException('You cannot kick the owner of the channel')
+    }
     channel.users = channel.users.filter((usr: User) => {
       return usr.ftId !== target.id
     })
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Post(':id/admin')
@@ -85,16 +91,20 @@ export class ChatController {
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
     const user: User | null = await this.usersService.findUser(target.id)
-    if (user == null)
+    if (user == null) {
       throw new NotFoundException(`User #${target.id} not found`)
-    if (!(await this.channelService.isOwner(channel.id, +profile.id)))
+    }
+    if (!(await this.channelService.isOwner(channel.id, +profile.id))) {
       throw new BadRequestException('You are not the owner of this channel')
-    if (!(await this.channelService.isUser(channel.id, target.id)))
+    }
+    if (!(await this.channelService.isUser(channel.id, target.id))) {
       throw new BadRequestException('User is not in this channel')
-    if (await this.channelService.isAdmin(channel.id, target.id))
+    }
+    if (await this.channelService.isAdmin(channel.id, target.id)) {
       throw new BadRequestException('User is already an admin of this channel')
+    }
     channel.admins.push(user)
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Delete(':id/admin')
@@ -104,14 +114,16 @@ export class ChatController {
       @Profile42() profile: Profile
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
-    if (!(await this.channelService.isOwner(channel.id, +profile.id)))
+    if (!(await this.channelService.isOwner(channel.id, +profile.id))) {
       throw new BadRequestException('You are not the owner of this channel')
-    if (!(await this.channelService.isAdmin(channel.id, target.id)))
+    }
+    if (!(await this.channelService.isAdmin(channel.id, target.id))) {
       throw new BadRequestException('User is not an admin of this channel')
+    }
     channel.admins = channel.admins.filter((usr: User) => {
       return usr.ftId !== target.id
     })
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Post(':id/ban')
@@ -122,19 +134,22 @@ export class ChatController {
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
     const user: User | null = await this.usersService.findUser(target.id)
-    if (user == null)
+    if (user == null) {
       throw new NotFoundException(`User #${target.id} not found`)
+    }
     if (!(await this.channelService.isAdmin(channel.id, +profile.id))) {
       throw new BadRequestException(
         'You are not allowed to ban users from this channel'
       )
     }
-    if (await this.channelService.isOwner(channel.id, target.id))
+    if (await this.channelService.isOwner(channel.id, target.id)) {
       throw new BadRequestException('You cannot ban the owner of the channel')
-    if (await this.channelService.isBanned(channel.id, target.id))
+    }
+    if (await this.channelService.isBanned(channel.id, target.id)) {
       throw new BadRequestException('User is already banned from this channel')
+    }
     channel.banned.push(user)
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Post(':id/mute')
@@ -145,20 +160,25 @@ export class ChatController {
   ): Promise<void> {
     const channel = await this.channelService.getFullChannel(id)
     const user: User | null = await this.usersService.findUser(mute.data[0])
-    if (user == null)
+    if (user == null) {
       throw new NotFoundException(`User #${mute.data[0]} not found`)
+    }
     if (!(await this.channelService.isAdmin(channel.id, +profile.id))) {
       throw new BadRequestException(
         'You are not allowed to mute users from this channel'
       )
     }
-    if (await this.channelService.isOwner(channel.id, mute.data[0]))
+    if (await this.channelService.isOwner(channel.id, mute.data[0])) {
       throw new BadRequestException('You cannot mute the owner of the channel')
-    if (await this.channelService.getMuteDuration(channel.id, mute.data[0]) > 0)
+    }
+    if (
+      (await this.channelService.getMuteDuration(channel.id, mute.data[0])) > 0
+    ) {
       throw new BadRequestException('User is already muted from this channel')
+    }
     const newMute: number[] = [mute.data[0], Date.now() + mute.data[1] * 1000]
     channel.muted.push(newMute)
-    this.channelService.save(channel)
+    await this.channelService.save(channel)
   }
 
   @Delete(':id')
@@ -166,8 +186,9 @@ export class ChatController {
     @Profile42() profile: Profile,
       @Param('id', ParseIntPipe) id: number
   ): Promise<void> {
-    if (!(await this.channelService.isOwner(id, +profile.id)))
+    if (!(await this.channelService.isOwner(id, +profile.id))) {
       throw new BadRequestException('You are not the owner of this channel')
+    }
     await this.channelService.removeChannel(id)
   }
 
@@ -177,8 +198,9 @@ export class ChatController {
       @Param('id', ParseIntPipe) id: number,
       @Body() data: PasswordDto
   ): Promise<void> {
-    if (await this.channelService.isOwner(id, +profile.id))
+    if (await this.channelService.isOwner(id, +profile.id)) {
       throw new BadRequestException('You are not the owner of this channel')
+    }
     await this.channelService.updatePassword(id, data.password)
   }
 

back/volume/src/chat/chat.gateway.ts

@@ -4,7 +4,7 @@ import {
   SubscribeMessage,
   WebSocketGateway,
   WebSocketServer,
-  WsException,
+  WsException
 } from '@nestjs/websockets'
 import { Socket, Server } from 'socket.io'
 // import { User } from 'users/user.entity';
@@ -20,7 +20,6 @@ import { Repository } from 'typeorm'
 import ConnectedUser from './entity/connection.entity'
 import { ConnectionDto } from './dto/connection.dto'
 
-
 @WebSocketGateway({
   cors: { origin: /^(http|ws):\/\/localhost(:\d+)?$/ }
 })
@@ -36,7 +35,9 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     private readonly connectedUserRepository: Repository<ConnectedUser>
   ) {}
 
-  async handleConnection (socket: Socket): Promise<void> {}
+  async handleConnection (socket: Socket): Promise<void> {
+    console.log('Client connected: ' + socket.id)
+  }
 
   handleDisconnect (socket: Socket): void {
     socket.disconnect()
@@ -44,9 +45,11 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
 
   @SubscribeMessage('joinChannel')
   async onJoinChannel (socket: Socket, connect: ConnectionDto): Promise<void> {
-    const channel = await this.chatService.getChannel(connect.ChannelId)
+    console.log(connect.ChannelId, connect.UserId, connect.pwd)
-    if (channel.banned.find((ban) => ban.id === connect.UserId) !== null)
+    const channel = await this.chatService.getFullChannel(connect.ChannelId)
+    if (channel.banned.find((ban) => ban.id === connect.UserId) !== null) {
       throw new WsException('You are banned from entering this channel')
+    }
     const user = (await this.userService.findUser(connect.UserId)) as User
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
     // We don't need to verify if the user is already in imo
@@ -55,9 +58,12 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     //  channel.users.find((usr) => usr.id === user.id) == null &&
     //  channel.password !== ''
     // ) {
-    if (channel.password !== '' && !(await bcrypt.compare(channel.password, connect.pwd)))
+    if (
+      channel.password !== '' &&
+      !(await bcrypt.compare(channel.password, connect.pwd))
+    ) {
       throw new WsException('Wrong password')
-    else await this.chatService.addUserToChannel(channel, user) 
+    } else await this.chatService.addUserToChannel(channel, user)
 
     {
       const conUser = new ConnectedUser()
@@ -67,8 +73,10 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
       await this.connectedUserRepository.save(conUser)
     }
 
-    const messages = 
+    const messages = await this.messageService.findMessagesInChannelForUser(
-      await this.messageService.findMessagesInChannelForUser(channel, user)
+      channel,
+      user
+    )
     this.server.to(socket.id).emit('messages', messages)
     await socket.join(channel.name)
   }

back/volume/src/chat/chat.module.ts

@@ -1,4 +1,4 @@
-import { forwardRef, Module } from '@nestjs/common'
+import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 
 import { AuthModule } from 'src/auth/auth.module'

back/volume/src/chat/chat.service.ts

@@ -56,7 +56,7 @@ export class ChatService {
     return newDM
   }
 
-  async updatePassword (id: number, password: string) {
+  async updatePassword (id: number, password: string): Promise<void> {
     const channel: Channel | null = await this.ChannelRepository.findOneBy({
       id
     })
@@ -113,7 +113,7 @@ export class ChatService {
   async getFullChannel (id: number): Promise<Channel> {
     const channel = await this.ChannelRepository.findOne({
       where: { id },
-      relations: ['users', 'admins', 'banned', 'muted', 'owner']
+      relations: ['users', 'admins', 'banned', 'owner']
     })
     if (channel == null) {
       throw new NotFoundException(`Channel #${id} not found`)
@@ -121,15 +121,15 @@ export class ChatService {
     return channel
   }
 
-  async update (channel: Channel) {
+  async update (channel: Channel): Promise<void> {
     await this.ChannelRepository.update(channel.id, channel)
   }
 
-  async save (channel: Channel) {
+  async save (channel: Channel): Promise<void> {
     await this.ChannelRepository.save(channel)
   }
 
-  async removeChannel (channelId: number) {
+  async removeChannel (channelId: number): Promise<void> {
     await this.ChannelRepository.delete(channelId)
   }
 
@@ -138,7 +138,7 @@ export class ChatService {
       where: { id },
       relations: { owner: true }
     })
-    if (channel == null) {
+    if (channel === null) {
       throw new NotFoundException(`Channel #${id} not found`)
     }
     return channel.owner.ftId === userId
@@ -149,10 +149,10 @@ export class ChatService {
       where: { id },
       relations: { admins: true }
     })
-    if (channel == null) {
+    if (channel === null) {
       throw new NotFoundException(`Channel #${id} not found`)
     }
-    return channel.admins.findIndex((user) => user.ftId === userId) != -1
+    return channel.admins.findIndex((user) => user.ftId === userId) !== -1
   }
 
   async isUser (id: number, userId: number): Promise<boolean> {
@@ -160,10 +160,10 @@ export class ChatService {
       where: { id },
       relations: { users: true }
     })
-    if (channel == null) {
+    if (channel === null) {
       throw new NotFoundException(`Channel #${id} not found`)
     }
-    return channel.users.findIndex((user) => user.ftId === userId) != -1
+    return channel.users.findIndex((user) => user.ftId === userId) !== -1
   }
 
   async isBanned (id: number, userId: number): Promise<boolean> {
@@ -171,10 +171,10 @@ export class ChatService {
       where: { id },
       relations: { banned: true }
     })
-    if (channel == null) {
+    if (channel === null) {
       throw new NotFoundException(`Channel #${id} not found`)
     }
-    return channel.banned.findIndex((user) => user.ftId === userId) != -1
+    return channel.banned.findIndex((user) => user.ftId === userId) !== -1
   }
 
   async getMuteDuration (id: number, userId: number): Promise<number> {
@@ -182,16 +182,14 @@ export class ChatService {
       where: { id },
       relations: { muted: true }
     })
-    if (channel == null) {
+    if (channel === null) {
       throw new NotFoundException(`Channel #${id} not found`)
     }
 
     const mutation: number[] | undefined = channel.muted.find(
       (mutation) => mutation[0] === userId
     )
-    if (mutation == null) {
+    if (mutation == null) return 0
-      return 0
-    }
     return mutation[1]
   }
 }

back/volume/src/chat/entity/channel.entity.ts

@@ -28,7 +28,7 @@ export default class Channel {
     password: string
 
   @BeforeInsert()
-  async hashPassword () {
+  async hashPassword (): Promise<void> {
     if (this.password === '') return
     this.password = await bcrypt.hash(
       this.password,

back/volume/src/chat/entity/connection.entity.ts

@@ -1,10 +1,4 @@
-import {
+import { Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-  Column,
-  Entity,
-  JoinColumn,
-  OneToOne,
-  PrimaryGeneratedColumn
-} from 'typeorm'
 
 import Channel from './channel.entity'
 import User from 'src/users/entity/user.entity'

back/volume/src/users/entity/user.entity.ts

@@ -2,13 +2,10 @@ import {
   Entity,
   PrimaryGeneratedColumn,
   Column,
-  OneToMany,
   ManyToMany,
   JoinTable
 } from 'typeorm'
 
-import Message from 'src/chat/entity/message.entity'
-import Channel from 'src/chat/entity/channel.entity'
 import Result from 'src/pong/entity/result.entity'
 
 @Entity()

back/volume/src/users/users.controller.ts

@@ -11,16 +11,16 @@ import {
   Res,
   StreamableFile,
   BadRequestException,
-  Redirect
+  Redirect,
+  Delete
 } from '@nestjs/common'
 
 import { FileInterceptor } from '@nestjs/platform-express'
 import { diskStorage } from 'multer'
 
-import { type User } from "./entity/user.entity";
+import { type User } from './entity/user.entity'
-import { UsersService } from "./users.service";
+import { UsersService } from './users.service'
-import { UserDto, AvatarUploadDto } from "./dto/user.dto";
+import { UserDto, AvatarUploadDto } from './dto/user.dto'
-import { PongService } from "src/pong/pong.service";
 
 import { AuthenticatedGuard } from 'src/auth/42-auth.guard'
 import { Profile42 } from 'src/auth/42.decorator'
@@ -35,24 +35,33 @@ import { join } from 'path'
 export class UsersController {
   constructor (private readonly usersService: UsersService) {}
 
-  @Post('block/:id')
+  @Get('block/:id')
   @UseGuards(AuthenticatedGuard)
-  @Post("block/:id")
+  async blockUser (
-  async blockUser(@Profile42() profile :Profile, @Param('id') id:number) {
+    @Profile42() profile: Profile,
-    const user = await this.usersService.findUser(id) as User
+      @Param('id') id: number
-    user.blocked.push((await this.usersService.findUser(+profile.id)) as User)
+  ): Promise<void> {
-    this.usersService.save(user)
+    const user = await this.usersService.findUser(profile.id)
+    const target = await this.usersService.findUser(id)
+    if (user === null || target === null) {
+      throw new BadRequestException('User not found')
+    }
+    user.blocked.push(target)
+    await this.usersService.save(user)
   }
 
-  @Post('unblock/:id')
+  @Delete('block/:id')
   @UseGuards(AuthenticatedGuard)
-  @Post("unblock/:id")
+  async unblockUser (
-  async unblockUser(@Profile42() profile :Profile, @Param('id') id:number) {
+    @Profile42() profile: Profile,
-    const user = await this.usersService.findUser(id) as User
+      @Param('id') id: number
+  ): Promise<void> {
+    const user = await this.usersService.findUser(profile.id)
+    if (user === null) throw new BadRequestException('User not found')
     user.blocked = user.blocked.filter((usr: User) => {
       return usr.id !== id
     })
-    this.usersService.save(user)
+    await this.usersService.save(user)
   }
 
   @Get('all')
@@ -100,10 +109,10 @@ export class UsersController {
       }
     })
   )
-  @ApiConsumes("multipart/form-data")
+  @ApiConsumes('multipart/form-data')
   @ApiBody({
-    description: "A new avatar for the user",
+    description: 'A new avatar for the user',
-    type: AvatarUploadDto,
+    type: AvatarUploadDto
   })
   async changeAvatar (
     @Profile42() profile: Profile,

back/volume/src/users/users.module.ts

@@ -4,7 +4,6 @@ import { User } from './entity/user.entity'
 import { UsersController } from './users.controller'
 import { UsersService } from './users.service'
 import { PongModule } from 'src/pong/pong.module'
-import { ChatModule } from 'src/chat/chat.module'
 
 @Module({
   imports: [forwardRef(() => PongModule), TypeOrmModule.forFeature([User])],

back/volume/src/users/users.service.ts

@@ -46,7 +46,7 @@ export class UsersService {
         })
       }
     })
-    this.getLeaderboard()
+    await this.getLeaderboard()
   }
 
   async findUser (ftId: number): Promise<User | null> {
@@ -125,7 +125,9 @@ export class UsersService {
     let r = 0
     ret.forEach((usr) => {
       usr.rank = r++
-      this.usersRepository.save(usr)
+      this.usersRepository.save(usr).catch((err) => {
+        console.log(err)
+      })
       usr.socketKey = ''
     })
     return ret

front/volume/src/Auth.ts

@@ -11,7 +11,7 @@ export const API_URL = `http://${import.meta.env.VITE_HOST}:${
   import.meta.env.VITE_BACK_PORT
 }`;
 
-export async function getUser(bypass: boolean = false) {
+export async function getUser() {
   const res = await fetch(API_URL + "/users", {
     method: "get",
     mode: "cors",

front/volume/src/components/Channels.svelte

@@ -14,10 +14,13 @@
 <script lang="ts">
   //--------------------------------------------------------------------------------/
   let channelMode = "";
-  const channelOptions = ['public','private','direct'];
+  const channelOptions = ["public", "private", "direct"];
 
   const joinChannel = async (id: number) => {
-    socket.emit("joinChannel", id, $store.ftId);
+    socket.emit("joinChannel", {
+      UserId: $store.ftId,
+      ChannelId: id,
+    });
   };
 
   let channels: Array<ChannelsType> = [];
@@ -46,7 +49,7 @@
     const name = prompt("Enter a name for the new channel:");
     if (name) {
       let password = "";
-      if (channelMode !== 'direct')
+      if (channelMode !== "direct")
         password = prompt("Enter a password for the new channel:");
       const response = await fetch(API_URL + "/channels", {
         credentials: "include",
@@ -168,11 +171,14 @@
       <div>
         <select bind:value={channelMode}>
           {#each channelOptions as option}
-                  <option value={option} selected={channelMode === option}>{option}</option>
+            <option value={option} selected={channelMode === option}
+              >{option}</option
+            >
           {/each}
         </select>
-        {#if channelMode!= ''}
+        {#if channelMode != ""}
-          <button class="button" on:click={createChannel}>Create Channel</button>
+          <button class="button" on:click={createChannel}>Create Channel</button
+          >
         {/if}
       </div>
     </div>
@@ -223,7 +229,7 @@
   }
 
   button {
-    background-color: #6B8E23;
+    background-color: #6b8e23;
     color: #ffffff;
     border: none;
     border-radius: 5px;
@@ -248,7 +254,7 @@
   }
 
   .button {
-    background-color: #6B8E23;
+    background-color: #6b8e23;
     color: #ffffff;
     border: none;
     border-radius: 5px;

front/volume/src/components/Chat.svelte

@@ -6,20 +6,19 @@
   }
   import { createEventDispatcher, onDestroy, onMount } from "svelte";
   import { store, API_URL } from "../Auth";
-import { socket } from "../socket"
+  import { socket } from "../socket";
   import type { ChannelsType } from "./Channels.svelte";
   import type User from "./Profile.svelte";
 </script>
 
 <script lang="ts">
-
   let blockedUsers: Array<User> = [];
   let chatMembers: Array<User> = [];
   let chatMessages: Array<chatMessagesType> = [];
   export let channel: ChannelsType;
   let newText = "";
   onMount(async () => {
-	let res = await fetch(API_URL + "/users/" + $store.ftId + "/blocked", {
+    let res = await fetch(API_URL + "/users/block/" + $store.ftId, {
       credentials: "include",
       mode: "cors",
     });
@@ -42,11 +41,13 @@ import type User  from "./Profile.svelte";
 
   const sendMessage = () => {
     if (newText !== "") {
+      /*
       const newMessage = {
         id: chatMessages.length + 1,
         author: $store.username,
         text: newText,
       };
+      */
       chatMessages = [...chatMessages.slice(-5 + 1)];
       socket.emit("addMessage", channel.id, $store.ftId, newText);
       newText = "";
@@ -83,111 +84,154 @@ import type User  from "./Profile.svelte";
   //--------------------------------------------------------------------------------/
 
   const blockUser = async (username: string) => {
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    if (response.ok) {
-    const res2 = await fetch(API_URL + "/users/block/" + data1.ftId, {
+      const target = await response.json();
+      response = await fetch(API_URL + "/users/" + target.ftId + "/block", {
         credentials: "include",
         method: "POST",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
       });
-    if (res2.ok) {
-      alert("User blocked");
-    } else {
-      alert("Failed to block user");
     }
+    if (response.ok) alert("User blocked");
+    else alert("Failed to block user");
   };
 
   //--------------------------------------------------------------------------------/
 
   const unblockUser = async (username: string) => {
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    if (response.ok) {
-    const res2 = await fetch(API_URL + "/users/unblock/" + data1.ftId, {
+      const target = await response.json();
+      response = await fetch(API_URL + "/users/" + target.ftId + "/block", {
         credentials: "include",
         method: "DELETE",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
       });
-    if (res2.ok) {
-      alert("User unblocked");
-    } else {
-      alert("Failed to unblock user");
     }
+    if (response.ok) alert("User blocked");
+    else alert("Failed to block user");
   };
 
   //--------------------------------------------------------------------------------/
 
   const banUser = async (username: string) => {
-    const prompt = window.prompt("Enter ban duration in seconds");
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    if (response.ok) {
-    const res2 = await fetch(API_URL + "/channels/" + data1.ftId + "/ban", {
+      const target = await response.json();
+      response = await fetch(API_URL + "/channels/" + channel.id + "/ban", {
         credentials: "include",
         method: "POST",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
       });
-    if (res2.ok) {
+      socket.emit("kickUser", channel.id, $store.ftId, target.ftId);
-      socket.emit("kickUser", channel.id, $store.ftId, data1.ftId);
+    }
+    if (response.ok) {
       alert("User banned");
-    } else {
+    } else alert("Failed to ban user");
-      alert("Failed to ban user");
+  };
+
+  //--------------------------------------------------------------------------------/
+
+  const unbanUser = async (username: string) => {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
+      credentials: "include",
+      mode: "cors",
+    });
+    if (response.ok) {
+      const target = await response.json();
+      response = await fetch(API_URL + "/channels/" + channel.id + "/ban", {
+        credentials: "include",
+        method: "DELETE",
+        mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
+      });
     }
+    if (response.ok) alert("User unbanned");
+    else alert("Failed to unban user");
   };
 
   //--------------------------------------------------------------------------------/
 
   const kickUser = async (username: string) => {
-    const res = await fetch(API_URL + "/users/" + username + "/byname", {
+    const response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const kickedUser = await res.json();
+    if (response.ok) {
-    socket.emit("kickUser", channel.id, $store.ftId, kickedUser.ftId);
+      const target = await response.json();
+      socket.emit("kickUser", channel.id, $store.ftId, target.ftId);
+    }
   };
 
   //--------------------------------------------------------------------------------/
 
   const muteUser = async (username: string) => {
     const prompt = window.prompt("Enter mute duration in seconds");
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    const target = await response.json();
-    const res2 = await fetch(API_URL + "/channels/" + data1.ftId + "/mute", {
+    if (response.ok) {
+      response = await fetch(API_URL + "/channels/" + channel.id + "/mute", {
         credentials: "include",
         method: "POST",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ data: [target.ftId, +prompt] }),
       });
-    if (res2.ok) {
-      alert("User muted");
-    } else {
-      alert("Failed to mute user");
     }
+    if (response.ok) alert("User muted");
+    else alert("Failed to mute user");
   };
 
   //--------------------------------------------------------------------------------/
 
   const adminUser = async (username: string) => {
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    if (response.ok) {
-    const res2 = await fetch(API_URL + "/channels/" + data1.ftId + "/admin", {
+      const target = await response.json();
+      response = await fetch(API_URL + "/channels/" + channel.id + "/admin", {
         credentials: "include",
         method: "POST",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
       });
-    if (res2.ok) {
+    }
+    if (response.ok) {
       alert("User admined");
     } else {
       alert("Failed to admin user");
@@ -197,27 +241,32 @@ import type User  from "./Profile.svelte";
   //--------------------------------------------------------------------------------/
 
   const removeAdminUser = async (username: string) => {
-    const res1 = await fetch(API_URL + "/users/" + username + "/byname", {
+    let response = await fetch(API_URL + "/users/" + username + "/byname", {
       credentials: "include",
       mode: "cors",
     });
-    const data1 = await res1.json();
+    if (response.ok) {
-    const res2 = await fetch(API_URL + "/channels/" + data1.ftId + "/admin", {
+      const target = await response.json();
+      response = await fetch(API_URL + "/channels/" + channel.id + "/admin", {
         credentials: "include",
         method: "DELETE",
         mode: "cors",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ id: target.ftId }),
       });
-    if (res2.ok) {
+    }
-      alert("User admin removed");
+    if (response.ok) {
+      alert("User admined");
     } else {
-      alert("Failed to remove admin user");
+      alert("Failed to admin user");
     }
   };
 
   //--------------------------------------------------------------------------------/
 </script>
 
-
 <div class="overlay">
   <div class="chat" on:click|stopPropagation on:keydown|stopPropagation>
     <div class="messages">
@@ -244,22 +293,34 @@ import type User  from "./Profile.svelte";
       >
         <ul>
           <li>
-        <button on:click = {() => dispatch("send-message", selectedUser)}> Send Message </button>
+            <button on:click={() => dispatch("send-message", selectedUser)}>
+              Send Message
+            </button>
           </li>
           <li>
-        <button on:click = {() => dispatch("view-profile", selectedUser)}> View Profile </button>
+            <button on:click={() => dispatch("view-profile", selectedUser)}>
+              View Profile
+            </button>
           </li>
           <li>
-        <button on:click = {() => dispatch("add-friend", selectedUser)}> Add Friend </button>
+            <button on:click={() => dispatch("add-friend", selectedUser)}>
+              Add Friend
+            </button>
           </li>
           <li>
-        <button on:click = {() => dispatch("invite-to-game", selectedUser)}> Invite to Game </button>
+            <button on:click={() => dispatch("invite-to-game", selectedUser)}>
+              Invite to Game
+            </button>
           </li>
           <li>
-        { #if !blockedUsers.filter((user) => user.username = selectedUser).length }
+            {#if !blockedUsers.filter((user) => (user.username = selectedUser)).length}
-        <button on:click = {() => blockUser(selectedUser)}> Block User </button>
+              <button on:click={() => blockUser(selectedUser)}>
+                Block User
+              </button>
             {:else}
-        <button on:click = {() => unblockUser(selectedUser)}> Unblock User </button>
+              <button on:click={() => unblockUser(selectedUser)}>
+                Unblock User
+              </button>
             {/if}
           </li>
           <li><button on:click={closeProfileMenu}> Close </button></li>
@@ -272,14 +333,18 @@ import type User  from "./Profile.svelte";
         <img src="img/send.png" alt="send" />
       </button>
     </form>
-    <button on:click|stopPropagation={ toggleChatMembers } on:keydown|stopPropagation > Chat Members </button>
+    <button
+      on:click|stopPropagation={toggleChatMembers}
+      on:keydown|stopPropagation
+    >
+      Chat Members
+    </button>
     {#if showChatMembers}
       <div
         class="chatMembers"
         on:click|stopPropagation
         on:keydown|stopPropagation
-      >
+      />
-      </div>
       <ul>
         {#each chatMembers as member}
           <li>
@@ -288,8 +353,12 @@ import type User  from "./Profile.svelte";
               <button on:click={() => banUser(member.username)}> ban </button>
               <button on:click={() => kickUser(member.username)}> kick </button>
               <button on:click={() => muteUser(member.username)}> mute </button>
-              <button on:click = {() => adminUser(member.username)}> promote </button>
+              <button on:click={() => adminUser(member.username)}>
-              <button on:click = {() => removeAdminUser(member.username)}> demote </button>
+                promote
+              </button>
+              <button on:click={() => removeAdminUser(member.username)}>
+                demote
+              </button>
             </p>
           </li>
         {/each}
@@ -351,7 +420,7 @@ import type User  from "./Profile.svelte";
   }
 
   button {
-    background-color: #6B8E23;
+    background-color: #6b8e23;
     color: #ffffff;
     border: none;
     border-radius: 5px;

front/volume/src/components/Friends.svelte

@@ -123,7 +123,8 @@
     color: #e8e6e3;
   }
 
-  h2, h3 {
+  h2,
+  h3 {
     color: #e8e6e3;
   }
 
@@ -133,7 +134,8 @@
     max-height: 200px;
   }
 
-  input[type="text"], button {
+  input[type="text"],
+  button {
     background-color: #198754;
     border: none;
     color: #e8e6e3;

front/volume/src/components/MatchHistory.svelte

@@ -14,12 +14,6 @@
   import { onMount } from "svelte";
 
   export let username: string = "Global";
-  function formatDate(str: string) {
-    const splitT = str.split("T");
-    const splitDate = splitT[0].split("-");
-    const splitDot = splitT[1].split(".");
-    return `${splitDate[1]}/${splitDate[2]}-${splitDot[0]}`;
-  }
   let page: number = 1;
   let data: Array<Match> = [];
   let newBatch: Array<Match> = [];

front/volume/src/components/NavBar.svelte

@@ -1,5 +1,9 @@
 <script lang="ts">
-  let api = "http://" + import.meta.env.VITE_HOST + ":" + import.meta.env.VITE_BACK_PORT;
+  let api =
+    "http://" +
+    import.meta.env.VITE_HOST +
+    ":" +
+    import.meta.env.VITE_BACK_PORT;
 
   export let links = [
     { text: "Home" },

front/volume/src/components/Pong/Pong.svelte

@@ -22,7 +22,7 @@
   export let appState: string;
   export let setAppState: (newState: APPSTATE | string) => void;
 
-  const SERVER_URL = `ws://${import.meta.env.VITE_HOST}:${
+  const SERVER_URL = `http://${import.meta.env.VITE_HOST}:${
     import.meta.env.VITE_BACK_PORT
   }`;
 

front/volume/src/socket.ts

@@ -1,3 +1,3 @@
-import { io } from "socket.io-client";
+import { io, Socket } from "socket.io-client";
 
 export const socket: Socket = io("http://localhost:3001");