first version

Author: lassejaco

atproto-slurper/example/create-event.ts

@@ -3,7 +3,11 @@ import dotenv from "dotenv";
 
 dotenv.config();
 
-const createEventBluesky = async (username: string, password: string) => {
+const createEventBluesky = async (
+  record: any,
+  username: string,
+  password: string
+) => {
   try {
     // Initialize the agent with Bluesky PDS service
     const agent = new BskyAgent({
@@ -16,20 +20,10 @@ const createEventBluesky = async (username: string, password: string) => {
       throw new Error("No session found");
     }
 
-    // This is your event
-    const record = {
-      title: "Example Devconnect Event",
-      start: "2026-01-01T00:00:00Z",
-      end: "2026-01-02T00:00:00Z",
-      description: "This is an example Devcon/nect event",
-      location: "Devcon/nect",
-      url: "https://devconnect.org",
-    };
-
     const result = await agent.api.com.atproto.repo.putRecord({
       repo: agent.session.did,
       // Your record must adhere to this schema:
-      collection: "org.devcon.event.test",
+      collection: "org.devcon.event.vone",
       // Record key - this is effectively the id of your record - it can be whatever you want, as long as it's unique per event
       // Sidenote: to update the record, you can use the same rkey and it will update the existing record.
       rkey: record.title.toLowerCase().replace(/ /g, "-"),
@@ -45,6 +39,7 @@ const createEventBluesky = async (username: string, password: string) => {
 // If you have a custom PDS, you can use this function to create an event - make sure the pds is connected to the atproto network, or it won't be crawlable
 // It is easier to use the createEventBluesky function
 const createEvent = async (
+  record: any,
   username: string,
   password: string,
   pdsService: string
@@ -74,7 +69,7 @@ const createEvent = async (
     const result = await agent.api.com.atproto.repo.putRecord({
       repo: agent.session.did,
       // Your record must adhere to this schema:
-      collection: "org.devcon.event.test",
+      collection: "org.devcon.event.vone",
       // Record key - this is effectively the id of your record - it can be whatever you want, as long as it's unique per event
       // Sidenote: to update the record, you can use the same rkey and it will update the existing record.
       rkey: record.title.toLowerCase().replace(/ /g, "-"),
@@ -90,13 +85,25 @@ const createEvent = async (
 (async () => {
   // const customPDS = "https://dcdev4.ticketh.xyz";
 
+  // This is your event
+  const record = {
+    title: "Example Devconnect Event",
+    start: "2026-01-01T00:00:00Z",
+    end: "2026-01-02T00:00:00Z",
+    description: "This is an example Devcon/nect event",
+    location: "Devcon/nect",
+    url: "https://devconnect.org",
+  };
+
   // const customResult = await createEvent(
-  //   process.env.HANDLE || "lasse.dcdev4.ticketh.xyz", // Your custom pds handle
+  //   record,
+  //   process.env.HANDLE || "", // Your custom pds handle
   //   process.env.PASSWORD || "", // Your custom pds password
   //   customPDS // Your custom PDS
   // );
 
   const blueskyResult = await createEventBluesky(
+    record,
     process.env.BLUESKY_HANDLE!,
     process.env.BLUESKY_PASSWORD!
   );

atproto-slurper/slurper/atproto.ts

@@ -189,6 +189,30 @@ const api = (() => {
     }
   };
 
+  const removeSchema = async (
+    serviceEndpoint: string,
+    username: string,
+    password: string,
+    rkey: string
+  ) => {
+    const { BskyAgent } = require("@atproto/api");
+
+    const agent = new BskyAgent({
+      service: serviceEndpoint,
+    });
+
+    // Log in with credentials
+    await agent.login({ identifier: username, password });
+
+    const response = await agent.com.atproto.repo.deleteRecord({
+      repo: agent.session.did,
+      collection: "com.atproto.lexicon.schema",
+      rkey: rkey,
+    });
+
+    return response;
+  };
+
   const addSchema = async (
     serviceEndpoint: string,
     username: string,
@@ -208,7 +232,7 @@ const api = (() => {
       repo: agent.session.did,
       // $ nslookup -type=TXT _lexicon.lexicon.atproto.com
       collection: "com.atproto.lexicon.schema",
-      rkey: "org.devcon.event.v1",
+      rkey: "org.devcon.event.vone",
       record: schema,
     });
 
@@ -232,7 +256,7 @@ const api = (() => {
 
       const response = await agent.com.atproto.repo.putRecord({
         repo: agent.session.did,
-        collection: "org.devcon.event.v1",
+        collection: "org.devcon.event.vone",
         rkey: record.title.toLowerCase().replace(/ /g, "-"),
         record,
       });
@@ -247,10 +271,21 @@ const api = (() => {
     addSchema: async () => {
       const result = await addSchema(
         "https://bsky.social",
-        process.env.AT_USERNAME!,
-        process.env.AT_PASSWORD!,
+        process.env.BLUESKY_HANDLE!,
+        process.env.BLUESKY_PASSWORD!,
         schema
       );
+
+      return result;
+    },
+    removeSchema: async () => {
+      const result = await removeSchema(
+        "https://bsky.social",
+        process.env.BLUESKY_HANDLE!,
+        process.env.BLUESKY_PASSWORD!,
+        "org.devcon.event.v1"
+      );
+
       return result;
     },
     test: async () => {

atproto-slurper/slurper/schema.ts

@@ -1,9 +1,7 @@
-import { LexiconDoc } from "@atproto/lexicon";
-
 export const schema = {
   lexicon: 1,
   $type: "com.atproto.lexicon.schema",
-  id: "org.devcon.event.v1",
+  id: "org.devcon.event.vone",
   defs: {
     main: {
       type: "record",
@@ -197,7 +195,7 @@ export const schema = {
 };
 
 export const dummyEvent = {
-  $type: "org.devcon.event.v1",
+  $type: "org.devcon.event.vone",
   start_utc: "2024-03-20T10:00:00Z",
   end_utc: "2024-03-20T12:00:00Z",
   title: "My Event",

atproto-slurper/slurper/server.ts

@@ -4,7 +4,7 @@ import { createClient } from "@supabase/supabase-js";
 import dotenv from "dotenv";
 import WebSocket from "ws";
 import validateRecord from "./validate";
-import { dummyEvent } from "./schema";
+import { dummyEvent, schema } from "./schema";
 import { api } from "./atproto";
 
 dotenv.config();
@@ -18,16 +18,10 @@ const supabase = createClient(
   process.env.SUPABASE_KEY!
 );
 
-// Initialize BskyAgent
-const agent = new BskyAgent({
-  service: "https://bsky.social",
-});
-
 // Target lexicon details
-const LEXICON_DID = "did:plc:dhnigydy24fp542wu5sxqy33"; // devcon did
-const COLLECTION_NAME = "org.devcon.event.test";
-const LEXICON_NSID = "com.atproto.lexicon.schema/org.devcon.event.test";
-const FULL_LEXICON_URI = `${LEXICON_DID}/${LEXICON_NSID}`;
+// const LEXICON_DID = "did:plc:dhnigydy24fp542wu5sxqy33"; // devcon did
+const COLLECTION_NAME = "org.devcon.event.vone";
+// const LEXICON_NSID = "com.atproto.lexicon.schema/org.devcon.event.vone";
 
 // Store cursor in memory and sync with Supabase
 let currentCursor: string | undefined;
@@ -108,12 +102,12 @@ async function startFirehose() {
 
     // Subtract a buffer (5 seconds worth of microseconds) to ensure gapless playback
     let cursorForConnection = cursor;
-    // if (cursorForConnection) {
-    //   const cursorValue = BigInt(cursorForConnection);
-    //   const fiveSecondsInMicroseconds = BigInt(5 * 1000 * 1000);
-    //   cursorForConnection = String(cursorValue - fiveSecondsInMicroseconds);
-    //   console.log("Using cursor with 5 second buffer:", cursorForConnection);
-    // }
+    if (cursorForConnection) {
+      const cursorValue = BigInt(cursorForConnection);
+      const fiveSecondsInMicroseconds = BigInt(5 * 1000 * 1000);
+      cursorForConnection = String(cursorValue - fiveSecondsInMicroseconds);
+      console.log("Using cursor with 5 second buffer:", cursorForConnection);
+    }
 
     // Add cursor as a query parameter if it exists
     const wsUrl = cursorForConnection
@@ -267,37 +261,18 @@ app.get("/all-events", async (req, res) => {
   const { data, error } = await supabase
     .from("atproto-events")
     .select("did, record");
-  res.json(data);
-});
-
-app.get("/validate-event", async (req, res) => {
-  // const record = req.body.record;
-
-  const { valid, error } = validateRecord(dummyEvent);
 
-  if (valid) {
-    res.status(200).json({ valid: true });
-  } else {
-    res.status(400).json({ valid: false, error });
-  }
-});
-
-app.get("/submit-event", async (req, res) => {
-  const { valid, error } = validateRecord(req.body);
-
-  res.json({ valid, error });
-
-  if (valid) {
-    res.status(200).json({ valid: true });
+  if (error) {
+    res.status(500).json({ error });
   } else {
-    res.status(400).json({ valid: false, error });
+    res.json(data);
   }
 });
 
-app.get("/submit-event-to-devcon-pds", async (req, res) => {
-  const { valid, error } = validateRecord(req.body);
+app.get("/validate-event", async (req, res) => {
+  const record = req.body.record;
 
-  res.json({ valid, error });
+  const { valid, error } = validateRecord(record);
 
   if (valid) {
     res.status(200).json({ valid: true });
@@ -306,42 +281,9 @@ app.get("/submit-event-to-devcon-pds", async (req, res) => {
   }
 });
 
-// app.get("/add-record-to-devcon-pds", async (req, res) => {
-//   const { valid, error } = validateRecord(req.body);
-
-//   if (valid) {
-//     const result = await api.addRecordToDevconPds(
-//       "https://bsky.social",
-//       process.env.AT_USERNAME!,
-//       process.env.AT_PASSWORD!,
-//       req.body
-//     );
-
-//     res.json({ valid, error });
-//   }
-// });
-
-// app.get("/add-schema", async (req, res) => {
-//   if (valid) {
-//     res.status(200).json({ valid: true });
-//   } else {
-//     res.status(400).json({ valid: false, error });
-//   }
-// });
-
 // Start the server
 app.listen(port, () => {
   console.log(`Server running on port ${port}`);
-  // startFirehose();
 
-  const result = validateRecord(dummyEvent);
-  console.log(result);
+  startFirehose();
 });
-
-/*
-  TODO: 
-    - frontend to submit events
-    - update schema to v1
-    - update validate to v1
-    - 
-*/

atproto-slurper/slurper/validate.ts

@@ -11,7 +11,10 @@ lexicons.add(schema as any);
 const validateRecord = (record: any) => {
   try {
     // This will use the same validation logic as the PDS
-    lexicons.assertValidRecord("org.devcon.event.v1", record.record || record);
+    lexicons.assertValidRecord(
+      "org.devcon.event.vone",
+      record.record || record
+    );
     return { valid: true };
   } catch (error) {
     console.log(error);

devconnect/src/pages/dashboard.tsx

@@ -1,8 +1,44 @@
 import React, { useEffect, useState } from 'react'
 import { SEO } from 'common/components/SEO'
-import { Header, Footer } from './index'
 import Head from 'next/head'
 import { supabase } from 'common/supabaseClient'
+import NewSchedule from 'lib/components/event-schedule-new'
+
+const formatATProtoEvent = (atprotoEvent: any) => {
+  // Map timeslots to timeblocks, or fallback to main event time
+  let timeblocks: any[] = []
+  if (Array.isArray(atprotoEvent.timeslots) && atprotoEvent.timeslots.length > 0) {
+    timeblocks = atprotoEvent.timeslots.map((slot: any) => ({
+      start: slot.start_utc,
+      end: slot.end_utc,
+      name: slot.title || undefined,
+    }))
+  } else if (atprotoEvent.start_utc && atprotoEvent.end_utc) {
+    timeblocks = [
+      {
+        start: atprotoEvent.start_utc,
+        end: atprotoEvent.end_utc,
+        name: atprotoEvent.title,
+      },
+    ]
+  }
+
+  return {
+    id: atprotoEvent.id,
+    name: atprotoEvent.title,
+    description: atprotoEvent.description,
+    organizer: atprotoEvent.organizer?.name,
+    difficulty: atprotoEvent.metadata?.expertise_level || 'All Welcome',
+    location: {
+      url: atprotoEvent.metadata?.website || '',
+      text: atprotoEvent.location?.name || '',
+    },
+    timeblocks,
+    priority: atprotoEvent.metadata?.priority || 1,
+    categories: atprotoEvent.metadata?.categories || [],
+    amountPeople: atprotoEvent.metadata?.capacity !== undefined ? String(atprotoEvent.metadata.capacity) : undefined,
+  }
+}
 
 const AdminPage = () => {
   const [user, setUser] = useState<any>(null)
@@ -51,8 +87,6 @@ const AdminPage = () => {
     }
   }, [user])
 
-  console.log(events, 'events')
-
   const handleMagicLink = async (e: React.FormEvent) => {
     e.preventDefault()
     setLoading(true)
@@ -94,6 +128,8 @@ const AdminPage = () => {
     setEventsLoading(false)
   }
 
+  const formattedEvents = events.map(formatATProtoEvent)
+
   return (
     <>
       <SEO title="Admin" description="Admin dashboard for Devconnect" />
@@ -195,6 +231,14 @@ const AdminPage = () => {
             {message && <p style={{ marginTop: 12, color: '#0070f3' }}>{message}</p>}
           </>
         )}
+
+        <NewSchedule
+          events={formattedEvents}
+          selectedEvent={null}
+          selectedDay={null}
+          setSelectedEvent={() => {}}
+          setSelectedDay={() => {}}
+        />
       </main>
       {/* <Footer /> */}
     </>