Fix

Author: hasparus

scripts/sync-sched/speakers.json

@@ -8,37 +8,37 @@
     "avatar": "//avatars.sched.co/b/99/18743846/avatar.jpg.320x320px.jpg?b57",
     "role": "speaker",
     "tags": "",
-    "tickets": [],
-    "plusones": 0,
-    "~syncedDetailsAt": 1749489924661
+    "~syncedDetailsAt": 1749491538699,
+    "company": "Graphile",
+    "position": "GraphQL Community Gardener",
+    "location": "Chandler's Ford, UK",
+    "socialurls": []
   },
   {
     "username": "lee_byron.25jvpjmb",
     "name": "Lee Byron",
     "email": "[email protected]",
     "about": "",
     "url": "",
-    "avatar": "http://avatars.sched.co/5/24/18743534/avatar.jpg.320x320px.jpg?480",
+    "avatar": "//avatars.sched.co/5/24/18743534/avatar.jpg.320x320px.jpg?480",
     "role": "speaker",
     "tags": "",
-    "tickets": [],
-    "plusones": 0,
+    "~syncedDetailsAt": 1749491538699,
     "company": "GraphQL Foundation",
     "position": "Co-creator of GraphQL and Director",
     "location": "",
     "socialurls": []
   },
   {
     "username": "saihaj",
+    "company": "",
+    "position": "",
     "name": "Saihajpreet Singh",
-    "email": "[email protected]",
     "about": "",
+    "location": "",
     "url": "",
     "avatar": "",
     "role": "speaker",
-    "tags": "",
-    "tickets": [],
-    "plusones": 0,
-    "~syncedDetailsAt": 1749489924661
+    "socialurls": []
   }
 ]

scripts/sync-sched/sync.ts

@@ -172,7 +172,10 @@ async function updateSpeakerDetails(
     if (location) {
       const [key, index] = location
       if (key === "changed") {
-        comparison[key][index].new = speaker
+        comparison[key][index].new = {
+          ...comparison[key][index].new,
+          ...speaker,
+        }
         comparison[key][index].new["~syncedDetailsAt"] = Date.now()
       } else {
         comparison[key][index] = speaker
@@ -309,15 +312,7 @@ function yellow(text: string) {
 }
 
 function deepStrictEqualWithoutInternals(a: unknown, b: unknown): boolean {
-  if (a === b) return true
-
-  if (a === null || b === null || a === undefined || b === undefined) {
-    return a === b
-  }
-
-  if (typeof a !== typeof b) return false
-
-  if (typeof a !== "object") return false
+  if (typeof a !== "object") return a === b
 
   if (Array.isArray(a) !== Array.isArray(b)) return false
 
@@ -343,10 +338,6 @@ function deepStrictEqualWithoutInternals(a: unknown, b: unknown): boolean {
   aKeys.sort()
   bKeys.sort()
 
-  for (let i = 0; i < aKeys.length; i++) {
-    if (aKeys[i] !== bKeys[i]) return false
-  }
-
   for (const key of aKeys) {
     if (!deepStrictEqualWithoutInternals(aObj[key], bObj[key])) {
       return false

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

@@ -125,6 +125,9 @@ export async function getSchedule(
 const SPEAKER_FIELDS =
   "username,company,position,name,about,location,url,avatar,role,socialurls"
 
+// We receive this fields despite the fact we don't ask for them.
+const SPEAKER_IGNORED_FIELDS = ["plusones", "tickets"]
+
 export async function getSpeakers(
   ctx: RequestContext,
 ): Promise<SchedSpeaker[]> {
@@ -135,11 +138,17 @@ export async function getSpeakers(
   const result = users
     .filter(speaker => speaker.role.includes("speaker"))
     .map(user => {
-      return {
+      const res = {
         ...user,
         socialurls: user.socialurls || [],
         about: preprocessDescription(user.about),
       }
+
+      for (const field of SPEAKER_IGNORED_FIELDS) {
+        delete res[field as keyof typeof res]
+      }
+
+      return res
     })
     .sort((a, b) => {
       if (a.avatar && !b.avatar) return -1
@@ -162,6 +171,10 @@ export async function getSpeakerDetails(
     term: username,
   })
 
+  for (const field of SPEAKER_IGNORED_FIELDS) {
+    delete data[field as keyof typeof data]
+  }
+
   return data as SchedSpeaker
 }