Merge branch 'develop'

Author: fcamblor

cloud/firestore/firebase.json

@@ -0,0 +1,6 @@
+{
+  "firestore": {
+    "rules": "firestore.default.rules",
+    "indexes": "firestore.default.indexes.json"
+  }
+}

cloud/firestore/firestore.indexes.json renamed to cloud/firestore/firestore.default.indexes.json

@@ -5,7 +5,9 @@
   "type": "module",
   "scripts": {
     "test": "firebase emulators:exec --only firestore \"jest --detectOpenHandles \"",
-    "deploy": "firebase use ${FIREBASE_PROJECT_NAME:-voxxrin-v3} && firebase deploy --only firestore"
+    "deploy:rules": "npx firebase-tools deploy --only firestore:rules --project ${FIREBASE_PROJECT_NAME:-voxxrin-v3}",
+    "deploy:indexes": "npx firebase-tools deploy --only firestore:indexes --project ${FIREBASE_PROJECT_NAME:-voxxrin-v3} --force || true",
+    "deploy": "concurrently 'npm run deploy:rules' 'npm run deploy:indexes'"
   },
   "license": "Apache-2.0",
   "devDependencies": {

cloud/firestore/package.json

@@ -7,7 +7,7 @@
     "serve": "npm run build && env-cmd -f ./.env.local firebase emulators:start --import data --export-on-exit --inspect-functions",
     "shell": "npm run build && firebase functions:shell",
     "start": "npm run shell",
-    "deploy": "firebase use ${FIREBASE_PROJECT_NAME:-voxxrin-v3} && firebase deploy --only functions",
+    "deploy": "firebase deploy --only functions --project ${FIREBASE_PROJECT_NAME:-voxxrin-v3}",
     "logs": "firebase functions:log",
     "test": "vitest"
   },

cloud/functions/package.json

@@ -33,7 +33,8 @@ export const CODEURS_EN_SEINE_PARSER = EVENT_DESCRIPTOR_PARSER.omit({
         })
     })),
     // the old one was: https://www.codeursenseine.com/_ipx/w_256,q_75/%2Fimages%2Fspeakers%2F{speakerImage}
-    speakerPictureTemplate: z.string().default(`https://www.codeursenseine.com/_next/image?url=%2Fimages%2Fspeakers%2F{speakerImage}&w=256&q=75`)
+    speakerPictureTemplate: z.string().default(`https://www.codeursenseine.com/_next/image?url=%2Fimages%2Fspeakers%2F{speakerImage}&w=256&q=75`),
+    unknownSpeakerIds: z.array(z.string()).optional().default([]),
 })
 
 function extractIdFromUrl(url: string) {
@@ -112,9 +113,12 @@ export const CODEURS_EN_SEINE_CRAWLER: CrawlerKind<typeof CODEURS_EN_SEINE_PARSE
             await githubMDXCrawler.crawlDirectory("content/talks", (mdxFile, fileEntry) => {
                 const fileMetadata = mdxFile.metadata as CESTalkMDXData;
 
-                const start = `${fileMetadata.start}+02:00` as ISODatetime
-                const end = `${fileMetadata.end}+02:00` as ISODatetime
+                const startZDT = Temporal.PlainDateTime.from(fileMetadata.start).toZonedDateTime(descriptor.timezone)
+                const endZDT = Temporal.PlainDateTime.from(fileMetadata.end).toZonedDateTime(descriptor.timezone)
+                const start = startZDT.toInstant().toString() as ISODatetime
+                const end = endZDT.toInstant().toString() as ISODatetime
                 const duration = durationFrom(start, end, descriptor);
+                const talkId = fileEntry.name.substring(0, fileEntry.name.length - ".mdx".length);
 
                 return match([fileMetadata])
                     .with([ { kind: P.union("conference","quicky","atelier","sponsor","pleniere","keynote") }], ([talkMetadata]) => {
@@ -133,10 +137,24 @@ export const CODEURS_EN_SEINE_CRAWLER: CrawlerKind<typeof CODEURS_EN_SEINE_PARSE
                                 return undefined;
                             }
 
-                            const speaker = fetchedSpeakers.find(sp => sp.id === speakerId)
-                            if(!speaker) {
-                                throw new Error(`No speaker found in fetched speakers with id: ${speakerId} !`);
-                            }
+                            const speaker = match(fetchedSpeakers.find(sp => sp.id === speakerId))
+                              .with(P.nullish, () => {
+                                if(descriptor.unknownSpeakerIds.includes(speakerId)) {
+                                  const unknownSpeaker: Speaker = {
+                                    id: speakerId,
+                                    fullName: "Speaker inconnu",
+                                    companyName: null,
+                                    bio: null,
+                                    social: [],
+                                    photoUrl: null,
+                                  }
+                                  return unknownSpeaker;
+                                }
+
+                                throw new Error(`No speaker found in fetched speakers with id: ${speakerId} ! (context: talkId=${talkId})`);
+                              })
+                              .otherwise(speaker => speaker)
+
                             return speaker;
                         }).filter(sp => !!sp).map(sp => sp!);
 
@@ -149,8 +167,8 @@ export const CODEURS_EN_SEINE_CRAWLER: CrawlerKind<typeof CODEURS_EN_SEINE_PARSE
                             talkFormats.push(format);
                         }
 
-                        const talkDetails: DetailedTalk = {
-                            id: fileEntry.name.substring(0, fileEntry.name.length - ".mdx".length),
+                      const talkDetails: DetailedTalk = {
+                            id: talkId,
                             start, end,
                             speakers,
                             summary: mdxFile.content,

cloud/functions/src/crawlers/codeurs-en-seine/crawler.ts

@@ -68,7 +68,7 @@ export const LANGUAGE_FALLBACK_COLORS: HexColor[] = [
 ];
 
 export type CrawlCriteria = {
-    eventIds?: string[]|undefined;
+    crawlerIds?: string[]|undefined;
     crawlingToken?: string|undefined;
     dayIds?: string[]|undefined;
 }
@@ -105,15 +105,15 @@ const crawlAll = async function(criteria: CrawlCriteria) {
     const crawlerDescriptors = await resolveCrawlerDescriptorsMatchingWithToken(criteria.crawlingToken);
 
     const matchingCrawlerDescriptors = crawlerDescriptors.filter(firestoreCrawler => {
-      const eventIdConstraintMatches = !criteria.eventIds
-        || !criteria.eventIds.length
-        || criteria.eventIds.includes(firestoreCrawler.id);
+      const eventIdConstraintMatches = !criteria.crawlerIds
+        || !criteria.crawlerIds.length
+        || criteria.crawlerIds.includes(firestoreCrawler.id);
 
       return eventIdConstraintMatches;
     });
 
     if(!matchingCrawlerDescriptors.length) {
-      throw new Error(`No crawler found matching eventIds=${JSON.stringify(criteria.eventIds)}`);
+      throw new Error(`No crawler found matching crawlerIds=${JSON.stringify(criteria.crawlerIds)}`);
     }
 
     return await Promise.all(matchingCrawlerDescriptors.map(async crawlerDescriptor => {
@@ -370,7 +370,7 @@ const saveEvent = async function (event: FullEvent, crawlerDescriptor: z.infer<t
           }
         }),
         ...event.talks.map(async talk => {
-          if(!ratingsTalkIds.includes(talk.id)) {
+          if(!ratingsTalkIds.includes(talk.id) && !talk.isOverflow) {
             await db.doc(`${resolvedEventFirestorePath(event.id, spaceToken)}/organizer-space/${organizerSecretToken}/ratings/${talk.id}`).create({})
           }
         })

cloud/functions/src/crawlers/crawl.ts

@@ -11,6 +11,9 @@ describe('openplanenr crawlers', () => {
       }, {
         id: 'sunnytech24', confName: `Sunny Tech '24`,
         descriptorUrl: `https://gist.githubusercontent.com/fcamblor/2b4cb4f3ee1f2861cfe2ebb434dc6c20/raw/sunnytech.json`
+      }, {
+        id: 'snowcamp25', confName: `Snowcamp '25`,
+        descriptorUrl: `https://gist.githubusercontent.com/schassande/83afc84a6d6bb78ebed9b77399ebf8b6/raw/voxxrin-snowcamp-2025.json`
       }
     ] as const;