merge main

Author: lassejaco

atproto-slurper/slurper/server.ts

@@ -528,7 +528,7 @@ app.get("/calendar-events", async (req, res) => {
     .from("atproto_records")
     .select(
       `
-      id, rkey, created_by, record_passed_review, is_core_event,
+      id, rkey, created_by, record_passed_review, is_core_event, admin_override, updated_at,
       atproto_dids!created_by(did, alias)
     `
     )
@@ -539,11 +539,66 @@ app.get("/calendar-events", async (req, res) => {
   if (error) {
     res.status(500).json({ error });
   } else {
-    res.json(data);
+    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: {
+          ...recordPassedReview,
+          ...rawEvent.admin_override,
+        },
+      };
+    });
+
+    res.json(formatted);
   }
 });
 
-app.get("/validate-event", async (req, res) => {
+app.post("/validate-event", async (req, res) => {
   const record = req.body.record;
 
   const { valid, error } = validateRecord(record);
@@ -565,9 +620,13 @@ app.post(
   verifySupabaseToken,
   async (req: express.Request, res: express.Response) => {
     try {
-      const eventData = req.body;
+      const { event: eventData, contact } = req.body;
+
+      console.log("Event data:", eventData, contact);
 
-      console.log("Event data:", eventData);
+      if (!contact) {
+        return res.status(400).json({ error: "No contact provided" });
+      }
 
       if (!eventData) {
         return res.status(400).json({ error: "No event data provided" });
@@ -595,6 +654,23 @@ app.post(
         rkey
       );
 
+      const { error: contactError } = await supabase
+        .from("atproto_records_contacts")
+        .upsert(
+          {
+            rkey,
+            email: contact,
+          },
+          { onConflict: "rkey" }
+        );
+
+      if (contactError) {
+        console.error(
+          "Error saving contact, but continuing anyway:",
+          contactError
+        );
+      }
+
       if (!result.success) {
         console.error("Error creating event:", result.error);
         return res.status(400).json({ error: result.error });

devcon-api/data/sessions/devcon-7/whats-in-your-dose.json

@@ -11,6 +11,7 @@ import { decryptFile } from '@/utils/encrypt'
 import { parseCSV } from '@/utils/files'
 import { ValidateTicketPod } from '@/utils/zupass'
 import { GenerateRandomUsername, GetEnsAddress, GetEnsAvatar, GetEnsName } from '@/utils/account'
+import { apikeyHandler } from '@/middleware/apikey'
 import dayjs from 'dayjs'
 
 const client = new PrismaClient()
@@ -32,6 +33,7 @@ accountRouter.get(`/account/speakers`, FollowedSpeakers)
 accountRouter.get(`/account/speakers/recommended`, RecommendedSpeakers)
 accountRouter.get(`/account/sessions`, FollowedSessions)
 accountRouter.get(`/account/sessions/recommended`, RecommendedSessions)
+accountRouter.post(`/account/accreditation/email`, apikeyHandler, SendAccreditationEmail)
 
 async function GetAccount(req: Request, res: Response) {
   // #swagger.tags = ['Account']
@@ -725,6 +727,47 @@ async function RecommendedSessions(req: Request, res: Response) {
   return res.status(200).send({ code: 200, message: '', data: sessions })
 }
 
+async function SendAccreditationEmail(req: Request, res: Response) {
+  // #swagger.ignore = true
+  // Private route: requires apiKey
+
+  const { email, name, accreditationLink } = req.body
+
+  if (!email || !name || !accreditationLink) {
+    return res.status(400).send({
+      code: 400,
+      message: 'Missing required fields: email, name, accreditationLink'
+    })
+  }
+
+  try {
+    // Import the email service
+    const { sendAccreditationConfirmationEmail } = await import('@/services/email')
+
+    // Send the accreditation confirmation email
+    const success = await sendAccreditationConfirmationEmail(email, name, accreditationLink)
+
+    if (success) {
+      return res.status(200).send({
+        code: 200,
+        message: 'Accreditation confirmation email sent successfully',
+        data: { email, name, accreditationLink }
+      })
+    } else {
+      return res.status(500).send({
+        code: 500,
+        message: 'Failed to send accreditation email'
+      })
+    }
+  } catch (error) {
+    console.error('Error in SendAccreditationEmail:', error)
+    return res.status(500).send({
+      code: 500,
+      message: 'Internal server error'
+    })
+  }
+}
+
 async function parseProfileData(attendeeEmail: string) {
   const normalizedEmail = attendeeEmail.toLowerCase()
 

devcon-api/src/controllers/account.ts

@@ -2,7 +2,7 @@ import nodemailer from 'nodemailer'
 import { SERVER_CONFIG } from '@/utils/config'
 import emailTemplates from './email-templates.json'
 
-type EmailTemplates = 'default-email' | 'email-cta'
+type EmailTemplates = 'default-email' | 'email-cta' | 'accreditation-confirmation'
 
 const transporter = nodemailer.createTransport({
   host: SERVER_CONFIG.SMTP_SERVICE,
@@ -22,6 +22,9 @@ export async function sendMail(to: string, template: EmailTemplates, subject: st
   if (template === 'email-cta') {
     text = replace(emailTemplates.ctaEmail.text.join('\n'), properties)
     html = replace(emailTemplates.ctaEmail.html, properties).replace(/(?:\r\n|\r|\n)/g, '<br>')
+  } else if (template === 'accreditation-confirmation') {
+    text = replace(emailTemplates.accreditationConfirmation.text.join('\n'), properties)
+    html = replace(emailTemplates.accreditationConfirmation.html, properties).replace(/(?:\r\n|\r|\n)/g, '<br>')
   }
 
   const response = await transporter.sendMail({
@@ -35,6 +38,25 @@ export async function sendMail(to: string, template: EmailTemplates, subject: st
   return response.accepted.length > 0
 }
 
+// Example usage for accreditation confirmation
+export async function sendAccreditationConfirmationEmail(
+  to: string,
+  name: string,
+  accreditationLink: string
+) {
+  const properties = {
+    Name: name,
+    AccreditationLink: accreditationLink
+  }
+
+  return sendMail(
+    to,
+    'accreditation-confirmation',
+    '🎉 Your Accreditation Has Been Confirmed!',
+    properties
+  )
+}
+
 function replace(template: string, data: any) {
   const pattern = /{%\s*(\w+?)\s*%}/g // {%property%}
   return template.replace(pattern, (_, token) => data[token] || '')

devcon-api/src/services/email-templates.json

@@ -1 +1 @@
-v2.33.9
+v2.39.2

devcon-api/src/services/email.ts

@@ -0,0 +1,4 @@
+CREATE TABLE atproto_records_contacts (
+    rkey TEXT PRIMARY KEY,
+    email TEXT NOT NULL
+);

devcon-api/src/supabase/.temp/cli-latest

@@ -0,0 +1,37 @@
+-- Create devconnect_app_user table
+CREATE TABLE devconnect_app_user (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    email TEXT NOT NULL,
+    addresses TEXT[] DEFAULT '{}',
+    additional_ticket_emails TEXT[] DEFAULT '{}',
+    favorite_events TEXT[] DEFAULT '{}',
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+-- Create index on email for faster lookups
+CREATE INDEX idx_devconnect_app_user_email ON devconnect_app_user(email);
+
+-- Add RLS (Row Level Security) policies
+ALTER TABLE devconnect_app_user ENABLE ROW LEVEL SECURITY;
+
+-- Policy: Users can perform all operations on their own rows (where email matches)
+CREATE POLICY "Users can manage their own data" 
+ON devconnect_app_user 
+FOR ALL 
+USING (email = auth.email()) 
+WITH CHECK (email = auth.email());
+
+-- Create updated_at trigger
+CREATE OR REPLACE FUNCTION update_updated_at_column()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = NOW();
+    RETURN NEW;
+END;
+$$ language 'plpgsql';
+
+CREATE TRIGGER update_devconnect_app_user_updated_at 
+    BEFORE UPDATE ON devconnect_app_user 
+    FOR EACH ROW 
+    EXECUTE FUNCTION update_updated_at_column();

devcon-api/src/supabase/migrations/20250826092208_add-contact-field.sql

@@ -0,0 +1,5 @@
+ALTER TABLE atproto_records 
+ADD COLUMN admin_override JSONB;
+
+-- Add comment for documentation
+COMMENT ON COLUMN atproto_records.admin_override IS 'JSON blob of admin override data';

devcon-api/src/supabase/migrations/20250827182344_app_user.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';