@meith/plugin-calendar 0.37.0 → 0.37.1

package/README.md

@@ -82,7 +82,11 @@ 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.
+Upcoming and Past paginate all occurrences across months, 50 per page,
+including ongoing events in Upcoming. Previous/Next page links work without
+JavaScript; no stored events are removed or hidden by a total-count limit. Non-repeating events retain their
+original dates after an upgrade. Previous/next month navigation explicitly
+filters the agenda to one UTC month.
 The thread card selects from recurring occurrences within a year on either
 side of now. ICS downloads contain the series with a standard RRULE.
 
@@ -116,3 +120,12 @@ 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.
+
+Calendar load failures are reported by the host instead of being shown as
+an empty agenda. The agenda expands a bounded range per recurring series
+around the page cursor before sorting and taking the requested count.
+The cursor uses occurrence time and event ID, so simultaneous events can
+span pages without being skipped. Page links use the current clock when
+opened; events may move from Upcoming to Past as time passes. It allows 62 days per
+requested occurrence, covering monthly rules that skip a missing day and
+therefore have gaps of up to 61 days.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/plugin-calendar",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "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.37.0",
-    "@meith/ui": "^0.37.0"
+    "@meith/plugin-kit": "^0.37.1",
+    "@meith/ui": "^0.37.1"
   },
   "peerDependencies": {
     "react": "^19.2.0"

package/src/definition.tsx

@@ -22,7 +22,7 @@ export const calendarPlugin = definePlugin({
   key: 'calendar',
   name: en['calendar.definition.name'],
   nameKey: 'calendar.definition.name',
-  version: '0.37.0',
+  version: '0.37.1',
   description: en['calendar.definition.description'],
   descriptionKey: 'calendar.definition.description',
   apiVersion: '0',

package/src/messages/en.json

@@ -34,8 +34,11 @@
   "calendar.page.emptyPast": "Nothing has happened yet.",
   "calendar.page.months": "Calendar months",
   "calendar.page.next": "Next month",
+  "calendar.page.nextPage": "Next page",
+  "calendar.page.pagination": "Calendar pages",
   "calendar.page.past": "Past",
   "calendar.page.previous": "Previous month",
+  "calendar.page.previousPage": "Previous page",
   "calendar.page.title": "Calendar",
   "calendar.page.upcoming": "Upcoming",
   "calendar.page.views": "Calendar views",

package/src/store.ts

@@ -1,6 +1,13 @@
 import type { PluginData } from '@meith/plugin-kit'
 
-import { byStart, type CalendarEvent, type EventDraft, occurrences, type Repeat } from './events'
+import {
+  byStart,
+  type CalendarEvent,
+  type EventDraft,
+  isUpcoming,
+  occurrences,
+  type Repeat,
+} from './events'
 
 interface EventRow extends Record<string, unknown> {
   readonly repeat?: Repeat
@@ -97,6 +104,53 @@ export async function windowEvents(
   return rows.flatMap((row) => occurrences(toEvent(row), from, to)).sort(byStart)
 }
 
+export async function agendaEvents(
+  data: PluginData,
+  now: Date,
+  past = false,
+  limit = 50,
+  cursor?: Pick<CalendarEvent, 'startsAt' | 'id'>,
+  backwards = false,
+): Promise<readonly CalendarEvent[]> {
+  const rows = await data.query<EventRow>(
+    `select ${COLUMNS} from plugin_calendar_event
+     where repeat <> 'none' or coalesce(ends_at, starts_at) ${past ? '<' : '>='} $1`,
+    [now],
+  )
+  const span = limit * 62 * 86_400_000
+  const descending = past !== backwards
+  const compare = (
+    a: Pick<CalendarEvent, 'startsAt' | 'id'>,
+    b: Pick<CalendarEvent, 'startsAt' | 'id'>,
+  ) => a.startsAt.getTime() - b.startsAt.getTime() || a.id.localeCompare(b.id)
+  const events = rows
+    .flatMap((row) => {
+      const event = toEvent(row)
+      if (event.repeat === 'none') return isUpcoming(event, now) !== past ? [event] : []
+      const duration = event.endsAt === null ? 0 : event.endsAt.getTime() - event.startsAt.getTime()
+      const boundary = now.getTime() - duration
+      const until =
+        event.repeatUntil == null
+          ? Number.POSITIVE_INFINITY
+          : new Date(event.repeatUntil + 'T00:00:00Z').getTime() + 86_400_000
+      const lower = Math.max(past ? -Infinity : boundary, event.startsAt.getTime())
+      const upper = Math.min(past ? boundary : Infinity, until)
+      const start = Math.max(lower, cursor?.startsAt.getTime() ?? lower)
+      const end = Math.min(upper, cursor ? cursor.startsAt.getTime() + 1 : upper)
+      return occurrences(
+        event,
+        new Date(descending ? Math.max(lower, end - span) : start),
+        new Date(descending ? end : Math.min(upper, start + span)),
+      )
+    })
+    .filter(
+      (event) => !cursor || (descending ? compare(event, cursor) < 0 : compare(event, cursor) > 0),
+    )
+    .sort((a, b) => (descending ? compare(b, a) : compare(a, b)))
+    .slice(0, limit)
+  return backwards ? events.reverse() : events
+}
+
 export async function eventById(data: PluginData, id: string): Promise<CalendarEvent | null> {
   const row = await data.one<EventRow>(
     `select ${COLUMNS} from plugin_calendar_event where id = $1`,

package/src/ui/page.tsx

@@ -22,6 +22,7 @@ import {
 } from '../events'
 import en from '../messages/en.json'
 import {
+  agendaEvents,
   eventById,
   organiserIds,
   RSVP_LABELS,
@@ -304,17 +305,37 @@ export async function CalendarPage(context: PluginPageContext) {
   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 filteringMonth = /^\d{4}-(0[1-9]|1[0-2])$/.test(rawMonth)
+  const pageSize = 50
+  const rawCursor = context.query.after ?? context.query.before ?? ''
+  const match = /^(-?\d{1,16}):(\d+)$/.exec(rawCursor)
+  const cursor =
+    match && Number.isFinite(new Date(Number(match[1])).getTime())
+      ? { startsAt: new Date(Number(match[1])), id: match[2]! }
+      : undefined
+  const backwards = cursor !== undefined && context.query.after === undefined
+  const pageHref = (event: CalendarEvent, direction: 'after' | 'before') =>
+    `?${showingPast ? 'show=past&' : ''}${direction}=${event.startsAt.getTime()}:${event.id}`
+  const month = filteringMonth ? 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([
-    windowEvents(context.data, from, to).catch(() => [] as readonly CalendarEvent[]),
+  const [results, organisers] = await Promise.all([
+    filteringMonth
+      ? windowEvents(context.data, from, to)
+      : agendaEvents(context.data, now, showingPast, pageSize + 1, cursor, backwards),
     organiserIds(context.data).catch(() => [] as readonly number[]),
   ])
+  const hasMore = results.length > pageSize
+  const events = filteringMonth
+    ? results
+    : backwards
+      ? results.slice(-pageSize)
+      : results.slice(0, pageSize)
+  const first = events[0]
+  const last = events.at(-1)
   const selectedId = context.query.event ?? ''
   const series = /^\d+$/.test(selectedId) ? await eventById(context.data, selectedId) : null
   const selected =
@@ -409,8 +430,8 @@ export async function CalendarPage(context: PluginPageContext) {
           <li className="shrink-0">
             <a
               href="/plugins/calendar"
-              {...(showingPast ? {} : { 'aria-current': 'page' as const })}
-              className={pluginTabClass(!showingPast)}
+              {...(showingPast || filteringMonth ? {} : { 'aria-current': 'page' as const })}
+              className={pluginTabClass(!showingPast && !filteringMonth)}
             >
               {translated(context, 'calendar.page.upcoming')}
             </a>
@@ -418,8 +439,8 @@ export async function CalendarPage(context: PluginPageContext) {
           <li className="shrink-0">
             <a
               href="/plugins/calendar?show=past"
-              {...(showingPast ? { 'aria-current': 'page' as const } : {})}
-              className={pluginTabClass(showingPast)}
+              {...(showingPast && !filteringMonth ? { 'aria-current': 'page' as const } : {})}
+              className={pluginTabClass(showingPast && !filteringMonth)}
             >
               {translated(context, 'calendar.page.past')}
             </a>
@@ -441,6 +462,19 @@ export async function CalendarPage(context: PluginPageContext) {
         />
       )}
 
+      {!filteringMonth && (cursor !== undefined || hasMore) && (
+        <nav className="flex gap-4" aria-label={translated(context, 'calendar.page.pagination')}>
+          {first && (backwards ? hasMore : cursor !== undefined) && (
+            <a href={pageHref(first, 'before')}>
+              {translated(context, 'calendar.page.previousPage')}
+            </a>
+          )}
+          {last && (backwards ? cursor !== undefined : hasMore) && (
+            <a href={pageHref(last, 'after')}>{translated(context, 'calendar.page.nextPage')}</a>
+          )}
+        </nav>
+      )}
+
       {editing !== null ? (
         <EventForm context={context} event={editing} />
       ) : (