@acms-subir/core 0.3.56 → 0.3.57

package/src/lib/push/service.ts

@@ -5,7 +5,8 @@ import type { ContentRepository } from '../repo/types';
 import type { CalEvent, Calendar, Post, Settings } from '../schema';
 import { CONTENT, collectionUrl } from '../content';
 import { CALENDAR, eventUrl } from '../calendar/config';
-import { eventIsListed, eventTimeZone, expandEvents, findOccurrence, type Occurrence } from '../calendar/events';
+import { cutsAt, eventIsListed, eventTimeZone, expandEvents, findOccurrence, partOf, type Occurrence } from '../calendar/events';
+import { describeRepeat } from '../calendar/rrule';
 import { tzParts } from '../calendar/ics';
 import { I18N, stripLocale } from '../i18n';
 import { localizeDoc } from '../translations';
@@ -98,28 +99,30 @@ interface Words {
   cancelled: (d: string) => string; cancelledFrom: (d: string) => string; cancelledOn: (d: string) => string; more: (n: number) => string;
   // one date of a series moved (CalEvent.movedDates), or several: their new days
   dateMoved: (to: string, was: string) => string; datesMoved: (d: string) => string;
+  // the series changed from a date on (CalEvent.segments): "From Wed, Jan 16: Weekly on Wednesday, 5:00 PM"
+  fromDate: (d: string, what: string) => string;
 }
 const STRINGS: Record<string, Words> = {
   en: { startsIn: (m) => `Starts in ${m} min`, now: 'Starting now', live: 'We’re live',
     moved: (to, was) => `Now ${to} (was ${was})`, movedTo: (to, p) => `Now ${to} · ${p}`, place: (p) => `New place: ${p}`,
     cancelled: (d) => `Cancelled: ${d}`, cancelledFrom: (d) => `Cancelled: every date from ${d}`, cancelledOn: (d) => `Cancelled on ${d}`, more: (n) => `${n} more`,
-    dateMoved: (to, was) => `Moved to ${to} (was ${was})`, datesMoved: (d) => `New times on ${d}` },
+    dateMoved: (to, was) => `Moved to ${to} (was ${was})`, datesMoved: (d) => `New times on ${d}`, fromDate: (d, w) => `From ${d}: ${w}` },
   es: { startsIn: (m) => `Empieza en ${m} min`, now: 'Empieza ahora', live: 'Estamos en vivo',
     moved: (to, was) => `Ahora ${to} (antes ${was})`, movedTo: (to, p) => `Ahora ${to} · ${p}`, place: (p) => `Nuevo lugar: ${p}`,
     cancelled: (d) => `Cancelado: ${d}`, cancelledFrom: (d) => `Cancelado: todas las fechas desde el ${d}`, cancelledOn: (d) => `Cancelado el ${d}`, more: (n) => `${n} más`,
-    dateMoved: (to, was) => `Se cambia al ${to} (antes ${was})`, datesMoved: (d) => `Nuevo horario el ${d}` },
+    dateMoved: (to, was) => `Se cambia al ${to} (antes ${was})`, datesMoved: (d) => `Nuevo horario el ${d}`, fromDate: (d, w) => `Desde el ${d}: ${w}` },
   fr: { startsIn: (m) => `Commence dans ${m} min`, now: 'Commence maintenant', live: 'Nous sommes en direct',
     moved: (to, was) => `Désormais ${to} (au lieu de ${was})`, movedTo: (to, p) => `Désormais ${to} · ${p}`, place: (p) => `Nouveau lieu : ${p}`,
     cancelled: (d) => `Annulé : ${d}`, cancelledFrom: (d) => `Annulé : toutes les dates à partir du ${d}`, cancelledOn: (d) => `Annulé le ${d}`, more: (n) => `${n} autres`,
-    dateMoved: (to, was) => `Déplacé au ${to} (au lieu de ${was})`, datesMoved: (d) => `Nouveaux horaires le ${d}` },
+    dateMoved: (to, was) => `Déplacé au ${to} (au lieu de ${was})`, datesMoved: (d) => `Nouveaux horaires le ${d}`, fromDate: (d, w) => `À partir du ${d} : ${w}` },
   de: { startsIn: (m) => `Beginnt in ${m} Min.`, now: 'Beginnt jetzt', live: 'Wir sind live',
     moved: (to, was) => `Jetzt ${to} (statt ${was})`, movedTo: (to, p) => `Jetzt ${to} · ${p}`, place: (p) => `Neuer Ort: ${p}`,
     cancelled: (d) => `Abgesagt: ${d}`, cancelledFrom: (d) => `Abgesagt: alle Termine ab ${d}`, cancelledOn: (d) => `Abgesagt am ${d}`, more: (n) => `${n} weitere`,
-    dateMoved: (to, was) => `Verschoben auf ${to} (statt ${was})`, datesMoved: (d) => `Neue Zeiten am ${d}` },
+    dateMoved: (to, was) => `Verschoben auf ${to} (statt ${was})`, datesMoved: (d) => `Neue Zeiten am ${d}`, fromDate: (d, w) => `Ab ${d}: ${w}` },
   pt: { startsIn: (m) => `Começa em ${m} min`, now: 'Começa agora', live: 'Estamos ao vivo',
     moved: (to, was) => `Agora ${to} (antes ${was})`, movedTo: (to, p) => `Agora ${to} · ${p}`, place: (p) => `Novo local: ${p}`,
     cancelled: (d) => `Cancelado: ${d}`, cancelledFrom: (d) => `Cancelado: todas as datas a partir de ${d}`, cancelledOn: (d) => `Cancelado em ${d}`, more: (n) => `mais ${n}`,
-    dateMoved: (to, was) => `Mudou para ${to} (antes ${was})`, datesMoved: (d) => `Novos horários em ${d}` },
+    dateMoved: (to, was) => `Mudou para ${to} (antes ${was})`, datesMoved: (d) => `Novos horários em ${d}`, fromDate: (d, w) => `A partir de ${d}: ${w}` },
 };
 export const pushStrings = (locale: string) => STRINGS[locale.split('-')[0]] ?? STRINGS.en;
 
@@ -299,7 +302,8 @@ export const CHANGE_SOON = 3 * HOUR;
 export function eventSnapshot(e: CalEvent): EventSnapshot {
   return { start: e.start, end: e.end, allDay: e.allDay, timezone: e.timezone, rrule: e.rrule, exdates: [...e.exdates].sort(),
     cancelled: e.cancelled, cancelledDates: [...e.cancelledDates].sort(), location: { name: e.location.name.trim(), address: e.location.address.trim() },
-    movedDates: Object.fromEntries(Object.keys(e.movedDates ?? {}).sort().map((k) => [k, { start: e.movedDates[k].start, end: e.movedDates[k].end }])) };
+    movedDates: Object.fromEntries(Object.keys(e.movedDates ?? {}).sort().map((k) => [k, { start: e.movedDates[k].start, end: e.movedDates[k].end }])),
+    segments: (e.segments ?? []).map(({ from, start, end, rrule, cancelled }) => ({ from, start, end, rrule, cancelled })).sort((a, b) => (a.from < b.from ? -1 : 1)) };
 }
 function readSnapshot(raw: string | null): EventSnapshot | null {
   try { const r = EventSnapshot.safeParse(JSON.parse(raw ?? '')); return r.success ? r.data : null; } catch { return null; }
@@ -317,6 +321,10 @@ export interface EventChange {
   cancelledDates?: Slot[];
   /** single dates of a repeating event at a new time (moved, moved again or moved back), by their new time */
   movedDates?: { from: Slot; to: Slot }[];
+  /** the series changed from a date on (or back): its first new date, and the rule it follows from there */
+  fromDate?: { at: Slot; rrule: string; start: string };
+  /** every date from this one on cancelled (a cancelled segment) */
+  cancelledFrom?: Slot;
   /** when the soonest date it touches starts (a move: the old or the new time, whichever is sooner) */
   at: number;
 }
@@ -342,7 +350,24 @@ export function eventChange(was: EventSnapshot, e: CalEvent, settings: Pick<Sett
   if (!upcoming) return null;
   if (e.cancelled) return { cancelled: upcoming, at: upcoming.start };
   // the series as people knew it, with today's moved dates (those are compared one by one below)
+  // (its segments are today's: a change to them is told on its own, below)
   const then: CalEvent = { ...e, start: was.start, end: was.end, allDay: was.allDay, timezone: was.timezone, rrule: was.rrule, exdates: was.exdates, cancelledDates: was.cancelledDates };
+  // changed from a date on (or back): one notice from the first date it touches; the dates it carried over aren't news on their own
+  const segs = (list: EventSnapshot['segments']) => new Map(list.map((g) => [g.from, JSON.stringify(g)]));
+  const before = segs(was.segments), after = segs(eventSnapshot(e).segments);
+  const touched = [...new Set([...before.keys(), ...after.keys()])].filter((k) => before.get(k) !== after.get(k)).sort()[0];
+  // (when the whole series moved, its segments moved with it: that's told as a move below)
+  const sameSeries = was.start === e.start && was.end === e.end && was.rrule === e.rrule && was.allDay === e.allDay && was.timezone === e.timezone;
+  if (touched !== undefined && sameSeries) {
+    const first = expandEvents([e], settings, { displayTz: settings.timezone || 'UTC', now, windowStartMs: now, windowEndMs: now + 400 * DAY })
+      .find((o) => o.start > now && (cutsAt(touched, o.key) || (o.segment ?? '') >= touched));
+    if (!first) return null;
+    const part = partOf(e, first);
+    const slot = { start: first.start, allDay: first.allDay };
+    const place = { name: e.location.name.trim(), address: e.location.address.trim() };
+    const placeChange = (place.name || place.address) && (place.name !== was.location.name || place.address !== was.location.address) ? { place: { from: was.location, to: place } } : {};
+    return part.cancelled ? { cancelledFrom: slot, at: slot.start, ...placeChange } : { fromDate: { at: slot, rrule: part.rrule, start: part.start }, at: slot.start, ...placeChange };
+  }
   // a date taken out of the series (dragged to its own event) or put back isn't a move
   const exdates = [...new Set([...was.exdates, ...e.exdates])];
   const from = slots({ ...then, exdates }, settings, now).next;
@@ -418,10 +443,11 @@ export function eventChangeNotice(e: CalEvent, change: EventChange, settings: Se
   const zone = (x: Slot) => (x.allDay ? siteTz : tz);
   const dates = change.cancelledDates ?? [];
   const movedDates = change.movedDates ?? [];
-  const kind = change.cancelled ? 'cancelled' : change.moved ? 'moved' : change.place ? 'place' : movedDates.length ? 'dateMoved' : 'dateCancelled';
+  const kind = change.cancelled ? 'cancelled' : change.cancelledFrom ? 'cancelledFrom' : change.fromDate ? 'fromDate' : change.moved ? 'moved' : change.place ? 'place' : movedDates.length ? 'dateMoved' : 'dateCancelled';
   // one cancelled or moved date opens that date (?on= is its day in the site's zone, like calendar links)
   let on = '';
-  const one = kind === 'dateCancelled' && dates.length === 1 ? dates[0] : kind === 'dateMoved' && movedDates.length === 1 && !dates.length ? movedDates[0].to : null;
+  const one = kind === 'dateCancelled' && dates.length === 1 ? dates[0] : kind === 'dateMoved' && movedDates.length === 1 && !dates.length ? movedDates[0].to
+    : change.fromDate?.at ?? change.cancelledFrom ?? null;
   if (one) {
     const p = tzParts(one.start, siteTz);
     on = `?on=${p.y}-${String(p.m).padStart(2, '0')}-${String(p.d).padStart(2, '0')}`;
@@ -432,7 +458,13 @@ export function eventChangeNotice(e: CalEvent, change: EventChange, settings: Se
     const day = (x: Slot) => when(x.start, true, zone(x), locale);
     const parts: string[] = [];
     if (change.cancelled) parts.push(ev.rrule ? s.cancelledFrom(day(change.cancelled)) : s.cancelled(at(change.cancelled)));
-    else {
+    else if (change.cancelledFrom) parts.push(s.cancelledFrom(day(change.cancelledFrom)));
+    else if (change.fromDate) {
+      const { at: first, rrule, start } = change.fromDate;
+      const rule = describeRepeat(rrule, start, undefined, locale);
+      parts.push(s.fromDate(day(first), first.allDay || !rule ? rule || at(first) : `${rule}, ${when(first.start, false, zone(first), locale, 'time')}`));
+      if (change.place) parts.push(s.place(ev.location.name.trim() || ev.location.address.trim()));
+    } else {
       const loc = { name: ev.location.name.trim(), address: ev.location.address.trim() };
       // a new name is enough; the same name at a new address needs both
       const place = !change.place ? '' : change.place.to.name !== change.place.from.name ? loc.name || loc.address : [loc.name, loc.address].filter(Boolean).join(', ');

package/src/lib/push/types.ts

@@ -40,6 +40,8 @@ export const EventSnapshot = z.object({
   cancelled: z.boolean(), cancelledDates: z.array(z.string()), location: z.object({ name: z.string(), address: z.string() }),
   // single dates at another time (key → new wall times); notices queued before moved dates have none
   movedDates: z.record(z.object({ start: z.string(), end: z.string() })).default({}),
+  // the series from a date on (CalEvent.segments); notices queued before segments have none
+  segments: z.array(z.object({ from: z.string(), start: z.string(), end: z.string(), rrule: z.string(), cancelled: z.boolean() })).default([]),
 });
 export type EventSnapshot = z.infer<typeof EventSnapshot>;
 

package/src/lib/repo/migrations.ts

@@ -5,7 +5,7 @@ import { WEBHOOK_MIGRATION } from '../webhook-sql';
 import { PUSH_MIGRATION } from '../push/migration';
 import { EDITOR_MIGRATION, EDITOR_GRACE_MIGRATION } from '../editor/migration';
 import { CALENDAR_SETTINGS_MIGRATION, ROOM_HOLD_MIGRATION } from '../calendar/migration';
-import { EVENT_CHANGES_MIGRATION, MOVED_DATES_MIGRATION } from '../calendar/change-migration';
+import { EVENT_CHANGES_MIGRATION, MOVED_DATES_MIGRATION, SEGMENTS_MIGRATION } from '../calendar/change-migration';
 import { PLACES_MIGRATION } from '../maps/migration';
 import { ROLES_MIGRATION } from '../permissions/migration';
 import { SYNC_MIGRATION } from '../sync/migration';
@@ -738,13 +738,16 @@ export const MIGRATIONS: Migration[] = [
   // two-way Google Calendar sync: the account, links, pairs, outgoing queue
   // (triggers on events) and Recent changes. Not public, so no cache trigger.
   GCAL_MIGRATION,
+  // a series changed from one date on (CalEvent.segments): a column on the
+  // row, so the triggers on events see it, like moved_dates
+  SEGMENTS_MIGRATION(contentVersionTriggers('events', [...CONTENT_VERSION_COLUMNS.events, 'cancelled_dates', 'moved_dates', 'segments'])[2]),
 ];
 
 // Current cache coverage; keep earlier migration inputs frozen for upgrade compatibility.
 export const CURRENT_CONTENT_VERSION_COLUMNS = {
   ...CONTENT_VERSION_COLUMNS,
   settings: [...CONTENT_VERSION_COLUMNS.settings, 'links_verified', 'links_avatar_shape', 'links_avatar_fit', 'links_avatar_scale', 'legal'],
-  events: [...CONTENT_VERSION_COLUMNS.events, 'cancelled_dates', 'moved_dates'],
+  events: [...CONTENT_VERSION_COLUMNS.events, 'cancelled_dates', 'moved_dates', 'segments'],
   resources: [...CONTENT_VERSION_COLUMNS.resources, 'color', 'show_on_events'],
   announcements: ANNOUNCEMENT_VISIBLE_COLUMNS,
 };

package/src/lib/repo/sql.ts

@@ -16,7 +16,7 @@ import { LiveConfig } from '../live/types';
 import { ApiError } from '../api';
 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, MovedDate, isInternalTag, roomColor, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
+import { DocTranslations, Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Calendar, CalEvent, ApiKey, Webhook, WebhookDelivery, Resource, BookingLink, Booking, Place, EventLocation, EventRequest, MovedDate, SeriesSegment, isInternalTag, roomColor, normalizeRedirectPath, publicTags, slugify, type WidgetInstance } from '../schema';
 import { designSnapshot, draftNavItems, pickDesignDraft, pickEventDraft, pickPageDraft, pickPostDraft } from '../drafts';
 import { eventInstants, eventTimeZone, normalizeEventTimes } from '../calendar/events';
 import { cleanRrule } from '../calendar/rrule';
@@ -164,6 +164,13 @@ function parseMovedDates(raw: unknown): CalEvent['movedDates'] {
 // (push_control.quiet shares the write's transaction)
 const quietly = (write: SqlStatement, quiet?: boolean): SqlStatement[] =>
   quiet ? [{ sql: 'UPDATE push_control SET quiet=1 WHERE id=1' }, write, { sql: 'UPDATE push_control SET quiet=0 WHERE id=1' }] : [write];
+// a corrupt segments list, or one bad segment, reads as "not changed from a date"
+function parseSegments(raw: unknown): CalEvent['segments'] {
+  let value: unknown;
+  try { value = JSON.parse(String(raw ?? '[]')); } catch { return []; }
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((entry) => { const s = SeriesSegment.safeParse(entry); return s.success ? [s.data] : []; }).sort((a, b) => (a.from < b.from ? -1 : a.from > b.from ? 1 : 0));
+}
 function rowToEvent(r: Row): CalEvent {
   return CalEvent.parse({
     id: r.id, slug: r.slug, title: r.title, bodyJson: r.body_json ?? '', bodyHtml: r.body_html ?? '',
@@ -172,6 +179,7 @@ function rowToEvent(r: Row): CalEvent {
     featured: Boolean(r.featured), tags: json(r.tags, []), template: r.template ?? '',
     start: r.starts, end: r.ends ?? '', allDay: Boolean(r.all_day), timezone: r.timezone ?? '',
     rrule: r.rrule ?? '', exdates: json(r.exdates, []), cancelled: Boolean(r.cancelled), cancelledDates: json(r.cancelled_dates, []), movedDates: parseMovedDates(r.moved_dates),
+    segments: parseSegments(r.segments),
     location: json(r.location, {}), cta: json(r.cta, {}), calendarIds: json(r.calendar_ids, []),
     fields: json(r.fields, {}), sourceUid: r.source_uid ?? '', rsvp: json(r.rsvp, {}), roomHold: json(r.room_hold, {}),
     hostIds: json(r.host_ids, []), request: parseRequest(r.request),
@@ -870,8 +878,8 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(
       `INSERT INTO events (id, slug, title, body_json, body_html, excerpt, cover, cover_alt, seo_title, seo_desc, status, featured, tags, template,
         starts, ends, all_day, timezone, rrule, exdates, cancelled, location, cta, calendar_ids, fields, source_uid, start_at, end_at,
-        published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request, translations, moved_dates)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request, translations, moved_dates, segments)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [
         id, data.slug, data.title, data.bodyJson ?? '', data.bodyHtml ?? '', data.excerpt ?? '', data.cover ?? '', data.coverAlt ?? '',
         data.seoTitle ?? '', data.seoDesc ?? '', data.status ?? 'draft', data.featured ? 1 : 0, JSON.stringify(data.tags ?? []), data.template ?? '',
@@ -881,7 +889,7 @@ export class SqlRepository implements ContentRepository {
         data.publishedAt ?? (data.status === 'published' ? now : null), data.scheduledAt ?? null, now, now,
         JSON.stringify(data.rsvp ?? {}), JSON.stringify(data.roomHold ?? {}), JSON.stringify(data.cancelledDates ?? []),
         JSON.stringify(data.hostIds ?? []), data.request ? JSON.stringify(data.request) : null, JSON.stringify(data.translations ?? {}),
-        JSON.stringify(data.movedDates ?? {}),
+        JSON.stringify(data.movedDates ?? {}), JSON.stringify(data.segments ?? []),
       ]
     );
     await this.syncEventIndex(id);
@@ -907,7 +915,7 @@ export class SqlRepository implements ContentRepository {
       if (v !== undefined) { sets.push(`${col} = ?`); args.push(v); }
     }
     const jsonCols: Record<string, string> = {
-      tags: 'tags', exdates: 'exdates', cancelledDates: 'cancelled_dates', movedDates: 'moved_dates', location: 'location', cta: 'cta', calendarIds: 'calendar_ids', fields: 'fields', rsvp: 'rsvp', translations: 'translations', roomHold: 'room_hold',
+      tags: 'tags', exdates: 'exdates', cancelledDates: 'cancelled_dates', movedDates: 'moved_dates', segments: 'segments', location: 'location', cta: 'cta', calendarIds: 'calendar_ids', fields: 'fields', rsvp: 'rsvp', translations: 'translations', roomHold: 'room_hold',
     };
     for (const [k, col] of Object.entries(jsonCols)) {
       const v = (data as Record<string, unknown>)[k];
@@ -986,6 +994,14 @@ export class SqlRepository implements ContentRepository {
       : { sql: 'UPDATE events SET moved_dates = ?, updated_at = ? WHERE id = ?', args: [JSON.stringify(moved), Date.now(), id] };
     await this.driver.batch(quietly(write, opts.quiet));
   }
+  async setEventDates(id: string, dates: Partial<Pick<CalEvent, 'segments' | 'movedDates' | 'cancelledDates' | 'exdates'>>, opts: { quiet?: boolean } = {}) {
+    await this.ready;
+    const cols: [keyof typeof dates, string][] = [['segments', 'segments'], ['movedDates', 'moved_dates'], ['cancelledDates', 'cancelled_dates'], ['exdates', 'exdates']];
+    const set = cols.filter(([k]) => dates[k] !== undefined);
+    if (!set.length) return;
+    const write = { sql: `UPDATE events SET ${set.map(([, c]) => `${c} = ?`).join(', ')}, updated_at = ? WHERE id = ?`, args: [...set.map(([k]) => JSON.stringify(dates[k])), Date.now(), id] };
+    await this.driver.batch(quietly(write, opts.quiet));
+  }
   async cancelOccurrenceRsvps(id: string, start: number) {
     await this.ready;
     // the mutation id limits the "cancelled" emails to exactly these RSVPs (as deleteEvent does)
@@ -1939,15 +1955,15 @@ export class SqlRepository implements ContentRepository {
       ...(content.events ?? []).map((e) => ({
         sql: `INSERT INTO events (id, slug, title, body_json, body_html, excerpt, cover, cover_alt, seo_title, seo_desc, status, featured, tags, template,
           starts, ends, all_day, timezone, rrule, exdates, cancelled, location, cta, calendar_ids, fields, source_uid, start_at, end_at,
-          draft, published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request, moved_dates)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          draft, published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request, moved_dates, segments)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: [
           e.id, e.slug, e.title, e.bodyJson, e.bodyHtml, e.excerpt, e.cover, e.coverAlt, e.seoTitle, e.seoDesc, e.status, e.featured ? 1 : 0,
           JSON.stringify(e.tags), e.template, e.start, e.end, e.allDay ? 1 : 0, e.timezone, e.rrule, JSON.stringify(e.exdates),
           e.cancelled ? 1 : 0, JSON.stringify(e.location), JSON.stringify(e.cta), JSON.stringify(e.calendarIds), JSON.stringify(e.fields),
           e.sourceUid, e.startAt, e.endAt, e.draft ? JSON.stringify(e.draft) : null, e.publishedAt, e.scheduledAt, e.createdAt, e.updatedAt,
           JSON.stringify(e.rsvp ?? {}), JSON.stringify(e.roomHold ?? {}), JSON.stringify(e.cancelledDates ?? []),
-          JSON.stringify(e.hostIds ?? []), e.request ? JSON.stringify(e.request) : null, JSON.stringify(e.movedDates ?? {}),
+          JSON.stringify(e.hostIds ?? []), e.request ? JSON.stringify(e.request) : null, JSON.stringify(e.movedDates ?? {}), JSON.stringify(e.segments ?? []),
         ],
       })),
       // announcements (a backup made before them leaves the current ones). Restored

package/src/lib/repo/types.ts

@@ -51,7 +51,7 @@ export type EventUpdate = Partial<
     CalEvent,
     | 'title' | 'slug' | 'bodyJson' | 'bodyHtml' | 'excerpt' | 'cover' | 'coverAlt'
     | 'seoTitle' | 'seoDesc' | 'status' | 'featured' | 'tags' | 'template'
-    | 'start' | 'end' | 'allDay' | 'timezone' | 'rrule' | 'exdates' | 'cancelled' | 'cancelledDates' | 'movedDates'
+    | 'start' | 'end' | 'allDay' | 'timezone' | 'rrule' | 'exdates' | 'cancelled' | 'cancelledDates' | 'movedDates' | 'segments'
     | 'location' | 'cta' | 'calendarIds' | 'fields' | 'sourceUid' | 'rsvp' | 'translations' | 'roomHold'
     | 'publishedAt' | 'scheduledAt'
   >
@@ -179,6 +179,8 @@ export interface ContentRepository {
   setEventCancelledDates(id: string, dates: string[], opts?: { quiet?: boolean }): Promise<void>;
   /** replace an event's moved dates (and cancelled dates, when given) at once, keeping any staged draft; quiet: no member push for it */
   setEventMovedDates(id: string, moved: CalEvent['movedDates'], cancelledDates?: string[], opts?: { quiet?: boolean }): Promise<void>;
+  /** replace an event's rule segments, moved, cancelled or skipped dates together in one write (lib/calendar/segments.ts), keeping any staged draft; quiet as above */
+  setEventDates(id: string, dates: Partial<Pick<CalEvent, 'segments' | 'movedDates' | 'cancelledDates' | 'exdates'>>, opts?: { quiet?: boolean }): Promise<void>;
   /** Cancels the RSVPs for one date of an event (they get the "cancelled" email). Returns how many. */
   cancelOccurrenceRsvps(id: string, start: number): Promise<number>;
   /**

package/src/lib/schema.ts

@@ -375,6 +375,28 @@ export const MovedDate = z.object({
 export type MovedDate = z.infer<typeof MovedDate>;
 export const MovedDates = z.record(z.string(), MovedDate).default({});
 
+// A repeating event changed from one date on (CalEvent.segments, C4): the
+// rule before it stops at `from` (an occurrence key of that rule: its dates
+// from there on are gone) and this one takes over with its own first date
+// (`start`/`end`, wall-clock like the event's, and possibly before `from`),
+// rule, rooms and place. It stays one event: same page, hosts and RSVPs.
+// `cancelled`: every date from `from` on is cancelled (struck through,
+// restorable). note is public; by/at as for MovedDate. lib/calendar/segments.ts
+// writes these; they're sorted by `from`.
+export const SeriesSegment = z.object({
+  from: z.string(),
+  start: z.string(),
+  end: z.string(),
+  rrule: z.string().default(''),
+  roomIds: z.array(z.string()).optional(),
+  location: EventLocation.optional(),
+  cancelled: z.boolean().default(false),
+  note: z.string().max(500).default(''),
+  by: z.string().default(''),
+  at: z.number().default(0),
+});
+export type SeriesSegment = z.infer<typeof SeriesSegment>;
+
 // A member's event request (lib/calendar/requests.ts): a new event waiting
 // for approval (kind 'new', the event stays a draft), or changes to a live
 // event staged in its `draft` (kind 'changes'). Staff approve or decline;
@@ -477,6 +499,8 @@ export const CalEvent = z.object({
   // single dates at another time (MovedDate above); a date is moved or
   // cancelled, never both. Keys that no longer match an occurrence are ignored.
   movedDates: MovedDates,
+  // the series changed from a date on (SeriesSegment above); only used while it repeats
+  segments: z.array(SeriesSegment).default([]),
   location: EventLocation.default({}),
   cta: EventCta.default({}),
   calendarIds: z.array(z.string()).default([]),

package/src/lib/sections.ts

@@ -135,7 +135,7 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
       const ctaHref = safeUrl(e.cta.href);
       return {
         title: e.title || 'Untitled event', url: lp(eventUrl(e.slug)), summary: e.excerpt, image: safeUrl(e.cover), imageAlt: e.coverAlt,
-        location: locationLine(o.moved?.location ?? e.location), start: new Date(o.start).toISOString(), end: new Date(o.end).toISOString(),
+        location: locationLine(o.location ?? e.location), start: new Date(o.start).toISOString(), end: new Date(o.end).toISOString(),
         allDay: o.allDay, cancelled: o.cancelled, moved: was && o.moved ? { from: o.allDay ? was.date : was.range, note: o.moved.note } : null,
         rooms: (o.rooms ?? []).map((r) => ({ slug: r.slug, name: r.name, color: r.color || null })), when: f.range, date: f.date, time: f.time, month: f.month, day: f.day, weekday: f.weekday,
         cta: e.cta.label && ctaHref && !o.cancelled ? { label: e.cta.label, href: ctaHref } : null,

package/src/lib/sync/catalog.ts

@@ -131,6 +131,7 @@ const jsonFields = new Set([
   "exdates",
   "cancelledDates",
   "movedDates",
+  "segments",
   "amenities",
   "hours",
   "overrides",

package/src/pages/admin/calendar/events/index.astro

@@ -8,7 +8,7 @@ import ContentList, { type ContentItem } from '../../../../components/ContentLis
 import { getRepo } from '../../../../lib/repo';
 import { slugify, type Status } from '../../../../lib/schema';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
-import { featuredOccurrence, formatOccurrence, locationLine, safeColor } from '../../../../lib/calendar/events';
+import { describeSeries, featuredOccurrence, formatOccurrence, locationLine, safeColor } from '../../../../lib/calendar/events';
 import { defaultPlaceLocation } from '../../../../lib/maps/places';
 import { describeRepeat } from '../../../../lib/calendar/rrule';
 import { expandVEvents, loadFeed, tzParts } from '../../../../lib/calendar/ics';
@@ -97,10 +97,11 @@ if (Astro.request.method === 'POST') {
     try {
       // a host's date move (host-requests.ts): `id` is the request's
       if (op === 'approve-date') {
-        const { moved } = await approveDateRequest(repo, who, id, hooks, Number(form.get('at')) || undefined);
-        const n = moved.clashes.length;
+        const { moved, changed } = await approveDateRequest(repo, who, id, hooks, Number(form.get('at')) || undefined);
+        const done = (moved ?? changed)!;
+        const n = done.clashes.length;
         const shared = n ? ', and it shares a room with ' + n + ' other booking' + (n === 1 ? '' : 's') + ' at that time' : '';
-        return toRequests('Approved. “' + moved.event.title + '” has the date moved' + shared + '.');
+        return toRequests('Approved. “' + done.event.title + '” ' + (moved ? 'has the date moved' : 'is changed from that date on') + shared + '.');
       }
       if (op === 'decline-date') {
         await declineDateRequest(repo, who, id, String(form.get('reply') || ''), hooks, Number(form.get('at')) || undefined);
@@ -233,7 +234,7 @@ const selected = rows
 const items: ContentItem[] = selected.map(({ e, o }) => {
   const f = o ? formatOccurrence(o, tz, locale) : null;
   const cals = e.calendarIds.map((id) => calById.get(id)?.name).filter(Boolean);
-  const repeats = describeRepeat(e.rrule, e.start);
+  const repeats = describeSeries(e, settings, now);
   return {
     id: e.id,
     href: `/admin/calendar/events/${e.id}`,
@@ -307,8 +308,8 @@ const dateRows = scope !== 'requests' ? [] : await Promise.all(waitingDates
     const clash = clashes.length ? `${[...new Set(clashes.map((c) => roomNames.get(c.resourceId) ?? 'A room'))].join(', ')} also held then by ${[...new Set(clashes.map((c) => c.title || 'something else'))].slice(0, 3).join(', ')}` : '';
     return {
       id: r.id, href: `/admin/calendar/events/${e.id}`, title: e.title || 'Untitled event', at: r.updatedAt, host,
-      ...(await dateRequestTimes(repo, r)), back: Boolean(d.back),
-      line: `${d.back ? 'Move back' : 'Date move'} from ${host} · ${ago(r.createdAt)}`, note: r.note, publicNote: d.note, clash,
+      ...(await dateRequestTimes(repo, r)), back: Boolean(d.back), label: r.kind === 'from-date' ? 'From this date on' : d.back ? 'Move back' : 'Date move',
+      line: `${r.kind === 'from-date' ? 'Change from this date on' : d.back ? 'Move back' : 'Date move'} from ${host} · ${ago(r.createdAt)}`, note: r.note, publicNote: d.note, clash,
     };
   }));
 
@@ -511,7 +512,7 @@ const subBits = [
                     {r.publicNote && <small>Note on the date: {r.publicNote}</small>}
                     {r.clash && <small class="ev-req-clash">{r.clash}</small>}
                   </a>
-                  <span class="bk-st is-pending">{r.back ? 'Move back' : 'Date move'}</span>
+                  <span class="bk-st is-pending">{r.label}</span>
                   <div class="bk-acts">
                     <a class="btn sm ghost" href={r.href}>Open</a>
                     {canApprove && (

package/src/pages/admin/calendar/requests.astro

@@ -139,7 +139,7 @@ const empty = { pending: 'Nothing waiting. Requests from the app, the website an
           {tab === 'pending' && canAnswer && (
             <div class="rq-acts">
               {(r.kind === 'new' || r.kind === 'change') && <button class="btn sm primary" type="button" data-modal={'approve-' + r.dom}>Approve…</button>}
-              {r.kind === 'move' && <form method="post"><input type="hidden" name="op" value="approve" /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} /><button class="btn sm primary" type="submit">Approve</button></form>}
+              {(r.kind === 'move' || r.kind === 'from-date') && <form method="post"><input type="hidden" name="op" value="approve" /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} /><button class="btn sm primary" type="submit">Approve</button></form>}
               {(r.kind === 'move' || r.kind === 'from-date') && r.href && <a class="btn sm ghost" href={r.href}>Open the event</a>}
               {r.kind === 'member-new' || r.kind === 'member-changes' ? (
                 <>
@@ -147,7 +147,7 @@ const empty = { pending: 'Nothing waiting. Requests from the app, the website an
                   <form method="post"><input type="hidden" name="op" value="member-approve" /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} /><button class="btn sm primary" type="submit">Approve</button></form>
                 </>
               ) : r.canReply && r.email && <button class="btn sm ghost" type="button" data-modal={'reply-' + r.dom}>Reply</button>}
-              {r.kind !== 'from-date' && <button class="btn sm ghost" type="button" data-modal={'decline-' + r.dom}>Decline…</button>}
+              <button class="btn sm ghost" type="button" data-modal={'decline-' + r.dom}>Decline…</button>
             </div>
           )}
           {tab !== 'pending' && r.canReply && r.email && canAnswer && <div class="rq-acts"><button class="btn sm ghost" type="button" data-modal={'reply-' + r.dom}>Reply</button></div>}
@@ -189,12 +189,12 @@ const empty = { pending: 'Nothing waiting. Requests from the app, the website an
           </form>
         </Modal>
       )}
-      {tab === 'pending' && r.kind !== 'from-date' && (
+      {tab === 'pending' && (
         <Modal id={'decline-' + r.dom} title="Decline this request">
           <form method="post">
             <input type="hidden" name="op" value={r.kind === 'member-new' || r.kind === 'member-changes' ? 'member-decline' : 'decline'} /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} />
-            <p class="hint">{r.kind === 'member-new' || r.kind === 'member-changes' || r.kind === 'move'
-              ? 'They’re emailed that it can’t go ahead' + (r.kind === 'member-new' ? '; the draft stays for them to change and send again.' : r.kind === 'move' ? '; the date stays as it is.' : '.')
+            <p class="hint">{r.kind === 'member-new' || r.kind === 'member-changes' || r.kind === 'move' || r.kind === 'from-date'
+              ? 'They’re emailed that it can’t go ahead' + (r.kind === 'member-new' ? '; the draft stays for them to change and send again.' : r.kind === 'move' ? '; the date stays as it is.' : r.kind === 'from-date' ? '; the schedule stays as it is.' : '.')
               : 'It moves to Declined, and is deleted with the rest after the time you keep requests.'}</p>
             <label class="field"><span>Reason <em class="hint">optional</em></span><textarea name="reason" rows="3" maxlength="2000" placeholder="The Sanctuary is booked that weekend."></textarea></label>
             {(r.kind === 'new' || r.kind === 'change') && <label class="check-row"><input type="hidden" name="email-offered" value="1" /><input type="checkbox" name="email" value="1" checked /> Email them, in their language</label>}

package/src/pages/api/calendar/events/index.ts

@@ -106,8 +106,9 @@ export const GET: APIRoute = async ({ request, locals, url }) => {
             from: { start: o.allDay ? isoWithOffset(o.moved.from.start, etz).slice(0, 10) : isoWithOffset(o.moved.from.start, etz), end: o.allDay ? isoWithOffset(o.moved.from.end - 86_400_000, etz).slice(0, 10) : isoWithOffset(o.moved.from.end, etz) },
             note: o.moved.note, location: o.moved.location ?? null,
           } : null,
-          // that date's rooms
+          // that date's rooms, and its own place (moved there, or from its segment; null = the event's)
           rooms: roomsToJson(o.roomIds, resources, full),
+          location: o.location ?? null,
           event: toJson(o.event.id),
         };
       }),

package/src/pages/members/events/index.astro

@@ -5,9 +5,11 @@ import { currentUser } from '../../../server';
 import { coded } from '../../../lib/api';
 import { readForm } from '../../../lib/forms/http';
 import { MEMBERS, memberEventsPath, hostedEvents, withdrawEventRequest, dismissEventRequest, setHostedOccurrence } from '../../../lib/calendar/requests';
-import { dismissDateRequest, moveHostedDate, moveHostedDateBack, myDateRequests, requestDateMove, withdrawDateRequest, type MoveRequestData } from '../../../lib/calendar/host-requests';
+import { dismissDateRequest, moveHostedDate, moveHostedDateBack, myDateRequests, requestDateMove, requestFromDate, withdrawDateRequest, type FromDateRequestData, type MoveRequestData } from '../../../lib/calendar/host-requests';
+import { changeFromDate, changeFromDefaults, type ChangeFromInput } from '../../../lib/calendar/segments';
+import { rruleMap, WEEKDAY_CODES, weekdayOf } from '../../../lib/calendar/rrule';
 import { eventUrl } from '../../../lib/calendar/config';
-import { eventIsPublic, eventRoomIds, eventTimeZone, expandEvents, featuredOccurrence, findOccurrence, formatOccurrence, type Occurrence } from '../../../lib/calendar/events';
+import { describeSeries, eventIsPublic, eventRoomIds, eventTimeZone, expandEvents, featuredOccurrence, findOccurrence, formatOccurrence, type Occurrence } from '../../../lib/calendar/events';
 import { tzParts } from '../../../lib/calendar/ics';
 import { describeRepeat } from '../../../lib/calendar/rrule';
 import { requestLabel } from '../../../lib/calendar/member-form';
@@ -57,6 +59,25 @@ function nextDay(day: string): string {
   return d.toISOString().slice(0, 10);
 }
 
+/**
+ * The "Change from this date on" form → ChangeFromInput: the first date and
+ * times as for a move, and a repeat choice worded around that first date
+ * ('same' keeps the rule in effect, moved to its weekday; the others end as
+ * that rule does).
+ */
+async function fromDateInput(form: FormData, e: CalEvent | null, key: string): Promise<ChangeFromInput> {
+  const base = moveInput(form, e);
+  const choice = String(form.get('repeat') ?? 'same');
+  if (choice === 'same' || !e) return base;
+  const date = String(form.get('date') ?? '').trim();
+  const wd = weekdayOf(date);
+  const code = WEEKDAY_CODES[wd.dow];
+  const kept = rruleMap((await changeFromDefaults(repo, e.id, key))?.rrule ?? '');
+  const ends = kept.COUNT ? `;COUNT=${kept.COUNT}` : kept.UNTIL ? `;UNTIL=${kept.UNTIL}` : '';
+  const rule = { weekly: `FREQ=WEEKLY;BYDAY=${code}`, biweekly: `FREQ=WEEKLY;INTERVAL=2;BYDAY=${code}`, monthly: `FREQ=MONTHLY;BYDAY=${wd.nth >= 5 ? -1 : wd.nth}${code}`, daily: 'FREQ=DAILY' }[choice];
+  return { ...base, rrule: choice === 'once' ? '' : rule ? rule + ends : undefined };
+}
+
 let error = '';
 // a move refused because a room is taken: shown under its date, with "Send as a request"
 let clash: { id: string; key: string; back: boolean; message: string; input: MoveInput | null } | null = null;
@@ -108,6 +129,16 @@ if (Astro.request.method === 'POST') {
         clash = { id, key, back: true, message: failure(err, w, lang).message, input: null };
         Astro.response.status = 409;
       }
+    } else if (op === 'from-date') {
+      // staff who host apply it; other hosts send it to them
+      posted = { id, key, form };
+      const input = await fromDateInput(form, await repo.getEvent(id), key);
+      if (user.can('content.edit')) {
+        await changeFromDate(repo, user, id, key, input, hooks);
+        return redirectTo(`${home}?fromDateDone=1`);
+      }
+      await requestFromDate(repo, user, id, key, input, String(form.get('message') ?? ''), hooks);
+      return redirectTo(`${home}?fromDateSent=1`);
     } else if (op === 'withdraw-request') {
       await withdrawDateRequest(repo, user, String(form.get('request') ?? ''));
       return redirectTo(`${home}?withdrawn=1`);
@@ -122,7 +153,7 @@ if (Astro.request.method === 'POST') {
   }
 }
 
-const FLASH: [keyof typeof w.flash, string][] = (['sent', 'updated', 'changes', 'withdrawn', 'cancelled', 'restored', 'moved', 'movedBack', 'moveSent', 'fromDateSent'] as const).map((k) => [k, w.flash[k]]);
+const FLASH: [keyof typeof w.flash, string][] = (['sent', 'updated', 'changes', 'withdrawn', 'cancelled', 'restored', 'moved', 'movedBack', 'moveSent', 'fromDateSent', 'fromDateDone'] as const).map((k) => [k, w.flash[k]]);
 const flash = error || clash ? '' : FLASH.find(([k]) => Astro.url.searchParams.has(k))?.[1] ?? '';
 
 const DAY = 86_400_000;
@@ -147,7 +178,8 @@ const when = (o: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>
 };
 const day = (ms: number) => format({ month: 'short', day: 'numeric' }, siteTz).format(ms);
 const meta = (...parts: string[]) => parts.filter(Boolean).join(' · ');
-const repeats = (e: CalEvent) => describeRepeat(e.rrule, e.start, undefined, lang);
+// the rule in effect, and a change from a date on still to come
+const repeats = (e: CalEvent) => describeSeries(e, settings, now, lang, undefined, dateLocale);
 const pad = (n: number) => String(n).padStart(2, '0');
 /** an instant as the move form's date and time, in the event's zone */
 const wallParts = (e: CalEvent, ms: number) => {
@@ -169,12 +201,21 @@ const requestTarget = (e: CalEvent, r: RequestRecord) => {
 // …worded for its card: "Thu, Jan 10 · 6:00 – 7:00 PM → Wed, Jan 9 · 5:00 – 6:00 PM" while it waits, else the date as it is
 const requestWhen = (r: RequestRecord) => {
   const e = byId.get(r.eventId);
+  if (e && r.kind === 'from-date') {
+    // the date it changes from (while it's still there), then the new first date and its repeat
+    const f = r.data as FromDateRequestData;
+    const first = findOccurrence({ ...e, start: f.start, end: f.end, rrule: f.rrule, segments: [], movedDates: {}, cancelledDates: [], exdates: [] }, f.start, settings);
+    const from = r.state === 'pending' ? findOccurrence({ ...e, movedDates: {} }, r.key, settings) : null;
+    const to = [first ? when(first) : '', describeRepeat(f.rrule, f.start, undefined, lang)].filter(Boolean).join(' · ');
+    return from ? `${when(from)} → ${to}` : to;
+  }
   const at = e && findOccurrence(e, r.key, settings);
   if (!e || !at) return '';
   const to = r.state === 'pending' ? requestTarget(e, r) : null;
   return to ? `${when(at)} → ${when(to)}` : when(at);
 };
 const waitingMove = new Map(dateRequests.filter((r) => r.kind === 'move' && r.state === 'pending').map((r) => [`${r.eventId}|${r.key}`, r]));
+const waitingFrom = new Set(dateRequests.filter((r) => r.kind === 'from-date' && r.state === 'pending').map((r) => `${r.eventId}|${r.key}`));
 
 // requests: waiting ones first, newest first; shown as they'd be once approved
 const requests = [
@@ -294,13 +335,16 @@ function moveValues(e: CalEvent, o: Occurrence) {
               <ul class="pc-mem-dates">
                 {dates.map((o) => {
                   const off = e.cancelledDates.includes(o.key);
-                  const open = e.rrule && !e.cancelled && o.start > now;
+                  // a date cancelled with every date after it (a cancelled part) is the team's to restore
+                  const open = e.rrule && !e.cancelled && o.start > now && (!o.cancelled || off);
                   const waiting = waitingMove.get(`${e.id}|${o.key}`);
                   const ownMove = o.moved && e.movedDates[o.key]?.by === user.id;
                   const clashHere = clash && clash.id === e.id && clash.key === o.key ? clash : null;
                   const target = waiting && requestTarget(e, waiting);
                   const v = moveValues(e, o);
-                  const reopen = Boolean(posted && posted.id === e.id && posted.key === o.key && error);
+                  const failed = Boolean(posted && posted.id === e.id && posted.key === o.key && error);
+                  const reopen = failed && posted!.form.get('op') !== 'from-date';
+                  const reopenFrom = failed && posted!.form.get('op') === 'from-date';
                   return (
                     <li class={o.cancelled ? 'is-cancelled' : undefined}>
                       <span>
@@ -308,6 +352,7 @@ function moveValues(e: CalEvent, o: Occurrence) {
                         {o.cancelled && <em>{w.cancelledDate}</em>}
                         {o.moved && !o.cancelled && <em class="is-moved" title={o.moved.note || undefined}>{fill(w.movedFrom, { when: when({ ...o, start: o.moved.from.start, end: o.moved.from.end }) })}</em>}
                         {waiting && <em class="is-pending">{(waiting.data as MoveRequestData).back ? w.moveBackRequested : fill(w.moveRequested, { when: target ? when(target) : '' })}</em>}
+                        {waitingFrom.has(`${e.id}|${o.key}`) && <em class="is-pending">{fill(w.changeFromRequested, { when: day(o.start) })}</em>}
                       </span>
                       {open && (
                         <span class="pc-mem-date-acts">
@@ -377,6 +422,39 @@ function moveValues(e: CalEvent, o: Occurrence) {
                           </form>
                         </details>
                       )}
+                      {open && !off && !clashHere && (
+                        <details class="pc-mem-move" open={reopenFrom}>
+                          <summary class="pc-mem-btn is-small" aria-label={fill(w.changeFromLabel, { title: ev.title, when: when(o) })}>{w.changeFrom}</summary>
+                          <form method="post">
+                            <input type="hidden" name="op" value="from-date" />
+                            <input type="hidden" name="id" value={e.id} />
+                            <input type="hidden" name="key" value={o.key} />
+                            <p class="pc-mem-hint">{w.changeFromHint}</p>
+                            <div class="pc-mem-row">
+                              <label class="pc-bk-field"><span>{w.firstDate}</span><input type="date" name="date" required value={reopenFrom ? v.date : wallParts(e, o.start).date} /></label>
+                              {!e.allDay && <label class="pc-bk-field"><span>{w.starts}</span><input type="time" name="startTime" required value={reopenFrom ? v.startTime : wallParts(e, o.start).time} /></label>}
+                              {!e.allDay && <label class="pc-bk-field"><span>{w.ends}</span><input type="time" name="endTime" value={reopenFrom ? v.endTime : wallParts(e, o.end).time} /></label>}
+                            </div>
+                            <label class="pc-bk-field"><span>{w.form.repeats}</span>
+                              <select name="repeat">
+                                {([['same', w.sameRepeat], ['weekly', w.form.repeat.weekly], ['biweekly', w.form.repeat.biweekly], ['monthly', w.form.repeat.monthly], ['daily', w.form.repeat.daily], ['once', w.justThisDate]] as const)
+                                  .map(([value, label]) => <option value={value} selected={reopenFrom && posted!.form.get('repeat') === value}>{label}</option>)}
+                              </select>
+                            </label>
+                            {rooms.length > 0 && (
+                              <fieldset>
+                                <legend>{w.rooms}</legend>
+                                <input type="hidden" name="rooms" value="1" />
+                                {rooms.map((r) => <label class="pc-bk-check"><input type="checkbox" name="roomIds" value={r.id} checked={(reopenFrom ? v.roomIds : o.roomIds).includes(r.id)} /> <span>{r.name}</span></label>)}
+                                <p class="pc-mem-hint" style="flex-basis:100%">{w.roomsHint}</p>
+                              </fieldset>
+                            )}
+                            <label class="pc-bk-field"><span>{w.publicNote} <em>{w.form.optional}</em></span><input name="note" maxlength="500" value={reopenFrom ? v.note : ''} /><small>{w.publicNoteHint}</small></label>
+                            {!user.can('content.edit') && <label class="pc-bk-field"><span>{w.messageForTeam} <em>{w.form.optional}</em></span><textarea name="message" rows="2" maxlength="1000">{reopenFrom ? v.message : ''}</textarea></label>}
+                            <div class="pc-mem-actions"><button class="pc-mem-btn is-small is-primary" type="submit">{user.can('content.edit') ? w.changeFrom.replace(/…$/, '') : w.sendForApproval}</button></div>
+                          </form>
+                        </details>
+                      )}
                     </li>
                   );
                 })}