Actually use the equality sets

Author: hasparus

scripts/sync-sched/sync.ts

@@ -10,6 +10,7 @@ import {
   getSchedule,
   getSpeakerDetails,
   getSpeakers,
+  mergeSpeaker,
   RequestContext,
 } from "@/app/conf/_api/sched-client"
 import type { ConferenceYear, SchedSpeaker } from "@/app/conf/_api/sched-types"
@@ -491,27 +492,4 @@ function deepStrictEqualWithoutInternals(a: unknown, b: unknown): boolean {
   return true
 }
 
-/**
- * Merges speaker data from API with existing local data,
- * preserving important local fields when API returns empty values.
- */
-function mergeSpeaker(
-  oldSpeaker: SchedSpeaker,
-  newSpeaker: SchedSpeaker,
-): SchedSpeaker {
-  return {
-    ...oldSpeaker,
-    ...newSpeaker,
-    socialurls: newSpeaker.socialurls?.length
-      ? newSpeaker.socialurls
-      : oldSpeaker.socialurls,
-    ["_years"]: [
-      ...new Set([
-        ...(oldSpeaker["_years"] || []),
-        ...(newSpeaker["_years"] || []),
-      ]),
-    ].sort(),
-  }
-}
-
 // #endregion utility

src/app/conf/_api/sched-client.tsx

@@ -213,3 +213,26 @@ function shapeSpeaker(user: SchedSpeaker): SchedSpeaker {
 
   return res
 }
+
+/**
+ * Merges speaker data from API with existing local data,
+ * preserving important local fields when API returns empty values.
+ */
+export function mergeSpeaker(
+  oldSpeaker: SchedSpeaker,
+  newSpeaker: SchedSpeaker,
+): SchedSpeaker {
+  return {
+    ...oldSpeaker,
+    ...newSpeaker,
+    socialurls: newSpeaker.socialurls?.length
+      ? newSpeaker.socialurls
+      : oldSpeaker.socialurls,
+    ["_years"]: [
+      ...new Set([
+        ...(oldSpeaker["_years"] || []),
+        ...(newSpeaker["_years"] || []),
+      ]),
+    ].sort(),
+  }
+}

src/app/conf/_api/sched-data.tsx

@@ -1,11 +1,34 @@
 import { ConferenceYear, SchedSpeaker } from "./sched-types"
+import { mergeSpeaker } from "./sched-client"
 
-const allSpeakers: SchedSpeaker[] = require("../../../../scripts/sync-sched/speakers.json")
+const speakersData = require("../../../../scripts/sync-sched/speakers.json")
+const allSpeakers: SchedSpeaker[] = speakersData.speakers
+const equalitySets: string[][] = speakersData.equal || []
 
 export function readSpeakers(year: ConferenceYear): SchedSpeaker[] {
+  const speakersThisYear = allSpeakers.filter(speaker =>
+    speaker._years.includes(year),
+  )
+
+  const speakersWithDuplicates = new Set(equalitySets.flat())
+
+  const res = speakersThisYear.map(speaker => {
+    if (speakersWithDuplicates.has(speaker.username)) {
+      return (
+        equalitySets
+          .find(set => set.includes(speaker.username))! // we will definitely find, because we checked .has above
+          .map(username => allSpeakers.find(s => s.username === username))
+          .filter(x => !!x)
+          // we prefer the data from the most recent years
+          .sort((a, b) => Math.max(...a._years) - Math.max(...b._years))
+          .reduce(mergeSpeaker)
+      )
+    }
+    return speaker
+  })
+
   return (
-    allSpeakers
-      .filter(speaker => speaker._years.includes(year))
+    res
       .sort((a, b) => a.name.localeCompare(b.name))
       // show speakers without avatars last
       .sort((a, b) => {
@@ -15,6 +38,3 @@ export function readSpeakers(year: ConferenceYear): SchedSpeaker[] {
       })
   )
 }
-
-// TODO: We need to be able to say that a speaker is returning even if they don't share username, only first name and last name.
-//       But this needs to be done without adding to `_years` so we don't show duplicates.