@acms-subir/core 0.3.38 → 0.3.40

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/sql.ts

@@ -11,7 +11,7 @@ import { PermissionStore } from '../permissions/store';
 import { BackupStore } from '../backup/store';
 import { LiveConfig } from '../live/types';
 import { ApiError } from '../api';
-import { EmailStore, bookingJobs } from '../email/store';
+import { EmailStore, bookingJobs, rsvpStaffJobs } from '../email/store';
 import type { ContentRepository, DesignVersion, EventUpdate, ImportRecord, ImportRecordKind, ImportRun, SearchResults, Stats } from './types';
 import { DocTranslations, Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Calendar, CalEvent, ApiKey, Webhook, WebhookDelivery, Resource, BookingLink, Booking, Place, EventLocation, EventRequest, isInternalTag, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
 import { designSnapshot, draftNavItems, pickDesignDraft, pickEventDraft, pickPageDraft, pickPostDraft } from '../drafts';
@@ -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 > ?)`,
@@ -1238,7 +1241,7 @@ export class SqlRepository implements ContentRepository {
         SELECT ?,?,id,? FROM bookings WHERE id=?`, args: [keyHash, requestHash, now, b.id] });
     }
     // Booking, retry ledger and email outbox commit together on D1 and libSQL.
-    await this.driver.batch([write, ...ledger, ...bookingJobs(b.id, b.status === 'confirmed' ? 'confirmed' : 'received', 0, true)]);
+    await this.driver.batch([write, ...ledger, ...bookingJobs(b.id, b.status === 'confirmed' ? 'confirmed' : 'received', 0, true), ...rsvpStaffJobs(b.id, 'staff-rsvp', guard.staff, 0)]);
     return this.getBooking(b.id);
   }
   async moveBooking(id: string, t: { start: number; end: number; holdStart: number; holdEnd: number }) {
@@ -1275,7 +1278,8 @@ export class SqlRepository implements ContentRepository {
     args.push(id);
     const kind = data.status === 'confirmed' ? 'confirmed' : data.status === 'declined' ? 'declined' : data.status === 'pending' ? 'received' : 'cancelled';
     await this.driver.batch([{sql:`UPDATE bookings SET ${sets.join(', ')} WHERE id = ? AND notification_version = ?`,args:[...args,current.notificationVersion]},
-      ...(changed ? bookingJobs(id,kind,current.notificationVersion+1,false,mutation,data.notificationMessage) : [])]);
+      ...(changed ? bookingJobs(id,kind,current.notificationVersion+1,false,mutation,data.notificationMessage) : []),
+      ...(changed && data.status === 'cancelled' ? rsvpStaffJobs(id,'staff-rsvp-cancelled',data.staff,current.notificationVersion+1,mutation) : [])]);
   }
   async deleteBooking(id: string) {
     await this.ready;

package/src/lib/repo/types.ts

@@ -7,6 +7,7 @@ import type { SavedForm, FormSubmission } from '../forms/schema';
 import type { LiveStore } from '../live/store';
 import type { BookingRequest } from '../backup/content';
 import type { EmailStore } from '../email/store';
+import type { RsvpStaffNotice } from '../email/types';
 import type { PushStore } from '../push/store';
 import type { AnnouncementStore } from '../announcements/store';
 import type { Announcement } from '../announcements/types';
@@ -187,8 +188,10 @@ 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
-  // returns null when it lost.
+  // 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. staff: who hears about a new RSVP (queued with
+  // it, so a lost race or a replay emails no one).
   /** 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[]>;
   getBooking(id: string): Promise<Booking | null>;
@@ -198,11 +201,12 @@ export interface ContentRepository {
   // locale: the booker's language; '' (the main language) when left out
   createBooking(
     data: Omit<Booking, 'id' | 'createdAt' | 'updatedAt' | 'reminderSentAt' | 'notificationVersion' | 'locale'> & { locale?: string },
-    guard?: { capacity?: number; idempotency?: { keyHash: string; requestHash: string } }
+    guard?: { capacity?: number; oncePerEmail?: boolean; idempotency?: { keyHash: string; requestHash: string }; staff?: RsvpStaffNotice }
   ): 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>;
-  updateBooking(id: string, data: Partial<Pick<Booking, 'status' | 'notes' | 'name' | 'email' | 'phone' | 'answers' | 'reminderSentAt'>> & { notificationMessage?: string }): Promise<void>;
+  // staff: who hears that the person cancelled their RSVP (status → cancelled only)
+  updateBooking(id: string, data: Partial<Pick<Booking, 'status' | 'notes' | 'name' | 'email' | 'phone' | 'answers' | 'reminderSentAt'>> & { notificationMessage?: string; staff?: RsvpStaffNotice }): Promise<void>;
   deleteBooking(id: string): Promise<void>;
   // confirmed bookings starting in [from, to) that haven't had a reminder
   listDueReminders(from: number, to: number): Promise<Booking[]>;

package/src/lib/schema.ts

@@ -415,12 +415,19 @@ 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. notifyStaff:
+  // the hosts (else the church's contact email) hear about each new RSVP and
+  // each one the person cancels (lib/booking/service.ts rsvpStaff).
   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),
+    notifyStaff: z.boolean().default(true),
     form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or

package/src/pages/api/v1/events/[slug]/index.ts

@@ -0,0 +1,8 @@
+import { getEventDetail } from '../../../../../lib/mobile/calendar';
+import { readRoute } from '../../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../../lib/mobile/http';
+// the next occurrence moves with the clock: not timeless
+export const GET = readRoute(getEventDetail, true);
+export const HEAD = GET;
+export const ALL = () => methodNotAllowed();

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';
@@ -50,6 +50,7 @@ const origin = siteOrigin(settings, Astro.url);
 // RSVP: "Save my seat" posts back here and lands on the manage page, in the
 // 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();
@@ -66,13 +67,19 @@ if (Astro.request.method === 'POST' && event.rsvp.enabled) {
     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