@acms-subir/core 0.3.55 → 0.3.57

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';
@@ -25,6 +25,7 @@ import { approveEventRequest, declineEventRequest, pendingRequests } from '../..
 import { approveDateRequest, dateRequestClashes, dateRequestTimes, declineDateRequest, type MoveRequestData } from '../../../../lib/calendar/host-requests';
 import { mergeEventDraft } from '../../../../lib/drafts';
 import { ApiError } from '../../../../lib/api';
+import { REQUESTS } from '../../../../lib/calendar/request-config';
 
 // Schedule → List: upcoming first, grouped by the month each event next
 // happens. Subscribed calendars appear as read-only rows with a "Make an
@@ -96,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);
@@ -232,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}`,
@@ -306,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,
     };
   }));
 
@@ -510,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 && (
@@ -527,6 +529,7 @@ const subBits = [
               ))}
             </section>
           )}
+          {REQUESTS.enabled && <p class="hint">Every request, including those from the app and the website, is on <a href="/admin/calendar/requests">Requests</a>.</p>}
           {(requestRows.length > 0 || dateRows.length > 0) && !canApprove && <p class="hint">Someone whose role can publish content approves these.</p>}
           {canApprove && dateRows.map((r) => (
             <Modal id={`decline-date-${r.id}`} title="Decline this date change">

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

@@ -0,0 +1,298 @@
+---
+import Admin from '../../../layouts/Admin.astro';
+import Modal from '../../../components/Modal.astro';
+import { getRepo } from '../../../lib/repo';
+import { ApiError } from '../../../lib/api';
+import { extraLocales, localeName, localePath } from '../../../lib/i18n';
+import { PUSH } from '../../../lib/push/config';
+import { accessFor, forbiddenUnless } from '../../../lib/permissions/access';
+import type { Permission } from '../../../lib/permissions/catalog';
+import { REQUESTS } from '../../../lib/calendar/request-config';
+import { MEMBERS } from '../../../lib/calendar/members-config';
+import { approveRequest, declineRequest, deleteRequest, replyToRequest, requestRecipients, requestableRooms, requestSettings } from '../../../lib/calendar/request-service';
+import { pendingCount, requestRows, settingsFromForm, type RequestTab } from '../../../lib/calendar/request-admin';
+import { approveEventRequest, declineEventRequest } from '../../../lib/calendar/requests';
+
+// Calendar → Requests (acms({ requests })): requests from the app, the
+// website and hosts in one list, with Pending, Approved and Declined tabs and
+// what takes the rooms on each row. Approve opens a filled-in draft (or the
+// event a change is about); Reply and Decline email the person in their
+// language. Reading needs "Create and edit content", answering "Publish
+// content", the settings "Manage rooms and calendars". The rules are
+// lib/calendar/request-service.ts; the list lib/calendar/request-admin.ts.
+if (!REQUESTS.enabled) return new Response(null, { status: 404 });
+const repo = await getRepo(Astro.locals);
+const denied = await forbiddenUnless(Astro.request, Astro.cookies, repo, 'content.edit');
+if (denied) return denied;
+const access = (await accessFor(Astro.request, Astro.cookies, repo))!;
+const who = { id: access.userId, can: (p: string) => access.can(p as Permission) };
+const hooks = { url: Astro.url, locals: Astro.locals };
+const back = (notice: string, tab = Astro.url.searchParams.get('tab') ?? '') => {
+  const p = new URLSearchParams();
+  if (tab) p.set('tab', tab);
+  if (notice) p.set('notice', notice);
+  const q = p.toString();
+  return Astro.redirect(q ? '/admin/calendar/requests?' + q : '/admin/calendar/requests');
+};
+
+if (Astro.request.method === 'POST') {
+  const form = await Astro.request.formData();
+  const op = String(form.get('op') ?? '');
+  const id = String(form.get('id') ?? '');
+  const seen = Number(form.get('at')) || undefined;
+  const nope = await forbiddenUnless(Astro.request, Astro.cookies, repo, op === 'settings' ? 'schedule.manage' : 'content.publish');
+  if (nope) return nope;
+  try {
+    if (op === 'approve') {
+      const done = await approveRequest(repo, who, id, hooks, seen, { message: String(form.get('message') ?? ''), email: form.get('email') === '1' });
+      return Astro.redirect(done.next);
+    }
+    if (op === 'decline') {
+      // the email choice is only offered for requests from the app or the website (hosts are always told)
+      const email = form.has('email-offered') ? form.get('email') === '1' : true;
+      await declineRequest(repo, who, id, String(form.get('reason') ?? ''), hooks, seen, { email });
+      return back(email ? 'Declined. The person was emailed.' : 'Declined, without an email.');
+    }
+    if (op === 'delete') {
+      await deleteRequest(repo, who, id);
+      return back('Deleted as spam. Nobody was emailed.');
+    }
+    if (op === 'reply') {
+      await replyToRequest(repo, who, id, String(form.get('message') ?? ''), hooks);
+      return back('Reply sent.');
+    }
+    // members' requests staged on their events (My events)
+    if (op === 'member-approve') {
+      const e = await approveEventRequest(repo, who, id, hooks, seen);
+      return back(`Approved “${e.title}”.`);
+    }
+    if (op === 'member-decline') {
+      const e = await declineEventRequest(repo, who, id, String(form.get('reason') ?? ''), hooks, seen);
+      return back(`Declined “${e.title}”.`);
+    }
+    if (op === 'settings') {
+      const settings = await repo.getSettings();
+      const calendars = (await repo.listCalendars()).filter((c) => c.kind === 'native').map((c) => c.id);
+      const requests = settingsFromForm(form, requestSettings(settings), calendars);
+      await repo.updateSettings({ calendar: { ...settings.calendar, requests } });
+      return back('Request settings saved.');
+    }
+    return back('');
+  } catch (err) {
+    return back(err instanceof ApiError ? err.message : 'Couldn’t do that. Try again.');
+  }
+}
+
+const settings = await repo.getSettings();
+const rq = requestSettings(settings);
+const tab = (['pending', 'approved', 'declined'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'pending';
+const page = Math.min(1000, Math.max(1, Number.parseInt(Astro.url.searchParams.get('page') ?? '', 10) || 1));
+const [{ rows, more }, waiting, rooms, calendars, recipients] = await Promise.all([
+  requestRows(repo, settings, tab as RequestTab, Date.now(), page), pendingCount(repo), requestableRooms(repo),
+  repo.listCalendars().then((cs) => cs.filter((c) => c.kind === 'native')), requestRecipients(repo, settings),
+]);
+const notice = Astro.url.searchParams.get('notice') ?? '';
+const canAnswer = access.can('content.publish');
+const canSet = access.can('schedule.manage');
+const langs = extraLocales();
+// the kinds there are, plus a few empty rows to add more (12 at most)
+const typeRows = [...rq.types, ...Array.from({ length: Math.min(3, 12 - rq.types.length) }, () => null)];
+const TABS = [['pending', 'Pending'], ['approved', 'Approved'], ['declined', 'Declined']] as const;
+const formUrl = REQUESTS.page ? REQUESTS.path : '';
+const pageHref = (n: number) => '/admin/calendar/requests?' + new URLSearchParams({ ...(tab === 'pending' ? {} : { tab }), ...(n > 1 ? { page: String(n) } : {}) }).toString();
+const empty = { pending: 'Nothing waiting. Requests from the app, the website and hosts show up here.', approved: 'No approved requests yet.', declined: 'No declined requests.' }[tab];
+---
+
+<Admin title="Requests" section="calendar:requests">
+  <div class="page-head">
+    <div>
+      <h1>Requests</h1>
+      <p class="sub">From the app, the website{MEMBERS.enabled ? ' and hosts' : ''}, in one list{formUrl && <> · the form is at <a href={formUrl} target="_blank" rel="noopener">{formUrl}</a>{langs.map((l) => <> and <a href={localePath(formUrl, l)} target="_blank" rel="noopener">{localePath(formUrl, l)}</a></>)}</>}</p>
+    </div>
+    <div class="page-actions">
+      {!rq.open && <span class="rq-closed">Closed</span>}
+      {canSet && <button class="btn" type="button" data-modal="rq-settings">Settings</button>}
+    </div>
+  </div>
+
+  {notice && <p class="notice" role="status">{notice}</p>}
+
+  <nav class="seg rq-tabs" aria-label="Show">
+    {TABS.map(([k, l]) => (
+      <a href={k === 'pending' ? '/admin/calendar/requests' : '/admin/calendar/requests?tab=' + k} class={tab === k ? 'on' : ''} aria-current={tab === k ? 'page' : undefined}>
+        {l}{k === 'pending' && waiting > 0 && <span class="rq-count">{waiting}</span>}
+      </a>
+    ))}
+  </nav>
+
+  {rows.length === 0 ? <p class="hint rq-empty">{empty}</p> : (
+    <section class="card rq-list">
+      {rows.map((r) => (
+        <article class="rq-row" id={r.dom}>
+          <small class="rq-head">{r.head}</small>
+          <b class="rq-title">{r.href ? <a href={r.href}>{r.title}</a> : r.title}</b>
+          {r.line && <span class="rq-line">{r.line}</span>}
+          <span class="rq-who">{r.who}</span>
+          {r.note && <p class="rq-note">“{r.note}”</p>}
+          {r.clash && <p class={r.clash.taken ? 'rq-clash is-taken' : 'rq-clash'}>{r.clash.text}</p>}
+          {r.answer && <p class="rq-answer">{r.answer}{r.reply && <> — “{r.reply}”</>}</p>}
+          {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' || 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' ? (
+                <>
+                  <a class="btn sm ghost" href={r.href}>Open</a>
+                  <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>}
+              <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>}
+        </article>
+      ))}
+    </section>
+  )}
+  {(page > 1 || more) && (
+    <nav class="rq-pager" aria-label="Pages">
+      {page > 1 && <a class="btn sm ghost" href={pageHref(page - 1)}>Previous</a>}
+      <span class="hint">Page {page}</span>
+      {more && <a class="btn sm ghost" href={pageHref(page + 1)}>Next</a>}
+    </nav>
+  )}
+  {tab === 'pending' && rows.length > 0 && !canAnswer && <p class="hint">Someone whose role can publish content answers these.</p>}
+
+  {canAnswer && rows.map((r) => (
+    <>
+      {tab === 'pending' && (r.kind === 'new' || r.kind === 'change') && (
+        <Modal id={'approve-' + r.dom} title={r.kind === 'new' ? 'Approve and make a draft' : 'Approve this change'}>
+          <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} />
+            <p class="hint">{r.kind === 'new'
+              ? 'You’ll get a draft with the title, time, repeat, rooms held and the kind’s tag and calendar. Check it, then publish it. Their contact details stay here, never on the event.'
+              : 'The event opens (or that date’s Move… dialog) so you can make the change.'}</p>
+            <label class="field"><span>Message <em class="hint">optional</em></span><textarea name="message" rows="3" maxlength="2000" placeholder="See you then!"></textarea></label>
+            <label class="check-row"><input type="checkbox" name="email" value="1" checked /> Email them that it’s approved, in their language</label>
+            <div class="modal-foot"><button class="btn ghost" type="button" data-close>Cancel</button><button class="btn primary" type="submit">Approve</button></div>
+          </form>
+        </Modal>
+      )}
+      {r.canReply && r.email && (
+        <Modal id={'reply-' + r.dom} title="Reply">
+          <form method="post">
+            <input type="hidden" name="op" value="reply" /><input type="hidden" name="id" value={r.id} />
+            <p class="hint">Emailed to {r.email} with a short line in their language. The request stays {tab === 'pending' ? 'waiting' : tab}.</p>
+            <label class="field"><span>Your reply</span><textarea name="message" rows="5" maxlength="2000" required placeholder="Could you come at 3 instead? The room is free then."></textarea></label>
+            <div class="modal-foot"><button class="btn ghost" type="button" data-close>Cancel</button><button class="btn primary" type="submit">Send reply</button></div>
+          </form>
+        </Modal>
+      )}
+      {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' || 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>}
+            <div class="modal-foot"><button class="btn ghost" type="button" data-close>Cancel</button><button class="btn primary" type="submit">Decline</button></div>
+          </form>
+          {(r.kind === 'new' || r.kind === 'change') && (
+            <form method="post" class="rq-spam">
+              <input type="hidden" name="op" value="delete" /><input type="hidden" name="id" value={r.id} />
+              <p class="hint">Spam? Delete it now, without an email to the address it gave.</p>
+              <button class="btn sm ghost" type="submit">Delete as spam</button>
+            </form>
+          )}
+        </Modal>
+      )}
+    </>
+  ))}
+
+  {canSet && (
+    <Modal id="rq-settings" title="Request settings" open={Astro.url.searchParams.has('settings')}>
+      <form method="post" class="rq-settings">
+        <input type="hidden" name="op" value="settings" />
+        <div>
+          <label class="check-row"><input type="checkbox" name="open" value="1" checked={rq.open} /> Taking requests</label>
+          <p class="hint">When off, the form and the app say so and show the office phone. They never disappear.</p>
+        </div>
+        <fieldset>
+          <legend>Kinds people choose from</legend>
+          <p class="hint">Approving a request makes a draft with the kind’s tag, in its calendar (else the default calendar).</p>
+          <div class="rq-type rq-type-h" aria-hidden="true"><span>Kind</span>{langs.map((l) => <span>{localeName(l, true)}</span>)}<span>Tag</span><span>Calendar</span></div>
+          {typeRows.map((t, i) => (
+            <div class="rq-type">
+              {t && <input type="hidden" name={'type-id-' + i} value={t.id} />}
+              <input name={'type-label-' + i} value={t?.label ?? ''} placeholder={t || i > rq.types.length ? '' : rq.types.length ? 'Add a kind' : 'Class'} aria-label="Kind" maxlength="60" />
+              {langs.map((l) => <input name={'type-' + l + '-' + i} value={t?.translations[l] ?? ''} placeholder={localeName(l, true)} aria-label={'Kind in ' + localeName(l)} maxlength="60" />)}
+              <input name={'type-tag-' + i} value={t?.tag ?? ''} placeholder="Tag" aria-label="Tag" maxlength="60" />
+              <select name={'type-cal-' + i} aria-label="Calendar">
+                <option value="">Default calendar</option>
+                {calendars.map((c) => <option value={c.id} selected={t?.calendarId === c.id}>{c.name}</option>)}
+              </select>
+            </div>
+          ))}
+        </fieldset>
+        <label class="field"><span>Reply time <em class="hint">“We usually answer within …”</em></span><input name="replyTime" value={rq.replyTime} placeholder="3 days" maxlength="60" /></label>
+        <label class="field"><span>Notice at the top of the form <em class="hint">optional</em></span><textarea name="notice" rows="2" maxlength="400" placeholder="The church office reviews every request. It isn’t on the calendar until they confirm it.">{rq.notice}</textarea></label>
+        {langs.map((l) => (
+          <fieldset>
+            <legend>{localeName(l, true)}</legend>
+            <label class="field"><span>Reply time</span><input name={'replyTime-' + l} value={rq.translations[l]?.replyTime ?? ''} maxlength="60" /></label>
+            <label class="field"><span>Notice</span><textarea name={'notice-' + l} rows="2" maxlength="400">{rq.translations[l]?.notice ?? ''}</textarea></label>
+          </fieldset>
+        ))}
+        <label class="field"><span>Office phone <em class="hint">shown when requests are closed, and after sending</em></span><input name="phone" inputmode="tel" autocomplete="off" value={rq.phone} maxlength="40" /></label>
+        <label class="field"><span>Who hears about new requests</span><textarea name="notify" rows="2" placeholder={recipients.join(', ')}>{rq.notify.join(', ')}</textarea><em class="hint">Email addresses. Empty: {MEMBERS.notify.length ? 'the members notify list in the site’s config' : 'the owners'} ({recipients.join(', ') || 'nobody yet'}).</em></label>
+        {PUSH.enabled && (
+          <div>
+            <label class="check-row"><input type="hidden" name="phones" value="0" /><input type="checkbox" name="phones" value="1" checked={rq.phones} /> Also notify their linked phones</label>
+            <p class="hint">A push saying a request arrived and for when, without names.</p>
+          </div>
+        )}
+        <div class="field-row">
+          <label class="field"><span>New requests a day <em class="hint">0 = no limit</em></span><input name="perDay" type="number" min="0" max="10000" value={rq.perDay} /></label>
+          <label class="field"><span>Keep requests for (days) <em class="hint">after the answer, or after they arrive if nobody answers</em></span><input name="keepDays" type="number" min="7" max="1095" value={rq.keepDays} /></label>
+        </div>
+        <p class="hint">Rooms people can ask for: {rooms.length ? rooms.map((r) => r.name).join(', ') : 'none yet'}. Turn on “Anyone can check if it’s free” on a room to offer it.</p>
+        <div class="modal-foot"><button class="btn ghost" type="button" data-close>Cancel</button><button class="btn primary" type="submit">Save</button></div>
+      </form>
+    </Modal>
+  )}
+</Admin>
+
+<style>
+  .rq-tabs { margin: 0 0 14px; }
+  .rq-count { font-size: 11px; font-weight: 700; color: var(--amber); background: var(--amber-soft); border-radius: var(--r-full); padding: 0 6px; margin-left: 6px; }
+  .rq-closed { font-size: 12.5px; font-weight: 600; color: var(--amber); background: var(--amber-soft); border-radius: var(--r-full); padding: 3px 10px; }
+  .rq-empty { padding: 24px 8px; }
+  .rq-list { padding: 0; }
+  .rq-row { display: grid; gap: 3px; padding: 14px 18px; border-top: 1px solid var(--line); scroll-margin-top: 80px; }
+  .rq-row:first-child { border-top: 0; }
+  .rq-row:target { background: var(--amber-soft); }
+  .rq-head { color: var(--text-2); font-size: 12.5px; }
+  .rq-title { font-size: 15.5px; }
+  .rq-title a { color: inherit; }
+  .rq-line, .rq-who { font-size: 13.5px; color: var(--text-2); }
+  .rq-note { margin: 4px 0 0; font-style: italic; font-size: 14px; }
+  .rq-clash { margin: 4px 0 0; font-size: 13px; color: var(--green); }
+  .rq-clash.is-taken { color: var(--amber); }
+  .rq-answer { margin: 4px 0 0; font-size: 13px; color: var(--text-2); }
+  .rq-acts { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 8px; }
+  .rq-acts form { margin: 0; }
+  .rq-pager { display: flex; align-items: center; gap: 10px; margin: 12px 0 0; }
+  .rq-spam { display: flex; align-items: center; justify-content: space-between; gap: 12px; border-top: 1px solid var(--line); margin-top: 14px; padding-top: 12px; }
+  .rq-spam .hint { margin: 0; }
+  .rq-settings { display: grid; gap: 12px; }
+  .rq-settings fieldset { border: 1px solid var(--line); border-radius: 10px; padding: 10px 12px; margin: 0; display: grid; gap: 8px; }
+  .rq-settings legend { font-weight: 600; font-size: 13.5px; padding: 0 4px; }
+  .rq-settings .hint { margin: 2px 0 0; }
+  .rq-type { display: grid; grid-auto-flow: column; grid-auto-columns: minmax(0, 1fr); gap: 6px; }
+  .rq-type > * { min-width: 0; }
+  .rq-type-h span { font-size: 12px; color: var(--text-2); }
+  :global(dialog#rq-settings.modal) { width: min(680px, calc(100vw - 32px)); max-width: none; }
+</style>

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/api/v1/requests/index.ts

@@ -0,0 +1,6 @@
+import { postRequest } from '../../../../lib/mobile/requests';
+import { privateRoute } from '../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../lib/mobile/http';
+export const POST = privateRoute(postRequest, { write: true, status: 201 });
+export const ALL = () => methodNotAllowed('POST, OPTIONS');

package/src/pages/api/v1/requests/options.ts

@@ -0,0 +1,7 @@
+import { getRequestOptions } from '../../../../lib/mobile/requests';
+import { privateRoute } from '../../../../lib/mobile/route';
+import { methodNotAllowed } from '../../../../lib/mobile/http';
+export { preflight as OPTIONS } from '../../../../lib/mobile/http';
+// never cached: closing requests or marking a room requestable shows at once
+export const GET = privateRoute(getRequestOptions);
+export const ALL = () => methodNotAllowed('GET, OPTIONS');

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>
                   );
                 })}