Splittertech/tickLeisteServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed Player from parser because of protocol change

Browse source
This commit is contained in:
Dennis Frieberg 2020-08-30 02:27:54 +02:00
parent dd2d653459
commit 06cbdb7d76
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Data/Aeson/TickLeiste.hs
View file

@ -2,9 +2,7 @@
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
module Data.Aeson.TickLeiste module Data.Aeson.TickLeiste
( KnownPlayer (..), ( JSONRequest (..),
UnknownPlayer (..),
JSONRequest (..),
JSONEvent (..), JSONEvent (..),
) )
where where
@ -17,30 +15,22 @@ import qualified Data.UUID as U
$(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "tickType", contentsFieldName = "tickValue"}} ''Tick) $(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "tickType", contentsFieldName = "tickValue"}} ''Tick)
data KnownPlayer = KnownPlayer {kplayerUUID :: U.UUID, kplayerName :: Maybe T.Text}
deriving (Show)
$(deriveJSON defaultOptions {fieldLabelModifier = drop 1} ''KnownPlayer)
data UnknownPlayer = UnknownPlayer {uplayerName :: T.Text}
deriving (Show)
$(deriveJSON defaultOptions {fieldLabelModifier = drop 1} ''UnknownPlayer)
data JSONRequest data JSONRequest
= SetPlayerTickR {sptRplayer :: KnownPlayer, sptRtick :: Tick} = SetPlayerTickR {sptRplayerUUID :: U.UUID, sptRtick :: Tick}
| AddPladerTickR {aptRplayer :: UnknownPlayer, aptRtick :: Tick} | AddPladerTickR {aptRplayerName :: T.Text, aptRtick :: Tick}
| InitializeTickLeisteR {itlRtickLeiste :: [(Tick, [UnknownPlayer])]} | InitializeTickLeisteR {itlRtickLeiste :: [(Tick, [T.Text])]}
| TickLeisteR | TickLeisteR
| ChangeNameR {cnaRplayer :: KnownPlayer} | ChangeNameR {cnaRplayerUUID :: U.UUID, cnaRplayerName :: T.Text}
| RemovePlayerR {rmpRplayerUUID :: U.UUID}
deriving (Show) deriving (Show)
$(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "requestType"}, fieldLabelModifier = drop 4} ''JSONRequest) $(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "requestType"}, fieldLabelModifier = drop 4} ''JSONRequest)
data JSONEvent data JSONEvent
= SetPlayerTickE {sptEplayer :: KnownPlayer, sptEtick :: Tick} = SetPlayerTickE {sptEplayerUUID :: U.UUID, sptEtick :: Tick}
| InitializeTickLeisteE {itlEtickLeiste :: [(Tick, [KnownPlayer])]} | InitializeTickLeisteE {itlEtickLeiste :: [(Tick, [(U.UUID, T.Text)])]}
| ChangeNameE {cnaEplayer :: KnownPlayer} | ChangeNameE {cnaEplayerUUID :: U.UUID, cnaEplayerName :: T.Text}
| RemovePlayerE {rmpEplayerUUID :: U.UUID}
deriving (Show) deriving (Show)
$(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "eventType"}, fieldLabelModifier = drop 4} ''JSONEvent) $(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "eventType"}, fieldLabelModifier = drop 4} ''JSONEvent)