domma-cms 0.86.0 → 0.87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/server/routes/api/todo.js

@@ -87,6 +87,14 @@ export async function todoRoutes(fastify, opts = {}) {
         return request.user?.id ?? request.user?.sub ?? null;
     }
 
+    /** A to-do was completed, removed or re-dated: this person's notices follow at once (0.87). Never throws. */
+    async function tell(uid) {
+        try {
+            const {todoChanged} = await import('../../services/notification-sources.js');
+            await todoChanged(uid, await loadAll(uid), localDay(new Date()));
+        } catch { /* a notice never breaks a to-do */ }
+    }
+
     async function loadAll(uid) {
         const {entries} = await listEntries(SLUG, {limit: 10000, sort: 'createdAt', order: 'asc'});
         let items = entries.map(toTodo);
@@ -185,6 +193,7 @@ export async function todoRoutes(fastify, opts = {}) {
         }
 
         const updated = await updateEntry(SLUG, id, merged);
+        if ('status' in patch || 'dueAt' in patch) tell(entry.data.userId);
         return reply.send(toTodo(updated));
     });
 
@@ -194,6 +203,7 @@ export async function todoRoutes(fastify, opts = {}) {
         const all = await loadAll(uid);
         const completed = all.filter(t => t.status === 'completed');
         await Promise.all(completed.map(t => deleteEntry(SLUG, t.id)));
+        if (completed.length) tell(uid);
         return reply.send({success: true, removed: completed.length});
     });
 
@@ -207,6 +217,7 @@ export async function todoRoutes(fastify, opts = {}) {
         if (uid && entry.data.userId !== uid) return reply.code(404).send({error: 'Todo not found'});
 
         await deleteEntry(SLUG, id);
+        tell(entry.data.userId);
         return reply.send({ success: true });
     });
 }

package/server/services/notification-sources.js

@@ -18,7 +18,7 @@
 import fs from 'fs';
 import path from 'path';
 import {config, getConfig} from '../config.js';
-import {notify, registerNotificationSource} from './notify.js';
+import {notify, registerNotificationSource, resolveNotification} from './notify.js';
 
 const day = (d = new Date()) => d.toISOString().slice(0, 10);
 
@@ -133,6 +133,53 @@ export function recordCrash(err) {
 }
 
 /** Register every core source. Called once, before plugins load. */
+/**
+ * To-dos (0.87): each person's overdue and due-today to-dos, as at most TWO
+ * notices for them (one listing the overdue, one the due today) - never one
+ * per task, so twenty overdue tasks are one notice. Completed ones and those
+ * with no due day are left out. Pure.
+ *
+ * @param {object[]} todos - {id, userId, text, status, dueAt}
+ * @param {string} today - YYYY-MM-DD (the server's day)
+ * @returns {{raise: object[], clear: string[]}} notices, and the keys to resolve (users with nothing in that state)
+ */
+export function todoNotices(todos, today) {
+    const endOfDay = new Date(Date.parse(`${today}T00:00:00Z`) + 86400000).toISOString();
+    const byUser = new Map();
+    for (const t of todos || []) {
+        if (!t?.userId) continue;
+        if (!byUser.has(t.userId)) byUser.set(t.userId, {overdue: [], today: []});
+        if (t.status === 'completed') continue;
+        const day = /^(\d{4}-\d{2}-\d{2})/.exec(String(t.dueAt ?? ''))?.[1];
+        if (!day) continue;
+        if (day < today) byUser.get(t.userId).overdue.push(t);
+        else if (day === today) byUser.get(t.userId).today.push(t);
+    }
+    const name = (t) => String(t.text || 'To-do').replace(/\s+/g, ' ').trim().slice(0, 80) || 'To-do';
+    const list = (ts) => ts.slice(0, 5).map(t => `- ${name(t)}`).join('\n') + (ts.length > 5 ? `\n- and ${ts.length - 5} more` : '');
+    const raise = [];
+    const clear = [];
+    for (const [uid, {overdue, today: due}] of byUser) {
+        const who = {userIds: [String(uid)]};
+        if (overdue.length) {
+            raise.push({title: overdue.length === 1 ? `Overdue: ${name(overdue[0])}` : `${overdue.length} to-dos are overdue`,
+                body: list(overdue), severity: 'warning', link: '#/todo', dedupeKey: `todo-overdue:${uid}`, audience: who});
+        } else clear.push(`todo-overdue:${uid}`);
+        if (due.length) {
+            raise.push({title: due.length === 1 ? `Due today: ${name(due[0])}` : `${due.length} to-dos are due today`,
+                body: list(due), severity: 'info', link: '#/todo', dedupeKey: `todo-today:${uid}:${today}`, audience: who, expiresAt: endOfDay});
+        } else clear.push(`todo-today:${uid}:${today}`);
+    }
+    return {raise, clear};
+}
+
+/** A person's to-dos changed (completed, deleted, re-dated): if nothing is overdue any more, their notice goes now. */
+export async function todoChanged(userId, todos, today) {
+    if (!userId) return;
+    const {clear} = todoNotices((todos || []).filter(t => t.userId === userId).concat([{userId}]), today);
+    for (const key of clear) await resolveNotification(key, 'core:todo').catch(() => 0);
+}
+
 export async function registerCoreSources() {
     const plugins = await import('./plugins.js');
     const {classifyEntitlement} = await import('./pluginEntitlement.js');
@@ -154,6 +201,20 @@ export async function registerCoreSources() {
         }
     });
 
+    registerNotificationSource({
+        id: 'core:todo', label: 'To-dos overdue or due today', severity: 'warning', every: 'daily', atBoot: true,
+        description: "Each morning: a person's overdue to-dos, and those due today - one notice each, to that person.",
+        async check({notify: raise, resolve, now}) {
+            const {listEntries} = await import('./collections.js');
+            const {entries} = await listEntries('todo-items', {limit: 100000}).catch(() => ({entries: []}));
+            const d = now || new Date();
+            const today = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+            const {raise: notices, clear} = todoNotices(entries.map(e => ({id: e.id, ...e.data})), today);
+            for (const key of clear) await resolve(key);
+            for (const n of notices) await raise(n);
+        }
+    });
+
     registerNotificationSource({
         id: 'core:licence', label: 'Plugin licences', severity: 'warning', every: 'daily', atBoot: true,
         description: 'A licensed plugin that has stopped, is in its grace period, or ends within 14 days.',