Harden baseball chart interaction fallback

src/index.js

@@ -180,7 +180,15 @@ async function main() {
     try {
       if (interaction.isChatInputCommand()) {
         if (shouldDeferImmediately(interaction.commandName)) {
-          await interaction.deferReply();
+          try {
+            await interaction.deferReply();
+          } catch (error) {
+            if (error?.code === 10062 || error?.code === 10008) {
+              interaction.__ackFailed = true;
+            } else {
+              throw error;
+            }
+          }
         }
         auditLog('command_start', {
           command: interaction.commandName,
@@ -1595,7 +1603,7 @@ async function handleMatchupCommand(interaction, config, commandName) {
 }
 
 async function handleBaseballChartCommand(interaction, config, commandName) {
-  if (!interaction.deferred && !interaction.replied) {
+  if (!interaction.__ackFailed && !interaction.deferred && !interaction.replied) {
     await interaction.deferReply();
   }
 
@@ -1799,6 +1807,16 @@ async function handleBaseballChartCommand(interaction, config, commandName) {
 }
 
 async function finalizeDeferredInteraction(interaction, payload) {
+  if (interaction.__ackFailed) {
+    const channelPayload = {
+      ...payload,
+      content: payload.content ?? `<@${interaction.user?.id}>`,
+      flags: undefined,
+    };
+    await interaction.channel?.send?.(channelPayload).catch(() => null);
+    return;
+  }
+
   try {
     await interaction.editReply(payload);
   } catch (error) {

src/matchups.js

@@ -724,20 +724,32 @@ function mapSlateTeams(slateRows) {
       continue;
     }
 
-    lookup.set(awayTeam, {
+    const awayEntry = {
       gamePk: row.game_pk ?? null,
       opponentTeam: homeTeam,
       opposingPitcherId: row.home_probable_pitcher_id ?? null,
       opposingPitcherName: row.home_probable_pitcher ?? null,
       opposingPitcherHand: row.home_probable_hand ?? null,
-    });
-    lookup.set(homeTeam, {
+    };
+    const homeEntry = {
       gamePk: row.game_pk ?? null,
       opponentTeam: awayTeam,
       opposingPitcherId: row.away_probable_pitcher_id ?? null,
       opposingPitcherName: row.away_probable_pitcher ?? null,
       opposingPitcherHand: row.away_probable_hand ?? null,
-    });
+    };
+
+    lookup.set(awayTeam, awayEntry);
+    lookup.set(homeTeam, homeEntry);
+
+    const normalizedAwayTeam = normalizeTeam(awayTeam);
+    const normalizedHomeTeam = normalizeTeam(homeTeam);
+    if (normalizedAwayTeam) {
+      lookup.set(normalizedAwayTeam, awayEntry);
+    }
+    if (normalizedHomeTeam) {
+      lookup.set(normalizedHomeTeam, homeEntry);
+    }
   }
   return lookup;
 }
@@ -850,7 +862,7 @@ function firstNonBlankValue(...values) {
 
 function withDefaults(row, slateLookup, options = {}) {
   const team = String(row.team ?? '').trim();
-  const slate = slateLookup.get(team) ?? {};
+  const slate = slateLookup.get(team) ?? slateLookup.get(normalizeTeam(team)) ?? {};
   const rosterLookup = options.rosterLookup ?? new Map();
   const playerType = options.playerType ?? 'hitter';
   return {
@@ -2331,13 +2343,20 @@ export class MatchupService {
         throw new Error(`No hitter matchup profile matched "${options.player}".`);
       }
 
-      const hitterSlate = slateLookup.get(String(hitterMatch.team ?? '').trim()) ?? {};
+      const hitterSlate = slateLookup.get(String(hitterMatch.team ?? '').trim())
+        ?? slateLookup.get(normalizeTeam(hitterMatch.team))
+        ?? {};
       const opposingPitcherId = String(
         firstNonBlankValue(hitterMatch.opposing_pitcher_id, hitterSlate.opposingPitcherId) ?? ''
       ).trim();
+      const opposingPitcherRow = pitcherLookup.get(opposingPitcherId) ?? null;
+      const opposingPitcherRowName = opposingPitcherRow
+        ? resolveHostedPlayerName(opposingPitcherRow, rosterLookup, 'pitcher')
+        : null;
       const opposingPitcherName = firstNonBlankValue(
         hitterMatch.opposing_pitcher_name,
         hitterSlate.opposingPitcherName,
+        opposingPitcherRowName,
       );
       const opposingPitcherHand = firstNonBlankValue(
         hitterMatch.opposing_pitcher_hand,