Game seems to work

Room/Chat/Chat.cs

@@ -1,33 +0,0 @@
-using System.Text.Json;
-using MauMau_Server.Websockets;
-
-namespace MauMau_Server.Room.Chat;
-
-public class Chat
-{
-    private readonly Room _room;
-    
-    public Chat(Room room)
-    {
-        _room = room;
-    }
-    
-    public void SendChatMessage(ConnectionInstance connection, string message)
-    {
-        var chatMessage = new ChatMessage(connection.Name, message);
-        var formattedMessage = new MessageDTO("CHAT", JsonSerializer.Serialize(chatMessage));
-        WebsocketManager.BroadcastAsync(_room.GetWebsockets(), JsonSerializer.Serialize(formattedMessage));
-    }
-}
-
-public class ChatMessage
-{
-    public string Sender { get; set; }
-    public string Message { get; set; }
-    
-    public ChatMessage(string sender, string message)
-    {
-        Sender = sender;
-        Message = message;
-    }
-}

Room/Chat/ChatOutput.cs

@@ -1,18 +0,0 @@
-namespace MauMau_Server.Mau;
-
-public class ChatOutput
-{
-    public string PlayerName { get; set; }
-    public string Message { get; set; }
-    
-    public ChatOutput(string playerName, string message)
-    {
-        PlayerName = playerName;
-        Message = message;
-    }
-    
-    public ChatOutput()
-    {
-        
-    }
-}

Room/Lobby.cs

@@ -1,39 +1,33 @@
 using MauMau_Server.Mau;
+using MauMau_Server.Room.Messages;
 using MauMau_Server.Websockets;
 
 namespace MauMau_Server.Room;
 
 public class Lobby : RoomType
 {
-    private readonly Room _room;
-    
-    public Lobby(Room room)
+    public Lobby(Room room) : base(room)
     {
-        _room = room;
-    }
-    
-    public Lobby(Room room, ConnectionInstance connection)
-    {
-        _room = room;
-        Console.WriteLine(connection.Name + " won the game!");
     }
 
-    public void OnMessage(ConnectionInstance sender, string message)
+    public override void OnMessage(ConnectionInstance sender, RoomMessage<string> message)
     {
         // TODO: Add a way to change game settings
-        if (sender == _room._host)
+        if (message.Type == "LOBBY" && sender == _room.Host)
         {
-            _room._roomType = new Game(_room, _room.Connections);
+            _room.RoomType = new Game(_room, _room.Connections);
         }
     }
 
-    public void OnConnect(ConnectionInstance connection)
+    public override void OnConnect(ConnectionInstance connection)
     {
-        var roomMessage = new RoomMessage("LOBBY", MessageType.INFO, _room.Connections, connection.Name + " joined!");
+        var joinMessage = new JoinMessage(connection.Id, connection.Name + " has joined the room.");
+        _room.BroadCast(new RoomMessage<JoinMessage>("JOIN", joinMessage));
     }
 
-    public void OnDisconnect(ConnectionInstance connection)
+    public override void OnDisconnect(ConnectionInstance connection)
     {
-        throw new NotImplementedException();
+        var leaveMessage = new LeaveMessage(connection.Id, connection.Name + " has left the room.");
+        _room.BroadCast(new RoomMessage<LeaveMessage>("LEAVE", leaveMessage));
     }
 }

Room/Messages/ChatMessage.cs

@@ -0,0 +1,13 @@
+namespace MauMau_Server.Room.Messages;
+
+public class ChatMessage
+{
+    public string Sender { get; set; }
+    public string Message { get; set; }
+    
+    public ChatMessage(string sender, string message)
+    {
+        Sender = sender;
+        Message = message;
+    }
+}

Room/Messages/EndMessage.cs

@@ -0,0 +1,13 @@
+namespace MauMau_Server.Room.Messages;
+
+public class EndMessage
+{
+    public Guid WinnerId { get; set; }
+    public string WinnerName { get; set; }
+    
+    public EndMessage(Guid winnerId, string winnerName)
+    {
+        WinnerId = winnerId;
+        WinnerName = winnerName;
+    }
+}

Room/Messages/JoinMessage.cs

@@ -0,0 +1,21 @@
+namespace MauMau_Server.Room.Messages;
+
+public class JoinMessage
+{
+    public Guid Id { get; set; }
+    public string ChatMessage { get; set; }
+    public string? Data { get; set; }
+    
+    public JoinMessage(Guid id, string chatMessage, string data)
+    {
+        Id = id;
+        ChatMessage = chatMessage;
+        Data = data;
+    }
+    
+    public JoinMessage(Guid id, string chatMessage)
+    {
+        Id = id;
+        ChatMessage = chatMessage;
+    }
+}

Room/Messages/LeaveMessage.cs

@@ -0,0 +1,13 @@
+namespace MauMau_Server.Room.Messages;
+
+public class LeaveMessage
+{
+    public Guid Id { get; set; }
+    public string ChatMessage { get; set; }
+    
+    public LeaveMessage(Guid id, string chatMessage)
+    {
+        Id = id;
+        ChatMessage = chatMessage;
+    }
+}

Room/Room.cs

@@ -1,6 +1,7 @@
 using System.Net.WebSockets;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using MauMau_Server.Room.Messages;
 using MauMau_Server.Websockets;
 
 namespace MauMau_Server.Room;
@@ -10,22 +11,24 @@ public class Room
     private readonly IRoomManager _roomManager;
     private readonly string _roomId;
     public readonly List<ConnectionInstance> Connections = new();
-    public ConnectionInstance? _host;
-    private readonly Chat.Chat _chat;
-    public RoomType _roomType;
+    public ConnectionInstance? Host;
+    public RoomType RoomType;
 
     public Room(IRoomManager roomManager, string roomId)
     {
         _roomManager = roomManager;
-        _chat = new Chat.Chat(this);
-        _roomType = new Lobby(this);
+        RoomType = new Lobby(this);
         _roomId = roomId;
     }
 
     public async Task InstantiateConnection(WebSocket socket, string name)
     {
-        var connection = AddConnection(socket, name);
-        _roomType.OnConnect(connection);
+        var connectionId = Guid.NewGuid();
+        var connection = new ConnectionInstance(name, connectionId, socket);
+        if (IsEmpty()) Host = connection;
+        Connections.Add(connection);
+        
+        RoomType.OnConnect(connection);
         await HandleConnection(connection);
     }
 
@@ -34,16 +37,17 @@ public class Room
         var webSocketResponse = await WebsocketManager.ReceiveAsync(connection.Socket);
         while (!webSocketResponse.Result!.CloseStatus.HasValue)
         {
-            var message = JsonSerializer.Deserialize<MessageDTO>(webSocketResponse.SlicedBuffer);
+            var message = JsonSerializer.Deserialize<RoomMessage<string>>(webSocketResponse.SlicedBuffer);
             if (message.Type == "CHAT")
             {
-                var cleanedMessage = StripHTML(message.Payload);
+                var cleanedMessage = StripHTML(message.Data);
                 if (string.IsNullOrWhiteSpace(cleanedMessage)) cleanedMessage = "Mau!";
-                _chat.SendChatMessage(connection, cleanedMessage);
+                var chatMessage = new ChatMessage(connection.Name, cleanedMessage);
+                BroadCast(new RoomMessage<ChatMessage>("CHAT", chatMessage));
             }
             else
             {
-                _roomType.OnMessage(connection, message.Payload);
+                RoomType.OnMessage(connection, message);
             }
 
             webSocketResponse = await WebsocketManager.ReceiveAsync(connection.Socket);
@@ -52,30 +56,23 @@ public class Room
         HandleDisconnect(connection);
     }
 
-    private ConnectionInstance AddConnection(WebSocket socket, string name)
-    {
-        var connectionId = Guid.NewGuid().ToString();
-        var connection = new ConnectionInstance(name, connectionId, socket);
-        if (IsEmpty()) _host = connection;
-        Connections.Add(connection);
-        return connection;
-    }
-
     private void HandleDisconnect(ConnectionInstance connection)
     {
         Connections.Remove(connection);        
-        _roomType.OnDisconnect(connection);
+        RoomType.OnDisconnect(connection);
         if (IsEmpty())
         {
             _roomManager.RemoveRoom(_roomId);
+            return;
         }
-        else if (connection == _host)
+
+        if (connection == Host)
         {
-            _host = Connections.First();
+            Host = Connections.First();
         }
     }
 
-    public void BroadCast(RoomMessage message)
+    public void BroadCast<T>(RoomMessage<T> message)
     {
         foreach (var connection in Connections)
         {
@@ -83,11 +80,6 @@ public class Room
         }
     }
 
-    public List<WebSocket> GetWebsockets()
-    {
-        return Connections.Select(connection => connection.Socket).ToList();
-    }
-
     public bool IsEmpty()
     {
         return Connections.Count == 0;

Room/RoomMessage.cs

@@ -1,39 +1,20 @@
-using MauMau_Server.Websockets;
+using Newtonsoft.Json;
 
 namespace MauMau_Server.Room;
 
-public class RoomMessage
+public class RoomMessage<T>
 {
-    public string CurrentRoomType;
-    public string? MessageType;
-    public List<string> JoinedPlayers;
-    public string? Message;
-
-    public RoomMessage(string currentRoomType, IEnumerable<ConnectionInstance> joinedPlayers, string? message)
+    public string Type { get; set; }
+    public string Data { get; set; }
+    
+    public RoomMessage(string type, T data)
     {
-        CurrentRoomType = currentRoomType;
-        JoinedPlayers = GetNamesFromConnections(joinedPlayers);
-        Message = message;
+        Type = type;
+        Data = JsonConvert.SerializeObject(data);
     }
     
-    public RoomMessage(string currentRoomType, MessageType messageType, IEnumerable<ConnectionInstance> joinedPlayers, string? message)
+    public RoomMessage()
     {
-        CurrentRoomType = currentRoomType;
-        MessageType = messageType.ToString();
-        JoinedPlayers = GetNamesFromConnections(joinedPlayers);
-        Message = message;
+        
     }
-    
-    private static List<string> GetNamesFromConnections(IEnumerable<ConnectionInstance> connections)
-    {
-        return connections.Select(player => player.Name).ToList();
-    }
-}
-
-public enum MessageType
-{
-    INFO,
-    SUCCES,
-    WARNING,
-    ERROR
 }

Room/RoomType.cs

@@ -18,7 +18,7 @@ public abstract class RoomType
      * <param name="sender">The ConnectionInstance that sent the message</param>
      * <param name="message">The message received</param>
      */
-    public abstract void OnMessage(ConnectionInstance sender, string message);
+    public abstract void OnMessage(ConnectionInstance sender, RoomMessage<string> message);
     
     /**
      * <summary>