+
diff --git a/src/lib/cards/social/UpcomingRsvpsCard/index.ts b/src/lib/cards/social/UpcomingRsvpsCard/index.ts
new file mode 100644
index 00000000..a663dfa1
--- /dev/null
+++ b/src/lib/cards/social/UpcomingRsvpsCard/index.ts
@@ -0,0 +1,41 @@
+import { fetchUserRsvps } from '$lib/events/fetch-attendees';
+import type { CardDefinition } from '../../types';
+import UpcomingRsvpsCard from './UpcomingRsvpsCard.svelte';
+import type { ResolvedRsvp } from '$lib/events/fetch-attendees';
+
+export type { ResolvedRsvp };
+
+export const UpcomingRsvpsCardDefinition = {
+ type: 'upcomingRsvps',
+ contentComponent: UpcomingRsvpsCard,
+ createNew: (card) => {
+ card.w = 4;
+ card.h = 4;
+ card.mobileW = 8;
+ card.mobileH = 6;
+ },
+ minW: 2,
+ minH: 3,
+
+ loadData: async (_items, { did, cache }) => {
+ const rsvps = await fetchUserRsvps(did, cache);
+
+ const now = new Date();
+ const upcoming = rsvps.filter((r) => {
+ const endsAt = r.event.endsAt ? new Date(r.event.endsAt) : null;
+ const startsAt = new Date(r.event.startsAt);
+ return (endsAt && endsAt >= now) || (!endsAt && startsAt >= now);
+ });
+
+ upcoming.sort(
+ (a, b) => new Date(a.event.startsAt).getTime() - new Date(b.event.startsAt).getTime()
+ );
+
+ return { rsvps: upcoming };
+ },
+
+ name: 'Upcoming RSVPs',
+ keywords: ['rsvp', 'attending', 'going', 'interested', 'events'],
+ groups: ['Social'],
+ icon: ``
+} as CardDefinition & { type: 'upcomingRsvps' };
diff --git a/src/lib/events/fetch-attendees.ts b/src/lib/events/fetch-attendees.ts
index 495ba3be..7be55de3 100644
--- a/src/lib/events/fetch-attendees.ts
+++ b/src/lib/events/fetch-attendees.ts
@@ -1,9 +1,19 @@
-import { getBlentoOrBskyProfile, parseUri } from '$lib/atproto/methods';
+import { getBlentoOrBskyProfile, getRecord, listRecords, parseUri } from '$lib/atproto/methods';
import type { CacheService, CachedProfile } from '$lib/cache';
+import type { EventData } from '$lib/cards/social/EventCard';
import type { Did } from '@atcute/lexicons';
export type RsvpStatus = 'going' | 'interested';
+export interface ResolvedRsvp {
+ event: EventData;
+ rkey: string;
+ hostDid: string;
+ hostProfile: CachedProfile | null;
+ status: 'going' | 'interested';
+ eventUri: string;
+}
+
/**
* Fetch raw RSVP data for an event from Microcosm Constellation backlinks.
* Returns a map of DID -> status (going/interested).
@@ -106,3 +116,65 @@ export function getProfileUrl(did: string, profile?: CachedProfile | null): stri
const handle = profile?.handle;
return handle ? `https://bsky.app/profile/${handle}` : `https://bsky.app/profile/${did}`;
}
+
+interface RsvpRecord {
+ $type: string;
+ status: string;
+ subject: { uri: string; cid?: string };
+ createdAt: string;
+}
+
+/**
+ * Fetch a user's RSVPs (going/interested) and resolve each referenced event + host profile.
+ */
+export async function fetchUserRsvps(
+ did: string,
+ cache?: CacheService | null
+): Promise
+
+
+
+
+
+ RSVPs
+
+ {#if rsvps.length > 0}
+
+
+ {#each rsvps as rsvp (rsvp.eventUri)}
+
+
+ {:else if isLoaded}
+
+ {rsvp.event.name}
+
+ {rsvp.status === 'going' ? 'Going' : 'Interested'}
+
+
+
+
+ {formatDate(rsvp.event.startsAt)} at {formatTime(rsvp.event.startsAt)}
+
+ {#if rsvp.hostProfile}
+
+
+ {rsvp.hostProfile.displayName || rsvp.hostProfile.handle}
+
+ {/if}
+
+ {/each}
+
+ No upcoming RSVPs
+
+ {:else}
+
+ Loading RSVPs...
+
+ {/if}
+ - Upcoming events + {showPast ? 'Past' : 'Upcoming'} events
Hosted by
@@ -111,26 +122,54 @@
+ {#if isOwner}
+
+ {/if}
{
+ const calendarUrl = `${page.url.origin}${page.url.pathname.replace(/\/$/, '')}/calendar`;
+ await navigator.clipboard.writeText(calendarUrl);
+ toast.success('Subscription link copied to clipboard');
+ }}>Subscribe
- {/if}
+
+
+
+
- {#if events.length === 0}
- No events found.
+ {#if filteredEvents.length === 0} ++ No {showPast ? 'past' : 'upcoming'} events. +
{:else}
- {#each events as event (event.rkey)}
+ {#each filteredEvents as event (event.rkey)}
{@const thumbnail = getThumbnail(event)}
{@const location = getLocationString(event.locations)}
{@const rkey = event.rkey}
diff --git a/src/routes/[[actor=actor]]/events/[rkey]/+page.svelte b/src/routes/[[actor=actor]]/events/[rkey]/+page.svelte
index ddc9d0cc..1d9ae3f1 100644
--- a/src/routes/[[actor=actor]]/events/[rkey]/+page.svelte
+++ b/src/routes/[[actor=actor]]/events/[rkey]/+page.svelte
@@ -217,7 +217,7 @@
{#if !isBannerOnly}
@@ -245,7 +245,7 @@
{/if}
-
+
{/if}
-
- ()
- );
- const attendees: ICalAttendee[] = [];
- await Promise.all(
- Array.from(rsvpMap.entries()).map(async ([attendeeDid, status]) => {
- const profile = await resolveProfile(attendeeDid, cache).catch(() => null);
- attendees.push({
- name: profile?.handle || attendeeDid,
- status,
- url: getProfileUrl(attendeeDid, profile)
- });
- })
- );
-
- return {
- eventData,
- uid: rsvp.subject.uri,
- url: `https://blento.app/${actor}/events/${parsed.rkey}`,
- organizer: actor,
- imageUrl,
- attendees
- } satisfies ICalEvent;
- } catch {
- return null;
- }
- })
- );
-
- const events: ICalEvent[] = eventResults.filter((e) => e !== null);
-
- const actor = hostProfile?.handle || did;
- const calendarName = `${hostProfile?.displayName || actor}'s RSVP Events`;
- const ical = generateICalFeed(events, calendarName);
-
- // Store in cache
- if (cache) {
- await cache.put('ical', cacheKey, ical).catch(() => {});
- }
-
- return new Response(ical, {
- headers: {
- 'Content-Type': 'text/calendar; charset=utf-8',
- 'Cache-Control': 'public, max-age=3600'
- }
- });
- } catch (e) {
- if (e && typeof e === 'object' && 'status' in e) throw e;
- throw error(500, 'Failed to generate calendar');
- }
-}
diff --git a/src/routes/[[actor=actor]]/rsvp/+layout.server.ts b/src/routes/[[actor=actor]]/rsvp/+layout.server.ts
new file mode 100644
index 00000000..5a88b2b4
--- /dev/null
+++ b/src/routes/[[actor=actor]]/rsvp/+layout.server.ts
@@ -0,0 +1,28 @@
+import { getRecord } from '$lib/atproto/methods.js';
+import type { Did } from '@atcute/lexicons';
+import { getActor } from '$lib/actor.js';
+
+export async function load({ params, platform, request }) {
+ const did = await getActor({ request, paramActor: params.actor, platform });
+
+ if (!did) return { accentColor: undefined, baseColor: undefined };
+
+ try {
+ const publication = await getRecord({
+ did: did as Did,
+ collection: 'site.standard.publication',
+ rkey: 'blento.self'
+ });
+
+ const preferences = publication?.value?.preferences as
+ | { accentColor?: string; baseColor?: string }
+ | undefined;
+
+ return {
+ accentColor: preferences?.accentColor,
+ baseColor: preferences?.baseColor
+ };
+ } catch {
+ return { accentColor: undefined, baseColor: undefined };
+ }
+}
diff --git a/src/routes/[[actor=actor]]/rsvp/+layout.svelte b/src/routes/[[actor=actor]]/rsvp/+layout.svelte
new file mode 100644
index 00000000..ea1c6fce
--- /dev/null
+++ b/src/routes/[[actor=actor]]/rsvp/+layout.svelte
@@ -0,0 +1,9 @@
+
+
+
+ {userName} - RSVPs
+
+
+
+
+
+
+
+
+()
+ );
+ const attendees: ICalAttendee[] = [];
+ await Promise.all(
+ Array.from(rsvpMap.entries()).map(async ([attendeeDid, status]) => {
+ const profile = await resolveProfile(attendeeDid, cache).catch(() => null);
+ attendees.push({
+ name: profile?.handle || attendeeDid,
+ status,
+ url: getProfileUrl(attendeeDid, profile)
+ });
+ })
+ );
+
+ return {
+ eventData: rsvp.event,
+ uid: rsvp.eventUri,
+ url: `https://blento.app/${actor}/events/${rsvp.rkey}`,
+ organizer: actor,
+ imageUrl,
+ attendees
+ } satisfies ICalEvent;
+ } catch {
+ return null;
+ }
+ })
+ )
+ ).filter((e) => e !== null);
+
+ const actor = userProfile?.handle || did;
+ const calendarName = `${userProfile?.displayName || actor}'s RSVP Events`;
+ const ical = generateICalFeed(events, calendarName);
+
+ // Store in cache
+ if (cache) {
+ await cache.put('ical', cacheKey, ical).catch(() => {});
+ }
+
+ return new Response(ical, {
+ headers: {
+ 'Content-Type': 'text/calendar; charset=utf-8',
+ 'Cache-Control': 'public, max-age=3600'
+ }
+ });
+ } catch (e) {
+ if (e && typeof e === 'object' && 'status' in e) throw e;
+ throw error(500, 'Failed to generate calendar');
+ }
+}
{eventData.name} @@ -337,76 +337,77 @@ > About -
+
{@html descriptionHtml}
-
-
- {#if eventData.uris && eventData.uris.length > 0}
-
- - Hosted By -
- -
+
+ e.preventDefault()} class="p-0">
+ e.preventDefault()}
+ class="p-0"
+>
{/if}
diff --git a/src/routes/[[actor=actor]]/events/api/refresh/+server.ts b/src/routes/[[actor=actor]]/events/api/refresh/+server.ts
new file mode 100644
index 00000000..d571444c
--- /dev/null
+++ b/src/routes/[[actor=actor]]/events/api/refresh/+server.ts
@@ -0,0 +1,47 @@
+import { createCache } from '$lib/cache';
+import { error, json } from '@sveltejs/kit';
+import { getActor } from '$lib/actor';
+import { listRecords } from '$lib/atproto/methods.js';
+import type { EventData } from '$lib/cards/social/EventCard';
+import type { Did } from '@atcute/lexicons';
+
+export async function GET({ params, platform, request }) {
+ const cache = createCache(platform);
+ if (!cache) return json('no cache');
+
+ const did = await getActor({ request, paramActor: params.actor, platform, blockBoth: false });
+
+ if (!did) {
+ throw error(404, 'Not found');
+ }
+
+ // Delete stale caches
+ await Promise.all([cache.delete('events', did), cache.delete('ical', `${did}:calendar`)]).catch(
+ () => {}
+ );
+
+ // Re-fetch and cache
+ const [records, hostProfile] = await Promise.all([
+ listRecords({
+ did: did as Did,
+ collection: 'community.lexicon.calendar.event',
+ limit: 100
+ }),
+ cache.getProfile(did as Did).catch(() => null)
+ ]);
+
+ const events = records.map((r) => ({
+ ...(r.value as EventData),
+ rkey: r.uri.split('/').pop() as string
+ }));
+
+ const result = {
+ events,
+ did,
+ hostProfile: hostProfile ?? null
+ };
+
+ await cache.putJSON('events', did, result).catch(() => {});
+
+ return json(result);
+}
diff --git a/src/routes/[[actor=actor]]/events/calendar/+server.ts b/src/routes/[[actor=actor]]/events/calendar/+server.ts
index 0d59814b..75d732a8 100644
--- a/src/routes/[[actor=actor]]/events/calendar/+server.ts
+++ b/src/routes/[[actor=actor]]/events/calendar/+server.ts
@@ -4,7 +4,7 @@ import { getCDNImageBlobUrl, listRecords } from '$lib/atproto/methods.js';
import { createCache } from '$lib/cache';
import type { Did } from '@atcute/lexicons';
import { getActor } from '$lib/actor';
-import { generateICalFeed, type ICalEvent } from '$lib/ical';
+import { generateICalFeed, type ICalAttendee, type ICalEvent } from '$lib/ical';
import { fetchEventRsvps, getProfileUrl, resolveProfile } from '$lib/events/fetch-attendees';
export async function GET({ params, platform, request }) {
diff --git a/src/routes/[[actor=actor]]/events/rsvp-calendar/+server.ts b/src/routes/[[actor=actor]]/events/rsvp-calendar/+server.ts
deleted file mode 100644
index 000a85e0..00000000
--- a/src/routes/[[actor=actor]]/events/rsvp-calendar/+server.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { error } from '@sveltejs/kit';
-import type { EventData } from '$lib/cards/social/EventCard';
-import { getCDNImageBlobUrl, getRecord, listRecords, parseUri } from '$lib/atproto/methods.js';
-import { createCache } from '$lib/cache';
-import type { Did } from '@atcute/lexicons';
-import { getActor } from '$lib/actor';
-import { generateICalFeed, type ICalAttendee, type ICalEvent } from '$lib/ical';
-import { fetchEventRsvps, getProfileUrl, resolveProfile } from '$lib/events/fetch-attendees';
-
-interface RsvpRecord {
- $type: string;
- status: string;
- subject: { uri: string; cid?: string };
- createdAt: string;
-}
-
-export async function GET({ params, platform, request }) {
- const cache = createCache(platform);
-
- const did = await getActor({ request, paramActor: params.actor, platform });
-
- if (!did) {
- throw error(404, 'Not found');
- }
-
- try {
- // Check cache first
- const cacheKey = `${did}:rsvp-calendar`;
- if (cache) {
- const cached = await cache.get('ical', cacheKey);
- if (cached) {
- return new Response(cached, {
- headers: {
- 'Content-Type': 'text/calendar; charset=utf-8',
- 'Cache-Control': 'public, max-age=3600'
- }
- });
- }
- }
-
- const [rsvpRecords, hostProfile] = await Promise.all([
- listRecords({
- did: did as Did,
- collection: 'community.lexicon.calendar.rsvp',
- limit: 100
- }),
- resolveProfile(did, cache)
- ]);
-
- // Filter to only going and interested RSVPs
- const activeRsvps = rsvpRecords.filter((r) => {
- const rsvp = r.value as unknown as RsvpRecord;
- return rsvp.status?.endsWith('#going') || rsvp.status?.endsWith('#interested');
- });
-
- // Fetch each referenced event in parallel
- const eventResults = await Promise.all(
- activeRsvps.map(async (r) => {
- const rsvp = r.value as unknown as RsvpRecord;
- const parsed = parseUri(rsvp.subject.uri);
- if (!parsed?.rkey || !parsed?.repo) return null;
-
- try {
- const [record, organizerProfile] = await Promise.all([
- getRecord({
- did: parsed.repo as Did,
- collection: 'community.lexicon.calendar.event',
- rkey: parsed.rkey
- }),
- resolveProfile(parsed.repo, cache).catch(() => null)
- ]);
- if (!record?.value) return null;
- const eventData = record.value as EventData;
- const actor = organizerProfile?.handle || parsed.repo;
- const thumbnail = eventData.media?.find((m) => m.role === 'thumbnail');
- const imageUrl = thumbnail?.content
- ? getCDNImageBlobUrl({
- did: parsed.repo,
- blob: thumbnail.content,
- type: 'jpeg'
- })
- : undefined;
-
- // Fetch RSVPs and resolve handles
- const rsvpMap = await fetchEventRsvps(rsvp.subject.uri).catch(
- () => new Map
+
+
- {/if}
+ {/if}
-
-
{/if}
-- Links + Hosted By
-
- {#each eventData.uris as link (link.name + link.uri)}
-
-
+
+
+ {#if eventData.uris && eventData.uris.length > 0}
+
+
+
- + Links +
+
+ {#each eventData.uris as link (link.name + link.uri)}
+
-
+
-
-
-
+
diff --git a/src/routes/[[actor=actor]]/events/[rkey]/EventAttendees.svelte b/src/routes/[[actor=actor]]/events/[rkey]/EventAttendees.svelte
index bfebcfc4..dfd090d5 100644
--- a/src/routes/[[actor=actor]]/events/[rkey]/EventAttendees.svelte
+++ b/src/routes/[[actor=actor]]/events/[rkey]/EventAttendees.svelte
@@ -166,7 +166,12 @@
{modalTitle}
diff --git a/src/routes/[[actor=actor]]/events/[rkey]/EventRsvp.svelte b/src/routes/[[actor=actor]]/events/[rkey]/EventRsvp.svelte
index 37be43af..06c19ee3 100644
--- a/src/routes/[[actor=actor]]/events/[rkey]/EventRsvp.svelte
+++ b/src/routes/[[actor=actor]]/events/[rkey]/EventRsvp.svelte
@@ -94,6 +94,7 @@
rsvpStatus = status;
rsvpRkey = key;
onrsvp?.(status);
+ refreshRsvpCache();
}
} catch (e) {
console.error('Failed to submit RSVP:', e);
@@ -113,12 +114,23 @@
rsvpStatus = null;
rsvpRkey = null;
oncancel?.();
+ refreshRsvpCache();
} catch (e) {
console.error('Failed to cancel RSVP:', e);
} finally {
rsvpSubmitting = false;
}
}
+
+ function refreshRsvpCache() {
+ const handle =
+ user.profile?.handle && user.profile.handle !== 'handle.invalid'
+ ? user.profile.handle
+ : user.did;
+ if (handle) {
+ fetch(`/${handle}/rsvp/api/refresh`).catch(() => {});
+ }
+ }
= e) {
+ // eslint-disable-next-line svelte/prefer-svelte-reactivity -- temporary local, not reactive state
const adjusted = new Date(s);
adjusted.setHours(adjusted.getHours() + 1);
endsAt = isoToDatetimeLocal(adjusted.toISOString());
@@ -564,6 +565,7 @@
user.profile?.handle && user.profile.handle !== 'handle.invalid'
? user.profile.handle
: user.did;
+ fetch(`/${handle}/events/api/refresh`).catch(() => {});
goto(`/${handle}/events/${rkey}`);
} else {
error = `Failed to ${isNew ? 'create' : 'save'} event. Please try again.`;
@@ -592,6 +594,7 @@
user.profile?.handle && user.profile.handle !== 'handle.invalid'
? user.profile.handle
: user.did;
+ fetch(`/${handle}/events/api/refresh`).catch(() => {});
goto(`/${handle}/events`);
} catch (e) {
console.error('Failed to delete event:', e);
@@ -1165,22 +1168,12 @@
>
Cancel
-
{:else}
-
+
{/if}
+
diff --git a/src/routes/[[actor=actor]]/rsvp/api/refresh/+server.ts b/src/routes/[[actor=actor]]/rsvp/api/refresh/+server.ts
new file mode 100644
index 00000000..b0d32b97
--- /dev/null
+++ b/src/routes/[[actor=actor]]/rsvp/api/refresh/+server.ts
@@ -0,0 +1,37 @@
+import { createCache } from '$lib/cache';
+import { error, json } from '@sveltejs/kit';
+import { getActor } from '$lib/actor';
+import { fetchUserRsvps, resolveProfile } from '$lib/events/fetch-attendees';
+
+export async function GET({ params, platform, request }) {
+ const cache = createCache(platform);
+ if (!cache) return json('no cache');
+
+ const did = await getActor({ request, paramActor: params.actor, platform, blockBoth: false });
+
+ if (!did) {
+ throw error(404, 'Not found');
+ }
+
+ // Delete stale caches
+ await Promise.all([
+ cache.delete('rsvps', did),
+ cache.delete('ical', `${did}:rsvp-calendar`)
+ ]).catch(() => {});
+
+ // Re-fetch and cache
+ const [rsvps, userProfile] = await Promise.all([
+ fetchUserRsvps(did, cache),
+ resolveProfile(did, cache)
+ ]);
+
+ const result = {
+ rsvps,
+ did,
+ userProfile: userProfile ?? null
+ };
+
+ await cache.putJSON('rsvps', did, result).catch(() => {});
+
+ return json(result);
+}
diff --git a/src/routes/[[actor=actor]]/rsvp/calendar/+server.ts b/src/routes/[[actor=actor]]/rsvp/calendar/+server.ts
new file mode 100644
index 00000000..c0f038ee
--- /dev/null
+++ b/src/routes/[[actor=actor]]/rsvp/calendar/+server.ts
@@ -0,0 +1,106 @@
+import { error } from '@sveltejs/kit';
+import { getCDNImageBlobUrl } from '$lib/atproto/methods.js';
+import { createCache } from '$lib/cache';
+import { getActor } from '$lib/actor';
+import { generateICalFeed, type ICalAttendee, type ICalEvent } from '$lib/ical';
+import {
+ fetchEventRsvps,
+ fetchUserRsvps,
+ getProfileUrl,
+ resolveProfile
+} from '$lib/events/fetch-attendees';
+
+export async function GET({ params, platform, request }) {
+ const cache = createCache(platform);
+
+ const did = await getActor({ request, paramActor: params.actor, platform });
+
+ if (!did) {
+ throw error(404, 'Not found');
+ }
+
+ try {
+ // Check cache first
+ const cacheKey = `${did}:rsvp-calendar`;
+ if (cache) {
+ const cached = await cache.get('ical', cacheKey);
+ if (cached) {
+ return new Response(cached, {
+ headers: {
+ 'Content-Type': 'text/calendar; charset=utf-8',
+ 'Cache-Control': 'public, max-age=3600'
+ }
+ });
+ }
+ }
+
+ const [rsvps, userProfile] = await Promise.all([
+ fetchUserRsvps(did, cache),
+ resolveProfile(did, cache)
+ ]);
+
+ // Enrich each RSVP with attendees and image URLs for the iCal feed
+ const events: ICalEvent[] = (
+ await Promise.all(
+ rsvps.map(async (rsvp) => {
+ try {
+ const actor = rsvp.hostProfile?.handle || rsvp.hostDid;
+ const thumbnail = rsvp.event.media?.find((m) => m.role === 'thumbnail');
+ const imageUrl = thumbnail?.content
+ ? getCDNImageBlobUrl({
+ did: rsvp.hostDid,
+ blob: thumbnail.content,
+ type: 'jpeg'
+ })
+ : undefined;
+
+ const rsvpMap = await fetchEventRsvps(rsvp.eventUri).catch(
+ () => new Map
+
+
+
+
+
+
+
+
+
+ + {showPast ? 'Past' : 'Upcoming'} RSVPs +
+
+
+
+
+
+
+
+ {#if filteredRsvps.length === 0}
+ + No {showPast ? 'past' : 'upcoming'} RSVPs. +
+ {:else} +
+ {#each filteredRsvps as rsvp (rsvp.eventUri)}
+ {@const thumbnail = getThumbnail(rsvp.event, rsvp.hostDid)}
+ {@const hostHandle = rsvp.hostProfile?.handle || rsvp.hostDid}
+
+
+
+ {/if}
+
+ {#if thumbnail}
+ 
+ {:else}
+
+
+
+
+
+ {/if}
+
+
+
+ {/each}
+ + {rsvp.event.name} +
+ ++ {formatDate(rsvp.event.startsAt)} · {formatTime(rsvp.event.startsAt)} +
+ +
+ {#if rsvp.event.mode}
+ {getModeLabel(rsvp.event.mode)}
+ {/if}
+
+ {getStatusLabel(rsvp.status)}
+
+