Take into account aliases when comparing userIDs

DemomanApp · Apr 27, 2024 · 5d2b5d1 · 5d2b5d1
1 parent 3b6ca7e
commit 5d2b5d1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/src/demo.ts b/src/demo.ts
@@ -208,6 +208,8 @@ export function primaryTeam(player: PlayerSummary): Team {
   }
 }
 
+export type UserIdAliases = Record<number, number>;
+
 export type GameSummary = {
   local_user_id: UserId;
   highlights: HighlightEvent[];
@@ -216,7 +218,7 @@ export type GameSummary = {
   interval_per_tick: number;
   players: PlayerSummary[];
   num_rounds: number;
-  aliases: Record<number, number>;
+  aliases: UserIdAliases;
 };
 
 export type Scoreboard = {

diff --git a/src/routes/demos/demoDir/demoDetails/Highlights.tsx b/src/routes/demos/demoDir/demoDetails/Highlights.tsx
@@ -12,6 +12,7 @@ import {
   HighlightPlayerSnapshot,
   PlayerSummary,
   TaggedHighlight,
+  UserIdAliases,
   destructureHighlight,
 } from "@/demo";
 import HighlightBox from "./HighlightBox";
@@ -23,66 +24,74 @@ export type TimelineProps = {
 
 function samePlayer(
   playerId: number,
-  player: PlayerSummary | HighlightPlayerSnapshot | null
+  player: PlayerSummary | HighlightPlayerSnapshot | null,
+  aliases: UserIdAliases
 ): boolean {
-  return playerId === player?.user_id;
+  if (player === null) {
+    return false;
+  } else {
+    return playerId === player.user_id || playerId === aliases[player.user_id];
+  }
 }
 
 function doesHighlightIncludePlayer(
   highlight: TaggedHighlight,
-  playerId: number
+  playerId: number,
+  aliases: UserIdAliases
 ): boolean {
   switch (highlight.type) {
     case "Airshot":
       return (
-        samePlayer(playerId, highlight.highlight.victim) ||
-        samePlayer(playerId, highlight.highlight.attacker)
+        samePlayer(playerId, highlight.highlight.victim, aliases) ||
+        samePlayer(playerId, highlight.highlight.attacker, aliases)
       );
     case "ChatMessage":
-      return samePlayer(playerId, highlight.highlight.sender);
+      return samePlayer(playerId, highlight.highlight.sender, aliases);
     case "CrossbowAirshot":
       return (
-        samePlayer(playerId, highlight.highlight.healer) ||
-        samePlayer(playerId, highlight.highlight.target)
+        samePlayer(playerId, highlight.highlight.healer, aliases) ||
+        samePlayer(playerId, highlight.highlight.target, aliases)
       );
     case "Kill":
       return (
-        samePlayer(playerId, highlight.highlight.killer) ||
-        samePlayer(playerId, highlight.highlight.assister) ||
-        samePlayer(playerId, highlight.highlight.victim)
+        samePlayer(playerId, highlight.highlight.killer, aliases) ||
+        samePlayer(playerId, highlight.highlight.assister, aliases) ||
+        samePlayer(playerId, highlight.highlight.victim, aliases)
       );
     case "KillStreak":
-      return samePlayer(playerId, highlight.highlight.player);
+      return samePlayer(playerId, highlight.highlight.player, aliases);
     case "KillStreakEnded":
       return (
-        samePlayer(playerId, highlight.highlight.killer) ||
-        samePlayer(playerId, highlight.highlight.victim)
+        samePlayer(playerId, highlight.highlight.killer, aliases) ||
+        samePlayer(playerId, highlight.highlight.victim, aliases)
       );
     case "PlayerConnected":
-      return samePlayer(playerId, highlight.highlight.player);
+      return samePlayer(playerId, highlight.highlight.player, aliases);
     case "PlayerDisconnected":
-      return samePlayer(playerId, highlight.highlight.player);
+      return samePlayer(playerId, highlight.highlight.player, aliases);
     case "PointCaptured":
       return highlight.highlight.cappers.some((capper) =>
-        samePlayer(playerId, capper)
+        samePlayer(playerId, capper, aliases)
       );
     case "PlayerTeamChange":
-      return samePlayer(playerId, highlight.highlight.player);
+      return samePlayer(playerId, highlight.highlight.player, aliases);
     default:
       return true;
   }
 }
 
 function filterHighlights(
   highlights: HighlightEvent[],
-  filters: Filters
+  filters: Filters,
+  aliases: UserIdAliases
 ): HighlightEvent[] {
   if (filters.playerIds.length > 0) {
     highlights = highlights.filter((h) =>
       filters.playerIds.find((p) =>
         doesHighlightIncludePlayer(
           destructureHighlight(h.event),
-          Number.parseInt(p, 10)
+          Number.parseInt(p, 10),
+          aliases
         )
       )
     );
@@ -182,7 +191,8 @@ export default function HighlightsList({ gameSummary }: TimelineProps) {
   });
 
   const highlights = useMemo(
-    () => filterHighlights(gameSummary.highlights, filters),
+    () =>
+      filterHighlights(gameSummary.highlights, filters, gameSummary.aliases),
     [gameSummary.highlights, filters]
   );