aboutsummaryrefslogtreecommitdiff
path: root/client/src/Messages.elm
diff options
context:
space:
mode:
authorJasper Van der Jeugt2020-07-31 17:13:37 +0200
committerJasper Van der Jeugt2020-07-31 17:13:37 +0200
commite3a2052522471d39e410f4ea13d51d3d18f52b80 (patch)
tree7d1500a70b22e767cc678700fc6fe3cbd7cfc9f9 /client/src/Messages.elm
parent323ca81c96e4186747f06b6178d71d49e98c6066 (diff)
Multiple \BLANK in black cards
Diffstat (limited to 'client/src/Messages.elm')
-rw-r--r--client/src/Messages.elm12
1 files changed, 6 insertions, 6 deletions
diff --git a/client/src/Messages.elm b/client/src/Messages.elm
index b38fbd5..11c34ca 100644
--- a/client/src/Messages.elm
+++ b/client/src/Messages.elm
@@ -77,16 +77,16 @@ jsonEncOpponent val =
type TableView =
- Proposing BlackCard (Maybe WhiteCard)
+ Proposing BlackCard (List WhiteCard)
jsonDecTableView : Json.Decode.Decoder ( TableView )
jsonDecTableView =
- Json.Decode.lazy (\_ -> Json.Decode.map2 Proposing (Json.Decode.index 0 (jsonDecBlackCard)) (Json.Decode.index 1 (Json.Decode.maybe (jsonDecWhiteCard))))
+ Json.Decode.lazy (\_ -> Json.Decode.map2 Proposing (Json.Decode.index 0 (jsonDecBlackCard)) (Json.Decode.index 1 (Json.Decode.list (jsonDecWhiteCard))))
jsonEncTableView : TableView -> Value
jsonEncTableView (Proposing v1 v2) =
- Json.Encode.list identity [jsonEncBlackCard v1, (maybeEncode (jsonEncWhiteCard)) v2]
+ Json.Encode.list identity [jsonEncBlackCard v1, (Json.Encode.list jsonEncWhiteCard) v2]
@@ -145,13 +145,13 @@ jsonEncServerMessage val =
type ClientMessage =
ChangeMyName String
- | ProposeWhiteCards WhiteCard
+ | ProposeWhiteCards (List WhiteCard)
jsonDecClientMessage : Json.Decode.Decoder ( ClientMessage )
jsonDecClientMessage =
let jsonDecDictClientMessage = Dict.fromList
[ ("ChangeMyName", Json.Decode.lazy (\_ -> Json.Decode.map ChangeMyName (Json.Decode.string)))
- , ("ProposeWhiteCards", Json.Decode.lazy (\_ -> Json.Decode.map ProposeWhiteCards (jsonDecWhiteCard)))
+ , ("ProposeWhiteCards", Json.Decode.lazy (\_ -> Json.Decode.map ProposeWhiteCards (Json.Decode.list (jsonDecWhiteCard))))
]
in decodeSumObjectWithSingleField "ClientMessage" jsonDecDictClientMessage
@@ -159,7 +159,7 @@ jsonEncClientMessage : ClientMessage -> Value
jsonEncClientMessage val =
let keyval v = case v of
ChangeMyName v1 -> ("ChangeMyName", encodeValue (Json.Encode.string v1))
- ProposeWhiteCards v1 -> ("ProposeWhiteCards", encodeValue (jsonEncWhiteCard v1))
+ ProposeWhiteCards v1 -> ("ProposeWhiteCards", encodeValue ((Json.Encode.list jsonEncWhiteCard) v1))
in encodeSumObjectWithSingleField keyval val