@acms-subir/core 0.3.46 → 0.3.47

package/src/lib/calendar/render.ts

@@ -11,7 +11,7 @@ import { siteLocale } from '../dates';
 import { getCalendarEvents, tzParts, zonedToUtc } from './ics';
 import { calendarPageUrl } from './src';
 import { collectViewEvents, type ViewEvent } from './data';
-import { eventStrings } from './event-words';
+import { eventStrings, type EventStrings } from './event-words';
 
 // Card sources are ICS feed URLs or native site calendars:
 //   'acms:all'         every public calendar (+ uncategorized events)
@@ -65,6 +65,7 @@ function compactTime(s: string): string {
 }
 
 function buildDisplay(events: ViewEvent[], tz: string, locale: string): DisplayEvent[] {
+  const allDay = eventStrings(locale).allDay;
   const timeFmt = new Intl.DateTimeFormat(locale, { hour: 'numeric', minute: '2-digit', timeZone: tz });
   const dayFmt = new Intl.DateTimeFormat(locale, { weekday: 'short', month: 'short', day: 'numeric', timeZone: tz });
   return events.map((e) => {
@@ -73,7 +74,7 @@ function buildDisplay(events: ViewEvent[], tz: string, locale: string): DisplayE
     let tm = '';
     let rg: string;
     if (e.allDay) {
-      rg = e.days > 1 ? `${when} – ${dayFmt.format(e.end - DAY)}` : `${when} · All day`;
+      rg = e.days > 1 ? `${when} – ${dayFmt.format(e.end - DAY)}` : `${when} · ${allDay}`;
     } else {
       tm = compactTime(timeFmt.format(e.start));
       rg = `${when} · ${timeFmt.format(e.start)} – ${timeFmt.format(e.end)}`;
@@ -132,11 +133,11 @@ function weekHtml(weekStart: number, todayN: number, byDay: Map<number, number[]
   return `<div class="pc-cal-week">${h}</div>`;
 }
 
-function upcomingHtml(events: DisplayEvent[], order: number[], limit: number): string {
-  if (!order.length) return `<p class="pc-cal-empty">No upcoming events.</p>`;
+function upcomingHtml(events: DisplayEvent[], order: number[], limit: number, w: EventStrings): string {
+  if (!order.length) return `<p class="pc-cal-empty">${esc(w.calendar.noUpcoming)}</p>`;
   const items = order.slice(0, limit).map((i) => {
     const e = events[i];
-    return `<li><button type="button" class="pc-cal-row${e.x ? ' is-cancelled' : ''}" data-ev="${i}" data-cal="${e.c}"${dotStyle(e)}><span class="d">${esc(e.rg.split(' · ')[0])}</span><span class="ti">${esc(e.t)}</span><span class="t">${esc(e.tm) || 'All day'}</span></button></li>`;
+    return `<li><button type="button" class="pc-cal-row${e.x ? ' is-cancelled' : ''}" data-ev="${i}" data-cal="${e.c}"${dotStyle(e)}><span class="d">${esc(e.rg.split(' · ')[0])}</span><span class="ti">${esc(e.t)}</span><span class="t">${esc(e.tm) || esc(w.allDay)}</span></button></li>`;
   });
   return `<ul class="pc-cal-agenda">${items.join('')}</ul>`;
 }
@@ -189,7 +190,7 @@ if(!hit||!root.contains(hit)){if(!t.closest('.pc-cal-pop'))closePop();return}
 var e=P.events[Number(hit.getAttribute('data-ev'))];if(!e)return;
 closePop();
 pop=document.createElement('div');pop.className='pc-cal-pop';
-pop.innerHTML='<button type="button" class="pc-cal-pop-x" aria-label="Close">&times;</button>'+(e.x?'<span class="pc-cal-pop-flag">'+esc(P.cancelled)+'</span>':'')+'<strong class="pc-cal-pop-title">'+esc(e.t)+'</strong><div class="pc-cal-pop-when">'+esc(e.rg)+'</div>'+(e.l?'<div class="pc-cal-pop-loc">'+esc(e.l)+'</div>':'')+(e.ds?'<p class="pc-cal-pop-desc">'+esc(e.ds)+'</p>':'')+(e.u?'<a class="pc-cal-pop-link" href="'+esc(e.u)+'">'+esc(P.details)+' &rarr;</a>':'');
+pop.innerHTML='<button type="button" class="pc-cal-pop-x" aria-label="'+esc(P.close)+'">&times;</button>'+(e.x?'<span class="pc-cal-pop-flag">'+esc(P.cancelled)+'</span>':'')+'<strong class="pc-cal-pop-title">'+esc(e.t)+'</strong><div class="pc-cal-pop-when">'+esc(e.rg)+'</div>'+(e.l?'<div class="pc-cal-pop-loc">'+esc(e.l)+'</div>':'')+(e.ds?'<p class="pc-cal-pop-desc">'+esc(e.ds)+'</p>':'')+(e.u?'<a class="pc-cal-pop-link" href="'+esc(e.u)+'">'+esc(P.details)+' &rarr;</a>':'');
 frame.appendChild(pop);
 var fr=frame.getBoundingClientRect(),cr=hit.getBoundingClientRect();
 pop.style.left=Math.max(8,Math.min(cr.left-fr.left,fr.width-pop.offsetWidth-8))+'px';
@@ -234,7 +235,9 @@ export function renderCalendarView(raw: ViewEvent[], settings: Settings, now: nu
     (opts.title ? `<h3 class="pc-cal-heading">${esc(opts.title)}</h3>` : '') +
     (opts.subtitle ? `<p class="pc-cal-sub">${esc(opts.subtitle)}</p>` : '');
   const tz = settings.timezone || 'UTC';
+  // a page in another language passes its settings with that locale
   const locale = siteLocale(settings);
+  const w = eventStrings(locale);
   const today = tzParts(now, tz);
   const [minY, minM] = addMonths(today.y, today.m, -6);
   const [maxY, maxM] = addMonths(today.y, today.m, 6);
@@ -263,10 +266,10 @@ export function renderCalendarView(raw: ViewEvent[], settings: Settings, now: nu
     titleText = `${monthsShort[wa.m - 1]} ${wa.d} – ${wa.m === wb.m ? '' : `${monthsShort[wb.m - 1]} `}${wb.d}, ${wb.y}`;
     bodyHtml = weekHtml(weekStart, todayN, byDay, events, dows);
   } else if (opts.view === 'upcoming') {
-    titleText = 'Upcoming';
+    titleText = w.calendar.upcoming;
     const startOfToday = zonedToUtc(today.y, today.m, today.d, 0, 0, 0, tz);
     const order = raw.map((e, i) => ({ e, i })).filter(({ e }) => e.end > startOfToday).map(({ i }) => i);
-    bodyHtml = upcomingHtml(events, order, Math.min(50, Math.max(1, opts.limit || 6)));
+    bodyHtml = upcomingHtml(events, order, Math.min(50, Math.max(1, opts.limit || 6)), w);
     if (!order.length && opts.emptyText) bodyHtml = `<p class="pc-cal-empty">${esc(opts.emptyText)}</p>`;
   } else {
     titleText = `${months[fm - 1]} ${fy}`;
@@ -276,9 +279,9 @@ export function renderCalendarView(raw: ViewEvent[], settings: Settings, now: nu
   const navButtons =
     opts.view === 'upcoming'
       ? ''
-      : `<button type="button" class="pc-cal-btn" data-nav="today">Today</button>` +
-        `<button type="button" class="pc-cal-btn" data-nav="prev" aria-label="Previous">‹</button>` +
-        `<button type="button" class="pc-cal-btn" data-nav="next" aria-label="Next">›</button>`;
+      : `<button type="button" class="pc-cal-btn" data-nav="today">${esc(w.calendar.today)}</button>` +
+        `<button type="button" class="pc-cal-btn" data-nav="prev" aria-label="${esc(w.calendar.previous)}">‹</button>` +
+        `<button type="button" class="pc-cal-btn" data-nav="next" aria-label="${esc(w.calendar.next)}">›</button>`;
 
   const footer = opts.footer
     ? `<div class="pc-cal-foot"><a class="pc-cal-open" href="${esc(opts.footer.href)}" target="_blank" rel="noopener">${esc(opts.footer.label)}</a></div>`
@@ -291,8 +294,8 @@ export function renderCalendarView(raw: ViewEvent[], settings: Settings, now: nu
     min: [minY, minM],
     max: [maxY, maxM],
     months, monthsShort, dows, events, ws,
-    // the pop-up's flag in the dates' language, like event cards
-    details: 'Details', cancelled: eventStrings(locale).cancelled,
+    // the pop-up's words in the dates' language, like event cards
+    details: w.calendar.details, cancelled: w.cancelled, close: w.calendar.close,
   };
   const json = JSON.stringify(payload).replace(/</g, '\\u003c');
 
@@ -319,11 +322,12 @@ export async function renderCalendarBlock(
   const heading =
     (a.title ? `<h3 class="pc-cal-heading">${esc(a.title)}</h3>` : '') +
     (a.subtitle ? `<p class="pc-cal-sub">${esc(a.subtitle)}</p>` : '');
+  const w = eventStrings(siteLocale(settings)).calendar;
 
   const feeds = a.sources.filter((s) => s.startsWith('http'));
   const natives = repo ? a.sources.filter(isNativeSource) : [];
   if (!feeds.length && !natives.length) {
-    return `<section class="pc-calendar is-empty">${heading}<div class="pc-cal-frame"><p class="pc-cal-empty">No calendar connected.</p></div></section>`;
+    return `<section class="pc-calendar is-empty">${heading}<div class="pc-cal-frame"><p class="pc-cal-empty">${esc(w.noSource)}</p></div></section>`;
   }
 
   const win = calendarWindow(settings, now);
@@ -346,7 +350,7 @@ export async function renderCalendarBlock(
   const raw: ViewEvent[] = [...feedEvents, ...native].sort((x, y) => x.start - y.start || x.title.localeCompare(y.title));
 
   if (!raw.length && feeds.length && errors.length === feeds.length && !natives.length) {
-    return `<section class="pc-calendar is-empty">${heading}<div class="pc-cal-frame"><p class="pc-cal-empty">Calendar unavailable right now.</p></div></section>`;
+    return `<section class="pc-calendar is-empty">${heading}<div class="pc-cal-frame"><p class="pc-cal-empty">${esc(w.unavailable)}</p></div></section>`;
   }
 
   const pageUrl = a.showOpenLink ? feeds.map(calendarPageUrl).find(Boolean) ?? '' : '';
@@ -355,7 +359,7 @@ export async function renderCalendarBlock(
     title: a.title,
     subtitle: a.subtitle,
     limit: a.limit,
-    footer: pageUrl ? { href: pageUrl, label: 'Open in Google Calendar ↗' } : undefined,
+    footer: pageUrl ? { href: pageUrl, label: w.openGoogle } : undefined,
     // dots only mean something with 2+ calendars
     multi: feeds.length + nativeCalendars > 1,
   });

package/src/lib/mobile/calendar.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { ContentRepository } from '../repo/types';
-import { publicTags, tagFilter, type BookingLink, type CalEvent, type Calendar, type Resource, type Settings } from '../schema';
+import { type BookingLink, type CalEvent, type Calendar, type Resource, type Settings } from '../schema';
 import { ApiError } from '../api';
 import { CALENDAR, bookingsEnabled, resourceUrl, bookingLinkUrl, publicEventFields } from '../calendar/config';
 import { calendarToJson, eventToJson, roomsToJson } from '../calendar/api';
@@ -17,6 +17,7 @@ import { localizeDoc } from '../translations';
 import { localeQuery, mobileLocale, localizedUrl } from './locale';
 import { confirmsInstantly, linkApproval } from '../booking/approval';
 import { changeTopics } from '../push/service';
+import { occurrenceMatches, readEventFilter, resolveEventFilter, tagsMatch } from '../calendar/filter';
 
 export function requireCalendar(bookings = false) {
   if (!CALENDAR.enabled || (bookings && !bookingsEnabled())) throw new ApiError(404, 'This feature is disabled.');
@@ -27,14 +28,24 @@ export async function listCalendars(repo: ContentRepository, url: URL) {
   const origin = siteOrigin(await repo.getSettings(), url);
   return { calendars: (await repo.listCalendars()).filter(c => c.visibility === 'public').map(c => calendarToJson(c, origin)) };
 }
-// tag/excludeTag: a public tag's name or slug (internal "#" tags are never matched, as they are never shown)
-export const eventsQuery = z.object({ ...pageQuery, locale: localeQuery, from: isoDayOrInstant.optional(), to: isoDayOrInstant.optional(), calendar: z.string().min(1).max(200).optional(),
-  tag: z.string().min(1).max(100).optional(), excludeTag: z.string().min(1).max(100).optional(), q: z.string().max(100).optional() }).strict();
+// The website calendar's filters (calendar/filter.ts). Each takes one or more
+// values, comma-separated or repeated. Tags are a public tag's name or slug
+// (internal "#" tags never match, as they are never shown).
+const FILTER_LISTS = ['calendar', 'cal', 'tag', 'excludeTag', 'notag', 'room'] as const;
+const filterList = (what: string) => z.string().min(1).max(2100)
+  .refine((v) => { const parts = v.split(','); return parts.length <= 20 && parts.every((p) => p.trim().length <= 100); }, 'Use up to 20 values of up to 100 characters each.')
+  .optional().describe(`${what} One or more, comma-separated (a,b) or repeated.`);
+export const eventsQuery = z.object({ ...pageQuery, locale: localeQuery, from: isoDayOrInstant.optional(), to: isoDayOrInstant.optional(),
+  calendar: filterList('Only events in these calendars (slugs).'), cal: filterList('Alias of calendar.'),
+  tag: filterList('Only events with one of these tags (a name in any case, or a slug).'), excludeTag: filterList('Leave out events with any of these tags.'), notag: filterList('Alias of excludeTag.'),
+  room: filterList('Only events held in one of these rooms (slugs of rooms shown on public events).'),
+  q: z.string().max(100).optional() }).strict();
 export async function listEvents(repo: ContentRepository, url: URL) {
   requireCalendar();
-  const q = eventsQuery.parse(queryParams(url));
+  const q = eventsQuery.parse(queryParams(url, FILTER_LISTS));
   const locale = mobileLocale(q.locale);
   const term = q.q?.trim() ?? '';
+  const filter = readEventFilter(url.searchParams);
   const [settings, calendars, events, resources, indexed] = await Promise.all([repo.getSettings(), repo.listCalendars(), repo.listPublishedEvents(), roomMap(repo),
     // the search index's matches (body text, word prefixes), so "more" from /search continues here
     term ? repo.searchPublished(term, { limit: 200, collections: [] }).then((r) => new Set(r.events.map(({ doc }) => doc.id))) : null]);
@@ -47,14 +58,18 @@ export async function listEvents(repo: ContentRepository, url: URL) {
   const to = q.to ? at(q.to) : fromDay.length === 10 ? localMidnight(addDaysYmd(fromDay, 30), tz) : from + 30 * 86400000;
   if (to <= from || to - from > 90 * 86400000 + 3600000) throw new ApiError(400, 'Use an event window of 1 to 90 days.');
   const all = new Map(calendars.map(c => [c.id, c]));
-  const cal = q.calendar ? calendars.find(c => c.slug === q.calendar && c.visibility !== 'private') : null;
-  if (q.calendar && !cal) throw new ApiError(404, 'Calendar not found.');
-  const publicCalendars = new Map(calendars.filter(c => c.visibility === 'public' || c.id === cal?.id).map(c => [c.id, c]));
-  const tagged = tagFilter(q.tag, q.excludeTag);
-  const visible = events.map(e => localizeDoc(e, locale ?? undefined)).filter(e => (cal ? e.calendarIds.includes(cal.id) && eventIsPublic(e, all) : eventIsListed(e, all))
-    && tagged(publicTags(e.tags))
+  // private calendars and rooms not shown on public events answer like missing ones
+  const f = resolveEventFilter(filter, { calendars, resources: [...resources.values()] });
+  if (f.calendarIds && f.calendarIds.length < filter.cal.length) throw new ApiError(404, 'Calendar not found.');
+  if (f.roomIds && f.roomIds.length < filter.room.length) throw new ApiError(404, 'Room not found.');
+  const picked = f.calendarIds;
+  const publicCalendars = new Map(calendars.filter(c => c.visibility === 'public' || picked?.includes(c.id)).map(c => [c.id, c]));
+  const visible = events.map(e => localizeDoc(e, locale ?? undefined)).filter(e => (picked ? e.calendarIds.some(id => picked.includes(id)) && eventIsPublic(e, all) : eventIsListed(e, all))
+    && tagsMatch(f, e.tags)
     && (!term || indexed!.has(e.id) || `${e.title} ${e.excerpt} ${e.location.name}`.toLowerCase().includes(term.toLowerCase())));
-  const occurrences = expandEvents(visible, settings, { displayTz: settings.timezone || 'UTC', now: Date.now(), windowStartMs: from, windowEndMs: to });
+  const occurrences = expandEvents(visible, settings, { displayTz: settings.timezone || 'UTC', now: Date.now(), windowStartMs: from, windowEndMs: to })
+    // rooms are per date (a moved date can change them)
+    .filter(o => !f.roomIds || occurrenceMatches(f, o));
   occurrences.sort((a, b) => a.start - b.start || (a.event.id < b.event.id ? -1 : a.event.id > b.event.id ? 1 : 0));
   const start = (q.page - 1) * q.limit;
   const origin = siteOrigin(settings, url);

package/src/lib/mobile/http.ts

@@ -43,11 +43,13 @@ export async function limitRequest(repo: ContentRepository, address: string, wri
   const key = `mobile:${write ? 'write' : 'read'}:${await sha256Hex(address)}`;
   if (!await repo.email.rateLimit(key, write ? 20 : 300, 60_000)) throw new ApiError(429, 'Too many requests. Try again in a minute.');
 }
-export function queryParams(url: URL) {
+// lists: parameters that may repeat (tag=a&tag=b); their values are joined
+// with commas, the same as tag=a,b
+export function queryParams(url: URL, lists: readonly string[] = []) {
   const result: Record<string, string> = {};
   for (const [key, value] of url.searchParams) {
-    if (key in result) throw new ApiError(400, `Duplicate query parameter: ${key}.`);
-    result[key] = value;
+    if (key in result && !lists.includes(key)) throw new ApiError(400, `Duplicate query parameter: ${key}.`);
+    result[key] = key in result ? `${result[key]},${value}` : value;
   }
   return result;
 }

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

@@ -14,16 +14,20 @@ import { readJson } from '../../../../lib/api';
 import { runAgentTool } from '../../../../lib/agent';
 import { waitUntilFrom } from '../../../../lib/webhooks';
 import { fail } from '../../../../lib/calendar/http';
-import { publicTags, tagFilter } from '../../../../lib/schema';
+import { occurrenceMatches, readEventFilter, resolveEventFilter, tagsMatch } from '../../../../lib/calendar/filter';
 
 // Public read API for other sites, apps and lobby screens.
 //   GET /api/calendar/events?from=2026-10-01&to=2026-10-31&calendar=youth&q=night
 //   GET /api/calendar/events?tag=class (or excludeTag=class; a tag's name or slug)
+//   GET /api/calendar/events?calendar=youth,events&notag=Class&room=chapel
+//   (the /calendar page's filters: each takes several values, comma-separated
+//   or repeated; cal and notag are aliases of calendar and excludeTag)
 //   → { timezone, from, to, occurrences: [{ id, start, end, allDay, cancelled, event }] }
 //   GET /api/calendar/events?expand=0 → { events: [...] } (rules, not instances)
 // Anonymous callers see public calendars (and an unlisted one when asked by
 // slug). A key with events:read also sees private calendars and private
-// custom fields, and its tag filters also match internal "#" tags.
+// custom fields, its tag filters also match internal "#" tags, and its room
+// filter matches every room (anonymous callers: rooms shown on public events).
 const CORS = {
   'Access-Control-Allow-Origin': '*',
   'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
@@ -43,28 +47,28 @@ export const GET: APIRoute = async ({ request, locals, url }) => {
     const principal = await authenticate(request, repo);
     if (request.headers.get('authorization') && !principal) throw new ApiError(401, 'Invalid API key.');
     const full = principal ? hasScope(principal, 'events:read') : false;
+    const filter = readEventFilter(url.searchParams);
     const [settings, calendars, published, rooms] = await Promise.all([repo.getSettings(), repo.listCalendars(), repo.listPublishedEvents(), repo.listResources()]);
     const tz = settings.timezone || 'UTC';
     const map = new Map(calendars.map((c) => [c.id, c]));
     const resources = new Map(rooms.map((r) => [r.id, r]));
     const origin = siteOrigin(settings, url);
 
-    const slug = url.searchParams.get('calendar');
-    const cal = slug ? calendars.find((c) => c.slug === slug) : null;
-    if (slug && (!cal || (cal.visibility === 'private' && !full))) throw new ApiError(404, 'Unknown calendar.');
+    const f = resolveEventFilter(filter, { calendars, resources: rooms, allowPrivate: full });
+    if (f.calendarIds && f.calendarIds.length < filter.cal.length) throw new ApiError(404, 'Unknown calendar.');
+    if (f.roomIds && f.roomIds.length < filter.room.length) throw new ApiError(404, 'Unknown room.');
+    const picked = f.calendarIds;
     const q = (url.searchParams.get('q') ?? '').trim().toLowerCase();
     let events = published.filter((e) => {
-      if (cal) return e.calendarIds.includes(cal.id) && (full || eventIsPublic(e, map));
+      if (picked) return e.calendarIds.some((id) => picked.includes(id)) && (full || eventIsPublic(e, map));
       return full ? true : eventIsListed(e, map);
     });
     if (q) events = events.filter((e) => `${e.title} ${e.excerpt} ${e.location.name}`.toLowerCase().includes(q));
-    const tag = url.searchParams.get('tag')?.slice(0, 100), excludeTag = url.searchParams.get('excludeTag')?.slice(0, 100);
-    if (tag || excludeTag) {
-      const tagged = tagFilter(tag, excludeTag);
-      events = events.filter((e) => tagged(full ? e.tags : publicTags(e.tags)));
-    }
+    events = events.filter((e) => tagsMatch(f, e.tags, { internal: full }));
 
     if (url.searchParams.get('expand') === '0') {
+      // rules, not dates: a room filter matches the series' own rooms
+      if (f.roomIds) events = events.filter((e) => occurrenceMatches(f, { event: e }));
       return withCors(json({ timezone: tz, events: events.map((e) => eventToJson(e, origin, map, settings.timezone, { includePrivate: full, resources })) }));
     }
     const day = (param: string, fallback: number) => {
@@ -76,7 +80,9 @@ export const GET: APIRoute = async ({ request, locals, url }) => {
     const to = Math.min(day('to', from + 90 * 86_400_000), from + 400 * 86_400_000);
     if (to <= from) throw new ApiError(400, '"to" must be after "from".');
     const limit = Math.min(1000, Math.max(1, Number(url.searchParams.get('limit')) || 200));
-    const occ = expandEvents(events, settings, { displayTz: tz, now, windowStartMs: from, windowEndMs: to }).slice(0, limit);
+    const occ = expandEvents(events, settings, { displayTz: tz, now, windowStartMs: from, windowEndMs: to })
+      .filter((o) => !f.roomIds || occurrenceMatches(f, o))
+      .slice(0, limit);
     const cache = new Map<string, ReturnType<typeof eventToJson>>();
     const toJson = (id: string) => {
       if (!cache.has(id)) cache.set(id, eventToJson(events.find((e) => e.id === id)!, origin, map, settings.timezone, { includePrivate: full, resources }));

package/src/pages/calendar/[slug].ics.ts

@@ -4,10 +4,13 @@ import { getRepo } from '../../lib/repo';
 import { siteOrigin } from '../../lib/seo';
 import { CALENDAR } from '../../lib/calendar/config';
 import { feedFor, icsResponse } from '../../lib/calendar/feeds';
+import { readEventFilter, resolveEventFilter } from '../../lib/calendar/filter';
 
 // One calendar's subscribe feed. Public and unlisted calendars are open;
 // private ones need the secret ?t= token from Calendars → Copy link (staff
 // subscriptions). A wrong token looks exactly like a missing calendar.
+// ?tag=, ?notag= and ?room= narrow it like the /calendar page (a `cal` here
+// is ignored: the address names the calendar).
 const sameToken = (a: string, b: string) =>
   a.length === b.length && a.length > 0 && timingSafeEqual(Buffer.from(a), Buffer.from(b));
 
@@ -18,8 +21,11 @@ export const GET: APIRoute = async ({ locals, url, params }) => {
   if (!calendar || calendar.kind !== 'native') return new Response(null, { status: 404 });
   const isPrivate = calendar.visibility === 'private';
   if (isPrivate && !sameToken(url.searchParams.get('t') ?? '', calendar.feedToken)) return new Response(null, { status: 404 });
-  const settings = await repo.getSettings();
-  const { body } = await feedFor(repo, settings, siteOrigin(settings, url), { calendar, allowPrivate: isPrivate });
+  const filter = { ...readEventFilter(url.searchParams), cal: [] };
+  const [settings, resources] = await Promise.all([repo.getSettings(), filter.room.length ? repo.listResources() : []]);
+  const resolved = resolveEventFilter(filter, { calendars: [], resources, allowPrivate: isPrivate });
+  if (resolved.unknown) return new Response(null, { status: 404 });
+  const { body } = await feedFor(repo, settings, siteOrigin(settings, url), { calendar, allowPrivate: isPrivate, filter: resolved });
   // private feeds must never sit in shared caches
   const res = icsResponse(body, `${calendar.slug}.ics`, isPrivate ? 0 : 300);
   if (isPrivate) res.headers.set('Cache-Control', 'private, no-store');

package/src/pages/calendar/feed.ics.ts

@@ -3,13 +3,20 @@ import { getRepo } from '../../lib/repo';
 import { siteOrigin } from '../../lib/seo';
 import { CALENDAR } from '../../lib/calendar/config';
 import { feedFor, icsResponse } from '../../lib/calendar/feeds';
+import { readEventFilter, resolveEventFilter } from '../../lib/calendar/filter';
 
 // Every public calendar in one subscribe feed (/calendar.ics). Feed
 // calendars are not re-published — subscribers can add those at the source.
+// The /calendar page's filters narrow it: /calendar.ics?tag=Class,
+// ?cal=youth,events&notag=Class, ?room=chapel. A calendar or room that isn't
+// public answers 404, like one that doesn't exist.
 export const GET: APIRoute = async ({ locals, url }) => {
   if (!CALENDAR.enabled) return new Response(null, { status: 404 });
   const repo = await getRepo(locals);
-  const settings = await repo.getSettings();
-  const { body } = await feedFor(repo, settings, siteOrigin(settings, url), {});
+  const filter = readEventFilter(url.searchParams);
+  const [settings, calendars, resources] = await Promise.all([repo.getSettings(), repo.listCalendars(), filter.room.length ? repo.listResources() : []]);
+  const resolved = resolveEventFilter(filter, { calendars, resources });
+  if (resolved.unknown) return new Response(null, { status: 404 });
+  const { body } = await feedFor(repo, settings, siteOrigin(settings, url), { filter: resolved });
   return icsResponse(body, 'calendar.ics');
 };

package/src/pages/calendar/index.astro

@@ -3,50 +3,69 @@ import Site from '../../layouts/Site.astro';
 import { getRepo } from '../../lib/repo';
 import { effectiveSettings } from '../../lib/designPreview';
 import { siteOrigin } from '../../lib/seo';
-import { siteLocale } from '../../lib/dates';
-import { CALENDAR, calendarFeedUrl, calendarPageUrl } from '../../lib/calendar/config';
+import { siteLang, siteLocale } from '../../lib/dates';
+import { I18N, localePath, requestLocale } from '../../lib/i18n';
+import { isExtraLocale } from '../../lib/translations';
+import { fill } from '../../lib/live/words';
+import { eventStrings } from '../../lib/calendar/event-words';
+import { CALENDAR, calendarFeedUrl, eventUrl } from '../../lib/calendar/config';
 import { calendarWindow, renderCalendarView } from '../../lib/calendar/render';
 import { collectViewEvents, type ViewEvent } from '../../lib/calendar/data';
 import { eventCardHtml } from '../../lib/calendar/cards';
 import { safeColor } from '../../lib/calendar/events';
 import { tzParts } from '../../lib/calendar/ics';
+import { eventFilterQuery, hasEventFilter, readEventFilter, resolveEventFilter, type EventFilter } from '../../lib/calendar/filter';
 
 // The main calendar page: filter chips per public calendar, Month / Week /
 // List views (the same renderer as the calendar card), image cards for
 // what's coming up, and subscribe links for every calendar app. On phones the
 // month grid gives way to a two-week day strip over the agenda.
+// The address carries the filters (filter.ts): ?cal=youth,events, ?tag=Class,
+// ?notag=Class, ?room=chapel. Active ones show as removable chips, and the
+// subscribe links carry them. /es/calendar speaks Spanish (the same languages
+// as event pages) and keeps its links under /es.
 if (!CALENDAR.enabled) return new Response(null, { status: 404, statusText: 'Not found' });
 
 const repo = await getRepo(Astro.locals);
-const settings = await effectiveSettings(await repo.getSettings(), Astro.url, Astro.cookies, Astro.locals);
+const reqLocale = I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '';
+const baseSettings = await effectiveSettings(await repo.getSettings(), Astro.url, Astro.cookies, Astro.locals);
+// dates and the renderer's words follow the page's language, like event pages
+const settings = isExtraLocale(reqLocale) ? { ...baseSettings, locale: reqLocale } : baseSettings;
+const lang = reqLocale || siteLang(settings);
+const w = eventStrings(lang);
+const cw = w.calendar;
+const here = (path: string) => localePath(path, reqLocale);
 const now = Date.now();
 const tz = settings.timezone || 'UTC';
 const locale = siteLocale(settings);
 const origin = siteOrigin(settings, Astro.url);
 
-const all = await repo.listCalendars();
+const filter = readEventFilter(Astro.url.searchParams);
+const filtered = hasEventFilter(filter);
+const [all, resources] = await Promise.all([repo.listCalendars(), filter.room.length ? repo.listResources() : []]);
+const resolved = resolveEventFilter(filter, { calendars: all, resources });
 const listed = all.filter((c) => c.visibility === 'public');
-const calSlug = Astro.url.searchParams.get('cal') ?? '';
-// unlisted calendars work when linked directly, they just aren't offered
-const active = calSlug ? all.find((c) => c.slug === calSlug && c.visibility !== 'private') ?? null : null;
+// exactly one calendar picked: its name, description and own feed
+const active = filter.cal.length === 1 && resolved.calendars.length === 1 ? resolved.calendars[0] : null;
+const picked = new Set(resolved.calendarIds ?? []);
 const viewParam = Astro.url.searchParams.get('view');
 const view = (['month', 'week', 'list'] as const).find((v) => v === viewParam) ?? CALENDAR.defaultView;
-const explicitView = Boolean(viewParam);
-const monthParam = /^(\d{4})-(\d{2})$/.exec(Astro.url.searchParams.get('m') ?? '');
+const explicitView = viewParam === view;
+const monthRaw = Astro.url.searchParams.get('m') ?? '';
+const monthParam = /^(\d{4})-(\d{2})$/.exec(monthRaw);
 
 const win = calendarWindow(settings, now);
-const { events, calendars, errors } = await collectViewEvents(repo, settings, win, {
-  audience: 'public',
-  ...(active ? { calendarIds: [active.id] } : {}),
-});
+const { events, calendars, errors } = await collectViewEvents(repo, settings, win, { audience: 'public', filter: resolved, locale: lang });
 
-const calendarHtml = renderCalendarView(events, settings, now, {
+const gridHtml = renderCalendarView(events, settings, now, {
   view: view === 'list' ? 'upcoming' : view,
   limit: 50,
-  multi: !active && calendars.length > 1,
-  emptyText: 'Nothing on the calendar yet.',
+  multi: calendars.length > 1,
+  emptyText: filtered ? cw.noMatch : cw.empty,
   focus: monthParam ? { y: Number(monthParam[1]), m: Number(monthParam[2]) } : undefined,
 });
+// an empty month or week grid says why (the list says it itself)
+const calendarHtml = (filtered && !events.length && view !== 'list' ? '<p class="pc-cal-empty">' + cw.noMatch + '</p>' : '') + gridHtml;
 
 // coming up: the next occurrence of each distinct native event
 const seen = new Set<string>();
@@ -79,19 +98,44 @@ const stripDays = Array.from({ length: 14 }, (_, i) => {
   return { k, dow: fmt({ weekday: 'narrow' }).format(ms), d: tzParts(ms, tz).d, has: agenda.has(k), today: i === 0 };
 });
 
-const feed = origin + calendarFeedUrl(active?.slug);
+// links keep the filters, the view, the month and the page's language
+const pageHref = (f: EventFilter, opts: { view?: string | null; m?: string | null } = {}) => {
+  const v = opts.view === undefined ? (explicitView ? view : null) : opts.view;
+  const m = opts.m === undefined ? (monthParam ? monthRaw : null) : opts.m;
+  const q = [eventFilterQuery(f), v ? `view=${v}` : '', m ? `m=${m}` : ''].filter(Boolean).join('&');
+  return here(CALENDAR.base) + (q ? `?${q}` : '');
+};
+const viewHref = (v: string) => pageHref(filter, { view: v, m: null });
+const without = (key: keyof EventFilter, value: string) => pageHref({ ...filter, [key]: filter[key].filter((x) => x !== value) });
+// calendar chips switch a calendar on or off; "All" drops the calendar filter
+const toggleCal = (slug: string) => {
+  const on = filter.cal.some((s) => s.toLowerCase() === slug);
+  return pageHref({ ...filter, cal: on ? filter.cal.filter((s) => s.toLowerCase() !== slug) : [...filter.cal, slug] });
+};
+const offered = [...listed, ...resolved.calendars.filter((c) => c.visibility !== 'public')];
+const roomName = (slug: string) => resolved.rooms.find((r) => r.slug === slug.toLowerCase())?.name ?? slug;
+// the removable chips: tags, left-out tags, rooms, and calendars that didn't resolve
+const chips = [
+  ...filter.tag.map((t) => ({ label: t, href: without('tag', t) })),
+  ...filter.notag.map((t) => ({ label: fill(cw.without, { tag: t }), href: without('notag', t) })),
+  ...filter.room.map((r) => ({ label: fill(cw.room, { room: roomName(r) }), href: without('room', r) })),
+  ...filter.cal.filter((s) => !resolved.calendars.some((c) => c.slug === s.toLowerCase())).map((s) => ({ label: s, href: without('cal', s) })),
+];
+
+// subscribe: one calendar alone keeps its own feed; anything else is the
+// site feed with the same filters
+const ownFeed = active && !filter.tag.length && !filter.notag.length && !filter.room.length;
+const feedQuery = eventFilterQuery(filter);
+const feed = origin + (ownFeed ? calendarFeedUrl(active.slug) : calendarFeedUrl() + (feedQuery ? `?${feedQuery}` : ''));
 const webcal = feed.replace(/^https?:\/\//, 'webcal://');
 const googleAdd = `https://calendar.google.com/calendar/r?cid=${encodeURIComponent(webcal)}`;
 const outlookAdd = `https://outlook.live.com/calendar/0/addfromweb?url=${encodeURIComponent(feed)}&name=${encodeURIComponent(active?.name ?? settings.siteTitle)}`;
-const viewHref = (v: string) => {
-  const p = new URLSearchParams(Astro.url.search);
-  p.set('view', v);
-  p.delete('m');
-  return `${CALENDAR.base}?${p}`;
-};
-const title = active ? active.name : 'Calendar';
-const lede = active?.description || `What’s happening at ${settings.siteTitle}. Subscribe to keep it in your own calendar.`;
+const subscribeNote = ownFeed ? fill(cw.subscribeNamed, { name: active.name }) : filtered ? cw.subscribeFiltered : cw.subscribeAll;
+const title = active ? active.name : cw.title;
+const lede = active?.description || fill(cw.lede, { site: settings.siteTitle });
 const zoneName = fmt({ timeZoneName: 'long' }).formatToParts(now).find((p) => p.type === 'timeZoneName')?.value ?? tz;
+const agendaEmpty = filtered && !events.length ? cw.noMatch : cw.emptySoon;
+const cardHref = (v: ViewEvent) => here(eventUrl(v.event!.slug));
 ---
 
 <Site title={title} description={lede}>
@@ -102,40 +146,51 @@ const zoneName = fmt({ timeZoneName: 'long' }).formatToParts(now).find((p) => p.
     </header>
 
     <div class="pc-calpage-bar">
-      {(listed.length > 1 || active) && (
-        <nav class="pc-calpage-chips" aria-label="Calendars">
-          <a class={!active ? 'is-on' : ''} href={CALENDAR.base} aria-current={!active ? 'page' : undefined}>All</a>
-          {listed.map((c) => (
-            <a class={active?.id === c.id ? 'is-on' : ''} href={calendarPageUrl(c.slug)} aria-current={active?.id === c.id ? 'page' : undefined}>
+      {(offered.length > 1 || picked.size > 0) && (
+        <nav class="pc-calpage-chips" aria-label={cw.calendars}>
+          <a class={!filter.cal.length ? 'is-on' : ''} href={pageHref({ ...filter, cal: [] })} aria-current={!filter.cal.length ? 'page' : undefined}>{cw.all}</a>
+          {offered.map((c) => (
+            <a class={picked.has(c.id) ? 'is-on' : ''} href={toggleCal(c.slug)} aria-current={picked.has(c.id) ? 'true' : undefined}>
               <i style={`background:${safeColor(c.color)}`} aria-hidden="true" />{c.name}
             </a>
           ))}
-          {active && active.visibility !== 'public' && <a class="is-on" href={calendarPageUrl(active.slug)}><i style={`background:${safeColor(active.color)}`} aria-hidden="true" />{active.name}</a>}
         </nav>
       )}
       <div class="pc-calpage-tools">
-        <nav class="pc-calpage-views" aria-label="View">
-          <a class={view === 'month' ? 'is-on' : ''} href={viewHref('month')}>Month</a>
-          <a class={view === 'week' ? 'is-on' : ''} href={viewHref('week')}>Week</a>
-          <a class={view === 'list' ? 'is-on' : ''} href={viewHref('list')}>List</a>
+        <nav class="pc-calpage-views" aria-label={cw.views}>
+          <a class={view === 'month' ? 'is-on' : ''} href={viewHref('month')}>{cw.month}</a>
+          <a class={view === 'week' ? 'is-on' : ''} href={viewHref('week')}>{cw.week}</a>
+          <a class={view === 'list' ? 'is-on' : ''} href={viewHref('list')}>{cw.list}</a>
         </nav>
         <details class="pc-calpage-sub">
           <summary>
             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 4v11M7 10l5 5 5-5M5 20h14" /></svg>
-            Subscribe
+            {cw.subscribe}
           </summary>
           <div class="pc-calpage-sub-menu">
-            <p>Add {active ? `“${active.name}”` : 'this calendar'} to your calendar app. New events show up on their own.</p>
+            <p>{subscribeNote}</p>
             <a href={googleAdd} target="_blank" rel="noopener">Google Calendar</a>
             <a href={webcal}>Apple Calendar</a>
             <a href={outlookAdd} target="_blank" rel="noopener">Outlook</a>
-            <button type="button" data-copy={feed}>Copy link</button>
+            <button type="button" data-copy={feed} data-copied={w.linkCopied}>{cw.copyLink}</button>
           </div>
         </details>
       </div>
     </div>
 
-    <div class="pc-calpage-strip" aria-label="Next two weeks">
+    {chips.length > 0 && (
+      <nav class="pc-calpage-filters" aria-label={cw.filters}>
+        {chips.map((c) => (
+          <a class="pc-calpage-filter" href={c.href} aria-label={fill(cw.remove, { filter: c.label })}>
+            <span>{c.label}</span>
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true"><path d="M7 7l10 10M17 7L7 17" /></svg>
+          </a>
+        ))}
+        {chips.length > 1 && <a class="pc-calpage-clear" href={pageHref({ cal: [], tag: [], notag: [], room: [] })}>{cw.clear}</a>}
+      </nav>
+    )}
+
+    <div class="pc-calpage-strip" aria-label={cw.nextTwoWeeks}>
       {stripDays.map((d) => (
         <a class={`${d.has ? 'has' : ''}${d.today ? ' today' : ''}`} href={d.has ? `#d-${d.k}` : undefined} aria-label={d.k}>
           <small>{d.dow}</small><b>{d.d}</b><i aria-hidden="true" />
@@ -145,13 +200,13 @@ const zoneName = fmt({ timeZoneName: 'long' }).formatToParts(now).find((p) => p.
 
     <div class="pc-calpage-view" set:html={calendarHtml} />
 
-    <section class="pc-calpage-agenda" aria-label="Agenda">
-      {agenda.size === 0 ? <p class="pc-cal-empty">Nothing in the next two months.</p> : [...agenda.entries()].map(([k, list]) => (
+    <section class="pc-calpage-agenda" aria-label={cw.agenda}>
+      {agenda.size === 0 ? <p class="pc-cal-empty">{agendaEmpty}</p> : [...agenda.entries()].map(([k, list]) => (
         <div class="pc-agenda-day" id={`d-${k}`}>
           <h3>{dayLabel.format(list[0].start < now ? now : list[0].start)}</h3>
           {list.map((v) => (
             <a class={`pc-agenda-row${v.cancelled ? ' is-cancelled' : ''}`} href={v.url ?? undefined}>
-              <span class="t">{v.allDay ? 'All day' : timeLabel.format(v.start)}</span>
+              <span class="t">{v.allDay ? w.allDay : timeLabel.format(v.start)}</span>
               <span class="ti">
                 {v.color && <i style={`background:${v.color}`} aria-hidden="true" />}
                 <b>{v.title}</b>
@@ -165,14 +220,14 @@ const zoneName = fmt({ timeZoneName: 'long' }).formatToParts(now).find((p) => p.
 
     {view !== 'list' && comingUp.length > 0 && (
       <section class="pc-calpage-up">
-        <h2>Coming up</h2>
-        <div class="pc-ev-cards" data-layout="grid" set:html={comingUp.map((v) => eventCardHtml({ event: v.event!, start: v.start, end: v.end, allDay: v.allDay, days: v.days, cancelled: v.cancelled }, settings, { showImage: true })).join('')} />
+        <h2>{cw.comingUp}</h2>
+        <div class="pc-ev-cards" data-layout="grid" set:html={comingUp.map((v) => eventCardHtml({ event: v.event!, start: v.start, end: v.end, allDay: v.allDay, days: v.days, cancelled: v.cancelled }, settings, { showImage: true, href: cardHref(v) })).join('')} />
       </section>
     )}
 
     <footer class="pc-calpage-foot">
-      <span>Times in {zoneName}</span>
-      {errors.length > 0 && <span>Some linked calendars couldn’t be loaded right now.</span>}
+      <span>{fill(cw.timesIn, { zone: zoneName })}</span>
+      {errors.length > 0 && <span>{cw.feedErrors}</span>}
     </footer>
   </div>
   <script>
@@ -180,8 +235,9 @@ const zoneName = fmt({ timeZoneName: 'long' }).formatToParts(now).find((p) => p.
       const b = e.target instanceof Element ? e.target.closest<HTMLButtonElement>('[data-copy]') : null;
       if (b) {
         await navigator.clipboard.writeText(b.dataset.copy ?? '');
-        b.textContent = 'Link copied';
-        setTimeout(() => (b.textContent = 'Copy link'), 1400);
+        const label = (b.dataset.label ??= b.textContent ?? '');
+        b.textContent = b.dataset.copied ?? label;
+        setTimeout(() => (b.textContent = label), 1400);
       }
       document.querySelectorAll<HTMLDetailsElement>('details.pc-calpage-sub[open]').forEach((d) => {
         if (!(e.target instanceof Node && d.contains(e.target))) d.open = false;