had to resolve some old code finding it's way back into the repo

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

@@ -19,8 +19,7 @@ import { kickUserDto } from './dto/kickUser.dto'
 import ConnectedUser from './entity/connection.entity'
 import { InjectRepository } from '@nestjs/typeorm'
 import { Repository } from 'typeorm'
-import { connect } from 'http2'
+import type User from 'src/users/entity/user.entity'
-import User from 'src/users/entity/user.entity'
 
 @WebSocketGateway({
   cors: {
@@ -39,23 +38,17 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
     private readonly chatService: ChatService,
     @InjectRepository(ConnectedUser)
     private readonly connectedUserRepository: Repository<ConnectedUser>
-	) {}
+  ) {}
 
   async handleConnection (socket: Socket): Promise<void> {}
 
   async handleDisconnect (socket: Socket): Promise<void> {
     await this.onLeaveChannel(socket)
-    socket.disconnect()
   }
 
   @SubscribeMessage('joinChannel')
   async onJoinChannel (socket: Socket, connect: ConnectionDto): Promise<void> {
-    console.log(
+    console.log('here')
-      'User %s is trying to join channel %s',
-      connect.UserId,
-      connect.ChannelId,
-      connect.pwd
-    )
     const channel = await this.chatService.getFullChannel(connect.ChannelId)
     if (channel.banned.findIndex((ban) => ban[0] === connect.UserId) !== -1) {
       throw new WsException('You are banned from entering this channel')
@@ -73,14 +66,15 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
       channel,
       user
     )
-	const conUser = {
+    const conUser = {
-		user : user.id,
+      user: user.id,
-		channel : channel.id,
+      channel: channel.id,
-		socket: socket.id	
+      socket: socket.id
-	}
+    }
-	this.connectedUserRepository.create(conUser)
+    this.connectedUserRepository.create(conUser)
     this.server.to(socket.id).emit('messages', messages)
     await socket.join(channel.id.toString())
+    console.log(this.server.sockets.adapter.rooms.get(channel.id.toString()))
   }
 
   @SubscribeMessage('getMessages')
@@ -96,19 +90,20 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
 
   @SubscribeMessage('leaveChannel')
   async onLeaveChannel (socket: Socket): Promise<void> {
-	const connect = await this.connectedUserRepository.findOneBy({socket : socket.id})
+    const connect = await this.connectedUserRepository.findOneBy({
-	if (connect == null)
+      socket: socket.id
-		return
+    })
-	const channel = await this.chatService.getFullChannel(connect.channel)
+    if (connect == null) return
-	socket.disconnect()
+    const channel = await this.chatService.getFullChannel(connect.channel)
-	if (connect.user == channel.owner.id) {
+    socket.disconnect()
-		this.server.in(channel.id.toString()).disconnectSockets()
+    if (connect.user === channel.owner.id) {
-		this.chatService.removeChannel(channel.id)
+      this.server.in(channel.id.toString()).disconnectSockets()
-	} else {
+      await this.chatService.removeChannel(channel.id)
-		channel.users = channel.users.filter((e) => e.id !== connect.user)
+    } else {
-	}
+      channel.users = channel.users.filter((e) => e.id !== connect.user)
-	await this.connectedUserRepository.delete({ socket : socket.id })
+    }
-	}
+    await this.connectedUserRepository.delete({ socket: socket.id })
+  }
 
   @SubscribeMessage('addMessage')
   async onAddMessage (socket: Socket, message: CreateMessageDto): Promise<void> {
@@ -126,18 +121,19 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {
 
   @SubscribeMessage('kickUser')
   async onKickUser (socket: Socket, kick: kickUserDto): Promise<void> {
-	const channel = await this.chatService.getFullChannel(kick.chan); 
+    const channel = await this.chatService.getFullChannel(kick.chan)
-	if (channel.owner.id == kick.to)
+    if (channel.owner.id === kick.to) { throw new WsException('You cannot kick the owner of a channel') }
-		throw new WsException('You cannot kick the owner of a channel')
+    if (
-	if (
+      channel.owner.id !== kick.from &&
-		channel.owner.id !== kick.from &&
+      channel.admins.findIndex((usr) => usr.id === kick.from) === -1
-		channel.admins.findIndex((usr) => usr.id === kick.from) === -1
+    ) {
-	  ) {
+      throw new WsException('You do not have the required privileges')
-		throw new WsException('You do not have the required privileges')
+    }
-	  }
+    const user = (await this.userService.findUser(kick.to)) as User
-	const user = await this.userService.findUser(kick.to) as User
+    const connect = (await this.connectedUserRepository.findOneBy({
-	const connect = await this.connectedUserRepository.findOneBy({user : user.id}) as ConnectedUser
+      user: user.id
+    })) as ConnectedUser
     await this.onLeaveChannel(socket)
-	this.server.sockets.sockets.get(connect.socket)?.disconnect()
+    this.server.sockets.sockets.get(connect.socket)?.disconnect()
   }
 }

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

@@ -40,7 +40,7 @@ export default class Channel {
   @JoinTable()
     users: User[]
 
-  @OneToMany(() => Message, (message: Message) => message.channel, {onDelete:'CASCADE'})
+  @OneToMany(() => Message, (message: Message) => message.channel, { cascade: true })
     messages: Message[]
 
   @ManyToOne(() => User)

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

@@ -22,7 +22,7 @@ export default class Message {
   @JoinColumn()
     author: User
 
-  @ManyToOne(() => Channel, (channel) => channel.messages, {onDelete:'CASCADE'} )
+  @ManyToOne(() => Channel, (channel) => channel.messages)
   @JoinTable()
     channel: Channel
 

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

@@ -30,7 +30,7 @@ export class User {
   @Column({ default: false, nullable: true })
     isVerified: boolean
 
-  @Column('uuid', { unique: true })
+  @Column('uuid', { nullable: true, unique: true })
     socketKey: string
 
   @Column({ unique: true })

front/volume/src/components/Leaderboard.svelte

@@ -65,7 +65,6 @@
     justify-content: center;
     align-items: center;
   }
-
   .history {
     background-color: #343A40;
     border: 1px solid #198754;