@acms-subir/core 0.3.34 → 0.3.35

package/src/lib/push/store.ts

@@ -96,6 +96,10 @@ export class PushStore {
   async receiptFailed(counts: Map<string, { failed: number; removed: number }>) {
     for (const [id, c] of counts) await this.run('UPDATE push_notifications SET ok=MAX(ok-?,0), failed=failed+?, removed=removed+? WHERE id=?', [c.failed, c.failed, c.removed, id]);
   }
+  /** Notifications from one source that went out since `since`, newest first. */
+  async sentSince(source: PushNotification['source'], since: number) {
+    return (await this.all(`SELECT * FROM push_notifications WHERE source=? AND created_at>=? AND status!='failed' ORDER BY created_at DESC LIMIT 100`, [source, since])).map(notification);
+  }
   async listNotifications(limit = 50) { return (await this.all('SELECT * FROM push_notifications ORDER BY created_at DESC LIMIT ?', [limit])).map(notification); }
   async getNotification(id: string) { const r = await this.all('SELECT * FROM push_notifications WHERE id=?', [id]); return r[0] ? notification(r[0]) : null; }
 
@@ -120,17 +124,39 @@ export class PushStore {
   }
 
   // ---- automatic notification queue ----
-  /** Claims up to `limit` pending rows (status → sending); rows queued before `staleBefore` are skipped instead. */
+  /**
+   * Claims up to `limit` due pending rows (status → sending); rows queued before
+   * `staleBefore` are skipped instead. A row with `due_at` waits until then and
+   * goes stale from then, so an event still being edited never counts as late.
+   */
   async claimPending(now: number, staleBefore: number, limit: number): Promise<PushQueueRow[]> {
-    await this.run(`UPDATE push_queue SET status='skipped', updated_at=? WHERE status='pending' AND created_at<?`, [now, staleBefore]);
-    const due = await this.all(`SELECT key FROM push_queue WHERE status='pending' ORDER BY created_at LIMIT ?`, [limit]);
+    await this.run(`UPDATE push_queue SET status='skipped', updated_at=? WHERE status='pending' AND COALESCE(due_at,created_at)<?`, [now, staleBefore]);
+    const due = await this.all(`SELECT key FROM push_queue WHERE status='pending' AND (due_at IS NULL OR due_at<=?) ORDER BY created_at LIMIT ?`, [now, limit]);
     const out: PushQueueRow[] = [];
     for (const { key } of due) {
-      const r = await this.all(`UPDATE push_queue SET status='sending', updated_at=? WHERE key=? AND status='pending' RETURNING *`, [now, key]);
-      if (r[0]) out.push({ key: String(r[0].key), kind: r[0].kind as PushQueueRow['kind'], docId: String(r[0].doc_id), occurrence: r[0].occurrence == null ? null : Number(r[0].occurrence), status: 'sending', createdAt: Number(r[0].created_at) });
+      const r = await this.all(`UPDATE push_queue SET status='sending', updated_at=? WHERE key=? AND status='pending' AND (due_at IS NULL OR due_at<=?) RETURNING *`, [now, key, now]);
+      if (r[0]) out.push({ key: String(r[0].key), kind: r[0].kind as PushQueueRow['kind'], docId: String(r[0].doc_id), occurrence: r[0].occurrence == null ? null : Number(r[0].occurrence),
+        status: 'sending', createdAt: Number(r[0].created_at), payload: r[0].payload == null ? null : String(r[0].payload), dueAt: r[0].due_at == null ? null : Number(r[0].due_at) });
     }
     return out;
   }
+  /**
+   * Debounces an event's change notice (key change:<id>) in one statement, so
+   * concurrent saves can't lose an edit: a pending row keeps its snapshot (what
+   * people last knew) and waits until `dueAt` again; any other row (sent,
+   * skipped, failed, or being sent) starts over with this snapshot.
+   */
+  async queueChange(key: string, docId: string, payload: string, now: number, dueAt: number) {
+    await this.run(`INSERT INTO push_queue (key,kind,doc_id,occurrence,status,notification_id,created_at,updated_at,payload,due_at)
+      VALUES (?,'change',?,NULL,'pending',NULL,?,?,?,?) ON CONFLICT(key) DO UPDATE SET
+      payload=CASE WHEN push_queue.status='pending' THEN push_queue.payload ELSE excluded.payload END,
+      created_at=CASE WHEN push_queue.status='pending' THEN push_queue.created_at ELSE excluded.created_at END,
+      status='pending', notification_id=NULL, due_at=excluded.due_at, updated_at=excluded.updated_at`, [key, docId, now, now, payload, dueAt]);
+  }
+  async queuedChange(key: string): Promise<{ status: string; payload: string | null } | null> {
+    const r = (await this.all('SELECT status, payload FROM push_queue WHERE key=?', [key]))[0];
+    return r ? { status: String(r.status), payload: r.payload == null ? null : String(r.payload) } : null;
+  }
   /** Inserts a new key as `sending`; false when it already exists (dedupe for "starting soon"). */
   async claimKey(key: string, kind: PushQueueRow['kind'], docId: string, occurrence: number | null, now: number): Promise<boolean> {
     const r = await this.all(`INSERT INTO push_queue (key,kind,doc_id,occurrence,status,notification_id,created_at,updated_at)
@@ -138,7 +164,8 @@ export class PushStore {
     return r.length > 0;
   }
   async markQueue(key: string, status: 'sent' | 'skipped' | 'failed', notificationId: string | null, now: number) {
-    await this.run('UPDATE push_queue SET status=?, notification_id=?, updated_at=? WHERE key=?', [status, notificationId, now, key]);
+    // a change row an edit queued again while it was sending stays pending
+    await this.run(`UPDATE push_queue SET status=?, notification_id=?, updated_at=? WHERE key=? AND (kind!='change' OR status='sending')`, [status, notificationId, now, key]);
   }
   async skipPending(now: number) { await this.run(`UPDATE push_queue SET status='skipped', updated_at=? WHERE status='pending'`, [now]); }
   /** When a notice of this kind last went out (0 = never). */
@@ -148,13 +175,13 @@ export class PushStore {
   async queueStatus(key: string) { return (await this.all('SELECT status FROM push_queue WHERE key=?', [key]))[0]?.status as string | undefined; }
 
   // ---- retention ----
-  /** Devices not seen since `devicesBefore`, log rows older than a year, expired tickets, and old occurrence and broadcast keys. */
+  /** Devices not seen since `devicesBefore`, log rows older than a year, expired tickets, and old occurrence, broadcast and change keys. */
   async purge(now: number, devicesBefore: number): Promise<number> {
     const gone = await this.all('DELETE FROM push_devices WHERE last_seen_at<? RETURNING id', [devicesBefore]);
     await (await this.driver()).batch([
       { sql: 'DELETE FROM push_notifications WHERE created_at<?', args: [now - 365 * 86400000] },
       { sql: 'DELETE FROM push_tickets WHERE created_at<?', args: [now - 86400000] },
-      { sql: `DELETE FROM push_queue WHERE kind IN ('soon','live') AND updated_at<?`, args: [now - 30 * 86400000] },
+      { sql: `DELETE FROM push_queue WHERE kind IN ('soon','live','change') AND updated_at<?`, args: [now - 30 * 86400000] },
     ]);
     return gone.length;
   }

package/src/lib/push/types.ts

@@ -11,11 +11,26 @@ export const PushAuto = z.object({
   startingSoon: z.object({ calendars: keys.default([]), minutes: z.number().int().min(5).max(1440).default(30) }).default({}),
   /** "We're live": once per broadcast that live video detects, to devices on the `live` topic */
   live: z.object({ enabled: z.boolean().default(false) }).default({}),
+  /** a published event's new date, time or place, or a cancellation, once its edits settle */
+  eventChanges: z.object({
+    calendars: keys.default([]),
+    /** only events with one of these tags (any case); [] = every event in the calendars */
+    tags: z.array(z.string().trim().min(1).max(100)).max(20).default([]),
+    /** sent to these topics instead of the event's own (`events` and its calendars) */
+    topics: z.array(z.string().min(1).max(200)).max(10).default([]),
+  }).default({}),
 });
 export type PushAuto = z.infer<typeof PushAuto>;
 export const PushSettings = z.object({ auto: PushAuto.default({}) });
 export type PushSettings = z.infer<typeof PushSettings>;
 
+/** An event's public schedule and place, as people last knew it (the payload of a queued change notice) */
+export const EventSnapshot = z.object({
+  start: z.string(), end: z.string(), allDay: z.boolean(), timezone: z.string(), rrule: z.string(), exdates: z.array(z.string()),
+  cancelled: z.boolean(), cancelledDates: z.array(z.string()), location: z.object({ name: z.string(), address: z.string() }),
+});
+export type EventSnapshot = z.infer<typeof EventSnapshot>;
+
 export type PushPlatform = 'ios' | 'android';
 export interface PushDevice {
   id: string; token: string; platform: PushPlatform; locale: string; topics: string[];
@@ -23,7 +38,7 @@ export interface PushDevice {
   channels: string[];
   createdAt: number; updatedAt: number; lastSeenAt: number;
 }
-export type PushSource = 'manual' | 'post' | 'event' | 'soon' | 'live' | 'announcement';
+export type PushSource = 'manual' | 'post' | 'event' | 'soon' | 'live' | 'announcement' | 'change';
 export interface PushNotification {
   id: string; title: string; body: string; url: string;
   /** ['*'] = everyone */
@@ -35,7 +50,13 @@ export interface PushNotification {
   removed: number;
   error: string; author: string; createdAt: number; finishedAt: number | null;
 }
-export interface PushQueueRow { key: string; kind: 'post' | 'event' | 'soon' | 'live' | 'announcement'; docId: string; occurrence: number | null; status: string; createdAt: number }
+export interface PushQueueRow {
+  key: string; kind: 'post' | 'event' | 'soon' | 'live' | 'announcement' | 'change'; docId: string; occurrence: number | null; status: string; createdAt: number;
+  /** change rows: the EventSnapshot JSON from before the first edit */
+  payload: string | null;
+  /** change rows: not sent before this (null = as soon as possible) */
+  dueAt: number | null;
+}
 export interface PushTopic { id: string; label: string; kind: 'general' | 'collection' | 'calendar' | 'site'; description?: string }
 export interface PushStats {
   devices: number;

package/src/lib/repo/migrations.ts

@@ -679,6 +679,12 @@ export const MIGRATIONS: Migration[] = [
   ] },
   // announcements show on public pages, the banner and the app API
   { version: 58, statements: [...ANNOUNCEMENT_TABLE, ...contentVersionTriggers('announcements', ANNOUNCEMENT_VISIBLE_COLUMNS)] },
+  // event-change notices (PushAuto.eventChanges) wait in push_queue until the
+  // edits settle: payload = the schedule people last knew, due_at = send time
+  { version: 59, statements: [
+    `ALTER TABLE push_queue ADD COLUMN payload TEXT`,
+    `ALTER TABLE push_queue ADD COLUMN due_at INTEGER`,
+  ] },
 ];
 
 // Current cache coverage; keep earlier migration inputs frozen for upgrade compatibility.

package/src/lib/search-i18n.ts

@@ -1,7 +1,5 @@
-// UI strings for the search modal and /search page. There is no site-wide
-// translation catalog yet — search is the first public surface with
-// per-locale chrome, so the dict lives here until one exists. Locales fall
-// back to English.
+// UI strings for the search modal and /search page, in the same languages as
+// the rest of the layout (site-words.ts). Locales fall back to English.
 export interface SearchStrings {
   label: string;
   placeholder: string;
@@ -43,6 +41,45 @@ const STRINGS: Record<string, SearchStrings> = {
     results: 'resultados',
     button: 'Buscar',
   },
+  fr: {
+    label: 'Rechercher',
+    placeholder: 'Rechercher des articles, pages, étiquettes et auteurs',
+    posts: 'Articles',
+    pages: 'Pages',
+    events: 'Événements',
+    tags: 'Étiquettes',
+    authors: 'Auteurs',
+    empty: 'Aucun résultat pour',
+    result: 'résultat',
+    results: 'résultats',
+    button: 'Rechercher',
+  },
+  de: {
+    label: 'Suchen',
+    placeholder: 'Beiträge, Seiten, Schlagwörter und Autoren durchsuchen',
+    posts: 'Beiträge',
+    pages: 'Seiten',
+    events: 'Veranstaltungen',
+    tags: 'Schlagwörter',
+    authors: 'Autoren',
+    empty: 'Nichts gefunden für',
+    result: 'Ergebnis',
+    results: 'Ergebnisse',
+    button: 'Suchen',
+  },
+  pt: {
+    label: 'Buscar',
+    placeholder: 'Busque posts, páginas, tags e autores',
+    posts: 'Posts',
+    pages: 'Páginas',
+    events: 'Eventos',
+    tags: 'Tags',
+    authors: 'Autores',
+    empty: 'Nada encontrado para',
+    result: 'resultado',
+    results: 'resultados',
+    button: 'Buscar',
+  },
 };
 
 export const searchStrings = (locale: string): SearchStrings => STRINGS[locale] ?? STRINGS.en;

package/src/lib/site-words.ts

@@ -0,0 +1,62 @@
+// Words the public layout (Site.astro) shows around every page: the skip
+// link, header and phone-menu controls, the footer's built-in columns and
+// links. Owner-written labels (menus, collections) keep their own words;
+// search, announcements and live video have their own lists. Other languages
+// fall back to English.
+export interface SiteStrings {
+  skip: string;
+  /** landmark labels */
+  main: string;
+  menu: string;
+  language: string;
+  social: string;
+  openMenu: string;
+  closeMenu: string;
+  /** the light/dark button */
+  scheme: string;
+  /** footer column headings (columns footer) */
+  read: string;
+  site: string;
+  /** built-in legal links, added when the site has no menu item for them */
+  privacy: string;
+  terms: string;
+  /** the header's automatic list, when there's no header menu */
+  home: string;
+  links: string;
+  /** code block copy button */
+  copy: string;
+  copied: string;
+  /** gallery lightbox */
+  close: string;
+}
+
+const STRINGS: Record<string, SiteStrings> = {
+  en: {
+    skip: 'Skip to content', main: 'Main', menu: 'Menu', language: 'Language', social: 'Social', openMenu: 'Open menu', closeMenu: 'Close menu',
+    scheme: 'Toggle dark mode', read: 'Read', site: 'Site', privacy: 'Privacy', terms: 'Terms', home: 'Home', links: 'Links',
+    copy: 'Copy', copied: 'Copied', close: 'Close',
+  },
+  es: {
+    skip: 'Saltar al contenido', main: 'Principal', menu: 'Menú', language: 'Idioma', social: 'Redes sociales', openMenu: 'Abrir menú', closeMenu: 'Cerrar menú',
+    scheme: 'Cambiar entre modo claro y oscuro', read: 'Leer', site: 'Sitio', privacy: 'Privacidad', terms: 'Términos', home: 'Inicio', links: 'Enlaces',
+    copy: 'Copiar', copied: 'Copiado', close: 'Cerrar',
+  },
+  fr: {
+    skip: 'Aller au contenu', main: 'Principal', menu: 'Menu', language: 'Langue', social: 'Réseaux sociaux', openMenu: 'Ouvrir le menu', closeMenu: 'Fermer le menu',
+    scheme: 'Basculer entre mode clair et sombre', read: 'Lire', site: 'Site', privacy: 'Confidentialité', terms: 'Conditions', home: 'Accueil', links: 'Liens',
+    copy: 'Copier', copied: 'Copié', close: 'Fermer',
+  },
+  de: {
+    skip: 'Zum Inhalt springen', main: 'Hauptmenü', menu: 'Menü', language: 'Sprache', social: 'Soziale Medien', openMenu: 'Menü öffnen', closeMenu: 'Menü schließen',
+    scheme: 'Hell- und Dunkelmodus umschalten', read: 'Lesen', site: 'Website', privacy: 'Datenschutz', terms: 'Nutzungsbedingungen', home: 'Startseite', links: 'Links',
+    copy: 'Kopieren', copied: 'Kopiert', close: 'Schließen',
+  },
+  pt: {
+    skip: 'Pular para o conteúdo', main: 'Principal', menu: 'Menu', language: 'Idioma', social: 'Redes sociais', openMenu: 'Abrir menu', closeMenu: 'Fechar menu',
+    scheme: 'Alternar entre modo claro e escuro', read: 'Ler', site: 'Site', privacy: 'Privacidade', terms: 'Termos', home: 'Início', links: 'Links',
+    copy: 'Copiar', copied: 'Copiado', close: 'Fechar',
+  },
+};
+
+export const siteStrings = (locale: string | null | undefined): SiteStrings =>
+  STRINGS[(locale || 'en').toLowerCase().split('-')[0]] ?? STRINGS.en;

package/src/styles/mobile-app.css

@@ -81,6 +81,13 @@
 .ma-check:has(input:disabled) { cursor: default; opacity: 0.6; }
 .ma-dot { display: inline-block; width: 8px; height: 8px; border-radius: 2px; margin-right: 6px; vertical-align: 1px; }
 .ma-lead { max-width: 240px; margin: 10px 0 0; }
+.ma-fields { display: flex; flex-wrap: wrap; align-items: flex-start; gap: 0 16px; }
+.ma-fields .ma-lead { flex: 1 1 200px; }
+.ma-tags { display: flex; flex-wrap: wrap; align-items: center; gap: 4px; min-height: 36px; padding: 4px 6px; background: var(--bg); border: 1px solid var(--line); border-radius: var(--r-md); }
+.ma-tags:focus-within { border-color: var(--accent); box-shadow: 0 0 0 3px var(--accent-ring); }
+.ma-tag { display: inline-flex; align-items: center; gap: 5px; background: var(--sel); color: var(--text-2); font-size: 12px; font-weight: 600; padding: 2px 8px; border-radius: var(--r-full); }
+.ma-tag button { background: none; border: 0; color: inherit; cursor: pointer; font-size: 10px; padding: 0; }
+.ma-tags input { flex: 1; min-width: 70px; background: none !important; border: 0 !important; box-shadow: none !important; padding: 2px !important; }
 .ma .form-actions { margin-top: 6px; }
 .ma-saved { color: var(--green); font-size: 12.5px; font-weight: 500; }