Skip to content

Commit 31673bb

Browse files
authored
Refactor toMisoString for Origin data type, reset msg
1 parent 42e08e2 commit 31673bb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/WebSocket.hs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ data Origin = CLIENT | SYSTEM | SERVER
3131
deriving (Eq, Show, Generic)
3232
-----------------------------------------------------------------------------
3333
instance ToMisoString Origin where
34-
toMisoString = ms . show
34+
toMisoString = \case
35+
CLIENT -> "CLIENT"
36+
SYSTEM -> "SYSTEM"
37+
SERVER -> "SERVER"
3538
-----------------------------------------------------------------------------
3639
data Action
3740
= OnOpen WebSocket
@@ -90,6 +93,7 @@ websocketComponent box =
9093
date <- newDate
9194
dateString <- date & toLocaleString
9295
pure $ Append (Message dateString m CLIENT)
96+
msg .= mempty
9397
SendMessage m -> do
9498
socket <- use websocket
9599
sendText socket m
@@ -129,7 +133,8 @@ websocketComponent box =
129133
broadcast box
130134
Disconnect ->
131135
close =<< use websocket
132-
Clear ->
136+
Clear -> do
137+
msg .= ""
133138
received .= []
134139
-----------------------------------------------------------------------------
135140
onEnter :: Action -> Attribute Action
@@ -227,7 +232,8 @@ viewModel m =
227232
-----------------------------------------------------------------------------
228233
messageHeader :: [Message] -> [ View model action ]
229234
messageHeader messages = concat
230-
[ [ div_
235+
[
236+
[ div_
231237
[ class_ "message-header" ]
232238
[ span_ [class_ "message-origin"] [ text (ms origin) ]
233239
, span_ [class_ "timestamp"] [ text dateString ]

0 commit comments

Comments
 (0)