Skip to content

Fix public calendar subscriptions and meetup links #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Elvis020 merged 1 commit into from
Aug 7, 2026
+64 −17
Merged

Fix public calendar subscriptions and meetup links #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/components/MeetupsSection.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ const statusConfig = {
<div class="meetup-body">
<div class="meetup-meta">
<time datetime={meetup.data.start}>{formatDate(meetup.data.start)}</time>
<span class="meetup-location">{meetup.data.location.label ?? meetup.data.location.name}</span>
<span class="meetup-location" title={meetup.data.location.label ?? meetup.data.location.name}>{meetup.data.location.label ?? meetup.data.location.name}</span>
</div>
<h3 class="heading-serif meetup-name">
<h3 class="heading-serif meetup-name" title={meetup.data.name}>
<a href={`/meetups/${meetup.slug}/`}>{meetup.data.name}</a>
</h3>
<p class="meetup-desc">{meetup.data.description}</p>
Expand Down Expand Up @@ -223,9 +223,25 @@ const statusConfig = {
flex-wrap: wrap;
gap: var(--s2);
}
.meetup-location { color: var(--pink); }
.meetup-location {
min-width: 0;
max-width: 100%;
overflow: hidden;
flex: 1 1 auto;
color: var(--pink);
text-align: right;
text-overflow: ellipsis;
white-space: nowrap;
}

.meetup-name { font-size: var(--text-xl); line-height: var(--leading-snug); }
.meetup-name {
min-width: 0;
overflow: hidden;
font-size: var(--text-xl);
line-height: var(--leading-snug);
text-overflow: ellipsis;
white-space: nowrap;
}
.meetup-name a:hover { color: var(--pink); }

.meetup-desc {
Expand Down
5 changes: 4 additions & 1 deletion src/lib/meetups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,10 @@ function mapPublicMeetup(meetup: PublicMeetup, origin: URL): WebsiteMeetup {
}

function resolveRemoteWebsiteUrl(value: string, origin: URL): string {
return value.startsWith('/') ? new URL(value, origin).toString() : value;
const resolved = value.startsWith('/') ? new URL(value, origin) : new URL(value);
return isLoopbackHostname(resolved.hostname)
? new URL(`${resolved.pathname}${resolved.search}${resolved.hash}`, origin).toString()
: resolved.toString();
}

function resolveOptionalRemoteWebsiteUrl(value: string | null, origin: URL): string | null {
Expand Down
38 changes: 30 additions & 8 deletions src/pages/events/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const events = sortEventsBySoonest(await getEvents()).map((event) => ({
}));

const calendarFeedUrl = 'https://devcongress.org/events/calendar.ics';
const googleCalendarUrl = `https://calendar.google.com/calendar/u/0/r?cid=${encodeURIComponent(calendarFeedUrl)}`;
const googleCalendarFeedUrl = `webcal://${new URL(calendarFeedUrl).host}${new URL(calendarFeedUrl).pathname}`;
const googleCalendarUrl = `https://calendar.google.com/calendar/r?cid=${encodeURIComponent(googleCalendarFeedUrl)}`;
const hasSubscribableEvents = upcomingCalendarEvents(events).length > 0;

function getEventStatus(event: WebsiteEvent): 'upcoming' | 'live' | 'past' {
Expand Down Expand Up @@ -132,9 +133,18 @@ const calendarEvents = events.map((event) => {
<span>Add to Google Calendar</span>
</button>
)}
{hasSubscribableEvents && (
<a
class="calendar-feed-link"
href="/events/calendar.ics"
download="devcongress-events.ics"
>
Download .ics file
</a>
)}
<p id="calendar-subscribe-note">
{hasSubscribableEvents
? 'Current and upcoming published events. Updates automatically.'
? 'Current and upcoming published events. Updates automatically. Download the .ics file if needed.'
: 'No upcoming events yet. Subscriptions open when the next event is published.'}
</p>
</div>
Expand Down Expand Up @@ -196,9 +206,9 @@ const calendarEvents = events.map((event) => {
<div class="event-body">
<div class="event-meta">
<time datetime={event.startsAt}>{formatDate(event.startsAt, event.timezone)}</time>
<span class="event-location">{getLocation(event)}</span>
<span class="event-location" title={getLocation(event)}>{getLocation(event)}</span>
</div>
<h2 class="heading-serif event-name">
<h2 class="heading-serif event-name" title={event.title}>
{eventUrl ? (
<a
href={eventUrl}
Expand Down Expand Up @@ -312,8 +322,9 @@ const calendarEvents = events.map((event) => {
let selectedMonth = monthPattern.test(initialMonth ?? '') ? initialMonth : fallbackMonth;

if (subscribeButton instanceof HTMLAnchorElement) {
const feedUrl = new URL('/events/calendar.ics', window.location.origin).toString();
subscribeButton.href = `https://calendar.google.com/calendar/u/0/r?cid=${encodeURIComponent(feedUrl)}`;
const feedUrl = new URL('/events/calendar.ics', window.location.origin);
const webcalUrl = `webcal://${feedUrl.host}${feedUrl.pathname}`;
subscribeButton.href = `https://calendar.google.com/calendar/r?cid=${encodeURIComponent(webcalUrl)}`;
}

function animatePanel(panel, direction = 0) {
Expand Down Expand Up @@ -643,6 +654,11 @@ const calendarEvents = events.map((event) => {
}
.calendar-subscribe { display: flex; flex-direction: column; align-items: flex-end; gap: var(--s2); }
.calendar-subscribe p { color: var(--text-muted); font-size: var(--text-xs); }
.calendar-feed-link {
color: var(--text-mid); font-size: var(--text-xs); text-decoration: underline;
text-underline-offset: 3px;
}
.calendar-feed-link:hover { color: var(--text); }
.calendar-subscribe-button {
display: inline-flex; min-height: 44px; align-items: center; justify-content: center; gap: 8px;
border-radius: var(--r-sm); padding: 9px 14px;
Expand Down Expand Up @@ -746,8 +762,14 @@ const calendarEvents = events.map((event) => {
letter-spacing: 0.04em; text-transform: uppercase;
flex-wrap: wrap; gap: var(--s2);
}
.event-location { color: var(--pink); }
.event-name { font-size: var(--text-xl); line-height: var(--leading-snug); }
.event-location {
min-width: 0; max-width: 100%; overflow: hidden; flex: 1 1 auto;
color: var(--pink); text-align: right; text-overflow: ellipsis; white-space: nowrap;
}
.event-name {
min-width: 0; overflow: hidden; font-size: var(--text-xl);
line-height: var(--leading-snug); text-overflow: ellipsis; white-space: nowrap;
}
.event-name a:hover { color: var(--pink); }
.event-desc {
font-size: var(--text-sm); color: var(--text-mid);
Expand Down
14 changes: 10 additions & 4 deletions src/pages/meetups/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ const statusConfig = {
<div class="meetup-body">
<div class="meetup-meta">
<time datetime={meetup.data.start}>{formatDate(meetup.data.start)}</time>
<span class="meetup-location">{meetup.data.location.label ?? meetup.data.location.name}</span>
<span class="meetup-location" title={meetup.data.location.label ?? meetup.data.location.name}>{meetup.data.location.label ?? meetup.data.location.name}</span>
</div>
<h2 class="heading-serif meetup-name">
<h2 class="heading-serif meetup-name" title={meetup.data.name}>
<a href={`/meetups/${meetup.slug}/`}>{meetup.data.name}</a>
</h2>
<p class="meetup-desc">{meetup.data.description}</p>
Expand Down Expand Up @@ -164,9 +164,15 @@ const statusConfig = {
letter-spacing: 0.04em; text-transform: uppercase;
flex-wrap: wrap; gap: var(--s2);
}
.meetup-location { color: var(--pink); }
.meetup-location {
min-width: 0; max-width: 100%; overflow: hidden; flex: 1 1 auto;
color: var(--pink); text-align: right; text-overflow: ellipsis; white-space: nowrap;
}

.meetup-name { font-size: var(--text-xl); line-height: var(--leading-snug); }
.meetup-name {
min-width: 0; overflow: hidden; font-size: var(--text-xl);
line-height: var(--leading-snug); text-overflow: ellipsis; white-space: nowrap;
}
.meetup-name a:hover { color: var(--pink); }

.meetup-desc {
Expand Down
Loading