From 06cbdb7d76498d7778ff67c369a41868b0190d54 Mon Sep 17 00:00:00 2001
From: Dennis Frieberg <nerfingen@yahoo.de>
Date: Sun, 30 Aug 2020 02:27:54 +0200
Subject: [PATCH] removed Player from parser because of protocol change

---
 src/Data/Aeson/TickLeiste.hs | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Data/Aeson/TickLeiste.hs b/src/Data/Aeson/TickLeiste.hs
index c9ca32d..4f5ea4e 100644
--- a/src/Data/Aeson/TickLeiste.hs
+++ b/src/Data/Aeson/TickLeiste.hs
@@ -2,9 +2,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 
 module Data.Aeson.TickLeiste
-  ( KnownPlayer (..),
-    UnknownPlayer (..),
-    JSONRequest (..),
+  ( JSONRequest (..),
     JSONEvent (..),
   )
 where
@@ -17,30 +15,22 @@ import qualified Data.UUID as U
 
 $(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
-  = SetPlayerTickR {sptRplayer :: KnownPlayer, sptRtick :: Tick}
-  | AddPladerTickR {aptRplayer :: UnknownPlayer, aptRtick :: Tick}
-  | InitializeTickLeisteR {itlRtickLeiste :: [(Tick, [UnknownPlayer])]}
+  = SetPlayerTickR {sptRplayerUUID :: U.UUID, sptRtick :: Tick}
+  | AddPladerTickR {aptRplayerName :: T.Text, aptRtick :: Tick}
+  | InitializeTickLeisteR {itlRtickLeiste :: [(Tick, [T.Text])]}
   | TickLeisteR
-  | ChangeNameR {cnaRplayer :: KnownPlayer}
+  | ChangeNameR {cnaRplayerUUID :: U.UUID, cnaRplayerName :: T.Text}
+  | RemovePlayerR {rmpRplayerUUID :: U.UUID}
   deriving (Show)
 
 $(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "requestType"}, fieldLabelModifier = drop 4} ''JSONRequest)
 
 data JSONEvent
-  = SetPlayerTickE {sptEplayer :: KnownPlayer, sptEtick :: Tick}
-  | InitializeTickLeisteE {itlEtickLeiste :: [(Tick, [KnownPlayer])]}
-  | ChangeNameE {cnaEplayer :: KnownPlayer}
+  = SetPlayerTickE {sptEplayerUUID :: U.UUID, sptEtick :: Tick}
+  | InitializeTickLeisteE {itlEtickLeiste :: [(Tick, [(U.UUID, T.Text)])]}
+  | ChangeNameE {cnaEplayerUUID :: U.UUID, cnaEplayerName :: T.Text}
+  | RemovePlayerE {rmpEplayerUUID :: U.UUID}
   deriving (Show)
 
 $(deriveJSON defaultOptions {sumEncoding = defaultTaggedObject {tagFieldName = "eventType"}, fieldLabelModifier = drop 4} ''JSONEvent)