@meith/plugin-calendar 0.36.2 → 0.37.0

package/README.md

@@ -54,7 +54,7 @@ the thread as its `URL`, as before.
 
 ## What it stores
 
-Two tables in its own namespace: `plugin_calendar_event` and
+The original two tables in its own namespace: `plugin_calendar_event` and
 `plugin_calendar_organiser`. The link and its text are two columns added by
 a second migration rather than folded into the first, because the first has
 already been applied wherever the plugin runs and a migration that has run
@@ -62,3 +62,57 @@ is never edited. The thread id is a plain column, not a foreign
 key — a plugin's schema may not reference the board's, so an event whose
 thread has since been deleted simply links to a thread that is not there,
 rather than blocking the deletion.
+
+## RSVP and recurrence
+
+Members can respond Yes, No or Maybe, change their answer, or clear it from
+an occurrence page, with JavaScript disabled. Responses belong to the event
+and its UTC occurrence date, never the entire series. Counts are public to
+board readers; only the member's own status is shown alongside them.
+Organisers and the event creator can see the response list, containing only
+usernames and answers.
+
+The third, forward-only migration adds recurrence columns and
+`plugin_calendar_rsvps`, unique on event, occurrence date and user.
+Its only foreign key stays inside the plugin namespace and cascades event
+deletion. Changing a series retains responses for unchanged UTC dates;
+responses for removed dates are no longer shown. Moving a session to a
+different date requires fresh responses.
+
+Weekly and fortnightly repeats advance the stored instant by 7 or 14 days.
+Monthly repeats keep the UTC day and time, skipping months without that
+day (January 31 next occurs March 31). The optional until date is inclusive.
+The agenda expands one UTC month at a time, with previous/next navigation.
+The thread card selects from recurring occurrences within a year on either
+side of now. ICS downloads contain the series with a standard RRULE.
+
+Calendar inputs and labels use UTC explicitly. Unlike core TimeModel
+timestamps, these plugin labels do not use the viewer's time zone; imported
+calendar entries are displayed in the calendar application's zone. Local
+wall-clock time can shift at daylight-saving boundaries. Reminders are described below.
+
+## Calendar reminders
+
+The cron scheduler runs `plugin.calendar.reminders` every five minutes in UTC.
+The operator's **Reminder lead time (hours)** setting defaults to 2 and
+accepts 0–168 hours, including fractions; 0 disables reminders. Members
+who answered Yes or Maybe receive `plugin.calendar.reminder` with a link
+to that occurrence. No and cleared responses receive nothing. Notifications
+appear on the board; email is off by default and members can enable it in
+their notification preferences.
+
+The task catches up on unsent reminders inside the lead-time window,
+including late RSVPs, but never sends for an occurrence that has started.
+Delivery depends on the board's system tick. Each run handles up to 100
+recipients, earliest events first; a larger backlog drains on later ticks.
+
+A fourth forward-only migration records handled event/date/member triples
+in `plugin_calendar_reminders`. Reading a notification, changing an RSVP,
+or editing the time within the same UTC date does not cause another reminder.
+Moving to a different date creates a new occurrence. Event deletion cascades
+to these records. Deleted members are recorded as skipped.
+
+The existing scheduler prevents concurrent normal runs. Failed notification
+sends remain eligible for retry. Sending and recording delivery use separate
+host APIs, so a process crash between them can retry a delivered notification;
+the host coalesces an unread duplicate, but this is not exactly-once delivery.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/plugin-calendar",
-  "version": "0.36.2",
+  "version": "0.37.0",
   "description": "A shared calendar: events the community can see, linked to the threads that discuss them.",
   "license": "MIT",
   "repository": {
@@ -20,8 +20,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/plugin-kit": "^0.36.2",
-    "@meith/ui": "^0.36.2"
+    "@meith/plugin-kit": "^0.37.0",
+    "@meith/ui": "^0.37.0"
   },
   "peerDependencies": {
     "react": "^19.2.0"

package/src/definition.tsx

@@ -6,9 +6,11 @@ import {
   handleDeleteEvent,
   handleEventIcs,
   handleRemoveOrganiser,
+  handleRsvp,
   handleUpdateEvent,
 } from './handlers'
 import en from './messages/en.json'
+import { sendReminders } from './reminders'
 import { CALENDAR_MIGRATIONS } from './schema'
 import { OrganisersPage } from './ui/admin'
 import { CalendarPage } from './ui/page'
@@ -20,12 +22,21 @@ export const calendarPlugin = definePlugin({
   key: 'calendar',
   name: en['calendar.definition.name'],
   nameKey: 'calendar.definition.name',
-  version: '0.36.2',
+  version: '0.37.0',
   description: en['calendar.definition.description'],
   descriptionKey: 'calendar.definition.description',
   apiVersion: '0',
 
   settings: [
+    {
+      key: 'reminder_hours',
+      label: en['calendar.setting.reminders.label'],
+      labelKey: 'calendar.setting.reminders.label',
+      description: en['calendar.setting.reminders.description'],
+      descriptionKey: 'calendar.setting.reminders.description',
+      type: 'number',
+      default: 2,
+    },
     {
       key: 'any_member_may_add',
       label: en['calendar.setting.anyMember.label'],
@@ -39,6 +50,19 @@ export const calendarPlugin = definePlugin({
 
   migrations: CALENDAR_MIGRATIONS,
 
+  tasks: [{ id: 'reminders', schedule: '*/5 * * * *', run: sendReminders }],
+
+  notifications: [
+    {
+      key: 'reminder',
+      title: en['calendar.reminder.title'],
+      titleKey: 'calendar.reminder.title',
+      description: en['calendar.reminder.description'],
+      descriptionKey: 'calendar.reminder.description',
+      emailByDefault: false,
+    },
+  ],
+
   pages: [
     {
       path: '',
@@ -69,6 +93,13 @@ export const calendarPlugin = definePlugin({
   ],
 
   routes: [
+    {
+      path: 'events/rsvp',
+      method: 'POST',
+      access: 'member',
+      rateLimit: ADD_RATE_LIMIT,
+      handler: handleRsvp,
+    },
     {
       path: 'events',
       method: 'POST',

package/src/events.ts

@@ -8,7 +8,18 @@ export const MAX_LINK_URL = 500
 
 export const MAX_DURATION_HOURS = 24 * 14
 
+export const REPEATS = ['none', 'weekly', 'fortnightly', 'monthly'] as const
+export const REPEAT_LABELS = {
+  none: 'calendar.repeat.none',
+  weekly: 'calendar.repeat.weekly',
+  fortnightly: 'calendar.repeat.fortnightly',
+  monthly: 'calendar.repeat.monthly',
+} as const
+export type Repeat = (typeof REPEATS)[number]
+
 export interface EventDraft {
+  readonly repeat?: Repeat
+  readonly repeatUntil?: string | null
   readonly title: string
   readonly startsAt: Date
   readonly endsAt: Date | null
@@ -19,6 +30,8 @@ export interface EventDraft {
 }
 
 export type DraftProblem =
+  | 'repeat-invalid'
+  | 'until-invalid'
   | 'title-missing'
   | 'title-too-long'
   | 'location-too-long'
@@ -31,6 +44,8 @@ export type DraftProblem =
   | 'link-label-without-link'
 
 export interface CalendarEvent {
+  readonly repeat?: Repeat
+  readonly repeatUntil?: string | null
   readonly id: string
   readonly title: string
   readonly startsAt: Date
@@ -65,7 +80,9 @@ function parseDate(raw: string): Date | null {
   const trimmed = raw.trim()
   if (trimmed === '') return null
 
-  const parsed = new Date(trimmed)
+  const parsed = new Date(
+    /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2})?$/.test(trimmed) ? trimmed + 'Z' : trimmed,
+  )
   return Number.isNaN(parsed.getTime()) ? null : parsed
 }
 
@@ -115,10 +132,24 @@ export function readDraft(form: Readonly<Record<string, string>>): {
   if (linkLabel.length > MAX_LINK_LABEL) problems.push('link-label-too-long')
   if (linkLabel !== '' && rawLink === '') problems.push('link-label-without-link')
 
+  const repeat = form.repeat ?? 'none'
+  const repeatUntil = form.repeat_until?.trim() || null
+  if (!REPEATS.includes(repeat as Repeat)) problems.push('repeat-invalid')
+  if (
+    repeatUntil !== null &&
+    (!validDay(repeatUntil) ||
+      repeat === 'none' ||
+      (startsAt !== null && repeatUntil < startsAt.toISOString().slice(0, 10)))
+  ) {
+    problems.push('until-invalid')
+  }
+
   if (problems.length > 0 || startsAt === null) return { draft: null, problems }
 
   return {
     draft: {
+      repeat: repeat as Repeat,
+      repeatUntil,
       title,
       startsAt,
       endsAt,
@@ -247,3 +278,67 @@ export function byStart(a: CalendarEvent, b: CalendarEvent): number {
 export function eventHref(event: CalendarEvent): string | null {
   return event.threadId === null ? null : `/thread/${event.threadId}`
 }
+
+export function validDay(day: string): boolean {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(day)) return false
+  const date = new Date(day + 'T00:00:00Z')
+  return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === day
+}
+
+export function occurrences(event: CalendarEvent, from: Date, to: Date): CalendarEvent[] {
+  const result: CalendarEvent[] = []
+  const repeat = event.repeat ?? 'none'
+  const start = event.startsAt
+  const duration = event.endsAt === null ? 0 : event.endsAt.getTime() - start.getTime()
+  const step = (repeat === 'fortnightly' ? 14 : 7) * 86_400_000
+  let index =
+    repeat === 'monthly'
+      ? Math.max(
+          0,
+          (from.getUTCFullYear() - start.getUTCFullYear()) * 12 +
+            from.getUTCMonth() -
+            start.getUTCMonth(),
+        )
+      : repeat === 'none'
+        ? 0
+        : Math.max(0, Math.floor((from.getTime() - start.getTime()) / step))
+  while (true) {
+    const date = new Date(start)
+    if (repeat === 'monthly') {
+      date.setUTCDate(1)
+      date.setUTCMonth(start.getUTCMonth() + index)
+      const month = date.getUTCMonth()
+      date.setUTCDate(start.getUTCDate())
+      if (date.getUTCMonth() !== month) {
+        index++
+        if (date >= to) break
+        continue
+      }
+    } else if (repeat !== 'none') date.setTime(start.getTime() + index * step)
+    if (
+      !Number.isFinite(date.getTime()) ||
+      date >= to ||
+      (event.repeatUntil && date.toISOString().slice(0, 10) > event.repeatUntil)
+    )
+      break
+    if (date >= from)
+      result.push({
+        ...event,
+        startsAt: date,
+        endsAt: event.endsAt === null ? null : new Date(date.getTime() + duration),
+      })
+    if (repeat === 'none') break
+    index++
+  }
+  return result
+}
+
+export function occurrenceOn(event: CalendarEvent, day: string): CalendarEvent | null {
+  if (!validDay(day)) return null
+  const from = new Date(day + 'T00:00:00Z')
+  return occurrences(event, from, new Date(from.getTime() + 86_400_000))[0] ?? null
+}
+
+export function occurrenceHref(event: CalendarEvent): string {
+  return `/plugins/calendar?event=${event.id}&occurrence=${event.startsAt.toISOString().slice(0, 10)}`
+}

package/src/handlers.ts

@@ -1,7 +1,7 @@
 import type { PluginRequest, PluginResponse, PluginRuntimeContext } from '@meith/plugin-kit'
 
 import { mayAdd, mayManage, resolveCalendarConfig } from './access'
-import { type CalendarEvent, readDraft } from './events'
+import { type CalendarEvent, occurrenceHref, occurrenceOn, readDraft } from './events'
 import { ICS_CONTENT_TYPE, toIcs } from './ics'
 import {
   addOrganiser,
@@ -9,7 +9,10 @@ import {
   deleteEvent,
   eventById,
   organiserIds,
+  RSVP_STATUSES,
+  type RsvpStatus,
   removeOrganiser,
+  saveRsvp,
   updateEvent,
 } from './store'
 
@@ -138,3 +141,27 @@ export async function handleRemoveOrganiser(
   await removeOrganiser(context.data, userId)
   return { kind: 'redirect', to: '/admin/plugins/calendar/organisers' }
 }
+
+export async function handleRsvp(
+  request: PluginRequest,
+  context: PluginRuntimeContext,
+): Promise<PluginResponse> {
+  if (request.viewer.userId === null) return refused(403, 'guest')
+  const form = request.form
+  if (form === null) return refused(400, 'form-required')
+  if (!/^\d+$/.test(form.id ?? '')) return refused(400, 'id-required')
+  if (form.status !== 'clear' && !RSVP_STATUSES.includes(form.status as RsvpStatus)) {
+    return refused(400, 'status-invalid')
+  }
+  const series = await eventById(context.data, form.id ?? '')
+  if (series === null) return refused(404, 'no-such-event')
+  const event = occurrenceOn(series, form.occurrence ?? '')
+  if (event === null) return refused(400, 'occurrence-invalid')
+  await saveRsvp(
+    context.data,
+    event,
+    request.viewer.userId,
+    form.status === 'clear' ? null : (form.status as RsvpStatus),
+  )
+  return { kind: 'redirect', to: occurrenceHref(event) }
+}

package/src/ics.ts

@@ -77,6 +77,11 @@ export function toIcs(event: CalendarEvent, boardUrl: string, now: Date): string
     `DTSTAMP:${stamp(now)}`,
     `DTSTART:${stamp(event.startsAt)}`,
     `DTEND:${stamp(ends)}`,
+    ...((event.repeat ?? 'none') === 'none'
+      ? []
+      : [
+          `RRULE:FREQ=${event.repeat === 'monthly' ? 'MONTHLY' : 'WEEKLY'}${event.repeat === 'fortnightly' ? ';INTERVAL=2' : ''}${event.repeatUntil ? ';UNTIL=' + event.repeatUntil.replaceAll('-', '') + 'T235959Z' : ''}`,
+        ]),
     `SUMMARY:${escapeText(event.title)}`,
     ...(event.location === '' ? [] : [`LOCATION:${escapeText(event.location)}`]),
     ...(actionUrl === null ? [] : [`URL:${escapeText(actionUrl)}`]),

package/src/messages/en.json

@@ -7,6 +7,7 @@
   "calendar.definition.description": "A shared calendar: events the community can see, linked to the threads that discuss them.",
   "calendar.definition.name": "Calendar",
   "calendar.error.notAnOrganiser": "Only an organiser may add an event to this calendar.",
+  "calendar.error.reminderHours": "calendar: reminder_hours must be a number between 0 and 168",
   "calendar.event.add": "Add event",
   "calendar.event.cancel": "Cancel",
   "calendar.event.delete": "Delete",
@@ -20,19 +21,43 @@
   "calendar.event.linkText": "Link text",
   "calendar.event.linkTextHint": "What the link should say — “Join online”, “Get tickets”.",
   "calendar.event.location": "Location",
+  "calendar.event.repeat": "Repeat",
+  "calendar.event.repeatUntil": "Repeat through (UTC date)",
   "calendar.event.save": "Save changes",
   "calendar.event.starts": "Starts",
   "calendar.event.thread": "Thread link or id",
   "calendar.event.title": "Title",
   "calendar.event.until": "Until",
+  "calendar.event.utc": "Times are UTC. Repeats keep the UTC time; local times may change with daylight saving.",
   "calendar.nav.label": "Calendar",
   "calendar.page.empty": "Nothing is scheduled yet.",
   "calendar.page.emptyPast": "Nothing has happened yet.",
+  "calendar.page.months": "Calendar months",
+  "calendar.page.next": "Next month",
   "calendar.page.past": "Past",
+  "calendar.page.previous": "Previous month",
   "calendar.page.title": "Calendar",
   "calendar.page.upcoming": "Upcoming",
   "calendar.page.views": "Calendar views",
+  "calendar.reminder.body": "Starts at {startsAt} UTC. Open the event to review your response.",
+  "calendar.reminder.description": "Upcoming calendar events you answered Yes or Maybe to.",
+  "calendar.reminder.subject": "Upcoming event: {title}",
+  "calendar.reminder.title": "Event reminders",
+  "calendar.repeat.fortnightly": "Fortnightly",
+  "calendar.repeat.monthly": "Monthly",
+  "calendar.repeat.none": "Does not repeat",
+  "calendar.repeat.weekly": "Weekly",
+  "calendar.rsvp.attendees": "Responses",
+  "calendar.rsvp.clear": "Clear response",
+  "calendar.rsvp.maybe": "Maybe",
+  "calendar.rsvp.no": "No",
+  "calendar.rsvp.own": "Your response",
+  "calendar.rsvp.respond": "View event / RSVP",
+  "calendar.rsvp.unanswered": "No response",
+  "calendar.rsvp.yes": "Yes",
   "calendar.setting.anyMember.description": "When off, only the organisers named under Admin → Plugins → Calendar may add events.",
   "calendar.setting.anyMember.label": "Any member may add an event",
+  "calendar.setting.reminders.description": "Remind members who answered Yes or Maybe this many hours before an occurrence. From 0 to 168 hours; 0 disables reminders. Checked every five minutes.",
+  "calendar.setting.reminders.label": "Reminder lead time (hours)",
   "calendar.thread.card": "This thread discusses an event."
 }

package/src/reminders.ts

@@ -0,0 +1,59 @@
+import type { PluginRuntimeContext } from '@meith/plugin-kit'
+
+import { occurrenceHref } from './events'
+import en from './messages/en.json'
+import { windowEvents } from './store'
+
+export const REMINDER_BATCH = 100
+
+export async function sendReminders(
+  context: PluginRuntimeContext,
+  now = new Date(),
+): Promise<void> {
+  const hours = context.settings.reminder_hours ?? 2
+  if (typeof hours !== 'number' || !Number.isFinite(hours) || hours < 0 || hours > 168) {
+    throw new Error(en['calendar.error.reminderHours'])
+  }
+  if (hours === 0) return
+  const events = await windowEvents(
+    context.data,
+    new Date(now.getTime() + 1),
+    new Date(now.getTime() + hours * 3_600_000 + 1),
+  )
+  let remaining = REMINDER_BATCH
+  for (const event of events) {
+    const day = event.startsAt.toISOString().slice(0, 10)
+    const recipients = await context.data.query<{ user_id: number }>(
+      `select r.user_id from plugin_calendar_rsvps r
+       where r.event_id = $1 and r.occurrence_date = $2 and r.status in ('yes', 'maybe')
+         and not exists (
+           select 1 from plugin_calendar_reminders s
+           where s.event_id = r.event_id and s.occurrence_date = r.occurrence_date
+             and s.user_id = r.user_id
+         )
+       order by r.user_id limit $3`,
+      [event.id, day, remaining],
+    )
+    for (const { user_id: userId } of recipients) {
+      if ((await context.users.byId(userId)) !== null) {
+        await context.notify.send({
+          userId,
+          kind: 'reminder',
+          subjectKey: 'calendar.reminder.subject',
+          subjectArgs: { title: event.title },
+          bodyKey: 'calendar.reminder.body',
+          bodyArgs: { startsAt: event.startsAt.toISOString().slice(0, 16).replace('T', ' ') },
+          href: occurrenceHref(event),
+          dedupeKey: `calendar.reminder:${event.id}:${day}`,
+        })
+      }
+      await context.data.query(
+        `insert into plugin_calendar_reminders (event_id, occurrence_date, user_id)
+         values ($1, $2, $3) on conflict do nothing`,
+        [event.id, day, userId],
+      )
+      remaining--
+      if (remaining === 0) return
+    }
+  }
+}

package/src/schema.ts

@@ -35,4 +35,33 @@ export const CALENDAR_MIGRATIONS: readonly PluginMigration[] = [
          add column if not exists link_label text not null default ''`,
     ],
   },
+  {
+    id: '0003_recurrence_and_rsvps',
+    statements: [
+      `alter table plugin_calendar_event
+         add column repeat text not null default 'none'
+           check (repeat in ('none', 'weekly', 'fortnightly', 'monthly')),
+         add column repeat_until date`,
+      `create table plugin_calendar_rsvps (
+         event_id bigint not null references plugin_calendar_event(id) on delete cascade,
+         occurrence_date date not null,
+         user_id integer not null,
+         status text not null check (status in ('yes', 'no', 'maybe')),
+         updated_at timestamptz not null default now(),
+         primary key (event_id, occurrence_date, user_id)
+       )`,
+    ],
+  },
+  {
+    id: '0004_reminder_deliveries',
+    statements: [
+      `create table plugin_calendar_reminders (
+         event_id bigint not null references plugin_calendar_event(id) on delete cascade,
+         occurrence_date date not null,
+         user_id integer not null,
+         processed_at timestamptz not null default now(),
+         primary key (event_id, occurrence_date, user_id)
+       )`,
+    ],
+  },
 ]

package/src/store.ts

@@ -1,8 +1,10 @@
 import type { PluginData } from '@meith/plugin-kit'
 
-import type { CalendarEvent, EventDraft } from './events'
+import { byStart, type CalendarEvent, type EventDraft, occurrences, type Repeat } from './events'
 
 interface EventRow extends Record<string, unknown> {
+  readonly repeat?: Repeat
+  readonly repeat_until?: string | Date | null
   readonly id: string | number
   readonly title: string
   readonly starts_at: Date | string
@@ -16,6 +18,9 @@ interface EventRow extends Record<string, unknown> {
 
 function toEvent(row: EventRow): CalendarEvent {
   return {
+    repeat: row.repeat ?? 'none',
+    repeatUntil:
+      row.repeat_until == null ? null : new Date(row.repeat_until).toISOString().slice(0, 10),
     id: String(row.id),
     title: row.title,
     startsAt: new Date(row.starts_at),
@@ -29,7 +34,7 @@ function toEvent(row: EventRow): CalendarEvent {
 }
 
 const COLUMNS = `id, title, starts_at, ends_at, location, thread_id, created_by_user_id,
-                 link_url, link_label`
+                 link_url, link_label, repeat, repeat_until`
 
 export async function createEvent(
   data: PluginData,
@@ -38,8 +43,8 @@ export async function createEvent(
 ): Promise<void> {
   await data.query(
     `insert into plugin_calendar_event
-       (title, starts_at, ends_at, location, thread_id, created_by_user_id, link_url, link_label)
-     values ($1, $2, $3, $4, $5, $6, $7, $8)`,
+       (title, starts_at, ends_at, location, thread_id, created_by_user_id, link_url, link_label, repeat, repeat_until)
+     values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
     [
       draft.title,
       draft.startsAt,
@@ -49,6 +54,8 @@ export async function createEvent(
       createdByUserId,
       draft.linkUrl,
       draft.linkLabel,
+      draft.repeat ?? 'none',
+      draft.repeatUntil ?? null,
     ],
   )
 }
@@ -57,7 +64,7 @@ export async function updateEvent(data: PluginData, id: string, draft: EventDraf
   await data.query(
     `update plugin_calendar_event
         set title = $2, starts_at = $3, ends_at = $4, location = $5, thread_id = $6,
-            link_url = $7, link_label = $8
+            link_url = $7, link_label = $8, repeat = $9, repeat_until = $10
       where id = $1`,
     [
       id,
@@ -68,36 +75,26 @@ export async function updateEvent(data: PluginData, id: string, draft: EventDraf
       draft.threadId,
       draft.linkUrl,
       draft.linkLabel,
+      draft.repeat ?? 'none',
+      draft.repeatUntil ?? null,
     ],
   )
 }
 
-export async function upcomingEvents(
+export async function windowEvents(
   data: PluginData,
-  limit: number,
+  from: Date,
+  to: Date,
 ): Promise<readonly CalendarEvent[]> {
   const rows = await data.query<EventRow>(
     `select ${COLUMNS} from plugin_calendar_event
-      where coalesce(ends_at, starts_at) >= now()
-      order by starts_at
-      limit $1`,
-    [limit],
+      where starts_at < $2 and
+        (starts_at >= $1 or (repeat <> 'none' and
+          (repeat_until is null or repeat_until >= $1::date)))
+      order by starts_at`,
+    [from, to],
   )
-  return rows.map(toEvent)
-}
-
-export async function pastEvents(
-  data: PluginData,
-  limit: number,
-): Promise<readonly CalendarEvent[]> {
-  const rows = await data.query<EventRow>(
-    `select ${COLUMNS} from plugin_calendar_event
-      where coalesce(ends_at, starts_at) < now()
-      order by starts_at desc
-      limit $1`,
-    [limit],
-  )
-  return rows.map(toEvent)
+  return rows.flatMap((row) => occurrences(toEvent(row), from, to)).sort(byStart)
 }
 
 export async function eventById(data: PluginData, id: string): Promise<CalendarEvent | null> {
@@ -121,7 +118,13 @@ export async function eventsForThread(
       limit $2`,
     [threadId, THREAD_EVENT_SCAN],
   )
-  return rows.map(toEvent)
+  const now = new Date()
+  const from = new Date(now.getTime() - 366 * 86_400_000)
+  const to = new Date(now.getTime() + 366 * 86_400_000)
+  return rows.flatMap((row) => {
+    const event = toEvent(row)
+    return event.repeat === 'none' ? [event] : occurrences(event, from, to)
+  })
 }
 
 export async function deleteEvent(data: PluginData, id: string): Promise<void> {
@@ -151,3 +154,56 @@ export async function addOrganiser(
 export async function removeOrganiser(data: PluginData, userId: number): Promise<void> {
   await data.query(`delete from plugin_calendar_organiser where user_id = $1`, [userId])
 }
+
+export const RSVP_STATUSES = ['yes', 'no', 'maybe'] as const
+export const RSVP_LABELS = {
+  yes: 'calendar.rsvp.yes',
+  no: 'calendar.rsvp.no',
+  maybe: 'calendar.rsvp.maybe',
+  clear: 'calendar.rsvp.clear',
+} as const
+export type RsvpStatus = (typeof RSVP_STATUSES)[number]
+
+export async function saveRsvp(
+  data: PluginData,
+  event: CalendarEvent,
+  userId: number,
+  status: RsvpStatus | null,
+): Promise<void> {
+  const params = [event.id, event.startsAt.toISOString().slice(0, 10), userId]
+  if (status === null) {
+    await data.query(
+      `delete from plugin_calendar_rsvps where event_id = $1 and occurrence_date = $2 and user_id = $3`,
+      params,
+    )
+  } else {
+    await data.query(
+      `insert into plugin_calendar_rsvps (event_id, occurrence_date, user_id, status)
+       values ($1, $2, $3, $4)
+       on conflict (event_id, occurrence_date, user_id)
+       do update set status = excluded.status, updated_at = now()`,
+      [...params, status],
+    )
+  }
+}
+
+export async function rsvpSummary(data: PluginData, event: CalendarEvent, userId: number | null) {
+  const params = [event.id, event.startsAt.toISOString().slice(0, 10)]
+  const counts = await data.query<{ status: RsvpStatus; count: string }>(
+    `select status, count(*) as count from plugin_calendar_rsvps
+     where event_id = $1 and occurrence_date = $2 group by status`,
+    params,
+  )
+  const own =
+    userId === null
+      ? null
+      : await data.one<{ status: RsvpStatus }>(
+          `select status from plugin_calendar_rsvps
+     where event_id = $1 and occurrence_date = $2 and user_id = $3`,
+          [...params, userId],
+        )
+  return {
+    counts: Object.fromEntries(counts.map((row) => [row.status, Number(row.count)])),
+    own: own?.status ?? null,
+  }
+}

package/src/ui/page.tsx

@@ -14,15 +14,23 @@ import {
   eventHref,
   formatRange,
   groupByMonth,
+  occurrenceHref,
+  occurrenceOn,
+  REPEAT_LABELS,
+  REPEATS,
   relativeHint,
 } from '../events'
 import en from '../messages/en.json'
-import { eventById, organiserIds, pastEvents, upcomingEvents } from '../store'
+import {
+  eventById,
+  organiserIds,
+  RSVP_LABELS,
+  type RsvpStatus,
+  rsvpSummary,
+  windowEvents,
+} from '../store'
 import { EventLink } from './event-link'
-
-export const UPCOMING_LIMIT = 50
-
-export const PAST_LIMIT = 30
+import { Rsvp } from './rsvp'
 
 function translated(context: PluginPageContext, key: keyof typeof en): string {
   return context.t.has(key) ? context.t.t(key) : en[key]
@@ -61,7 +69,11 @@ function EventRow({
       <DateBlock event={event} locale={locale} />
 
       <div className="flex min-w-0 flex-col gap-1">
-        <p className="font-semibold leading-snug [overflow-wrap:anywhere]">{event.title}</p>
+        <p className="font-semibold leading-snug [overflow-wrap:anywhere]">
+          <a className={textLinkVariants()} href={occurrenceHref(event)}>
+            {event.title}
+          </a>
+        </p>
 
         <p className="text-muted-foreground text-sm">
           <time dateTime={event.startsAt.toISOString()}>
@@ -130,7 +142,7 @@ function Agenda({
           <ul className="divide-border divide-y">
             {month.events.map((event) => (
               <EventRow
-                key={event.id}
+                key={event.id + event.startsAt.toISOString()}
                 event={event}
                 locale={locale}
                 now={now}
@@ -173,7 +185,31 @@ function EventForm({
       <h2 className="font-semibold">{heading}</h2>
       {event !== null && <input type="hidden" name="id" value={event.id} />}
 
+      <p className={PLUGIN_NOTE}>{translated(context, 'calendar.event.utc')}</p>
       <div className="grid gap-3 sm:grid-cols-2">
+        <label className="flex flex-col gap-2 text-sm">
+          {translated(context, 'calendar.event.repeat')}
+          <select
+            name="repeat"
+            defaultValue={event?.repeat ?? 'none'}
+            className={controlVariants()}
+          >
+            {REPEATS.map((repeat) => (
+              <option key={repeat} value={repeat}>
+                {translated(context, REPEAT_LABELS[repeat])}
+              </option>
+            ))}
+          </select>
+        </label>
+        <label className="flex flex-col gap-2 text-sm">
+          {translated(context, 'calendar.event.repeatUntil')}
+          <input
+            type="date"
+            name="repeat_until"
+            defaultValue={event?.repeatUntil ?? ''}
+            className={controlVariants()}
+          />
+        </label>
         <label className="flex min-w-0 flex-col gap-2 text-sm sm:col-span-2">
           {translated(context, 'calendar.event.title')}
           <input
@@ -267,13 +303,46 @@ export async function CalendarPage(context: PluginPageContext) {
   const showingPast = context.query.show === 'past'
   const now = new Date()
 
+  const rawMonth = context.query.month ?? ''
+  const month = /^\d{4}-(0[1-9]|1[0-2])$/.test(rawMonth) ? rawMonth : now.toISOString().slice(0, 7)
+  const from = new Date(month + '-01T00:00:00Z')
+  if (showingPast && rawMonth === '') from.setUTCMonth(from.getUTCMonth() - 1)
+  const to = new Date(from)
+  to.setUTCMonth(to.getUTCMonth() + 1)
+  const previous = new Date(from)
+  previous.setUTCMonth(previous.getUTCMonth() - 1)
   const [events, organisers] = await Promise.all([
-    (showingPast
-      ? pastEvents(context.data, PAST_LIMIT)
-      : upcomingEvents(context.data, UPCOMING_LIMIT)
-    ).catch(() => [] as readonly CalendarEvent[]),
+    windowEvents(context.data, from, to).catch(() => [] as readonly CalendarEvent[]),
     organiserIds(context.data).catch(() => [] as readonly number[]),
   ])
+  const selectedId = context.query.event ?? ''
+  const series = /^\d+$/.test(selectedId) ? await eventById(context.data, selectedId) : null
+  const selected =
+    series === null
+      ? null
+      : occurrenceOn(series, context.query.occurrence ?? series.startsAt.toISOString().slice(0, 10))
+  const summary =
+    selected === null ? null : await rsvpSummary(context.data, selected, context.viewer.userId)
+  const maySeeAttendees =
+    selected !== null &&
+    mayManage({
+      userId: context.viewer.userId,
+      createdByUserId: selected.createdByUserId,
+      organisers,
+    })
+  const attendees =
+    selected === null || !maySeeAttendees
+      ? []
+      : await context.data.query<{ user_id: number; status: RsvpStatus }>(
+          `select user_id, status from plugin_calendar_rsvps where event_id = $1 and occurrence_date = $2 order by updated_at`,
+          [selected.id, selected.startsAt.toISOString().slice(0, 10)],
+        )
+  const names = await Promise.all(
+    attendees.map(async (row) => ({
+      ...row,
+      member: await context.users.byId(row.user_id),
+    })),
+  )
 
   const verdict = mayAdd({ userId: context.viewer.userId, config, organisers })
 
@@ -295,6 +364,46 @@ export async function CalendarPage(context: PluginPageContext) {
 
   return (
     <div className="flex flex-col gap-6">
+      <p className={PLUGIN_NOTE}>{translated(context, 'calendar.event.utc')}</p>
+      {selected !== null && summary !== null && (
+        <section className={PLUGIN_CARD}>
+          <h2 className="font-semibold">{selected.title}</h2>
+          <time dateTime={selected.startsAt.toISOString()}>
+            {formatRange(selected.startsAt, selected.endsAt, context.locale)}
+          </time>
+          {selected.location !== '' && <p>{selected.location}</p>}
+          <EventLink event={selected} label={translated(context, 'calendar.event.linkFallback')} />
+          <a
+            className={textLinkVariants()}
+            href={`/api/plugins/calendar/events/ics?id=${selected.id}`}
+          >
+            {translated(context, 'calendar.event.download')}
+          </a>
+          <Rsvp event={selected} summary={summary} context={context} form />
+          {maySeeAttendees && (
+            <div>
+              <h3>{translated(context, 'calendar.rsvp.attendees')}</h3>
+              <ul>
+                {names.map(({ user_id, status, member }) =>
+                  member === null ? null : (
+                    <li key={user_id}>
+                      {member.username}: {translated(context, RSVP_LABELS[status])}
+                    </li>
+                  ),
+                )}
+              </ul>
+            </div>
+          )}
+        </section>
+      )}
+      <nav className="flex gap-4" aria-label={translated(context, 'calendar.page.months')}>
+        <a href={`?month=${previous.toISOString().slice(0, 7)}`}>
+          {translated(context, 'calendar.page.previous')}
+        </a>
+        <a href={`?month=${to.toISOString().slice(0, 7)}`}>
+          {translated(context, 'calendar.page.next')}
+        </a>
+      </nav>
       <nav aria-label={translated(context, 'calendar.page.views')}>
         <ul data-nav-tabs className={PLUGIN_TAB_LIST}>
           <li className="shrink-0">

package/src/ui/rsvp.tsx

@@ -0,0 +1,66 @@
+import type { PluginPageContext, PluginRegionContext } from '@meith/plugin-kit'
+import { buttonVariants, textLinkVariants } from '@meith/ui'
+
+import { type CalendarEvent, occurrenceHref } from '../events'
+import en from '../messages/en.json'
+import { RSVP_LABELS, RSVP_STATUSES, type rsvpSummary } from '../store'
+
+export function Rsvp({
+  event,
+  summary,
+  context,
+  form = false,
+}: {
+  event: CalendarEvent
+  summary: Awaited<ReturnType<typeof rsvpSummary>>
+  context: PluginPageContext | PluginRegionContext
+  form?: boolean
+}) {
+  const t = (key: keyof typeof en) => (context.t.has(key) ? context.t.t(key) : en[key])
+  return (
+    <div className="flex flex-col gap-2 text-sm">
+      <p>
+        {RSVP_STATUSES.map((status) => (
+          <span key={status} className="mr-3">
+            {t(RSVP_LABELS[status])}: {summary.counts[status] ?? 0}
+          </span>
+        ))}
+      </p>
+      {context.viewer.userId !== null && (
+        <p>
+          {t('calendar.rsvp.own')}:{' '}
+          {t(summary.own === null ? 'calendar.rsvp.unanswered' : RSVP_LABELS[summary.own])}
+        </p>
+      )}
+      {form && context.viewer.userId !== null ? (
+        <form
+          method="post"
+          action="/api/plugins/calendar/events/rsvp"
+          className="flex flex-wrap gap-2"
+        >
+          <input type="hidden" name="id" value={event.id} />
+          <input
+            type="hidden"
+            name="occurrence"
+            value={event.startsAt.toISOString().slice(0, 10)}
+          />
+          {([...RSVP_STATUSES, 'clear'] as const).map((status) => (
+            <button
+              key={status}
+              type="submit"
+              name="status"
+              value={status}
+              className={buttonVariants({ variant: 'secondary', size: 'sm' })}
+            >
+              {t(RSVP_LABELS[status])}
+            </button>
+          ))}
+        </form>
+      ) : (
+        <a className={textLinkVariants()} href={occurrenceHref(event)}>
+          {t('calendar.rsvp.respond')}
+        </a>
+      )}
+    </div>
+  )
+}

package/src/ui/thread-card.tsx

@@ -2,8 +2,9 @@ import type { PluginRegionContext, PluginRuntimeContext } from '@meith/plugin-ki
 
 import { type CalendarEvent, formatRange, pickThreadEvent } from '../events'
 import en from '../messages/en.json'
-import { eventsForThread } from '../store'
+import { eventsForThread, rsvpSummary } from '../store'
 import { EventLink } from './event-link'
+import { Rsvp } from './rsvp'
 
 function translated(context: PluginRegionContext, key: keyof typeof en): string {
   return context.t.has(key) ? context.t.t(key) : en[key]
@@ -12,10 +13,12 @@ function translated(context: PluginRegionContext, key: keyof typeof en): string
 export async function ThreadEventCard(context: PluginRegionContext) {
   if (context.subjectId === null) return null
 
+  let summary: Awaited<ReturnType<typeof rsvpSummary>> = { counts: {}, own: null }
   let event: CalendarEvent | null = null
   try {
     const runtime = (await context.runtime()) as PluginRuntimeContext
     event = pickThreadEvent(await eventsForThread(runtime.data, context.subjectId), new Date())
+    if (event !== null) summary = await rsvpSummary(runtime.data, event, context.viewer.userId)
   } catch {
     return null
   }
@@ -34,6 +37,8 @@ export async function ThreadEventCard(context: PluginRegionContext) {
         </time>
         {event.location !== '' && <span> · {event.location}</span>}
       </p>
+      <p>{translated(context, 'calendar.event.utc')}</p>
+      <Rsvp event={event} summary={summary} context={context} />
       <EventLink event={event} label={translated(context, 'calendar.event.linkFallback')} />
     </section>
   )