@acms-subir/core 0.3.37 → 0.3.39

package/src/lib/push/service.ts

@@ -15,7 +15,7 @@ import { ANNOUNCEMENTS } from '../announcements/config';
 import type { LiveSnapshot } from '../live/types';
 import { PUSH } from './config';
 import { expoOptions, fetchReceipts, isGone, sendMessages, type ExpoMessage, type ExpoOptions } from './expo';
-import { EventSnapshot, type PushAuto, type PushNotification, type PushSource, type PushTopic } from './types';
+import { EventSnapshot, type ChangeRule, type PushNotification, type PushSource, type PushTopic } from './types';
 
 const MINUTE = 60_000, HOUR = 60 * MINUTE, DAY = 24 * HOUR;
 /** automatic notices queued longer ago than this are skipped, never sent late */
@@ -57,9 +57,9 @@ export async function pushTopics(repo: ContentRepository, locale?: string | null
   const out: PushTopic[] = [{ id: 'news', label: w.news, kind: 'general' }];
   if (collections.length > 1) out.push(...collections.map(([key, c]): PushTopic => ({ id: `collection:${key}`, label: c.plural, kind: 'collection' })));
   if (CALENDAR.enabled) {
-    const changes = settings.push.auto.eventChanges;
-    // event-change notices go to `events` unless their rule names other topics
-    out.push({ id: 'events', label: changes.calendars.length && !changes.topics.length ? w.eventsChanges : w.events, kind: 'general' });
+    // event-change notices go to `events` from a rule that names no other topics
+    const toEvents = settings.push.auto.eventChanges.some((r) => r.calendars.length && !r.topics.length);
+    out.push({ id: 'events', label: toEvents ? w.eventsChanges : w.events, kind: 'general' });
     const calendars = (await repo.listCalendars()).filter((c) => c.visibility === 'public');
     if (calendars.length > 1) out.push(...calendars.map((c): PushTopic => ({ id: `calendar:${c.slug}`, label: c.name, kind: 'calendar' })));
   }
@@ -224,11 +224,25 @@ export async function sendNotification(repo: ContentRepository, input: SendInput
 
 const listedCalendars = (calendars: Calendar[]) => new Map(calendars.map((c) => [c.id, c]));
 const inRule = (rule: string[], e: CalEvent) => rule.includes('*') || e.calendarIds.some((id) => rule.includes(id));
-// the change rule: its calendars, and one of its tags when it lists some (any case)
-function inChangeRule(rule: PushAuto['eventChanges'], e: CalEvent) {
+// a change rule: its calendars, and one of its tags when it lists some (any case)
+function inChangeRule(rule: ChangeRule, e: CalEvent) {
   const tags = new Set(rule.tags.map((t) => t.toLowerCase()));
   return inRule(rule.calendars, e) && (!tags.size || e.tags.some((t) => tags.has(t.toLowerCase())));
 }
+// every rule that covers the event adds its topics, or the event's own when it
+// names none: in rule order, once each ([] = no rule covers it)
+function changeAudience(rules: ChangeRule[], e: CalEvent, calendars: Map<string, Calendar>) {
+  return [...new Set(rules.filter((r) => inChangeRule(r, e)).flatMap((r) => (r.topics.length ? r.topics : eventTopics(e, calendars))))];
+}
+/**
+ * The topics this event's change notices go to (Admin → Mobile app → When an
+ * event changes), or [] while no rule covers it. Apps show it to promise
+ * "we'll let you know if it changes" only when it's true.
+ */
+export function changeTopics(e: CalEvent, settings: Settings, calendars: Map<string, Calendar>): string[] {
+  if (!PUSH.enabled || !CALENDAR.enabled) return [];
+  return changeAudience(settings.push.auto.eventChanges, e, calendars);
+}
 function eventTopics(e: CalEvent, calendars: Map<string, Calendar>) {
   return ['events', ...e.calendarIds.map((id) => calendars.get(id)).filter((c): c is Calendar => c?.visibility === 'public').map((c) => `calendar:${c.slug}`)];
 }
@@ -345,7 +359,7 @@ export async function queueEventChange(repo: ContentRepository, before: CalEvent
   const was = eventSnapshot(before);
   if (JSON.stringify(was) === JSON.stringify(eventSnapshot(after))) return false;
   const [settings, all] = await Promise.all([repo.getSettings(), repo.listCalendars()]);
-  if (!inChangeRule(settings.push.auto.eventChanges, after) || !eventIsListed(after, listedCalendars(all))) return false;
+  if (!settings.push.auto.eventChanges.some((r) => inChangeRule(r, after)) || !eventIsListed(after, listedCalendars(all))) return false;
   const key = `change:${after.id}`;
   // a change to a date that starts soon waits only a minute (judged from what people last knew)
   const row = await repo.push.queuedChange(key);
@@ -371,7 +385,7 @@ async function announcedLately(repo: ContentRepository, e: CalEvent, origin: str
   return (await repo.announcements.pushedSince(now - HOUR)).some((a) => a.link !== '' && sitePath(a.link, origin) === page);
 }
 
-/** `topics`: the rule's own audience; [] = the event's topics. */
+/** `topics`: the audience of the rules that cover it (changeTopics); [] = the event's topics. */
 export function eventChangeNotice(e: CalEvent, change: EventChange, settings: Settings, calendars: Map<string, Calendar>, topics: string[] = []): SendInput {
   const tz = eventTimeZone(e, settings);
   const siteTz = settings.timezone || 'UTC';
@@ -438,9 +452,10 @@ export async function processPushQueue(repo: ContentRepository, opts: PushRunOpt
         // compared at send time: edits that cancel out, or come too late, send nothing
         const e = await repo.getEvent(row.docId);
         const was = readSnapshot(row.payload);
-        const rule = auto.eventChanges;
-        const change = e && was && eventIsListed(e, calendars) && inChangeRule(rule, e) ? eventChange(was, e, settings, now) : null;
-        if (e && change && !(await announcedLately(repo, e, run.origin, now))) notice = eventChangeNotice(e, change, settings, calendars, rule.topics);
+        // one notice, to everyone the rules that cover it send to
+        const topics = e ? changeAudience(auto.eventChanges, e, calendars) : [];
+        const change = e && was && topics.length && eventIsListed(e, calendars) ? eventChange(was, e, settings, now) : null;
+        if (e && change && !(await announcedLately(repo, e, run.origin, now))) notice = eventChangeNotice(e, change, settings, calendars, topics);
       }
       if (!notice) { await repo.push.markQueue(row.key, 'skipped', null, now); continue; }
       const n = await sendNotification(repo, notice, run);

package/src/lib/push/types.ts

@@ -2,6 +2,22 @@ import { z } from 'zod';
 
 // '*' in a calendars list = every public event
 const keys = z.array(z.string().min(1).max(200)).max(100);
+/** One "when an event changes" rule: the events it covers and who hears. */
+export const ChangeRule = z.object({
+  calendars: keys.default([]),
+  /** only events with one of these tags (any case); [] = every event in the calendars */
+  tags: z.array(z.string().trim().min(1).max(100)).max(20).default([]),
+  /** sent to these topics instead of the event's own (`events` and its calendars) */
+  topics: z.array(z.string().min(1).max(200)).max(10).default([]),
+});
+export type ChangeRule = z.infer<typeof ChangeRule>;
+export const MAX_CHANGE_RULES = 10;
+// one rule, as saved before there could be several: a list of one, or none while it had no calendars
+const oneRule = (v: unknown) => {
+  if (!v || typeof v !== 'object' || Array.isArray(v)) return v;
+  const calendars = (v as { calendars?: unknown }).calendars;
+  return Array.isArray(calendars) && calendars.length ? [v] : [];
+};
 export const PushAuto = z.object({
   /** collection keys whose first publish sends a notification */
   newPost: z.object({ collections: keys.default([]) }).default({}),
@@ -11,14 +27,8 @@ export const PushAuto = z.object({
   startingSoon: z.object({ calendars: keys.default([]), minutes: z.number().int().min(5).max(1440).default(30) }).default({}),
   /** "We're live": once per broadcast that live video detects, to devices on the `live` topic */
   live: z.object({ enabled: z.boolean().default(false) }).default({}),
-  /** a published event's new date, time or place, or a cancellation, once its edits settle */
-  eventChanges: z.object({
-    calendars: keys.default([]),
-    /** only events with one of these tags (any case); [] = every event in the calendars */
-    tags: z.array(z.string().trim().min(1).max(100)).max(20).default([]),
-    /** sent to these topics instead of the event's own (`events` and its calendars) */
-    topics: z.array(z.string().min(1).max(200)).max(10).default([]),
-  }).default({}),
+  /** a published event's new date, time or place, or a cancellation, once its edits settle: one notice when any rule covers it */
+  eventChanges: z.preprocess(oneRule, z.array(ChangeRule).max(MAX_CHANGE_RULES)).default([]),
 });
 export type PushAuto = z.infer<typeof PushAuto>;
 export const PushSettings = z.object({ auto: PushAuto.default({}) });

package/src/lib/repo/migrations.ts

@@ -685,6 +685,11 @@ export const MIGRATIONS: Migration[] = [
     `ALTER TABLE push_queue ADD COLUMN payload TEXT`,
     `ALTER TABLE push_queue ADD COLUMN due_at INTEGER`,
   ] },
+  // the language a booking or RSVP was made in (Booking.locale), so its
+  // emails and links follow it; '' = the main language, so older rows need no backfill
+  { version: 60, statements: [
+    `ALTER TABLE bookings ADD COLUMN locale TEXT NOT NULL DEFAULT ''`,
+  ] },
 ];
 
 // Current cache coverage; keep earlier migration inputs frozen for upgrade compatibility.

package/src/lib/repo/sql.ts

@@ -210,7 +210,7 @@ function rowToBooking(r: Row): Booking {
     status: r.status, start: Number(r.start_at), end: Number(r.end_at), holdStart: Number(r.hold_start), holdEnd: Number(r.hold_end),
     timezone: r.timezone ?? '', name: r.name ?? '', email: r.email ?? '', phone: r.phone ?? '', seats: Number(r.seats ?? 1),
     formResponse: r.form_response ? json(r.form_response, undefined) : undefined,
-    answers: json(r.answers, {}), notes: r.notes ?? '', manageToken: r.manage_token ?? '', source: r.source ?? 'web',
+    answers: json(r.answers, {}), notes: r.notes ?? '', manageToken: r.manage_token ?? '', source: r.source ?? 'web', locale: r.locale ?? '',
     notificationVersion: Number(r.notification_version ?? 0), reminderSentAt: r.reminder_sent_at === null || r.reminder_sent_at === undefined ? null : Number(r.reminder_sent_at),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
@@ -446,7 +446,7 @@ export class SqlRepository implements ContentRepository {
     await this.ready;
     // One SELECT snapshots bookings and their retry ledger together. No UI
     // list limit; include tombstones for deleted bookings as well.
-    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','form_response','notes','manage_token','source','reminder_sent_at','notification_version','created_at','updated_at'];
+    const columns = ['id','kind','resource_id','link_id','event_id','status','start_at','end_at','hold_start','hold_end','timezone','name','email','phone','seats','answers','form_response','notes','manage_token','source','locale','reminder_sent_at','notification_version','created_at','updated_at'];
     const rows = await this.driver.all(`SELECT 'booking' AS type, json_object(${columns.map(c => `'${c}',${c}`).join(',')}) AS data FROM bookings
       UNION ALL SELECT 'request', json_object('keyHash',key_hash,'requestHash',request_hash,'bookingId',booking_id,'createdAt',created_at) FROM mobile_booking_requests`);
     return {
@@ -1078,9 +1078,9 @@ export class SqlRepository implements ContentRepository {
   private bookingInsert(b: Booking): SqlStatement {
     return {
       sql: `INSERT INTO bookings (id, kind, resource_id, link_id, event_id, status, start_at, end_at, hold_start, hold_end, timezone, name, email, phone,
-        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version, form_response) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        seats, answers, notes, manage_token, source, reminder_sent_at, created_at, updated_at, notification_version, form_response, locale) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [b.id, b.kind, b.resourceId, b.linkId, b.eventId, b.status, b.start, b.end, b.holdStart, b.holdEnd, b.timezone, b.name, b.email, b.phone,
-        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion, b.formResponse ? JSON.stringify(b.formResponse) : null],
+        b.seats, JSON.stringify(b.answers), b.notes, b.manageToken, b.source, b.reminderSentAt, b.createdAt, b.updatedAt, b.notificationVersion, b.formResponse ? JSON.stringify(b.formResponse) : null, b.locale],
     };
   }
   async listResources() {
@@ -1225,6 +1225,9 @@ export class SqlRepository implements ContentRepository {
       write = { sql: `INSERT INTO bookings ${cols} SELECT ${ins.args!.map(() => '?').join(', ')}
         WHERE (? = 0 OR (SELECT COALESCE(SUM(seats),0) FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND status IN ('pending','confirmed')) + ? <= ?)`,
         args: [...ins.args!,cap,b.eventId,b.start,b.seats,cap] };
+      // same statement, so two at once from one address can't both get in
+      if (guard.oncePerEmail && holds && b.email) write = { sql: write.sql + ` AND NOT EXISTS (SELECT 1 FROM bookings WHERE kind='rsvp' AND event_id=? AND start_at=? AND email=? AND status IN ('pending','confirmed'))`,
+        args: [...write.args!,b.eventId,b.start,b.email] };
     } else if (holds && b.resourceId) {
       write = { sql: `INSERT INTO bookings ${cols} SELECT ${ins.args!.map(() => '?').join(', ')} WHERE NOT EXISTS (
         SELECT 1 FROM bookings WHERE resource_id=? AND kind IN ('booking','block') AND status IN ('pending','confirmed') AND hold_start < ? AND hold_end > ?)`,

package/src/lib/repo/types.ts

@@ -187,7 +187,8 @@ export interface ContentRepository {
 
   // bookings (+ staff blocks and event RSVPs). createBooking is the only
   // write that can fail on a race: it inserts atomically only if the held
-  // range is still free (resource bookings) or seats remain (RSVPs), and
+  // range is still free (resource bookings) or seats remain (RSVPs; with
+  // oncePerEmail, and the address has no active RSVP for that date), and
   // returns null when it lost.
   /** from/to: overlaps the window; endedBy: ended at or before; default order start ascending, at most 5000 rows */
   listBookings(filter?: { resourceId?: string; eventId?: string; email?: string; from?: number; to?: number; endedBy?: number; statuses?: BookingStatus[]; kinds?: Booking['kind'][]; newestFirst?: boolean; limit?: number; offset?: number }): Promise<Booking[]>;
@@ -195,9 +196,10 @@ export interface ContentRepository {
   getBookingByToken(token: string): Promise<Booking | null>;
   // bookings + RSVPs (never staff blocks) this address made since `since`
   countBookingsByEmail(email: string, since: number): Promise<number>;
+  // locale: the booker's language; '' (the main language) when left out
   createBooking(
-    data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion'>,
-    guard?: { capacity?: number; idempotency?: { keyHash: string; requestHash: string } }
+    data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion' | 'locale'> & { locale?: string },
+    guard?: { capacity?: number; oncePerEmail?: boolean; idempotency?: { keyHash: string; requestHash: string } }
   ): Promise<Booking | null>;
   // moves a booking only if the new held range is free (reschedule)
   moveBooking(id: string, times: { start: number; end: number; holdStart: number; holdEnd: number }): Promise<boolean>;

package/src/lib/schema.ts

@@ -415,12 +415,16 @@ export const CalEvent = z.object({
   // UID of the feed event this was imported from ('' = authored here)
   sourceUid: z.string().default(''),
   // RSVP: seats per occurrence (0 = unlimited) and whether RSVPs confirm at
-  // once; RSVPs are stored as bookings of kind 'rsvp'
+  // once; RSVPs are stored as bookings of kind 'rsvp'. They close at closesAt
+  // (wall time in the event's zone, like start; every date), else closeBefore
+  // minutes before each date's start, else when the date ends.
   rsvp: z.object({
     enabled: z.boolean().default(false),
     capacity: z.number().int().default(0),
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
+    closesAt: z.string().nullable().default(null),
+    closeBefore: z.number().int().default(0),
     form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or
@@ -674,6 +678,9 @@ export const Booking = z.object({
   manageToken: z.string().default(''),
   // web: the website; app: the public app API (/api/v1/bookings)
   source: z.enum(['web', 'app', 'admin', 'api', 'agent']).default('web'),
+  // the language the booker used (an extra site locale, e.g. 'es'): their
+  // emails and links speak it. '' = the site's main language, as on page rows
+  locale: z.string().default(''),
   reminderSentAt: z.number().nullable().default(null),
   notificationVersion: z.number().default(0),
   createdAt: z.number(),

package/src/pages/book/[resource]/[link].astro

@@ -6,9 +6,12 @@ import { bookingsEnabled, manageUrl, resourceUrl } from '../../../lib/calendar/c
 import { availabilityContext, createResourceBooking, guestMoveLink, guestReschedule, BookingError } from '../../../lib/booking/service';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
+import { localePath, requestLocale } from '../../../lib/i18n';
 
 // One booking link: pick → answer → done. POSTs create the booking (or move
-// one when ?reschedule=<token>) and land on the manage page.
+// one when ?reschedule=<token>) and land on the manage page. These pages are
+// in English, but a booking made from /es/… keeps the visitor's language for
+// its emails and its own page.
 if (!bookingsEnabled()) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const resource = await repo.getResourceBySlug(Astro.params.resource ?? '');
@@ -17,6 +20,7 @@ if (!resource || !link || !link.active) return new Response(null, { status: 404,
 const settings = await repo.getSettings();
 const origin = siteOrigin(settings, Astro.url);
 const flow = { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) };
+const locale = requestLocale(Astro.url, Astro.locals);
 const rescheduleToken = Astro.url.searchParams.get('reschedule') ?? '';
 const reschedule = rescheduleToken ? await repo.getBookingByToken(rescheduleToken) : null;
 if (reschedule && reschedule.linkId !== link.id) return Astro.redirect(manageUrl(reschedule.manageToken));
@@ -37,16 +41,16 @@ if (Astro.request.method === 'POST') {
       const b = await repo.getBookingByToken(token);
       if (!b || b.linkId !== link.id) throw new BookingError(404, 'That booking can’t be found.');
       await guestReschedule(repo, b, start, end, flow);
-      return Astro.redirect(`${manageUrl(b.manageToken)}?moved=1`);
+      return Astro.redirect(`${localePath(manageUrl(b.manageToken), locale)}?moved=1`);
     }
     const answers: Record<string, string> = {};
     for (const qn of link.questions) answers[qn.id] = String(form.get(`q_${qn.id}`) ?? '');
     const b = await createResourceBooking(repo, {
       resource, link, start, end,
-      booker: { name: String(form.get('name') ?? ''), email: String(form.get('email') ?? ''), phone: String(form.get('phone') ?? ''), answers },
+      booker: { name: String(form.get('name') ?? ''), email: String(form.get('email') ?? ''), phone: String(form.get('phone') ?? ''), answers, locale },
     }, flow);
     if (link.redirectUrl && /^https?:\/\//.test(link.redirectUrl)) return Astro.redirect(link.redirectUrl);
-    return Astro.redirect(`${manageUrl(b.manageToken)}?new=1`);
+    return Astro.redirect(`${localePath(manageUrl(b.manageToken), locale)}?new=1`);
   } catch (err) {
     error = err instanceof BookingError ? err.message : 'Something went wrong. Please try again.';
     if (Number.isFinite(start)) {

package/src/pages/book/manage/[token].astro

@@ -12,13 +12,16 @@ import { I18N, localePath, requestLocale } from '../../../lib/i18n';
 import { siteLang } from '../../../lib/dates';
 import { isExtraLocale, localizeDoc } from '../../../lib/translations';
 import { rsvpStrings } from '../../../lib/calendar/rsvp-words';
+import { bookingStrings } from '../../../lib/email/booking-words';
 import { fill } from '../../../lib/live/words';
 
 // The booker's own page, reached from the confirmation and every email: see
 // the status, add it to a calendar, move it or cancel it. The token in the
-// URL is the only credential — it's long and random, and never listed. An
-// RSVP's page speaks the page's language (/es/book/manage/… in Spanish);
-// room bookings stay in English like the rest of their pages.
+// URL is the only credential — it's long and random, and never listed. It
+// speaks the request's language, for RSVPs and room bookings alike
+// (/es/book/manage/… in Spanish, as the emails of a booking made in Spanish
+// link it); opened without the prefix it shows the main language, with no
+// redirect. The room booking flow it links back to stays in English.
 if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const booking = await repo.getBookingByToken(Astro.params.token ?? '');
@@ -32,14 +35,18 @@ const [resource, link, rawEvent] = await Promise.all([
 ]);
 const isRsvp = booking.kind === 'rsvp';
 const locale = I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '';
-const w = rsvpStrings(isRsvp ? locale || siteLang(settings) : 'en');
+const lang = locale || siteLang(settings);
+// a room booking words a few things its own way ("Your booking", not "Your RSVP")
+const bw = bookingStrings(lang).page;
+const w = isRsvp ? rsvpStrings(lang) : { ...rsvpStrings(lang), ...bw };
 const event = rawEvent && localizeDoc(rawEvent, locale || undefined);
-const title = event ? event.title : [resource?.name, link?.name].filter(Boolean).join(' · ') || 'Booking';
+const title = event ? event.title : [resource?.name, link?.name].filter(Boolean).join(' · ') || bw.untitled;
 const location = event ? locationLine(event.location) : resource?.name ?? '';
-const url = origin + Astro.url.pathname;
+// the address the visitor sees (/es/… is rewritten to this route)
+const url = origin + localePath(Astro.url.pathname, locale);
 
 if (Astro.url.searchParams.get('ics')) {
-  return new Response(bookingIcs(booking, title, location, url, new URL(origin).host), {
+  return new Response(bookingIcs(booking, title, location, url, new URL(origin).host, 'REQUEST', { lang }), {
     headers: { 'Content-Type': 'text/calendar; charset=utf-8', 'Content-Disposition': 'inline; filename="booking.ics"', 'Cache-Control': 'private, no-store' },
   });
 }
@@ -56,7 +63,7 @@ if (Astro.request.method === 'POST') {
   }
 }
 const tz = event ? eventTimeZone(event, settings) : resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC';
-const when = whenText(current, tz, isRsvp && isExtraLocale(locale) ? { ...settings, locale } : settings, link?.mode === 'day' || event?.allDay);
+const when = whenText(current, tz, isExtraLocale(locale) ? { ...settings, locale } : settings, link?.mode === 'day' || event?.allDay);
 const active = current.status === 'pending' || current.status === 'confirmed';
 const upcoming = current.end > Date.now();
 const can = guestChanges(current, link);
@@ -65,11 +72,12 @@ const moved = Astro.url.searchParams.has('moved');
 const heading = current.status === 'cancelled' ? w.cancelledTitle
   : current.status === 'declined' ? w.notAvailable
   : current.status === 'pending' ? (isNew ? w.requestSent : w.awaitingApproval)
-  : moved ? 'Booking moved' : isNew ? w.booked : w.yours;
+  : moved ? bw.moved : isNew ? w.booked : w.yours;
 const lede = current.status === 'pending' ? fill(w.emailWhenApproved, { email: current.email })
   : current.status === 'confirmed' ? (current.formResponse?.definition.confirmation || link?.confirmMessage || fill(w.confirmationOnItsWay, { email: current.email }))
-  : current.status === 'declined' ? (isRsvp ? w.declined : 'Sorry — this time couldn’t be confirmed. You’re welcome to pick another.')
+  : current.status === 'declined' ? w.declined
   : w.cancelledText;
+const cutoff = fill(bw.cutoff, { hours: String(can.cutoffHours) });
 const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchParams({ action: 'TEMPLATE', text: title, dates: `${new Date(current.start).toISOString().replace(/[-:]|\.\d{3}/g, '')}/${new Date(current.end).toISOString().replace(/[-:]|\.\d{3}/g, '')}`, details: url, location })}`;
 ---
 
@@ -104,17 +112,17 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
           </details>
         )}
         {resource && link && can.reschedule && (
-          <a class="pc-manage-btn" href={`${bookingLinkUrl(resource.slug, link.slug)}?reschedule=${encodeURIComponent(current.manageToken)}`}>Reschedule</a>
+          <a class="pc-manage-btn" href={`${bookingLinkUrl(resource.slug, link.slug)}?reschedule=${encodeURIComponent(current.manageToken)}`}>{bw.reschedule}</a>
         )}
         {can.cancel && (
-          <form method="post" onsubmit={`return confirm(${JSON.stringify(isRsvp ? w.cancelConfirm : 'Cancel this booking?')})`}>
+          <form method="post" onsubmit={`return confirm(${JSON.stringify(w.cancelConfirm)})`}>
             <input type="hidden" name="op" value="cancel" />
-            <button class="pc-manage-btn is-danger" type="submit">{isRsvp ? w.cancel : 'Cancel booking'}</button>
+            <button class="pc-manage-btn is-danger" type="submit">{w.cancel}</button>
           </form>
         )}
       </div>
     )}
-    {can.closed && <p class="pc-manage-note">Changes close {can.cutoffHours} hours before the start. Please contact us to change or cancel.</p>}
+    {can.closed && <p class="pc-manage-note">{cutoff}</p>}
     <p class="pc-bk-foot">
       {event ? <a href={localePath(eventUrl(event.slug), locale)}>{fill(w.backTo, { title: event.title })}</a> : resource ? <a href={resourceUrl(resource.slug)}>{fill(w.backTo, { title: resource.name })}</a> : null}
     </p>

package/src/pages/events/[slug].astro

@@ -19,7 +19,7 @@ import { effectiveSettings } from '../../lib/designPreview';
 import { resolveDesign } from '../../lib/theme';
 import { siteOrigin } from '../../lib/seo';
 import { CALENDAR, eventUrl, withoutPrivateFields } from '../../lib/calendar/config';
-import { eventIsPublic, featuredOccurrence } from '../../lib/calendar/events';
+import { eventIsPublic, featuredOccurrence, rsvpDeadline } from '../../lib/calendar/events';
 import { eventJsonLd } from '../../lib/calendar/seo';
 import { upcomingEvents } from '../../lib/calendar/cards';
 import { seatsTaken, BookingError } from '../../lib/booking/service';
@@ -48,8 +48,9 @@ const occurrence = featuredOccurrence(event, settings, now, on && /^\d{4}-\d{2}-
 if (!occurrence) return new Response(null, { status: 404, statusText: 'Not found' });
 const origin = siteOrigin(settings, Astro.url);
 // RSVP: "Save my seat" posts back here and lands on the manage page, in the
-// visitor's language
+// visitor's language (its emails speak it too)
 let rsvpError = '';
+let rsvpDuplicate = false;
 let formValues: Record<string,string> = {};
 let coreValues = { name: '', email: '', seats: '1' };
 let requestId: string = crypto.randomUUID();
@@ -63,16 +64,22 @@ if (Astro.request.method === 'POST' && event.rsvp.enabled) {
     requestId = await submissionGuard(repo, form, Astro.clientAddress, `event:${event.id}`);
     formValues = readAnswers(form, definition);
     coreValues = { name: String(form.get('name') || '').slice(0,120), email: String(form.get('email') || '').slice(0,200), seats: String(form.get('seats') || '1') };
-    const booking = await submitEventForm(repo, event, occurrence, form, requestId, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) });
+    const booking = await submitEventForm(repo, event, occurrence, form, requestId, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) }, locale);
     return Astro.redirect(`${localePath(manageUrl(booking.manageToken), locale)}?new=1`, 303);
   } catch (err) {
-    rsvpError = err instanceof BookingError || err instanceof ApiError ? err.message : rsvpStrings((I18N.enabled ? locale : '') || siteLang(settings)).saveError;
+    const w = rsvpStrings((I18N.enabled ? locale : '') || siteLang(settings));
+    // the address already has one: a notice in the page's words (templates that don't know it show it as the error)
+    rsvpDuplicate = err instanceof BookingError && err.code === 'duplicate';
+    rsvpError = rsvpDuplicate ? `${w.duplicate} ${w.duplicateNote}` : err instanceof BookingError || err instanceof ApiError ? err.message : w.saveError;
   }
 }
 const formHtml = hiddenFields(await formVersion(definition), requestId) + `<input type="hidden" name="occurrence" value="${occurrence.start}">`;
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
+// the event's RSVP deadline for this date (null: open until it ends)
+const closesAt = event.rsvp.enabled ? rsvpDeadline(occurrence, settings) : null;
 const rsvp = event.rsvp.enabled
-  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues, open: occurrence.end > now && !occurrence.cancelled }
+  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues,
+    open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt }
   : null;
 const calendars = event.calendarIds.map((id) => calMap.get(id)).filter((c): c is NonNullable<typeof c> => Boolean(c) && c!.visibility !== 'private');
 const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo));

package/src/styles/editor.css

@@ -1168,6 +1168,10 @@
 .pe-evr-modes + .pe-evs-fields { margin-top: 22px; }
 .pe-evr-link { grid-template-columns: minmax(0, 1fr) 150px; }
 .pe-evr-seats { grid-template-columns: repeat(2, minmax(0, 200px)); }
+.pe-evr-when { display: flex; flex-wrap: wrap; align-items: center; gap: 8px 10px; }
+.pe-evr-when > span { font-size: 13px; color: var(--muted); }
+.pe-field .pe-evr-when input, .pe-field .pe-evr-when select { width: auto; }
+.pe-field .pe-evr-when input[type='number'] { width: 84px; }
 .pe-evr-form { display: flex; flex-wrap: wrap; align-items: center; gap: 10px 18px; padding: 12px 14px; border: 1px solid var(--line); border-radius: var(--r-md); background: var(--panel); }
 .pe-evr-form-t { flex: 1 1 240px; min-width: 0; }
 .pe-evr-form-t b { display: block; font-size: 13.5px; font-weight: 600; color: var(--text); }

package/src/styles/mobile-app.css

@@ -88,6 +88,13 @@
 .ma-tag { display: inline-flex; align-items: center; gap: 5px; background: var(--sel); color: var(--text-2); font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: var(--r-full); }
 .ma-tag button { background: none; border: 0; color: inherit; cursor: pointer; font-size: 10px; padding: 0; }
 .ma-tags input { flex: 1; min-width: 70px; background: none !important; border: 0 !important; box-shadow: none !important; padding: 2px !important; }
+/* "when an event changes": a card per rule */
+.ma-subrules { display: grid; gap: 8px; margin-top: 10px; }
+.ma-subrule { padding: 6px 12px 12px; border: 1px solid var(--line); border-radius: var(--r-md); min-width: 0; }
+.ma-subrule-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; min-height: 30px; }
+.ma-subrule-head b { font-size: 12.5px; color: var(--text-2); }
+.ma-subrule .ma-choices { margin-top: 2px; }
+.ma-add { margin-top: 10px; }
 .ma .form-actions { margin-top: 6px; }
 .ma-saved { color: var(--green); font-size: 12.5px; font-weight: 500; }
 

package/src/styles/site.css

@@ -1147,6 +1147,9 @@ li::marker { color: var(--muted); }
   .pc-ev-rsvpform[open] > summary { display: none; }
   .pc-ev-rsvpform form { margin-top: 4px; }
   .pc-ev-full { font-size: 14px; font-weight: 600; color: var(--muted); }
+  .pc-ev-closes { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
+  .pc-ev-full + .pc-ev-closes { margin-top: 4px; }
+  .pc-ev-notice { font-size: 14px; line-height: 1.5; background: var(--soft); border-radius: var(--r-sm); padding: 9px 12px; margin: 0 0 14px; }
 
   @media (max-width: 860px) {
     .pc-bk { grid-template-columns: 1fr; }

package/src/theme-sdk/index.ts

@@ -11,7 +11,7 @@ export interface HomeProps { settings: Settings; page: Page | null; posts: Post[
 export interface PageProps { settings: Settings; page: Page; html: string }
 export interface PostProps { settings: Settings; post: Post; html: string; authors: User[]; related: Post[] }
 import type { Occurrence } from '../lib/calendar/events';
-export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean}|null }
+export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean}|null }
 /**
  * Props for a coded section. `data` holds resolved values: link fields arrive
  * as LinkValue, lists as row arrays, source fields as fresh item arrays
@@ -24,6 +24,9 @@ export type { LinkValue, EventItem, PostItem, PostAuthor, BookingItem } from '..
 export type { SiteChrome, ChromeLink } from '../lib/site-chrome';
 // core's chrome labels for any language (a template already gets them as site.words)
 export { siteStrings, type SiteStrings } from '../lib/site-words';
+// the built-in event page's words and repeat line ("Weekly on Sunday"), for templates/event.astro
+export { eventStrings, type EventStrings } from '../lib/calendar/event-words';
+export { describeRepeat } from '../lib/calendar/rrule';
 import type { SiteChrome } from '../lib/site-chrome';
 export interface ChromeProps { site: SiteChrome }