From c6c9acae3de8c407a29fe282c8a7f605ecaf8bee Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Wed, 5 Aug 2020 17:46:09 +1000
Subject: [PATCH] Added dice network replication and display for peers

---
 src/components/party/DiceRolls.js | 22 ++++++++++++++++++++++
 src/components/party/Nickname.js  |  4 +++-
 src/components/party/Party.js     |  9 +++------
 src/icons/DiceRollsIcon.js        | 18 ++++++++++++++++++
 src/network/NetworkedParty.js     | 24 +++++++++++++++++++++++-
 5 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 src/components/party/DiceRolls.js
 create mode 100644 src/icons/DiceRollsIcon.js

diff --git a/src/components/party/DiceRolls.js b/src/components/party/DiceRolls.js
new file mode 100644
index 0000000..c30303d
--- /dev/null
+++ b/src/components/party/DiceRolls.js
@@ -0,0 +1,22 @@
+import React from "react";
+import { Flex, Text } from "theme-ui";
+
+import DiceRollsIcon from "../../icons/DiceRollsIcon";
+
+import { getDiceRollTotal } from "../../helpers/dice";
+
+function DiceRolls({ rolls }) {
+  const total = getDiceRollTotal(rolls);
+  return (
+    total > 0 && (
+      <Flex p={1}>
+        <DiceRollsIcon />
+        <Text px={1} as="p" my={1} variant="body2" sx={{ width: "100%" }}>
+          {total}
+        </Text>
+      </Flex>
+    )
+  );
+}
+
+export default DiceRolls;
diff --git a/src/components/party/Nickname.js b/src/components/party/Nickname.js
index c20a588..12cdd33 100644
--- a/src/components/party/Nickname.js
+++ b/src/components/party/Nickname.js
@@ -2,8 +2,9 @@ import React from "react";
 import { Text, Flex } from "theme-ui";
 
 import Stream from "./Stream";
+import DiceRolls from "./DiceRolls";
 
-function Nickname({ nickname, stream }) {
+function Nickname({ nickname, stream, diceRolls }) {
   return (
     <Flex sx={{ flexDirection: "column" }}>
       <Text
@@ -17,6 +18,7 @@ function Nickname({ nickname, stream }) {
         {nickname}
       </Text>
       {stream && <Stream stream={stream} nickname={nickname} />}
+      {diceRolls && <DiceRolls rolls={diceRolls} />}
     </Flex>
   );
 }
diff --git a/src/components/party/Party.js b/src/components/party/Party.js
index 42324e1..e7ce986 100644
--- a/src/components/party/Party.js
+++ b/src/components/party/Party.js
@@ -27,6 +27,7 @@ function Party({
   onShareDiceChage,
   diceRolls,
   onDiceRollsChange,
+  partyDiceRolls,
 }) {
   return (
     <Flex
@@ -56,17 +57,13 @@ function Party({
           width: "100%",
         }}
       >
-        <Nickname
-          nickname={`${nickname} (you) ${
-            shareDice &&
-            diceRolls.reduce((accumulator, dice) => accumulator + dice.roll, 0)
-          }`}
-        />
+        <Nickname nickname={`${nickname} (you)`} />
         {Object.entries(partyNicknames).map(([id, partyNickname]) => (
           <Nickname
             nickname={partyNickname}
             key={id}
             stream={partyStreams[id]}
+            diceRolls={partyDiceRolls[id]}
           />
         ))}
         {timer && <Timer timer={timer} index={0} />}
diff --git a/src/icons/DiceRollsIcon.js b/src/icons/DiceRollsIcon.js
new file mode 100644
index 0000000..572a707
--- /dev/null
+++ b/src/icons/DiceRollsIcon.js
@@ -0,0 +1,18 @@
+import React from "react";
+
+function DiceRollsIcon() {
+  return (
+    <svg
+      width="24"
+      height="24"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="currentcolor"
+    >
+      <path d="M0 0h24v24H0V0z" fill="none" />
+      <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM7.5 18c-.83 0-1.5-.67-1.5-1.5S6.67 15 7.5 15s1.5.67 1.5 1.5S8.33 18 7.5 18zm0-9C6.67 9 6 8.33 6 7.5S6.67 6 7.5 6 9 6.67 9 7.5 8.33 9 7.5 9zm4.5 4.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm4.5 4.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm0-9c-.83 0-1.5-.67-1.5-1.5S15.67 6 16.5 6s1.5.67 1.5 1.5S17.33 9 16.5 9z" />
+    </svg>
+  );
+}
+
+export default DiceRollsIcon;
diff --git a/src/network/NetworkedParty.js b/src/network/NetworkedParty.js
index 6590453..ad48594 100644
--- a/src/network/NetworkedParty.js
+++ b/src/network/NetworkedParty.js
@@ -98,10 +98,18 @@ function NetworkedParty({ gameId, session }) {
 
   function handleDiceRollsChange(newDiceRolls) {
     setDiceRolls(newDiceRolls);
+    if (shareDice) {
+      session.send("dice", { [session.id]: newDiceRolls });
+    }
   }
 
   function handleShareDiceChange(newShareDice) {
     setShareDice(newShareDice);
+    if (newShareDice) {
+      session.send("dice", { [session.id]: diceRolls });
+    } else {
+      session.send("dice", { [session.id]: null });
+    }
   }
 
   useEffect(() => {
@@ -113,6 +121,9 @@ function NetworkedParty({ gameId, session }) {
       if (timer) {
         reply("timer", { [session.id]: timer });
       }
+      if (shareDice) {
+        reply("dice", { [session.id]: diceRolls });
+      }
     }
 
     function handlePeerDisconnect({ peer }) {
@@ -137,6 +148,16 @@ function NetworkedParty({ gameId, session }) {
           return fromEntries(filtered);
         });
       }
+      if (id === "dice") {
+        setPartyDiceRolls((prevDiceRolls) => {
+          const newRolls = { ...prevDiceRolls, ...data };
+          // filter out dice rolls that are null
+          const filtered = Object.entries(newRolls).filter(
+            ([, value]) => value !== null
+          );
+          return fromEntries(filtered);
+        });
+      }
     }
 
     function handlePeerTrackAdded({ peer, stream: remoteStream }) {
@@ -170,7 +191,7 @@ function NetworkedParty({ gameId, session }) {
       session.off("trackAdded", handlePeerTrackAdded);
       session.off("trackRemoved", handlePeerTrackRemoved);
     };
-  }, [session, nickname, stream, timer]);
+  }, [session, nickname, stream, timer, shareDice, diceRolls]);
 
   useEffect(() => {
     if (stream) {
@@ -206,6 +227,7 @@ function NetworkedParty({ gameId, session }) {
       onShareDiceChage={handleShareDiceChange}
       diceRolls={diceRolls}
       onDiceRollsChange={handleDiceRollsChange}
+      partyDiceRolls={partyDiceRolls}
     />
   );
 }