From 6512518fb72c6c15829ce2b6052062a5cac2a4ce Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Fri, 23 Oct 2020 14:30:16 +0200
Subject: [PATCH 1/3] [FIX] made first user in lobby a host if the host leaves

---
 Server/Models/ServerCommunication.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index e55c835..e70d376 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -142,7 +142,7 @@ namespace Server.Models
                 {
                     foreach (ServerClient sc in serverClientsInlobbies[l])
                     {
-                        Debug.WriteLine("[SERVERCLIENT] Sending message");
+                        Debug.WriteLine("[SERVERCLIENT] Sending message to lobby");
                         sc.sendMessage(message);
                     }
                     break;
@@ -261,6 +261,10 @@ namespace Server.Models
                                     break;
                                 }
                             }
+                            if (l.Users.Count != 0)
+                            {
+                                l.Users[0].Host = true;
+                            }
                             break;
                         }
                     }
-- 
2.47.2


From 7df48ab3227ad554f7e4529800d12408b790307b Mon Sep 17 00:00:00 2001
From: Dogukan <dogukan-akyazi@hotmail.com>
Date: Fri, 23 Oct 2020 14:49:20 +0200
Subject: [PATCH 2/3] [FIX] Callbacks weren't properly called

---
 Client/Client.cs                   |  1 -
 Client/ViewModels/ViewModelGame.cs | 24 +++---------------------
 Client/Views/GameWindow.xaml       |  4 +---
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index d3788f3..c33d66b 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -94,7 +94,6 @@ namespace Client
                     throw new OutOfMemoryException("buffer too small");
                 }
 
-
                 Array.Copy(buffer, 0, totalBuffer, totalBufferReceived, amountReceived);
                 totalBufferReceived += amountReceived;
 
diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs
index 40ac402..2f6e03e 100644
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -48,19 +48,12 @@ namespace Client.ViewModels
         }
 
         private string _randomWord;
-
         public string RandomWord
         {
             get { return _randomWord; }
             set { _randomWord = value; }
         }
 
-        public static string Word
-        {
-            get;
-            set;
-        }
-
         public bool IsHost
         {
             get { return data.User.Host; }
@@ -69,17 +62,6 @@ namespace Client.ViewModels
         public ViewModelGame(GameWindow window)
         {
             this.window = window;
-            if (_payload == null)
-            {
-                _message = "";
-
-            }
-            else
-            {
-                //_message = data.Message;
-                //_username = data.User.Username;
-                //Messages.Add($"{data.User.Username}: {Message}");
-            }
 
             buffer = new double[maxLines][];
             linesQueue = new Queue<double[][]>();
@@ -228,7 +210,7 @@ namespace Client.ViewModels
             data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
         }
 
-        public static void HandleIncomingMsg(string username, string message)
+        public void HandleIncomingMsg(string username, string message)
         {
             Application.Current.Dispatcher.Invoke(delegate
             {
@@ -241,12 +223,12 @@ namespace Client.ViewModels
             data.Client.SendMessage(JSONConvert.ConstructLobbyLeaveMessage(data.Lobby.ID));
         }
 
-        public static void HandleRandomWord(string randomWord)
+        public void HandleRandomWord(string randomWord)
         {
             Debug.WriteLine("[CLIENT] Reached the handle random word method!");
             Application.Current.Dispatcher.Invoke(delegate
             {
-                Word = randomWord;
+                RandomWord = randomWord;
             });
         }
         public void HandleIncomingPlayer(Lobby lobby)
diff --git a/Client/Views/GameWindow.xaml b/Client/Views/GameWindow.xaml
index dde8efc..eaf5391 100644
--- a/Client/Views/GameWindow.xaml
+++ b/Client/Views/GameWindow.xaml
@@ -38,10 +38,8 @@
             <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/>
 
 
-        <Label Name="GuessWord" Grid.Row="0" Grid.Column="1" Content="{Binding Path=RandomWord, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            <Label Name="GuessWord" Grid.Row="0" Grid.Column="2" Content="{Binding Path=RandomWord, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20"/>
 
-            <Label Grid.Row="0" Grid.Column="2" FontSize="20" Content="" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-            
             <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET"/>
         </Grid>
 
-- 
2.47.2


From bf09dba8503c55483507d274e1592df968d75dae Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Fri, 23 Oct 2020 15:44:18 +0200
Subject: [PATCH 3/3] [ADD] added timer start on next round message receive

---
 Client/Client.cs                     | 11 ++++++++
 Server/Models/ServerClient.cs        | 39 ++++++++++++++++++++++++++--
 Server/Models/ServerCommunication.cs | 16 ++++++++++++
 SharedClientServer/JSONConvert.cs    | 22 +++++++++++++---
 4 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index d3788f3..fd54caa 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -210,6 +210,17 @@ namespace Client
                 default:
                     Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
                     break;
+                case JSONConvert.GAME:
+                    switch (JSONConvert.GetGameCommand(payload))
+                    {
+                        case JSONConvert.GameCommand.TIMER_ELAPSED:
+                            int lobbyElapsedID = JSONConvert.GetLobbyID(payload);
+                            
+                            //todo set next round
+                            break;
+                        
+                    }
+                    break;
             }
             SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE_RECEIVED,null));
 
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 57bb6cb..8af3a86 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -11,6 +11,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Timers;
 using static SharedClientServer.JSONConvert;
 
 namespace Server.Models
@@ -23,6 +24,7 @@ namespace Server.Models
         private byte[] buffer = new byte[2048];
         private byte[] totalBuffer = new byte[2048];
         private int totalBufferReceived = 0;
+        private Dictionary<System.Timers.Timer, int> lobbyTimers;
         public User User { get; set; }
         private ServerCommunication serverCom = ServerCommunication.INSTANCE;
         private Callback OnMessageReceivedOk;
@@ -34,6 +36,7 @@ namespace Server.Models
         /// <param name="client">the TcpClient object to use</param>
         public ServerClient(TcpClient client)
         {
+            lobbyTimers = new Dictionary<System.Timers.Timer, int>();
             Debug.WriteLine("[SERVERCLIENT] making new instance and starting");
             tcpClient = client;
             stream = tcpClient.GetStream();
@@ -186,14 +189,35 @@ namespace Server.Models
 
                 case JSONConvert.GAME:
                     Debug.WriteLine("[SERVERCLIENT] Got a message about the game logic");
-                    string command = JSONConvert.GetGameCommand(payload);
+                    GameCommand command = JSONConvert.GetGameCommand(payload);
                     switch (command)
                     {
-                        case "startGame":
+                        case GameCommand.START_GAME:
                             int lobbyID = JSONConvert.GetStartGameLobbyID(payload);
                             serverCom.CloseALobby(lobbyID);
+                            //todo start a timer for this lobby
+                            Debug.WriteLine("[SERVERCLIENT] making timer for lobby " + lobbyID);
+                            System.Timers.Timer lobbyTimer = new System.Timers.Timer(60 * 1000);
+                            this.lobbyTimers.Add(lobbyTimer, lobbyID);
+                            lobbyTimer.Elapsed += LobbyTimer_Elapsed;
+                            lobbyTimer.Start();
                             ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
                             break;
+                        case GameCommand.TIMER_ELAPSED:
+                            
+                            break;
+                        case GameCommand.NEXT_ROUND:
+                            // The next round has been started, so we can start the timer again
+                            lobbyID = JSONConvert.GetLobbyID(payload);
+                            foreach (System.Timers.Timer timer in lobbyTimers.Keys)
+                            {
+                                if (lobbyTimers[timer] == lobbyID)
+                                {
+                                    timer.Start();
+                                    break;
+                                }
+                            }
+                            break;
                     }
 
                     break;
@@ -211,6 +235,17 @@ namespace Server.Models
             }
         }
 
+        private void LobbyTimer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            System.Timers.Timer timer = sender as System.Timers.Timer;
+            int lobbyID = lobbyTimers[timer];
+            Debug.WriteLine("[SERVERCLIENT] timer elapsed for lobby " + lobbyID);
+            serverCom.SendToLobby(lobbyID, JSONConvert.ConstructGameTimerElapsedMessage(lobbyID));
+            timer.Stop();
+            
+
+        }
+
         private void handleLobbyMessage(byte[] payload, LobbyIdentifier l)
         {
             switch (l)
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index e70d376..3dbdb8e 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -150,6 +150,22 @@ namespace Server.Models
             }
         }
 
+        public void SendToLobby(int lobbyID, byte[] message)
+        {
+            foreach (Lobby l in lobbies)
+            {
+                if (l.ID == lobbyID)
+                {
+                    foreach (ServerClient sc in serverClientsInlobbies[l])
+                    {
+                        Debug.WriteLine("[SERVERCLIENT] Sending message to lobby");
+                        sc.sendMessage(message);
+                    }
+                    break;
+                }
+            }
+        }
+
         public void SendCanvasDataToLobby(Lobby lobby, string username, byte[] message)
         {
             foreach (Lobby l in lobbies)
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 17e22f4..1f11b5a 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -35,6 +35,13 @@ namespace SharedClientServer
             REQUEST
         }
 
+        public enum GameCommand
+        {
+            START_GAME,
+            TIMER_ELAPSED,
+            NEXT_ROUND
+        }
+
         public static (string,string) GetUsernameAndMessage(byte[] json)
         {
             string msg = Encoding.UTF8.GetString(json);
@@ -205,15 +212,24 @@ namespace SharedClientServer
 
         public static byte[] ConstructGameStartData(int lobbyID)
         {
-            string startGame = "startGame";
+            
             return GetMessageToSend(GAME, new
             {
-                command = startGame,
+                command = GameCommand.START_GAME,
                 lobbyToStart = lobbyID
             }); ;
         }
 
-        public static string GetGameCommand(byte[] payload)
+        public static byte[] ConstructGameTimerElapsedMessage(int lobbyID)
+        {
+            return GetMessageToSend(GAME, new
+            {
+                command = GameCommand.TIMER_ELAPSED,
+                id = lobbyID
+            });
+        }
+
+        public static GameCommand GetGameCommand(byte[] payload)
         {
             dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload));
             return json.command;
-- 
2.47.2