form time inconsistency triage

Author: lassejaco

atproto-slurper/slurper/server.ts

@@ -540,10 +540,55 @@ app.get("/calendar-events", async (req, res) => {
     res.status(500).json({ error });
   } else {
     const formatted = data?.map((rawEvent) => {
+      let recordPassedReview = rawEvent.record_passed_review
+      // const devconnectFormSubmissionsDid = 'did:plc:l26dgtpir4fydulvmuoee2sn'
+      // // @ts-ignore
+      // const currentDid = rawEvent.atproto_dids.did 
+
+      // const isDevconnectFormSubmission = currentDid === devconnectFormSubmissionsDid
+
+      // // Helper function to convert Argentina time to UTC (subtract 3 hours)
+      // const convertArgentinaToUtc = (timestamp: string) => {
+      //   const date = new Date(timestamp);
+      //   date.setHours(date.getHours() - 3);
+      //   return date.toISOString();
+      // }
+
+      // const tmpFixTimezone = (event: any) => {
+      //   // If event is from Devconnect submission form, then convert from Argentina time back to UTC time (subtract 3 hours)
+      //   // This is because the form is UTC, but people have been entering the time in Argentina time, and so this is now the de facto standard
+      //   // Had to change the form to not say UTC as well, which is unfortunate - anyway, the fix for now is to convert from Argentina time back to UTC time for events through the form - this needs to be fixed for future editions if we still use atprotocol.
+      //   let fixedEvent = event
+        
+      //   if (isDevconnectFormSubmission) {
+      //     if (event.timeblocks) {
+      //       fixedEvent.timeblocks = event.timeblocks.map((timeblock: any) => {
+      //         timeblock.start_utc = convertArgentinaToUtc(timeblock.start_utc)
+      //         timeblock.end_utc = convertArgentinaToUtc(timeblock.end_utc)
+      //         return timeblock
+      //       })
+      //     }
+
+      //     if (fixedEvent.start_utc) {
+      //       fixedEvent.start_utc = convertArgentinaToUtc(fixedEvent.start_utc)
+      //     }
+      //     if (fixedEvent.end_utc) {
+      //       fixedEvent.end_utc = convertArgentinaToUtc(fixedEvent.end_utc)
+      //     }
+
+      //     return fixedEvent
+      //   }
+
+      //   return event
+      // }
+
+      // // Apply timezone fix
+      // const fixedRecord = tmpFixTimezone(recordPassedReview);
+
       return {
         ...rawEvent,
         record_passed_review: {
-          ...rawEvent.record_passed_review,
+          ...recordPassedReview,
           ...rawEvent.admin_override,
         },
       };

devcon-api/src/supabase/migrations/20250903105359_priority.sql

@@ -0,0 +1,5 @@
+ALTER TABLE atproto_records 
+ADD COLUMN priority INTEGER DEFAULT 0;
+
+-- Add comment for documentation
+COMMENT ON COLUMN atproto_records.priority IS 'Priority of the event on the calendar';

devconnect/next.config.js

@@ -51,6 +51,12 @@ module.exports = {
       'www.gravatar.com',
       'mealmslwugsqqyoesrxd.supabase.co',
     ],
+    remotePatterns: [
+      {
+        protocol: 'https',
+        hostname: '*',
+      },
+    ],
   },
   webpack: (config, { webpack, isServer }) => {
     const artifactPackageJsonPath = require.resolve('@pcd/proto-pod-gpc-artifacts/package.json')

devconnect/src/pages/calendar.tsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { useCalendarStore } from 'store/calendar'
-import { Client } from '@notionhq/client'
 import { Footer, Header, withTranslations } from 'pages/index'
 import { client } from '../../tina/__generated__/client'
 import { useTina } from 'tinacms/dist/react'
@@ -14,29 +13,13 @@ import RichText from 'lib/components/tina-cms/RichText'
 import { CMSButtons } from 'common/components/voxel-button/button'
 import CalendarLayout from 'lib/components/event-schedule-new/layout'
 import { Separator } from 'lib/components/ui/separator'
-import { record } from 'zod'
-import { makeConsoleLogger } from '@notionhq/client/build/src/logging'
+import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format'
 
 const Argentina = (props: any) => {
   const { selectedEvent, selectedDay, setSelectedEvent, setSelectedDay } = useCalendarStore()
   const { data }: { data: any } = useTina(props.content)
 
   const events = props.events
-  // const events = props.events.map((event: any) => {
-  //   const overrides = {} as any
-
-  //   if (event.id === '1f5638cd-c415-809b-8fbd-ec8c4ba7f5b9') {
-  //     overrides.name = 'ETH Day'
-  //     overrides.isFairEvent = true
-  //     overrides.spanRows = 3
-  //   }
-
-  //   return {
-  //     ...event,
-  //     ...overrides,
-  //     onClick: () => {},
-  //   }
-  // })
 
   return (
     <>
@@ -82,41 +65,11 @@ const Argentina = (props: any) => {
         />
 
         <div className="section mb-8 mt-12">
-          {/* <div className="text-center text-lg">
-            Stay tuned for details on how to submit your event to the calendar - we will be accepting submissions very
-            soon!
-          </div> */}
           <div className="grid grid-cols-1 md:grid-cols-2 gap-12 my-4 bg-[rgba(116,172,223,0.1)] p-4 md:p-12">
             <RichText content={data.pages.calendar_how_to_apply} Buttons={CMSButtons} />
             <RichText content={data.pages.calendar_community_calendar} Buttons={CMSButtons} />
           </div>
         </div>
-
-        {/* <div className="text-sm flex flex-col gap-4">
-          <p>
-            <strong>Disclaimer:</strong> This calendar is a work in progress and may change a lot before Devconnect
-            week. Please check back regularly for updates.
-          </p>
-          <div>
-            <p>
-              <strong>Want to be featured on our calendar?</strong> We encourage event hosts to submit their events to
-              atprotocol adhering to the [devcon.org event record type].{' '}
-              <strong>This is not a guarantee of inclusion as we still curate events,</strong> but is a{' '}
-              <strong>requirement</strong> for community events to be considered on our calendar.
-            </p>
-            <p>
-              <strong>How do I submit my event to atprotocol?</strong> ...
-            </p>
-          </div>
-          <p>
-            <strong>Want to build a community calendar? </strong> For your convenience, we collect all events submitted
-            to atprotocol and expose them via{' '}
-            <Link indicateExternal className="bold" href="https://at-slurper.onrender.com/all-events">
-              https://at-slurper.onrender.com/all-events
-            </Link>
-            . You can also use atprotocol directly, as all data is public.
-          </p>
-        </div> */}
       </div>
 
       <Footer />
@@ -130,165 +83,14 @@ export async function getStaticProps({ locale }: { locale: string }) {
   const translationPath = locale === 'en' ? 'global.json' : locale + '/global.json'
   const translations = await client.queries.global_translations({ relativePath: translationPath })
 
-  //www.notion.so/ef-events/1f5638cdc41580be9117f4963f021d8b?v=1f5638cdc415816c9277000ccc6cda85&pvs=4
-
-  const notion = new Client({
-    auth: process.env.NOTION_SECRET,
-  })
-
-  const query = {
-    database_id: '1f5638cdc41580be9117f4963f021d8b',
-    sorts: [
-      {
-        property: 'Requested event date',
-        direction: 'ascending',
-      },
-      // {
-      //   property: '[WEB] Priority (sort)',
-      //   direction: 'descending',
-      // },
-    ],
-    filter: {
-      and: [
-        {
-          property: 'Requested event date',
-          date: {
-            is_not_empty: true,
-          },
-        },
-        {
-          property: 'Live in Website',
-          checkbox: {
-            equals: true,
-          },
-        },
-      ],
-    },
-  }
-
-  let notionEvents: any = { results: [] }
-
-  try {
-    notionEvents = await notion.databases.query(query as any)
-  } catch (error) {
-    console.error('Failed to fetch events from Notion:', error)
-    // Continue with empty events array if Notion API fails
-  }
-
-  /*
-export interface Event {
-  id: string;
-  name: string;
-  isFairEvent?: boolean;
-  isCoreEvent?: boolean;
-  description: string;
-  organizer: string;
-  difficulty: string;
-  amountPeople?: string;
-  location: {
-    url: string;
-    text: string;
-    coordinates?: {
-      lat: number;
-      lng: number;
-    };
-  };
-  timeblocks: {
-    start: string;
-    end: string;   
-    name?: string;
-    location?: string;
-  }[];
-  priority: number;
-  categories: string[];
-}
-
-  */
-
-  // console.log(notionEvents)
-
   const atprotoEvents = await fetch(
     process.env.NODE_ENV === 'development'
       ? 'http://localhost:4000/calendar-events'
       : 'https://at-slurper.onrender.com/calendar-events'
   )
   const atprotoEventsData = await atprotoEvents.json()
-  // console.log(atprotoEventsData)
-
-  const formattedAtprotoEvents = atprotoEventsData.map((event: any) => {
-    const record = event.record_passed_review
-
-    const timeblocks = []
-
-    if (record.start_utc) {
-      let startDate = moment.utc(record.start_utc)
-      let endDate
-
-      if (record.end_utc) {
-        endDate = moment.utc(record.end_utc).format('YYYY-MM-DDTHH:mm:ss[Z]')
-      } else {
-        endDate = startDate.format('YYYY-MM-DDTHH:mm:ss[Z]')
-      }
-
-      timeblocks.push({
-        start: startDate.format('YYYY-MM-DDTHH:mm:ss[Z]'),
-        end: endDate,
-      })
-    }
-
-    const manualOverrides = {} as any
-
-    return {
-      id: event.id,
-      name: record.title,
-      description: record.description,
-      startDate: record.start_utc,
-      endDate: record.end_utc,
-      location: record.location.name,
-      difficulty: record.expertise,
-      organizer: record.organizer.name,
-      timeblocks: timeblocks,
-      eventType: record.event_type,
-      isCoreEvent: event.is_core_event || false,
-      eventLink: record.main_url,
-      ...manualOverrides,
-    }
-  })
-
-  // const events = notionEvents.results.map((event: any) => {
-  //   const formattedEvent = formatResult(event)
-
-  //   const timeblocks = []
-
-  //   if (formattedEvent['Requested event date']) {
-  //     let startDate = moment.utc(formattedEvent['Requested event date'].startDate)
-  //     let endDate
-
-  //     if (formattedEvent['Requested event date'].endDate) {
-  //       endDate = moment.utc(formattedEvent['Requested event date'].endDate).format('YYYY-MM-DDTHH:mm:ss[Z]')
-  //     } else {
-  //       endDate = startDate.format('YYYY-MM-DDTHH:mm:ss[Z]')
-  //     }
-
-  //     timeblocks.push({
-  //       start: startDate.format('YYYY-MM-DDTHH:mm:ss[Z]'),
-  //       end: endDate,
-  //     })
-  //   }
 
-  //   return {
-  //     id: event.id,
-  //     name: formattedEvent['Event name'] || '',
-  //     description: formattedEvent['Description'] || '',
-  //     capacity: formattedEvent['Capacity'] || '',
-  //     startDate: formattedEvent['Requested event date'],
-  //     // size: formattedEvent['Size'],
-  //     location: formattedEvent['Location'] || { text: 'TBD', url: '' },
-  //     timeblocks: timeblocks,
-  //     difficulty: 'Beginner',
-  //     organizer: formattedEvent['Organization'] || '',
-  //   }
-  // })
+  const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData)
 
   return {
     props: {