Merge pull request #735 from Roguelike-Celebration/fix-entry-dc-crashes

Fix entry dc crashes
Roguelike-Celebration · Oct 22, 2022 · 1ee6ff0 · 1ee6ff0
2 parents c3c5fff + 69c4e6c
commit 1ee6ff0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/src/Actions.ts b/src/Actions.ts
@@ -218,11 +218,15 @@ export const ConnectAction =
   (
     roomId: string,
     roomData: { [roomId: string]: Room },
+    presenceData?: { [roomId: string]: string[] },
     roomNotes?: RoomNote[]
   ): Thunk<Action, State> =>
     async (dispatch, getState) => {
       await getState().messageArchiveLoaded.promise
       dispatch(UpdatedCurrentRoomAction(roomId, roomData))
+      if (presenceData) {
+        dispatch(UpdatedPresenceAction(presenceData))
+      }
       if (roomNotes) {
         dispatch(NoteUpdateRoomAction(roomId, roomNotes))
       }

diff --git a/src/networking.ts b/src/networking.ts
@@ -76,6 +76,7 @@ export async function connect (
     ConnectAction(
       result.roomId,
       convertServerRoomData(result.roomData),
+      result.presenceData,
       result.roomNotes
     )
   )
@@ -89,8 +90,6 @@ export async function connect (
     dispatch(UpdateUnlockableBadgesAction(result.unlockableBadges))
   }
 
-  dispatch(UpdatedPresenceAction(result.presenceData))
-
   const hubConnection = await connectSignalR(userId, dispatch)
   if (hubConnection.state !== SignalR.HubConnectionState.Connected) {
     throw Error('SignalR connection could not be established!')

diff --git a/src/reducer.ts b/src/reducer.ts
@@ -248,15 +248,17 @@ export default produce((draft: State, action: Action) => {
 
   if (action.type === ActionType.PlayerDisconnected) {
     const roomData = draft.roomData[draft.roomId]
-    roomData.users = roomData.users.filter((u) => u !== action.value)
-    addMessage(
-      draft,
-      createDisconnectedMessage(
-        action.value,
-        draft.roomId,
-        roomData.users.length
+    if (roomData && roomData.users) {
+      roomData.users = roomData.users.filter((u) => u !== action.value)
+      addMessage(
+        draft,
+        createDisconnectedMessage(
+          action.value,
+          draft.roomId,
+          roomData.users.length
+        )
       )
-    )
+    }
   }
 
   if (action.type === ActionType.PlayerEntered) {
@@ -278,17 +280,20 @@ export default produce((draft: State, action: Action) => {
 
   if (action.type === ActionType.PlayerLeft) {
     const roomData = draft.roomData[draft.roomId]
-    roomData.users = roomData.users.filter((u) => u !== action.value.name)
-    addMessage(
-      draft,
-      createLeftMessage(
-        action.value.name,
-        action.value.toId,
-        action.value.toName,
-        draft.roomId,
-        roomData.users.length
+    // You can get messages for players leaving before your loading finishes - hence the ignore guard here.
+    if (roomData && roomData.users) {
+      roomData.users = roomData.users.filter((u) => u !== action.value.name)
+      addMessage(
+        draft,
+        createLeftMessage(
+          action.value.name,
+          action.value.toId,
+          action.value.toName,
+          draft.roomId,
+          roomData.users.length
+        )
       )
-    )
+    }
   }
 
   if (action.type === ActionType.ChatMessage) {