Skip to content

Commit 5a4f585

Browse files
committed
-Wall and handle null messages
1 parent 9b774ba commit 5a4f585

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/Main.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import qualified Data.Map.Strict as M
1616
-----------------------------------------------------------------------------
1717
import Miso hiding (on)
1818
import Miso.Lens
19-
import qualified Miso.Style as CSS
2019
-----------------------------------------------------------------------------
2120
import WebSocket
2221
-----------------------------------------------------------------------------

src/WebSocket.hs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
-----------------------------------------------------------------------------
1111
module WebSocket (websocketComponent) where
1212
-----------------------------------------------------------------------------
13+
import Control.Monad (unless)
1314
import Data.Bool
1415
import GHC.Generics
1516
import Language.Javascript.JSaddle hiding (create)
@@ -18,6 +19,7 @@ import Miso hiding (on)
1819
import Miso.Lens
1920
import Miso.WebSocket
2021
import Miso.String (ToMisoString)
22+
import qualified Miso.String as MS
2123
-----------------------------------------------------------------------------
2224
data Message
2325
= Message
@@ -83,11 +85,12 @@ websocketComponent box =
8385
updateModel = \case
8486
Send -> do
8587
message <- use msg
86-
io (SendMessage <$> toJSVal message)
87-
io $ do
88-
date <- newDate
89-
dateString <- date & toLocaleString
90-
pure $ Append (Message dateString message CLIENT)
88+
unless (MS.null message) $ do
89+
io (SendMessage <$> toJSVal message)
90+
io $ do
91+
date <- newDate
92+
dateString <- date & toLocaleString
93+
pure $ Append (Message dateString message CLIENT)
9194
SendMessage message -> do
9295
socket <- use websocket
9396
send socket message

0 commit comments

Comments
 (0)