@acms-subir/core 0.3.38 → 0.3.39

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @acms-subir/core
 
+## 0.3.39
+
+### Patch Changes
+
+- 4c33f48: **When an event changes** in **Admin → Mobile app** now takes a list of rules (up to 10), each with its own calendars, **Only events tagged** and **Send to**. Use **Add a rule** to add one and **Remove** to take one away; with no rules, change notices are off. A site can now send classes tagged "Class" in a shared rooms calendar to a `classes` topic, and every event in its Events calendar to that event's own topics (Events and its calendar). An event that several rules cover gets one notice, sent to all of their topics, so each phone gets it once. Events in the app API list those same topics in `notify.changes`. The rule you already have becomes the first rule, with nothing to redo.
+- 527ba2f: Events can stop taking RSVPs before they happen. In the event's CTA card (Built-in form), a one-time event sets when RSVPs close (a date and time in the event's time zone), and a repeating one closes each date some hours or days before it starts ("Close RSVPs 2 hours before each date", up to 60 days). Until then the event page says "RSVPs close Fri, Oct 24 at 9 PM"; afterwards the form gives way to "RSVPs are closed." and "They closed on Fri, Oct 24. Questions? Contact us.", in the page's language. With no deadline, RSVPs stay open until the date ends, as before. The website and apps both turn late RSVPs away (410 in the app API). `GET /api/v1/events/:slug/rsvp` has `closesAt` (the date's deadline, or `null`) and the new reason `closed`, and events in the app API carry `rsvp.closesAt` and `rsvp.closeBefore`. Saves that leave the new settings out, from older editors and editor apps, keep them.
+
+  A second RSVP from the same email for the same date no longer takes more seats. The page says "You already have an RSVP for this date. We sent you an email with a link to change it. Need more seats? Change it there." and keeps the form, and the address gets its RSVP's link again by email, at most once every 10 minutes per RSVP, so the form can't flood someone's inbox. Nothing else about the RSVP is shown, since anyone can type an address. In the app API that's a 409 with the new error code `duplicate`. Cancelled and declined RSVPs don't count, and other dates are separate. The check is part of the same database write as the seat count, so two at once can't both get in.
+
+  The RSVP panel in the app recipes shows when RSVPs close, says when they closed, and shows the "You already have an RSVP" notice. Update it with `npx acms mobile recipe add rsvp --force`; that overwrites `components/RsvpPanel.tsx`, including any changes you made to it, and needs this release's `@acms-subir/native`. Theme event templates get `rsvp.closesAt` and `rsvp.duplicate`; a duplicate's words also come in `rsvp.error`, so templates that don't know it still say something.
+
 ## 0.3.38
 
 ### Patch Changes

package/docs/mobile.md

@@ -120,7 +120,7 @@ Read the app's `AGENTS.md` too: it holds the same rules, next to the code.
 | `useSearch(text, { types, collection, limit })` | site-wide search: `data.posts`, `data.pages`, `data.events` (each with `snippet.text` + `snippet.highlights`), `data.more`; debounced, blank text fetches nothing |
 | `useEvents({ calendar, from, to, limit, q })` | `data.occurrences[]` (`start`, `end`, `allDay`, `event`) in a window (default 30 days, max 90). `from`/`to` take a site-local day (`'2026-10-01'`) or an ISO date-time with a zone (`new Date().toISOString()`) |
 | `useEvent(slug)` | one event |
-| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `cancelled`, `disabled`), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
+| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `closed`, `cancelled`, `disabled`), `closesAt` (the deadline; `rsvpDeadlineText` words it), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. One RSVP per email and date: `rsvp.duplicate` means that email already has one (the site emailed its link again); say so and keep the form. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
 | `useManagedBooking(token)` / `useCancelBooking` / `useRescheduleBooking` / `useRescheduleAvailability` | the booker's own booking (from `book()`'s `manageToken`): `can.cancel`, `can.reschedule`, `can.closed` (change cutoff passed: show "Contact us") |
 | `useGuest()` / `useMyBookings({ when })` | guest sign-in with an emailed code, then every booking made with that email; check `features.guestSignIn` |
 | `useLinks()` / `useForm(id)` / `useSubmitForm(id)` | the links page; published forms and sending answers; check `features.links` / `features.forms` |

package/mobile-template/recipes/events/files/components/RsvpPanel.tsx

@@ -3,15 +3,16 @@ import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View,
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
-// event's web page: open until the date ends, and the organiser may approve
-// each RSVP. useRsvp keeps one idempotency key per RSVP, so sending again
-// after a timeout can't register anyone twice. Its words come from
+// event's web page: open until the event's deadline or the date ends, one RSVP
+// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// one idempotency key per RSVP, so sending again after a timeout can't
+// register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
 // button win when the site has them.
 
@@ -91,6 +92,8 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const errorText = [t.styles.text.small, { color: t.colors.ink, fontWeight: '600' as const }];
   const num = (n: number) => n.toLocaleString(locale);
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
+  // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
+  const deadline = rsvpDeadlineText(s, words, locale);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
@@ -146,7 +149,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   if (!s.open) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
-      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : words.dateEnded}</Text>}
+      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
     </View>
   );
 
@@ -242,6 +245,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
       <View style={{ gap: 4 }}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
         {going}
+        {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
@@ -263,9 +267,9 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
       {fields.map(field)}
       {error && (
         <View style={{ backgroundColor: t.colors.soft, borderRadius: Math.min(t.radius, 10), padding: 12, gap: 4 }}>
-          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{words.notSent}</Text>
+          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{rsvp.duplicate ? words.alreadyRsvped : words.notSent}</Text>
           <Text style={t.styles.text.muted}>
-            {isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
+            {rsvp.duplicate ? words.alreadyRsvpedNote : isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
           </Text>
         </View>
       )}

package/mobile-template/recipes/rsvp/files/components/RsvpPanel.tsx

@@ -3,15 +3,16 @@ import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View,
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
-// event's web page: open until the date ends, and the organiser may approve
-// each RSVP. useRsvp keeps one idempotency key per RSVP, so sending again
-// after a timeout can't register anyone twice. Its words come from
+// event's web page: open until the event's deadline or the date ends, one RSVP
+// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// one idempotency key per RSVP, so sending again after a timeout can't
+// register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
 // button win when the site has them.
 
@@ -91,6 +92,8 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   const errorText = [t.styles.text.small, { color: t.colors.ink, fontWeight: '600' as const }];
   const num = (n: number) => n.toLocaleString(locale);
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
+  // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
+  const deadline = rsvpDeadlineText(s, words, locale);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
@@ -146,7 +149,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
   if (!s.open) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
-      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : words.dateEnded}</Text>}
+      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
     </View>
   );
 
@@ -242,6 +245,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
       <View style={{ gap: 4 }}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
         {going}
+        {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
@@ -263,9 +267,9 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
       {fields.map(field)}
       {error && (
         <View style={{ backgroundColor: t.colors.soft, borderRadius: Math.min(t.radius, 10), padding: 12, gap: 4 }}>
-          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{words.notSent}</Text>
+          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{rsvp.duplicate ? words.alreadyRsvped : words.notSent}</Text>
           <Text style={t.styles.text.muted}>
-            {isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
+            {rsvp.duplicate ? words.alreadyRsvpedNote : isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
           </Text>
         </View>
       )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.38",
+  "version": "0.3.39",
   "publishConfig": {
     "access": "public"
   },

package/src/actions/index.ts

@@ -994,7 +994,8 @@ export const server = {
         cta: z.object({ label: z.string().max(120), href: z.string().max(1000), style: z.enum(['primary', 'outline']) }).optional(),
         calendarIds: z.array(z.string()).max(50).optional(),
         fields: z.record(z.string().max(2000)).optional(),
-        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50), form: z.any().optional() }).optional(),
+        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50),
+          closesAt: z.string().max(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), form: z.any().optional() }).optional(),
         roomHold: z.object({ resourceIds: z.array(z.string()).max(50), span: z.enum(['event', 'day']), before: z.number().int().min(0).max(1440), after: z.number().int().min(0).max(1440), whileDraft: z.boolean(), keep: z.array(z.string()).max(500).default([]) }).optional(),
         scheduledAt: nullableTs.optional(),
       }),

package/src/components/EventPage.astro

@@ -11,7 +11,7 @@ import { describeRepeat } from '../lib/calendar/rrule';
 import { eventCardHtml, safeHref } from '../lib/calendar/cards';
 import { siteLang, siteLocale } from '../lib/dates';
 import { I18N, localePath, requestLocale } from '../lib/i18n';
-import { aroundCount, rsvpStrings } from '../lib/calendar/rsvp-words';
+import { aroundCount, deadlineParts, rsvpStrings } from '../lib/calendar/rsvp-words';
 import { eventStrings } from '../lib/calendar/event-words';
 import { fill } from '../lib/live/words';
 import { eventImage } from '../lib/calendar/images';
@@ -26,8 +26,10 @@ interface Props {
   upcoming: (Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'> & { cancelled?: boolean })[];
   origin: string;
   preview?: boolean;
-  // RSVP state when the event takes RSVPs (null otherwise)
-  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
+  // RSVP state when the event takes RSVPs (null otherwise). closesAt: this
+  // date's RSVP deadline (ms; null = open until it ends); duplicate: the
+  // address already has an RSVP for it (error then holds the same words)
+  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; closesAt?: number | null; duplicate?: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
 }
 const { event: e, occurrence: o, settings, calendars, html, upcoming, origin, preview = false, rsvp = null } = Astro.props;
 // the whole event, or just this date of a repeating one
@@ -78,6 +80,11 @@ const online = /zoom\.us|meet\.google|teams\.microsoft|webex|whereby|jit\.si/i.t
 const w = rsvpStrings(lang);
 const going = rsvp ? aroundCount(rsvp.going, w.personGoing, w.peopleGoing) : ['', ''];
 const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.spotsLeft) : ['', ''];
+const taking = Boolean(rsvp?.open) && (rsvp!.left === null || rsvp!.left > 0);
+// "RSVPs close Fri, Oct 24 at 9 PM" while open; once past, "They closed on Fri, Oct 24."
+const deadline = typeof rsvp?.closesAt === 'number' ? deadlineParts(rsvp.closesAt, tz, locale) : null;
+const closesLine = deadline && taking ? fill(w.closesOn, deadline) : '';
+const closedLine = deadline && !rsvp!.open && !cancelled && rsvp!.closesAt! <= Date.now() ? fill(w.closedOn, deadline) : '';
 const dateCancelled = fill(ew.dateCancelled, { date: f.date });
 const showing = fill(ew.showing, { date: f.date });
 const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: true, href: here(eventUrl(u.event.slug)) })).join('');
@@ -151,14 +158,15 @@ const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: tr
       {rsvp ? (
         <div class="pc-ev-rsvp">
           <p class="pc-ev-going">{going[0]}<b>{rsvp.going}</b>{going[1]}{rsvp.left !== null && <> · {left[0]}<b>{rsvp.left}</b>{left[1]}</>}</p>
-          {rsvp.open && (rsvp.left === null || rsvp.left > 0) ? (
+          {closesLine && <p class="pc-ev-closes">{closesLine}</p>}
+          {taking ? (
             <details class="pc-ev-rsvpform" open={Boolean(rsvp.error)}>
               <summary class="pc-ev-cta">{w.saveSeat}</summary>
               <form method="post">
                 <Fragment set:html={rsvp.formHtml ?? ''}/>
                 {e.rsvp.form?.title && <h3>{e.rsvp.form.title}</h3>}
                 {e.rsvp.form?.intro && <p>{e.rsvp.form.intro}</p>}
-                {rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
+                {rsvp.duplicate ? <p class="pc-ev-notice" role="status"><b>{w.duplicate}</b> {w.duplicateNote}</p> : rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
                 <label class="pc-bk-field"><span>{w.nameField}</span><input name="name" required maxlength="120" autocomplete="name" value={rsvp.values?.name} /></label>
                 <label class="pc-bk-field"><span>{w.emailField}</span><input name="email" type="email" required maxlength="200" autocomplete="email" value={rsvp.values?.email} /></label>
                 {rsvp.maxSeats > 1 && (
@@ -171,6 +179,7 @@ const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: tr
               </form>
             </details>
           ) : <p class="pc-ev-full">{rsvp.open ? w.full : w.closed}</p>}
+          {closedLine && <p class="pc-ev-closes">{closedLine}</p>}
         </div>
       ) : e.cta.label && ctaHref && !cancelled && (
         <a class={`pc-ev-cta${e.cta.style === 'outline' ? ' is-outline' : ''}`} href={ctaHref}>{e.cta.label}</a>

package/src/components/MobileApp.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useId, useMemo, useRef, useState } from 'react';
 import type { AdminPushState } from '../lib/push/api';
-import type { PushAuto, PushNotification } from '../lib/push/types';
+import type { ChangeRule, PushAuto, PushNotification } from '../lib/push/types';
 import '../styles/mobile-app.css';
 
 // Admin → Mobile app: send a notification to the site's own app, choose the
@@ -10,6 +10,8 @@ import '../styles/mobile-app.css';
 const ENDPOINT = '/api/push/admin';
 const CUSTOM = '__custom';
 const SOON_MINUTES = [10, 15, 30, 60, 120, 1440];
+// MAX_CHANGE_RULES (lib/push/types, which brings zod)
+const MAX_RULES = 10;
 
 async function api<T>(body?: Record<string, unknown>): Promise<T> {
   const res = await fetch(ENDPOINT, {
@@ -262,10 +264,14 @@ function Automatic({ state, setState }: { state: AdminPushState; setState: (s: A
     } catch (e) { setMsg({ err: errText(e) }); } finally { setBusy(false); }
   };
   const topicName = (id: string) => state.topics.find((t) => t.id === id)?.label ?? id;
-  const calendarChoices = (key: 'newEvent' | 'startingSoon' | 'eventChanges') => {
-    const list = auto[key].calendars;
+  const uid = useId();
+  const addRule = useRef<HTMLButtonElement>(null);
+  const rules = auto.eventChanges;
+  const setRule = (i: number, patch: Partial<ChangeRule>) => setAuto({ ...auto, eventChanges: rules.map((r, j) => (j === i ? { ...r, ...patch } : r)) });
+  // focus moves to "Add a rule" (enabled again once the tenth rule goes)
+  const removeRule = (i: number) => { setAuto({ ...auto, eventChanges: rules.filter((_, j) => j !== i) }); requestAnimationFrame(() => addRule.current?.focus()); };
+  const calendarChoices = (list: string[], set: (calendars: string[]) => void) => {
     const all = list.includes('*');
-    const set = (calendars: string[]) => setAuto({ ...auto, [key]: { ...auto[key], calendars } });
     return (
       <div className="ma-choices">
         <label className="ma-check"><input type="checkbox" checked={all} onChange={() => set(all ? [] : ['*'])} /><span>All public calendars</span></label>
@@ -296,11 +302,11 @@ function Automatic({ state, setState }: { state: AdminPushState; setState: (s: A
           <>
             <div className="ma-rule">
               <div className="ma-rule-head"><b>New event published</b><small>Name, date and place, opens the event.</small></div>
-              {calendarChoices('newEvent')}
+              {calendarChoices(auto.newEvent.calendars, (calendars) => setAuto({ ...auto, newEvent: { calendars } }))}
             </div>
             <div className="ma-rule">
               <div className="ma-rule-head"><b>Starting soon</b><small>A reminder before each event time, once per date.</small></div>
-              {calendarChoices('startingSoon')}
+              {calendarChoices(auto.startingSoon.calendars, (calendars) => setAuto({ ...auto, startingSoon: { ...auto.startingSoon, calendars } }))}
               <label className="field ma-lead">
                 <span>Send</span>
                 <select value={auto.startingSoon.minutes} onChange={(e) => setAuto({ ...auto, startingSoon: { ...auto.startingSoon, minutes: Number(e.target.value) } })}>
@@ -310,24 +316,39 @@ function Automatic({ state, setState }: { state: AdminPushState; setState: (s: A
             </div>
             <div className="ma-rule">
               <div className="ma-rule-head"><b>When an event changes</b><small>New date, time or place, or a cancellation, opens the event. Sent 10 minutes after the last edit (1 minute when it starts within 3 hours), so a quick fix doesn’t notify twice.</small></div>
-              {calendarChoices('eventChanges')}
-              <div className="ma-fields">
-                <div className="field ma-lead">
-                  <span>Only events tagged</span>
-                  <TagChips tags={auto.eventChanges.tags} suggestions={state.tags}
-                    onChange={(tags) => setAuto({ ...auto, eventChanges: { ...auto.eventChanges, tags } })} />
+              {rules.length ? (
+                <div className="ma-subrules">
+                  {/* rules have no ids; inputs are controlled, so a position is enough */}
+                  {rules.map((r, i) => (
+                    <div key={i} className="ma-subrule" role="group" aria-labelledby={`${uid}-rule-${i}`}>
+                      <div className="ma-subrule-head">
+                        <b id={`${uid}-rule-${i}`}>Rule {i + 1}</b>
+                        <button type="button" className="btn ghost sm" aria-label={`Remove rule ${i + 1}`} onClick={() => removeRule(i)}>Remove</button>
+                      </div>
+                      {calendarChoices(r.calendars, (calendars) => setRule(i, { calendars }))}
+                      <div className="ma-fields">
+                        <div className="field ma-lead">
+                          <span>Only events tagged</span>
+                          <TagChips tags={r.tags} suggestions={state.tags} onChange={(tags) => setRule(i, { tags })} />
+                        </div>
+                        <label className="field ma-lead">
+                          <span>Send to</span>
+                          <select value={r.topics.join(',')} onChange={(e) => setRule(i, { topics: e.target.value ? e.target.value.split(',') : [] })}>
+                            <option value="">The event’s topics (Events, its calendar)</option>
+                            {/* several topics can only come from the API: keep them choosable */}
+                            {r.topics.length > 1 && <option value={r.topics.join(',')}>{r.topics.map(topicName).join(', ')}</option>}
+                            {state.topics.map((t) => <option key={t.id} value={t.id}>{t.label}</option>)}
+                          </select>
+                        </label>
+                      </div>
+                      {!r.calendars.length && <p className="hint">Choose a calendar, or this rule is removed when you save.</p>}
+                    </div>
+                  ))}
                 </div>
-                <label className="field ma-lead">
-                  <span>Send to</span>
-                  <select value={auto.eventChanges.topics.join(',')}
-                    onChange={(e) => setAuto({ ...auto, eventChanges: { ...auto.eventChanges, topics: e.target.value ? e.target.value.split(',') : [] } })}>
-                    <option value="">The event’s topics (Events, its calendar)</option>
-                    {/* several topics can only come from the API: keep them choosable */}
-                    {auto.eventChanges.topics.length > 1 && <option value={auto.eventChanges.topics.join(',')}>{auto.eventChanges.topics.map(topicName).join(', ')}</option>}
-                    {state.topics.map((t) => <option key={t.id} value={t.id}>{t.label}</option>)}
-                  </select>
-                </label>
-              </div>
+              ) : <p className="hint">Off. Add a rule to choose which events notify and who hears.</p>}
+              {rules.length > 1 && <p className="hint">An event that fits several rules gets one notice, sent to all of their topics.</p>}
+              <button type="button" ref={addRule} className="btn sm ma-add" disabled={rules.length >= MAX_RULES}
+                onClick={() => setAuto({ ...auto, eventChanges: [...rules, { calendars: [], tags: [], topics: [] }] })}>Add a rule</button>
             </div>
           </>
         )}

package/src/components/editor/EventPanel.tsx

@@ -20,7 +20,8 @@ export interface EventMeta {
   cta: EventCta;
   calendarIds: string[];
   fields: Record<string, string>;
-  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number; form?: FormDefinition };
+  // closesAt: wall time like start; closeBefore: minutes before each date (0 = until it ends)
+  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number; closesAt?: string | null; closeBefore?: number; form?: FormDefinition };
   roomHold: RoomHoldValue;
 }
 

package/src/components/editor/PostEditor.tsx

@@ -169,7 +169,7 @@ const NO_MAPS: MapsStatus = { enabled: false, provider: '', label: '', search: f
 const NO_EVENT: EventMeta = {
   start: '', end: '', allDay: false, timezone: '', rrule: '', exdates: [], cancelled: false,
   location: NO_LOCATION, cta: { label: '', href: '', style: 'primary' }, calendarIds: [], fields: {},
-  rsvp: { enabled: false, capacity: 0, autoConfirm: true, maxSeats: 4 },
+  rsvp: { enabled: false, capacity: 0, autoConfirm: true, maxSeats: 4, closesAt: null, closeBefore: 0 },
   roomHold: NO_HOLD,
 };
 

package/src/components/editor/event/RegistrationCard.tsx

@@ -4,7 +4,8 @@ import type { EventCta } from '../../../lib/schema';
 import type { EventMeta } from '../EventPanel';
 import { Section } from './Section';
 import { RegistrationFormEditor } from './RegistrationFormEditor';
-import { ctaHrefValid, normalizeCtaHref, registrationMode, registrationPatch, type RegistrationMode } from './registration';
+import { closeBeforeAmount, closeBeforeMinutes, closeBeforeUnit, ctaHrefValid, deadlineAfterEnd, normalizeCtaHref, registrationMode, registrationPatch, type CloseUnit, type RegistrationMode } from './registration';
+import { datePart, timePart } from './dates';
 
 const MODES: { id: RegistrationMode; label: string; sub: string }[] = [
   { id: 'none', label: 'None', sub: 'Just the details' },
@@ -73,6 +74,7 @@ export function RegistrationCard({ meta, onChange, eventId, title = '' }: { even
               <input type="checkbox" role="switch" className="pe-switch" checked={meta.rsvp.autoConfirm} onChange={(e) => onChange({ rsvp: { ...meta.rsvp, autoConfirm: e.target.checked } })} />
             </label>
           </div>
+          <Deadline meta={meta} onChange={onChange} />
           <div className="pe-evr-form">
             <div className="pe-evr-form-t">
               <b>{form.title || 'Registration form'}</b>
@@ -90,6 +92,54 @@ export function RegistrationCard({ meta, onChange, eventId, title = '' }: { even
   );
 }
 
+// When RSVPs close: a date and time for a one-time event, "[N] hours/days
+// before each date" for a repeating one. A setting the other kind left behind
+// (the event changed kind) is shown with a way to remove it, never hidden.
+function Deadline({ meta, onChange }: { meta: EventMeta; onChange: (patch: Partial<EventMeta>) => void }) {
+  const closesAt = meta.rsvp.closesAt ?? null;
+  const before = meta.rsvp.closeBefore ?? 0;
+  const [unit, setUnit] = useState<CloseUnit>(() => closeBeforeUnit(before));
+  const set = (patch: Partial<EventMeta['rsvp']>) => onChange({ rsvp: { ...meta.rsvp, ...patch } });
+  const amount = closeBeforeAmount(before, unit);
+  const ahead = `${amount} ${amount === 1 ? unit.slice(0, -1) : unit}`;
+  const at = (wall: string) => `${new Date(`${datePart(wall)}T12:00:00Z`).toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric', timeZone: 'UTC' })}, ${timePart(wall)}`;
+  const remove = (patch: Partial<EventMeta['rsvp']>) => <button type="button" className="pe-evw-link" onClick={() => set(patch)}>Remove</button>;
+
+  if (meta.rrule) return (
+    <div className="pe-field pe-evr-close" role="group" aria-labelledby="ev-rsvp-close">
+      <span id="ev-rsvp-close">Close RSVPs</span>
+      <div className="pe-evr-when">
+        <input type="number" min={0} max={unit === 'days' ? 60 : 1440} placeholder="0" aria-label={`${unit} before each date`} value={before ? amount : ''}
+          onChange={(e) => set({ closeBefore: closeBeforeMinutes(Number(e.target.value), unit) })} />
+        <select aria-label="Unit" value={unit} onChange={(e) => { const next = e.target.value as CloseUnit; setUnit(next); if (before) set({ closeBefore: closeBeforeMinutes(amount, next) }); }}>
+          <option value="hours">{amount === 1 ? 'hour' : 'hours'}</option>
+          <option value="days">{amount === 1 ? 'day' : 'days'}</option>
+        </select>
+        <span>before each date</span>
+      </div>
+      <small className="pe-evs-hint">{before ? `Each date stops taking RSVPs ${ahead} before it starts.` : 'Leave empty to take RSVPs until each date ends.'}</small>
+      {closesAt && <small className="pe-evs-hint">Every date also closes {at(closesAt)}. {remove({ closesAt: null })}</small>}
+    </div>
+  );
+  const late = closesAt ? deadlineAfterEnd(closesAt, meta) : false;
+  return (
+    <div className="pe-field pe-evr-close" role="group" aria-labelledby="ev-rsvp-close">
+      <span id="ev-rsvp-close">RSVPs close</span>
+      <div className="pe-evr-when">
+        <input type="date" aria-label="RSVPs close on" max={datePart(meta.end || meta.start) || undefined} value={closesAt ? datePart(closesAt) : ''}
+          onChange={(e) => set({ closesAt: e.target.value ? `${e.target.value}T${(closesAt && timePart(closesAt)) || timePart(meta.start) || '12:00'}` : null })} />
+        <input type="time" aria-label="RSVPs close at" step={300} disabled={!closesAt} value={closesAt ? timePart(closesAt) : ''}
+          onChange={(e) => { if (closesAt && e.target.value) set({ closesAt: `${datePart(closesAt)}T${e.target.value}` }); }} />
+        {closesAt && remove({ closesAt: null })}
+      </div>
+      <small className={`pe-evs-hint ${late ? 'is-error' : ''}`}>
+        {!closesAt ? 'Leave empty to take RSVPs until the event ends.' : late ? 'That’s after the event ends, so RSVPs stay open until it ends.' : 'In the event’s time zone. Then the page says RSVPs are closed.'}
+      </small>
+      {!closesAt && before > 0 && <small className="pe-evs-hint">It closes {ahead} before it starts. {remove({ closeBefore: 0 })}</small>}
+    </div>
+  );
+}
+
 // The link only reaches the event (and autosave) once it's valid, so a
 // half-typed link never blocks saving the rest. Blur fills in https://,
 // mailto: or tel: for bare domains, emails and phone numbers.

package/src/components/editor/event/registration.ts

@@ -1,4 +1,5 @@
 import type { EventCta } from '../../../lib/schema';
+import { toMin } from './dates';
 
 // The Registration card is one choice over two stored fields: `cta` (a link
 // button) and `rsvp` (the "Save my seat" form, which replaces the button on
@@ -8,7 +9,7 @@ export type RegistrationMode = 'none' | 'link' | 'rsvp';
 
 interface RegistrationData {
   cta: EventCta;
-  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number };
+  rsvp: { enabled: boolean; capacity: number; autoConfirm: boolean; maxSeats: number; closesAt?: string | null; closeBefore?: number };
 }
 
 export function registrationMode({ cta, rsvp }: RegistrationData): RegistrationMode {
@@ -37,3 +38,19 @@ export function normalizeCtaHref(raw: string): string {
   if (/^([\w-]+\.)+[a-z]{2,}(:\d+)?([/?#]\S*)?$/i.test(v)) return `https://${v}`;
   return v;
 }
+
+// RSVP deadline. One-time events pick when RSVPs close (closesAt); repeating
+// ones close each date "[N] [hours|days] before" it starts (closeBefore, in
+// minutes, at most 60 days). The server checks both again on save.
+export type CloseUnit = 'hours' | 'days';
+export const closeBeforeUnit = (minutes: number): CloseUnit => (minutes > 0 && minutes % 1440 === 0 ? 'days' : 'hours');
+export const closeBeforeAmount = (minutes: number, unit: CloseUnit) => minutes / (unit === 'days' ? 1440 : 60);
+export const closeBeforeMinutes = (amount: number, unit: CloseUnit) =>
+  Math.min(60 * 1440, Math.max(0, Math.round((Number.isFinite(amount) ? amount : 0) * (unit === 'days' ? 1440 : 60))));
+
+// a deadline at or after the end changes nothing: RSVPs close then anyway
+export function deadlineAfterEnd(closesAt: string, when: { start: string; end: string; allDay: boolean }): boolean {
+  const end = when.end || when.start;
+  if (!closesAt || !end) return false;
+  return toMin(closesAt) >= (when.allDay ? toMin(end.slice(0, 10)) + 1440 : toMin(end));
+}

package/src/lib/booking/emails.ts

@@ -97,7 +97,8 @@ ${button ? `<p style="margin:22px 0 0"><a href="${esc(button.href)}" style="disp
   return { html, text };
 }
 
-export type BookingEmail = 'received' | 'confirmed' | 'declined' | 'cancelled' | 'rescheduled' | 'updated' | 'reminder' | 'staff-new';
+// link: the booking's own link again, after someone tried to make it twice
+export type BookingEmail = 'received' | 'confirmed' | 'declined' | 'cancelled' | 'rescheduled' | 'updated' | 'reminder' | 'link' | 'staff-new';
 
 export function bookingEmail(kind: BookingEmail, c: Ctx): Mail {
   const w = bookingStrings(c.lang);
@@ -118,6 +119,7 @@ export function bookingEmail(kind: BookingEmail, c: Ctx): Mail {
     case 'updated': return { ...guest('updated'), attachments: ics() };
     case 'rescheduled': return { ...guest('rescheduled'), attachments: ics() };
     case 'reminder': return guest('reminder');
+    case 'link': return guest('link');
     case 'staff-new': {
       const pending = c.booking.status === 'pending';
       const who = [c.booking.name, c.booking.email, c.booking.phone].filter(Boolean).join(' · ');

package/src/lib/booking/service.ts

@@ -10,7 +10,7 @@ import { emitWebhook } from '../webhooks';
 import { parseFrom } from '../email/config';
 import { kickEmail } from '../email/service';
 import { eventUrl } from '../calendar/config';
-import { eventTimeZone, locationLine, occurrenceKey } from '../calendar/events';
+import { eventTimeZone, locationLine, occurrenceKey, rsvpDeadline } from '../calendar/events';
 import { normalizePageLocale } from '../i18n';
 import { localizeDoc } from '../translations';
 import { bookingStrings } from '../email/booking-words';
@@ -28,7 +28,8 @@ export interface FlowOptions {
 }
 
 export class BookingError extends Error {
-  constructor(public status: number, message: string) { super(message); }
+  // code: why, when the status alone doesn't say (apps get it as the error code)
+  constructor(public status: number, message: string, public code?: 'duplicate') { super(message); }
 }
 
 const token = () => {
@@ -113,10 +114,11 @@ export function bookingJson(b: Booking, extra: { title?: string; resourceSlug?:
   };
 }
 
-export async function bookingMail(repo: ContentRepository, b: Booking, kind: BookingEmail, origin: string, from = '', snapshot?: { message?: string; eventTitle?: string; eventLocation?: string; eventAllDay?: number }) {
+// snapshot.locale: the language to use instead of the booking's (a link sent again)
+export async function bookingMail(repo: ContentRepository, b: Booking, kind: BookingEmail, origin: string, from = '', snapshot?: { message?: string; eventTitle?: string; eventLocation?: string; eventAllDay?: number; locale?: string }) {
   const site = await repo.getSettings();
   // the guest hears in the language they booked in; staff in the main one
-  const language = bookingLanguage(kind === 'staff-new' ? { locale: '' } : b, site);
+  const language = bookingLanguage(kind === 'staff-new' ? { locale: '' } : typeof snapshot?.locale === 'string' ? { locale: snapshot.locale } : b, site);
   const settings = language.settings;
   const d = await describe(repo,b,settings,language.locale);
   if (b.kind === 'rsvp' && !d.event && snapshot?.eventTitle) {
@@ -125,7 +127,7 @@ export async function bookingMail(repo: ContentRepository, b: Booking, kind: Boo
     d.when = whenText(b,b.timezone || settings.timezone || 'UTC',settings,!!snapshot.eventAllDay);
   }
   return bookingEmail(kind, { booking:b,resource:d.resource,link:d.link,title:d.title,location:d.location,when:d.when,
-    manageUrl:kind === 'staff-new' ? `${origin}/admin/calendar/bookings?b=${b.id}` : origin + bookingManagePath(b),
+    manageUrl:kind === 'staff-new' ? `${origin}/admin/calendar/bookings?b=${b.id}` : origin + bookingManagePath({ manageToken: b.manageToken, locale: language.locale }),
     siteTitle:settings.siteTitle,host:new URL(origin).host,organizer:parseFrom(from)?.email,message:snapshot?.message,
     allDay:d.link?.mode==='day'||!!d.event?.allDay||(!d.event&&!!snapshot?.eventAllDay), lang:language.lang });
 }
@@ -275,29 +277,54 @@ export async function createRsvp(
   opts: FlowOptions
 ): Promise<Booking> {
   const e = args.event;
+  const now = opts.now ?? Date.now();
   if (!e.rsvp.enabled) throw new BookingError(400, 'This event doesn’t take RSVPs.');
   if (e.cancelled) throw new BookingError(410, 'This event is cancelled.');
-  if (args.end <= (opts.now ?? Date.now())) throw new BookingError(410, 'This event has already happened.');
-  if (e.cancelledDates?.length && e.cancelledDates.includes(occurrenceKey(e, args.start, await repo.getSettings()))) {
+  if (args.end <= now) throw new BookingError(410, 'This event has already happened.');
+  const settings = await repo.getSettings();
+  if (e.cancelledDates?.length && e.cancelledDates.includes(occurrenceKey(e, args.start, settings))) {
     throw new BookingError(410, 'This date is cancelled.');
   }
+  const deadline = rsvpDeadline({ event: e, start: args.start, end: args.end }, settings);
+  if (deadline !== null && deadline <= now) throw new BookingError(410, 'RSVPs for this date are closed.');
   const seats = Math.max(1, Math.min(e.rsvp.maxSeats || 1, Math.floor(args.seats) || 1));
   const booker = validateBooker(null, args.booker);
-  await checkEmailCap(repo, booker.email, args.source, await repo.getSettings(), opts.now);
+  await checkEmailCap(repo, booker.email, args.source, settings, opts.now);
   const formResponse = e.rsvp.form ? await collectResponse(e.rsvp.form, args.booker.answers ?? {}, args.booker.formVersion) : undefined;
   if (formResponse) booker.answers = displayAnswers(formResponse);
+  // one RSVP per address and date on public channels; staff may add more
+  const once = args.source !== 'admin';
   const b = await repo.createBooking({
     kind: 'rsvp', resourceId: '', linkId: '', eventId: e.id, status: e.rsvp.autoConfirm ? 'confirmed' : 'pending',
     start: args.start, end: args.end, holdStart: args.start, holdEnd: args.end, timezone: e.timezone, ...booker, seats,
     formResponse, notes: '', manageToken: token(), source: args.source ?? 'web', locale: normalizePageLocale(args.booker.locale ?? ''),
-  }, { capacity: e.rsvp.capacity, idempotency: opts.idempotency });
-  if (!b) throw new BookingError(409, e.rsvp.capacity ? 'Sorry — that’s more seats than are left.' : 'Couldn’t save your RSVP.');
+  }, { capacity: e.rsvp.capacity, oncePerEmail: once, idempotency: opts.idempotency });
+  if (!b) {
+    // a retry of a request that just committed: the caller replays that one
+    const retry = opts.idempotency ? await repo.getBookingRequest(opts.idempotency.keyHash) : null;
+    const mine = once && !retry ? (await repo.listBookings({ eventId: e.id, email: booker.email, from: args.start - 1, to: args.start + 1, statuses: ['pending', 'confirmed'], kinds: ['rsvp'] })).find((x) => x.start === args.start) : undefined;
+    if (mine) {
+      await resendManageLink(repo, mine, args.booker.locale === undefined ? mine.locale : normalizePageLocale(args.booker.locale), opts);
+      // anyone can type an address: say only that it has one
+      throw new BookingError(409, 'You already have an RSVP for this date. We sent you an email with a link to change it.', 'duplicate');
+    }
+    throw new BookingError(409, e.rsvp.capacity ? 'Sorry — that’s more seats than are left.' : 'Couldn’t save your RSVP.');
+  }
   await notify(repo, b, [b.status === 'confirmed' ? 'confirmed' : 'received'], opts);
   await hook(repo, 'booking.created', b, opts);
   if (b.status === 'confirmed') await hook(repo, 'booking.confirmed', b, opts);
   return b;
 }
 
+// The address gets its RSVP's own link again, in the language it just used,
+// at most once per 10 minutes per RSVP so the form can't flood an inbox.
+async function resendManageLink(repo: ContentRepository, b: Booking, locale: string, opts: FlowOptions) {
+  if (!await repo.email.rateLimit(`rsvp-link:${b.id}`, 1, 10 * 60_000)) return;
+  await repo.email.enqueue({dedupe:`${b.id}:${b.notificationVersion}:link:${Date.now()}`,kind:'booking',recipient:b.email,
+    payload:JSON.stringify({bookingId:b.id,version:b.notificationVersion,kind:'link',locale}),configVersion:(await repo.email.config())?.version||0,expiresAt:b.end});
+  await kickEmail(repo,opts.locals,opts.waitUntil);
+}
+
 const TRANSITIONS: Record<BookingStatus, BookingStatus[]> = {
   pending: ['confirmed', 'declined', 'cancelled'],
   confirmed: ['cancelled'],