From 7c0ca6e3730853b9875b1806140c102d43944fdb Mon Sep 17 00:00:00 2001
From: Clemente Solorio <solorioeclem164@gmail.com>
Date: Wed, 10 Apr 2024 19:51:40 -0700
Subject: [PATCH] fix #75: persist farmhand across page refreshes

---
 bun.lockb                                  | Bin 210543 -> 210543 bytes
 src/components/dialogs/deletion-dialog.tsx |  15 +++++++++++++--
 src/contexts/players-context.tsx           |  16 +++++++++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index efd148c694592dc2b83d0ceb60f42074dd4b2240..a1353a0b94292ea25dd998f642f3e00df00207a4 100755
GIT binary patch
delta 3352
zcmYk-N6?&f9LDi%jM!dDY}iqwVn<`a62*=s5sigdu``nyha=wh<g7Pl94EXtF3xad
zaw3N)8Vj~p?AWnIY>`;8MA7&6JmX9*&*%UD?(VRco!zm0ZpZeyO&hmNCXXju)-P_4
zb)J-SiXE`-Q&KYQi1kV-IaYaE&OWxls?SIXuq9U8Dka2LSp8Wk5w^w}&q<kL8?5=f
zlo__gS}#b6u^rZ~q$JoL>%1r>#SU2aB`Fzp#Ck7F$+5~Sa`v$WR((}UfGx4wf|L+j
zVfELfMA#Z@)KaF{25Y`9Wrl6B)*Dh{Y=^bql#*b3tn-$X6gyzux20s*5$nApCC4i7
z%Gt*jShbN7U`wp_o|F(<VfFW=MA#Z@d?00tZLsEtQfAl|Ykedo#&%fyV<`!?$2y-#
zNwEXgZKY(`5$k;_CC4hC$=SyiSoL!$0k*_yUq}hD6;}UJN`$Sk#x^NaY=bqwk}|`#
zSgVr~V>_(<wUh+gW1VlLq}T!Lek&!zj#%$IDLGd8Ud}$Yz^dD&1lSU*{U9a8R#?54
z5@Bnsu|vuf+hENfrOdD`*7`|GjP0=Y&r%X>k9B^Ll41v}`>T`;J7T@xq~us-kh701
zu<Gwp0&I!Z{*V%4E3E#fln7g6jlZN!u?^PTDP@LjvDV*GVr+-C|B;eld#p1`NwEXg
z{Z~qc9c4Fq6WLsLUYP)&6hvK$7?6@^yCH_8BKk7Kh}6W`9dSw;Vk(F;(h_SA#F%u%
z-V-q)J#qFzOvympy%94q5^o>GoG5d+`J^D~zK8)SiKZfkq$2uq#E8_ySb;bt4Kepa
zoROAT`y<ArBlZD^3F(P*AYw`e;vR&Uk&$>BVosEUaq~$*)I$&hQWEV@#E?`(KMXM<
zH8BoHoRWr^M<C8fOROUiW6}{@M@&dhoTCs^G7$G@#Egu@I|eZ)%1YdPQV{i6#DJ7U
zI}R}<7157Jj7Uuk193_kVxBNrKQ~#jWU^#jJ}$a?e(TD~+QnZ;yZFK))`=h{9kEYB
zOh`|hlMz!g5cd?sjEuxP6)|6A*GI4U|Iz+wc)cL1iCaL*MRxtry7^TGzHfLs-c}L)
z4BR486Jr(Plr+RV6LCgbVx5H;laAPDBPOIL&N+xF8Hj5kW@IGZxrjMY&cn?o1yRpO
z3`j||3lKw65q&jcL~3GOh&Uw;F)u=#k(O9CVoW+>UyPWLo;a5vreq-QrHC0BiFX-d
zPL#`W^GQL}D-Z)x675RFkW@r>5F=6(<0`}{X^43>;*7M!x&|>O9kH)POh`|hHHax0
zh`SasBO~#yL(GZd;^vcrsMjL~q$Ju6h#{$nz78=WH8E~PoRWr^HzCeQORSp_W6}}(
z7Q}?~#PJYQG7xt?Vn!DKF6Ec*-3oG|+=iP^3ZmYQ7?6@^cOZtOBKn<(5vhrB7vhvO
z#Pktoq$Sqfh%xDieGg(ndg9!Rn393G_aSCvB;NgqIZ+<K%_jv>A4CjDNwfg*v2YU1
guXt#(Y<|-tlNFnHK0MjB^wEV4lg$eomOioYAM+v4EdT%j

delta 3350
zcmYk-N37gr7=__GA((b?LNnb!0MiYjm=ZAElmtU4zEsnVA|Wq_-K@~CvxHE5citd*
zX=UXs0)|jbyO?geX~DGMP)!LK<~v77Y|iul@65=v8O@IE^E<ZBZ`!zJH1}A%Wns1*
z)_FqC3AV?&PfAI#1J)~~WLV`XIs4cgt3E9yz!q3-tCSF1V)bXFjIkBgcvi{;TVu`V
zq)f35)_Pt_gl(~QDJ8~sSmy;P3AV?&FG@+V1J-*<N`_Tlma~t|vFa;Q0&IcRmZXH(
z605%|WsI$`MkQr}t+D27Ql{7jYrQTd!nRoZ4Jk3U!#ZzDNw7WEeM?G;9kAZpQZlUa
zj+}jLj#X<Z0k*(u?@9@=C02h=${1T=jrXNYur=2FK*|)`V66|OMA#N<e<UTwc39_Q
zDG9d6x{Z_+J7B#}q-0p-Q#t$C9IJjNCBPO~?Q<z1w#4dRNEu@*tg%hX1Y2XxFQrVe
z4c2O<MA#N<e<dZxc39_YDG9d6y5C4iu>;ooR!W9dzLT?$&9UlsDFL>?YTru<u_adT
zq>Ql@*4QCsf~~RU4^pPs25bE&CBn8?`zI+ew!=C<OG&Uj*8N3FiXE`tuTnCs(#zS$
z=2-PNDFL>?YQIYfu_adjL&_LiVU0hfOt3Z9+$m*>ZLro~QX*`Nwf~k9V>_%fNJ+3g
z*8N9HiXCJ(dL!9Pc2OAtpX5Ych8U27XuBYWq$K)s#4)Leu`A+))WlQ}r=%g)Zio?S
ziM=~wOgiH1ftZk<xO*a|WFX#Nh#67laq~$|)V&b{QV>l=3`t4!6^LU}5o0Cdgw({`
z2XRUoV(p6<k(Su|A;zR5&i;rA>4|#)VoC<$X^0t74#dqTIZ+Qn3`jw=gAqeg68#Xw
zF{y}gDB^_F#5@dfN*ZDvju?@a*g9fNI^rCGn2?^hM<S+VAl^}k8Btc@=98SLM<WKL
zAlfmAAt{M|EaI3{#4r#iq$cKZqlNjoxw+BYuwod^&8=D7x@xp;_6uodFU+ux2N7wB
zeF9=kI^vv&n2?^hCn2U}Al}J{*^K``dhLIY_D{j<IZ;jA0#eNQ|A*Eut~T&}!&C9L
zlIW-5HYOD@RwGVGP0Z5~r=%g)8Hf>SiG3zwOgiG6g_w|@xE5kc2I8HKm=Wb1+<cM~
z^<2b&6hu1@F(f6?*C38bMU3+iC!{9k1&CA95X(l4NK5Ps5o6L3=OV;}^u)awF(m`>
zE<wzQaw%>;$%%RyVn7O_U5*%%lIRZNm{i2L0&zlWVqS?jB@MBzLX1dD?5h!D(h+AZ
zVnTZ2u0u@8K)h=ZGorY-`6MUmwTJ;Jh;|)fNJ^rwM;w!i7}q0CNKMQe5T~Re){Te}
zX^DLkVoW;Xc!&w<iMxQ9lG)#-{L;OfK}M8YaPvt{)LRh)QV{Jn#E_Ikza4Q*Dq`G$
zI3YDLeZ(ngh;=7oL|S6sg&32LICmo^q$ln@h$$I}cQ0Z_l>2b=Nlw)J5d%^XEf_5<
lJ{pc5SX}wwX!+u%hes<n?|f*qZP_DB8%CR#HY|I5>0cqn%{u@9

diff --git a/src/components/dialogs/deletion-dialog.tsx b/src/components/dialogs/deletion-dialog.tsx
index eae361e9..69362920 100644
--- a/src/components/dialogs/deletion-dialog.tsx
+++ b/src/components/dialogs/deletion-dialog.tsx
@@ -25,7 +25,7 @@ export const DeletionDialog = ({ open, setOpen, playerID, type }: Props) => {
   const { players } = useContext(PlayersContext);
 
   const selectedPlayer = players?.filter(
-    (player) => player._id === playerID
+    (player) => player._id === playerID,
   )[0];
 
   const [verify, setVerify] = useState("");
@@ -74,7 +74,18 @@ export const DeletionDialog = ({ open, setOpen, playerID, type }: Props) => {
             ? "localhost"
             : "stardew.app",
         });
+        window.localStorage.removeItem("player_id");
       }
+
+      // delete the saved player id if player requested to delete character and it was their saved player
+      // if player requested to delete all saved data, also remove saved player_id
+      if (
+        type &&
+        type === "player" &&
+        window.localStorage.getItem("player_id") === _body._id
+      ) {
+        window.localStorage.removeItem("player_id");
+      } else if (!type) window.localStorage.removeItem("player_id");
       window.location.reload();
     }
   };
@@ -144,7 +155,7 @@ export const DeletionDialog = ({ open, setOpen, playerID, type }: Props) => {
         <DialogDescription asChild>
           <span>
             The following farmhands will be deleted:
-            <ul className="list-disc list-inside">
+            <ul className="list-inside list-disc">
               {playerID ? (
                 <li>
                   {`${selectedPlayer?.general?.name} - ${selectedPlayer?.general?.farmInfo}`}
diff --git a/src/contexts/players-context.tsx b/src/contexts/players-context.tsx
index def9012c..a0fd1e02 100644
--- a/src/contexts/players-context.tsx
+++ b/src/contexts/players-context.tsx
@@ -91,7 +91,15 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => {
 
   useEffect(() => {
     if (!activePlayerId && players.length > 0) {
-      setActivePlayerId(players[0]._id);
+      // first lets check if local storage contains the last set player
+      if (typeof window !== "undefined") {
+        const stored = window.localStorage.getItem("player_id");
+
+        // also check if the player_id is still in the players array
+        if (stored && players.some((player) => player._id === stored)) {
+          setActivePlayerId(stored);
+        } else setActivePlayerId(players[0]._id);
+      }
     }
   }, [activePlayerId, players]);
 
@@ -136,7 +144,13 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => {
       setActivePlayerId(undefined);
       return;
     }
+
     setActivePlayerId(player._id);
+
+    if (typeof window !== "undefined") {
+      console.log(`Setting player_id to '${player._id}'`);
+      window.localStorage.setItem("player_id", player._id);
+    }
   }, []);
 
   return (