From 63129dfa14db185ef33b5a903b37d67657669ca0 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 1 Jan 2021 14:50:11 +1100
Subject: [PATCH] Moved joined and left notifications to new networking

---
 src/components/party/Party.js |  3 ---
 src/network/NetworkedParty.js | 37 +++++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/components/party/Party.js b/src/components/party/Party.js
index b766946..c24949e 100644
--- a/src/components/party/Party.js
+++ b/src/components/party/Party.js
@@ -1,7 +1,6 @@
 import React, { useContext, useEffect } from "react";
 import { Flex, Box, Text } from "theme-ui";
 import SimpleBar from "simplebar-react";
-import { useToasts } from "react-toast-notifications";
 
 import AddPartyMemberButton from "./AddPartyMemberButton";
 import Nickname from "./Nickname";
@@ -28,8 +27,6 @@ function Party({ gameId, stream, partyStreams, onStreamStart, onStreamEnd }) {
   const [fullScreen] = useSetting("map.fullScreen");
   const [shareDice, setShareDice] = useSetting("dice.shareDice");
 
-  const { addToast } = useToasts();
-
   function handleTimerStart(newTimer) {
     setPlayerState((prevState) => ({ ...prevState, timer: newTimer }));
   }
diff --git a/src/network/NetworkedParty.js b/src/network/NetworkedParty.js
index 40daf1e..94d2e20 100644
--- a/src/network/NetworkedParty.js
+++ b/src/network/NetworkedParty.js
@@ -1,9 +1,16 @@
-import React, { useContext, useState, useEffect, useCallback } from "react";
+import React, {
+  useContext,
+  useState,
+  useEffect,
+  useCallback,
+  useRef,
+} from "react";
+import { useToasts } from "react-toast-notifications";
 
 // Load session for auto complete
 // eslint-disable-next-line no-unused-vars
 import Session from "./Session";
-import { isStreamStopped, omit } from "../helpers/shared";
+import { isStreamStopped, omit, difference } from "../helpers/shared";
 
 import PartyContext from "../contexts/PartyContext";
 
@@ -23,6 +30,8 @@ function NetworkedParty({ gameId, session }) {
   const [stream, setStream] = useState(null);
   const [partyStreams, setPartyStreams] = useState({});
 
+  const { addToast } = useToasts();
+
   function handleStreamStart(localStream) {
     setStream(localStream);
     const tracks = localStream.getTracks();
@@ -53,6 +62,19 @@ function NetworkedParty({ gameId, session }) {
     [session, partyState]
   );
 
+  // Keep a reference to players who have just joined to show the joined notification
+  const joinedPlayersRef = useRef([]);
+  useEffect(() => {
+    if (joinedPlayersRef.current.length > 0) {
+      for (let id of joinedPlayersRef.current) {
+        if (partyState[id]) {
+          addToast(`${partyState[id].nickname} joined the party`);
+        }
+      }
+      joinedPlayersRef.current = [];
+    }
+  }, [partyState]);
+
   useEffect(() => {
     function handlePlayerJoined(sessionId) {
       if (stream) {
@@ -63,6 +85,15 @@ function NetworkedParty({ gameId, session }) {
           }
         }
       }
+      // Add player to join notification list
+      // Can't just show the notification here as the partyState data isn't populated at this point
+      joinedPlayersRef.current.push(sessionId);
+    }
+
+    function handlePlayerLeft(sessionId) {
+      if (partyState[sessionId]) {
+        addToast(`${partyState[sessionId].nickname} left the party`);
+      }
     }
 
     function handlePeerTrackAdded({ peer, stream: remoteStream }) {
@@ -84,11 +115,13 @@ function NetworkedParty({ gameId, session }) {
     }
 
     session.on("playerJoined", handlePlayerJoined);
+    session.on("playerLeft", handlePlayerLeft);
     session.on("peerTrackAdded", handlePeerTrackAdded);
     session.on("peerTrackRemoved", handlePeerTrackRemoved);
 
     return () => {
       session.off("playerJoined", handlePlayerJoined);
+      session.off("playerLeft", handlePlayerLeft);
       session.off("peerTrackAdded", handlePeerTrackAdded);
       session.off("peerTrackRemoved", handlePeerTrackRemoved);
     };