Remove player names from URL state

These might be added back in future, when needed
Jcparkyn · Nov 5, 2023 · c6b5c94 · c6b5c94
1 parent 4a6b983
commit c6b5c94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 33 deletions.
diff --git a/src/Main.elm b/src/Main.elm
@@ -266,12 +266,6 @@ modelToUrlModel model =
                 |> List.filterMap (\x -> x)
     in
     { turns = PlayedTurn nextTurn :: model.playedTurns
-    , lastPlayer =
-        { name = model.selfName
-        }
-    , nextPlayer =
-        { name = model.opponent.name
-        }
     , initialSeed = model.initialSeed
     }
 
@@ -406,6 +400,12 @@ urlModelToModel model flags =
 
         finalState =
             List.foldr (getNextGameState wordlist) initialState model.turns
+
+        playerName n =
+            "Player " ++ String.fromInt (n + 1)
+
+        turnCount =
+            List.length model.turns
     in
     Playing
         { selectedCell = Nothing
@@ -416,10 +416,10 @@ urlModelToModel model flags =
             finalState.nextPlayer.rack
                 |> Array.map (\tile -> RackTile 0 tile Nothing)
         , opponent =
-            { name = model.lastPlayer.name
+            { name = playerName (turnCount - 1 |> modBy 2)
             , score = finalState.lastPlayer.score
             }
-        , selfName = model.nextPlayer.name
+        , selfName = playerName (turnCount |> modBy 2)
         , selfScore = finalState.nextPlayer.score
         , playedTurns = model.turns
         , initialSeed = model.initialSeed

diff --git a/src/UrlState.elm b/src/UrlState.elm
@@ -1,4 +1,4 @@
-module UrlState exposing (DecodeUrlError, UrlModel, UrlPlayer, decodeUrl, getNextUrlState)
+module UrlState exposing (DecodeUrlError, UrlModel, decodeUrl, getNextUrlState)
 
 import Base64
 import Bytes
@@ -18,16 +18,10 @@ import UrlBase64
 
 type alias UrlModel =
     { turns : List PlayedTurn
-    , nextPlayer : UrlPlayer
-    , lastPlayer : UrlPlayer
     , initialSeed : Int
     }
 
 
-type alias UrlPlayer =
-    { name : String }
-
-
 compressToBase64 : String -> String
 compressToBase64 str =
     str
@@ -66,25 +60,10 @@ getNextUrlBody : UrlModel -> E.Value
 getNextUrlBody model =
     E.object
         [ ( "turns", E.list encodeTurn model.turns )
-        , ( "np", encodePlayer model.nextPlayer )
-        , ( "lp", encodePlayer model.lastPlayer )
         , ( "s0", E.int model.initialSeed )
         ]
 
 
-encodePlayer : UrlPlayer -> E.Value
-encodePlayer player =
-    E.object
-        [ ( "n", E.string player.name )
-        ]
-
-
-decodePlayer : Decoder UrlPlayer
-decodePlayer =
-    D.map UrlPlayer
-        (D.field "n" D.string)
-
-
 encodeTurn : PlayedTurn -> E.Value
 encodeTurn turn =
     case turn of
@@ -125,10 +104,8 @@ decodeTurn =
 
 decodeModel : Decoder UrlModel
 decodeModel =
-    D.map4 UrlModel
+    D.map2 UrlModel
         (D.field "turns" (D.list decodeTurn))
-        (D.field "np" decodePlayer)
-        (D.field "lp" decodePlayer)
         (D.field "s0" D.int)