From b8c7b4b9545a207d5a71958e0fe7ce3e7c903613 Mon Sep 17 00:00:00 2001
From: qvalentin <valentin.theodor@web.de>
Date: Tue, 1 Aug 2023 10:21:12 +0200
Subject: [PATCH] Clean up backend code

---
 backend/src/RoomDataHandler.hs |  6 +-----
 backend/src/WebServer.hs       | 28 ++++------------------------
 backend/src/WebSocket/WSApp.hs |  4 +++-
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/backend/src/RoomDataHandler.hs b/backend/src/RoomDataHandler.hs
index 273846d..898bc55 100644
--- a/backend/src/RoomDataHandler.hs
+++ b/backend/src/RoomDataHandler.hs
@@ -16,16 +16,12 @@ import Network.Wai
     consumeRequestBodyStrict,
     responseLBS,
   )
-import State.ConnectedClientsState (MonadConnectedClientsRead)
 import State.RoomDataState
   ( MonadRoomDataStateModify (setRoomDataState),
     MonadRoomDataStateRead,
   )
-import Types.AppTypes (HasConnectedClientState)
 import Types.RoomsState
-  ( HasRoomsState,
-    roomStateDiffers,
-    updateRoomState,
+  ( roomStateDiffers,
   )
 import Types.WebEnv
   ( HasWebEnv (getRequest),
diff --git a/backend/src/WebServer.hs b/backend/src/WebServer.hs
index 8b572f9..484cb37 100644
--- a/backend/src/WebServer.hs
+++ b/backend/src/WebServer.hs
@@ -15,7 +15,7 @@ import Control.Monad.Except
 import Network.HTTP.Types
 import Network.Wai
 import Network.Wai.Handler.Warp (run)
-import Network.Wai.Middleware.RequestLogger (logStdoutDev)
+import Network.Wai.Middleware.RequestLogger (logStdout)
 import RoomDataHandler (roomDataHandler)
 import State.ConnectedClientsState
   ( MonadConnectedClientsRead (..),
@@ -27,9 +27,7 @@ import State.RoomDataState
   )
 import Types.AppTypes (Env (..))
 import Types.RoomsState
-  ( HasRoomsState (getRoomsState),
-    getRoomState,
-    roomStateDiffers,
+  ( getRoomState,
     updateRoomState,
   )
 import Types.WebEnv
@@ -122,24 +120,6 @@ notFound = do
           "404 - Not Found"
   throwError response
 
--- notFound ::
---   ( MonadIO m,
---     HasWebEnv env,
---     MonadReader env m,
---     MonadError ResponseReceived m
---   ) =>
---   m ResponseReceived
--- notFound = do
---   respond' <- getRespond <$> ask
---   response <-
---     liftIO $
---       respond' $
---         responseLBS
---           status200
---           [("Content-Type", "text/plain")]
---           "200 - Success"
---   response
-
 runWebApp ::
   ( MonadIO m,
     MonadReader Env m
@@ -165,6 +145,6 @@ runWebServer ::
   ) =>
   m ()
 runWebServer = do
-  putStrLn "http://localhost:8081/"
-  runWebApp >>= liftIO . (run 8081 . logStdoutDev)
+  putStrLn "Webserver up and running at http://localhost:8081/"
+  runWebApp >>= liftIO . (run 8081 . logStdout)
   return ()
diff --git a/backend/src/WebSocket/WSApp.hs b/backend/src/WebSocket/WSApp.hs
index 6d613ad..85a0786 100644
--- a/backend/src/WebSocket/WSApp.hs
+++ b/backend/src/WebSocket/WSApp.hs
@@ -33,11 +33,11 @@ wsApp = do
   broadcastUserData
   withCleanUp $ forever $ do
     handleWSAction
-    broadcastUserData
 
 handleWSAction ::
   ( MonadWebSocketSession m,
     MonadConnectedClientsModify m,
+    MonadRoomDataStateRead m,
     MonadBroadcast m,
     MonadAllChat m
   ) =>
@@ -47,8 +47,10 @@ handleWSAction = do
   case msg of
     JoinRoomMessage _ -> do
       joinRoom
+      broadcastUserData
     ClientInfoMessage clientInfo -> do
       updateClientName clientInfo
+      broadcastUserData
     AllChatMessageIncomingMessage incomingMessage -> do
       broadCastAllChatMessage incomingMessage