update highScore logic

Author: LinaBell

client/src/components/Leaderboard/Leaderboard.jsx

@@ -53,7 +53,7 @@ export const Leaderboard = () => {
         </h2>
         <div className="card-primary grid gap-2">
           <h3>Personal Best</h3>
-          <p>{highScore || "No highScore available"}</p>
+          <p>{highScore || "No high score available"}</p>
         </div>
         <div className="card-outline">
           {leaderboard?.length > 0 ? (

client/src/context/reducer.js

@@ -121,6 +121,7 @@ const globalReducer = (state, action) => {
       return {
         ...state,
         leaderboard: payload.leaderboard,
+        highScore: payload.highScore,
         error: "",
       };
     case SET_ERROR:

package-lock.json

@@ -4,7 +4,7 @@
   "description": "",
   "dependencies": {
     "@googleapis/sheets": "^7.0.0",
-    "@rtsdk/topia": "^0.18.3",
+    "@rtsdk/topia": "^0.19.3",
     "axios": "^1.6.7",
     "body-parser": "^1.20.2",
     "concurrently": "^8.2.2",

package.json

@@ -3,15 +3,15 @@ import { errorHandler, formatLeaderboard, getCredentials, World } from "../utils
 export const handleGetLeaderboard = async (req, res) => {
   try {
     const credentials = getCredentials(req.query);
-    const { urlSlug, sceneDropId } = credentials;
+    const { profileId, urlSlug, sceneDropId } = credentials;
 
     const world = await World.create(urlSlug, { credentials });
     await world.fetchDataObject();
     const sceneData = world.dataObject?.[sceneDropId];
 
-    const leaderboard = await formatLeaderboard(sceneData?.leaderboard || {});
+    const { leaderboardArray, highScore } = await formatLeaderboard(sceneData.leaderboard, profileId);
 
-    return res.json({ success: true, leaderboard });
+    return res.json({ success: true, leaderboard: leaderboardArray, highScore });
   } catch (error) {
     return errorHandler({
       error,

server/controllers/handleGetLeaderboard.js

@@ -11,7 +11,7 @@ import { TRACKS } from "../constants.js";
 export const handleLoadGameState = async (req, res) => {
   try {
     const credentials = getCredentials(req.query);
-    const { urlSlug, sceneDropId } = credentials;
+    const { profileId, urlSlug, sceneDropId } = credentials;
     const now = Date.now();
 
     const world = await World.create(urlSlug, { credentials });
@@ -65,10 +65,10 @@ export const handleLoadGameState = async (req, res) => {
       );
     }
 
-    const { visitor, visitorProgress, visitorInventory } = await getVisitor(credentials, true);
-    const { checkpoints, highScore, startTimestamp } = visitorProgress;
+    const { leaderboardArray, highScore } = await formatLeaderboard(sceneData.leaderboard, profileId);
 
-    const leaderboardArray = await formatLeaderboard(sceneData.leaderboard);
+    const { visitor, visitorProgress, visitorInventory } = await getVisitor(credentials, true);
+    let { checkpoints, startTimestamp } = visitorProgress;
 
     const { badges } = await getInventoryItems(credentials);
 

server/controllers/handleLoadGameState.js

@@ -1,4 +1,4 @@
-export const formatLeaderboard = async (leaderboard) => {
+export const formatLeaderboard = async (leaderboard, profileId) => {
   const leaderboardArray = [];
   for (const profileId in leaderboard) {
     const data = leaderboard[profileId];
@@ -19,5 +19,8 @@ export const formatLeaderboard = async (leaderboard) => {
   };
   leaderboardArray.sort((a, b) => timeToSeconds(a.highScore) - timeToSeconds(b.highScore)).slice(0, 20);
 
-  return leaderboardArray;
+  let highScore;
+  if (Object.keys(leaderboard).includes(profileId)) highScore = leaderboard[profileId].split("|")[1];
+
+  return { leaderboardArray, highScore };
 };