From a4e45b1a6b24a79e0c3a2c1226857daa676d125f Mon Sep 17 00:00:00 2001
From: Dogukan <dogukan-akyazi@hotmail.com>
Date: Wed, 21 Oct 2020 20:43:28 +0200
Subject: [PATCH] [MISC] tried to send the message to the current lobby, didn't
 work.

---
 Client/Client.cs                   |  3 ++-
 Client/ClientData.cs               | 13 +++++++++++++
 Client/ViewModels/ViewModelGame.cs | 20 +++++++++++---------
 Server/Models/ServerClient.cs      | 10 ++--------
 SharedClientServer/JSONConvert.cs  |  1 -
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Client/Client.cs b/Client/Client.cs
index c44eca6..f75c1af 100644
--- a/Client/Client.cs
+++ b/Client/Client.cs
@@ -82,8 +82,9 @@ namespace Client
                     (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
                     string textUsername = combo.Item1;
                     string textMsg = combo.Item2;
-                    //TODO display username and message in chat window
 
+                    //TODO display username and message in chat window
+                    Debug.WriteLine("[CLIENT] INCOMING MESSAGE!");
                     Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
                     break;
 
diff --git a/Client/ClientData.cs b/Client/ClientData.cs
index 9442e8d..8a217a0 100644
--- a/Client/ClientData.cs
+++ b/Client/ClientData.cs
@@ -30,6 +30,7 @@ namespace Client
         private User _user;
         private Client _client;
         private Lobby _lobby;
+        private string _message;
 
         private ClientData()
         {
@@ -55,5 +56,17 @@ namespace Client
             set { _lobby = value; }
         }
 
+        public String Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                _message = value;
+            }
+        }
+
     }
 }
diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs
index 8af8af4..d75c52c 100644
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -33,15 +33,17 @@ namespace Client.ViewModels
 
         public ViewModelGame()
         {
-            //if (_payload == null)
-            //{
-            //    _message = "";
-            //}
-            //else
-            //{
-            //    _message = _payload.message;
-            //    _username = _payload.username;
-            //}
+            if (_payload == null)
+            {
+                _message = "";
+               
+            }
+            else
+            {
+                //_message = data.Message;
+                //_username = data.User.Username;
+                //Messages.Add($"{data.User.Username}: {Message}");
+            }
             OnKeyDown = new RelayCommand(ChatBox_KeyDown);
         }
 
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index ea791cb..e2afa52 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -120,15 +120,9 @@ namespace Server.Models
 
                     Debug.WriteLine("[SERVERCLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
 
-                    dynamic dataPacket = new
-                    {
-                        username = textUsername,
-                        message = textMsg
-                    };
-
                     // todo handle sending to all except this user the username and message to display in chat
-                    //serverCom.SendToAllExcept();
-                    serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, dataPacket));
+                    serverCom.SendToLobby(User.Lobby,payload);
+                    Debug.WriteLine("Payload has been sent!");
                     break;
 
                 case JSONConvert.LOBBY:
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 4914ee3..c83ca44 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -24,7 +24,6 @@ namespace SharedClientServer
         public static (string,string) GetUsernameAndMessage(byte[] json)
         {
             string msg = Encoding.ASCII.GetString(json);
-            Debug.WriteLine("Sent data: {0}", msg);
             dynamic payload = JsonConvert.DeserializeObject(msg);
             
             return (payload.username, payload.message);