Merge pull request #38 from AlecM33/end-of-game-bug

don't try to re-subscribe for same game, fix score property
AlecM33 · Aug 11, 2024 · f786b44 · f786b44
2 parents 575b27c + 25253e5
commit f786b44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/modules/gameday.js b/modules/gameday.js
@@ -26,10 +26,15 @@ async function statusPoll (bot) {
             globalCache.values.nearestGames = nearestGames.filter(g => g.status.codedGameState !== 'D');
             globalCache.values.game.isDoubleHeader = nearestGames.length > 1;
             const inProgressGame = nearestGames.find(nearestGame => nearestGame.status.statusCode === 'I' || nearestGame.status.statusCode === 'PW');
-            if (inProgressGame) {
+            /*
+                the "game_finished" socket event is received before a game's status changes to "Final", typically. So we shouldn't try to
+                re-subscribe just because the status is still "In Progress". We should check if it's a different game.
+             */
+            if (inProgressGame && inProgressGame.gamePk !== globalCache.values.game.currentGamePk) {
                 LOGGER.info('Gameday: polling stopped: a game is live.');
                 globalCache.resetGameCache();
                 globalCache.values.game.currentLiveFeed = await mlbAPIUtil.liveFeed(inProgressGame.gamePk);
+                globalCache.values.game.currentGamePk = inProgressGame.gamePk;
                 gamedayUtil.getConstrastingEmbedColors();
                 module.exports.subscribe(bot, inProgressGame, nearestGames);
             } else {

diff --git a/modules/global-cache.js b/modules/global-cache.js
@@ -4,6 +4,7 @@ const values = {
     subscribedChannels: [],
     game: {
         currentLiveFeed: null,
+        currentGamePk: null,
         isDoubleHeader: null,
         lastReportedCompleteAtBatIndex: null,
         lastReportedPlayDescription: null,
@@ -19,6 +20,7 @@ const values = {
 
 function resetGameCache () {
     values.game.currentLiveFeed = null;
+    values.game.currentGamePk = null;
     values.game.isDoubleHeader = null;
     values.game.lastReportedCompleteAtBatIndex = null;
     values.game.lastReportedPlayDescription = null;

diff --git a/modules/livefeed.js b/modules/livefeed.js
@@ -41,10 +41,10 @@ module.exports = {
                 return liveFeed.liveData.linescore;
             },
             homeTeamScore: () => {
-                return liveFeed.liveData.linescore.teams.home.runs;
+                return liveFeed.liveData.plays.currentPlay.result.homeScore;
             },
             awayTeamScore: () => {
-                return liveFeed.liveData.linescore.teams.away.runs;
+                return liveFeed.liveData.plays.currentPlay.result.awayScore;
             },
             currentBatterBatSide: () => {
                 return liveFeed.liveData.plays.currentPlay.matchup.batSide.code;