From 089fd27ccf8b5d51b15631c69cb818f455a52d49 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Sat, 12 Dec 2020 15:03:24 +1100
Subject: [PATCH] Converted custom token support to new network model

---
 src/network/NetworkedMapAndTokens.js | 30 ++++++++++------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index 4e412d2..15cccab 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -131,11 +131,21 @@ function NetworkedMapAndTokens({ session }) {
           } else {
             session.sendTo(owner.sessionId, "mapRequest", asset.id, "map");
           }
+        } else if (asset.type === "token") {
+          const cachedToken = getToken(asset.id);
+          if (cachedToken && cachedToken.lastModified >= asset.lastModified) {
+            // Update last used for cache invalidation
+            const lastUsed = Date.now();
+            await updateToken(cachedToken.id, { lastUsed });
+          } else {
+            session.sendTo(owner.sessionId, "tokenRequest", asset.id, "token");
+          }
         }
       }
     }
 
     requestAssetsIfNeeded();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [assetManifest, partyState, session]);
 
   /**
@@ -355,22 +365,6 @@ function NetworkedMapAndTokens({ session }) {
         setCurrentMap(newMap);
       }
 
-      if (id === "token") {
-        const newToken = data;
-        if (newToken && newToken.type === "file") {
-          const cachedToken = getToken(newToken.id);
-          if (
-            cachedToken &&
-            cachedToken.lastModified >= newToken.lastModified
-          ) {
-            // Update last used for cache invalidation
-            const lastUsed = Date.now();
-            await updateToken(cachedToken.id, { lastUsed });
-          } else {
-            reply("tokenRequest", newToken.id, "token");
-          }
-        }
-      }
       if (id === "tokenRequest") {
         const token = getToken(data);
         // Add a last used property for cache invalidation
@@ -378,9 +372,7 @@ function NetworkedMapAndTokens({ session }) {
       }
       if (id === "tokenResponse") {
         const newToken = data;
-        if (newToken && newToken.type === "file") {
-          putToken(newToken);
-        }
+        await putToken(newToken);
       }
     }