domma-cms 1.10.34 → 1.10.36

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.10.36] - 2026-10-27
+
+- Trash folder menus offer Empty Trash with an explicit permanent-deletion confirmation. Clear every message in the server-designated Trash folder, including more than one list page, while retaining the folder and its subfolders. Requires Email Pro 0.10.1.
+
+## [1.10.35] - 2026-10-27
+
+- Email lists always show the local date and time. Ctrl-click adds or removes individual messages, starting with the open message; Shift-click selects a range from it.
+- Email folder menus offer a destination picker to move a folder and its subfolders within the mailbox. System folders, cycles and duplicate destinations are protected.
+- Open messages in Spam have a visible Not spam action that returns them to Inbox.
+- Update Domma JS for context menus that remain open while their contents scroll on smaller screens.
+- **Built against domma-js 1.0.1** - see [its release notes](https://github.com/pinpointzero73/domma/releases/tag/v1.0.1).
+
 ## [1.10.34] - 2026-10-27
 
 - Scan rendered page previews for external image domains, show blocked hosts in the editor, and let users with site settings permission allow individual domains. Image policy updates apply without restarting; an open editor can reload its preview policy while retaining unsaved drafts.

package/admin/dist/domma/domma-tools.css

@@ -1,9 +1,9 @@
 /*!
- * Domma Tools CSS v1.0.0
+ * Domma Tools CSS v1.0.1
  * Dynamic Object Manipulation & Modeling API
  * (c) 2026 Darryl Waterhouse & DCBW-IT
- * Built: 2026-10-26T07:45:05.989Z
- * Commit: f81c097
+ * Built: 2026-10-27T10:51:45.431Z
+ * Commit: 721b19e
  */
 
 /*!

package/admin/dist/domma/domma-tools.min.js

@@ -1,9 +1,9 @@
 /*!
- * Domma Tools v1.0.0
+ * Domma Tools v1.0.1
  * Developer tools: Theme Roller & Page Roller
  * (c) 2026 Darryl Waterhouse & DCBW-IT
- * Built: 2026-10-26T07:44:49.638Z
- * Commit: f81c097
+ * Built: 2026-10-27T10:51:32.116Z
+ * Commit: 721b19e
  *
  * Requires: domma.min.js
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.10.34",
+  "version": "1.10.36",
   "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",
@@ -86,7 +86,7 @@
     "bcryptjs": "^3.0.3",
     "css-select": "^7.0.0",
     "dom-serializer": "^3.1.1",
-    "domma-js": "1.0.0",
+    "domma-js": "1.0.1",
     "dotenv": "^17.2.3",
     "fastify": "5.12.7",
     "gray-matter": "^4.0.3",

package/plugins/_lib/admin/mail/reader-view.js

@@ -40,7 +40,7 @@ const {
 } = await import(versioned('settings-section.js'));
 const {createSplitters, fitToViewport} = await import(versioned('panes.js'));
 const {createDiagnosticsSection} = await import(versioned('diagnostics-section.js'));
-const {fmtDate, fmtDateTime} = await import(new URL(`../ui/dates.js?v=${ASSET_VERSION}`, import.meta.url).href);
+const {fmtDateTime} = await import(new URL(`../ui/dates.js?v=${ASSET_VERSION}`, import.meta.url).href);
 // Renamed: onMount wraps it in its own `openCompose`, which tracks each window it opens.
 const {openCompose: openComposeWindow} = await import(versioned('compose-window.js'));
 const {makeResizable} = await import(versioned('resizable.js'));
@@ -99,20 +99,6 @@ async function api(url, method = 'GET', body) {
     return payload;
 }
 
-/**
- * Format a message date: time for today, date for anything older.
- *
- * @param   {string|null} value
- * @returns {string}
- */
-function formatDate(value) {
-    if (!value) return '';
-    const d = D(value);
-    return d.format('YYYY-MM-DD') === D().format('YYYY-MM-DD')
-        ? d.format('HH:mm')
-        : fmtDate(value);
-}
-
 /**
  * Render an address list as a readable string.
  *
@@ -2565,7 +2551,7 @@ return {
 
                 const date = document.createElement('span');
                 date.className = 'mail-item-date';
-                date.textContent = formatDate(message.date);
+                date.textContent = fmtDateTime(message.date);
                 top.appendChild(date);
 
                 item.appendChild(top);
@@ -2687,6 +2673,9 @@ return {
                     // which is the gesture people use ninety times in a
                     // hundred and must stay the simplest one.
                     if (event.ctrlKey || event.metaKey) {
+                        event.preventDefault();
+                        const open = selectedUid$.value;
+                        if (!selected.size && open != null && messages.some(m => m.uid === open)) selected.add(open);
                         toggleSelected(message.uid);
                         return;
                     }
@@ -2695,6 +2684,7 @@ return {
                         return;
                     }
                     if (selected.size) clearSelection();
+                    selectionAnchor = message.uid;
                     openMessage(message.uid, message.folder);
                 });
                 listEl.appendChild(item);
@@ -3159,6 +3149,14 @@ return {
                     `Mark this message ${isSeen ? 'unread' : 'read'} (u)`
                 ));
 
+                const spam = messageIsSpam(current ?? message);
+                if (spam || junkFolder()) {
+                    actions.appendChild(actionButton(spam ? 'Not spam' : 'Mark as spam',
+                        spam ? 'shield-check' : 'shield-alert',
+                        () => markSpam(message, !spam),
+                        spam ? 'Mark as not spam and return to Inbox' : 'Move this message to Spam'));
+                }
+
                 if (features.send) {
                     actions.appendChild(actionButton('Reply', 'corner-up-left',
                         () => compose(message, 'reply'), 'Reply to the sender (r)'));
@@ -5083,7 +5081,7 @@ return {
             // what to grey out. The server refuses regardless - this is the
             // courtesy, not the control.
             const protectedUse = folder.specialUse
-                && ['\\Inbox', '\\Sent', '\\Drafts', '\\Trash', '\\Junk', '\\Archive']
+                && ['\\Inbox', '\\Sent', '\\Drafts', '\\Trash', '\\Junk', '\\Archive', '\\All', '\\Flagged']
                     .includes(folder.specialUse);
             const isInbox = String(folder.path).toUpperCase() === 'INBOX';
             const locked = protectedUse || isInbox;
@@ -5116,12 +5114,24 @@ return {
                     action: () => setFolderVisible(folder, folder.subscribed === false)
                 },
                 {type: 'divider'},
+                ...(folder.specialUse === '\\Trash' && features.emptyTrash ? [{
+                    label: 'Empty Trash...',
+                    icon: 'trash',
+                    danger: true,
+                    action: () => emptyTrashFolder(folder)
+                }, {type: 'divider'}] : []),
                 {
                     label: 'Rename',
                     icon: 'edit-3',
                     disabled: () => locked,
                     action: () => renameFolder(folder)
                 },
+                {
+                    label: 'Move to...',
+                    icon: 'folder',
+                    disabled: () => locked || !folder.delimiter,
+                    action: () => moveFolder(folder)
+                },
                 {
                     label: 'Delete',
                     icon: 'trash',
@@ -5187,11 +5197,12 @@ return {
          * inputs at all.
          *
          * @param   {string|null} preselect
+         * @param   {object|null} moving - the folder to relocate, or null to create
          * @returns {Promise<{parent: string, name: string}|null>}
          */
-        function askForFolder(preselect = null) {
+        function askForFolder(preselect = null, moving = null) {
             return new Promise(resolve => {
-                const modal = trackModal(E.modal({title: 'New folder', size: 'sm'}));
+                const modal = trackModal(E.modal({title: moving ? `Move ${moving.name}` : 'New folder', size: 'sm', buttons: []}));
 
                 const wrap = document.createElement('div');
                 wrap.className = 'mail-form-stack';
@@ -5230,7 +5241,8 @@ return {
                     // A level the server never listed cannot hold mail. Shown
                     // anyway, because leaving a hole makes its children look
                     // top-level, but not choosable.
-                    if (node.selectable === false) option.disabled = true;
+                    if (node.selectable === false || (moving && (node.path === moving.path
+                        || node.path.startsWith(`${moving.path}${moving.delimiter}`)))) option.disabled = true;
                     // The full path where the indentation is ambiguous.
                     option.title = node.path;
                     if (node.path === preselect) option.selected = true;
@@ -5244,7 +5256,7 @@ return {
                 cancel.textContent = 'Cancel';
                 const create = document.createElement('button');
                 create.className = 'btn btn-sm btn-primary';
-                create.textContent = 'Create';
+                create.textContent = moving ? 'Move' : 'Create';
 
                 let settled = false;
                 const finish = (value) => {
@@ -5256,7 +5268,7 @@ return {
 
                 cancel.addEventListener('click', () => finish(null));
                 create.addEventListener('click', () => {
-                    const name = nameInput.value.trim();
+                    const name = moving ? moving.name : nameInput.value.trim();
                     if (!name) { nameInput.focus(); return; }
                     finish({parent: parentSelect.value, name});
                 });
@@ -5268,12 +5280,12 @@ return {
 
                 actions.appendChild(cancel);
                 actions.appendChild(create);
-                for (const el of [nameLabel, nameInput, parentLabel, parentSelect, actions]) {
+                for (const el of [...(moving ? [] : [nameLabel, nameInput]), parentLabel, parentSelect, actions]) {
                     wrap.appendChild(el);
                 }
                 modal.element.appendChild(wrap);
                 modal.open?.();
-                setTimeout(() => nameInput.focus(), 60);
+                setTimeout(() => (moving ? parentSelect : nameInput).focus(), 60);
             });
         }
 
@@ -5303,6 +5315,31 @@ return {
             }
         }
 
+        /** Move a folder and its children within the current mailbox. */
+        async function moveFolder(folder) {
+            if (!dialogOnce.claim()) return;
+            const accountId = currentAccountId;
+            const cut = folder.path.lastIndexOf(folder.delimiter);
+            const parent = cut < 0 ? '' : folder.path.slice(0, cut);
+            let chosen;
+            try {
+                chosen = await askForFolder(parent, folder);
+            } finally {
+                dialogOnce.release();
+            }
+            if (!chosen || !here() || accountId !== currentAccountId || chosen.parent === parent) return;
+            try {
+                const params = new URLSearchParams({account: accountId ?? ''});
+                const result = await api(`${BASE}/folders?${params}`, 'PUT',
+                    {path: folder.path, parent: chosen.parent});
+                if (!here() || accountId !== currentAccountId) return;
+                E.toast(`Moved to ${result.path}.`, {type: 'success'});
+                await loadFolders({quiet: true});
+            } catch (err) {
+                E.toast(err.message || 'That folder could not be moved.', {type: 'error'});
+            }
+        }
+
         /**
          * Rename a folder, leaving it where it is.
          *
@@ -5331,6 +5368,33 @@ return {
             }
         }
 
+        /** Empty Trash after explicitly confirming permanent deletion. */
+        async function emptyTrashFolder(folder) {
+            const accountId = currentAccountId;
+            const count = Number.isFinite(folder.messages) ? `${folder.messages} message${folder.messages === 1 ? '' : 's'}` : 'all messages';
+            const question = `Are you sure you want to permanently delete ${count} from "${folder.path}"? This cannot be undone. The folder and its subfolders will be kept.`;
+            if (!dialogOnce.claim()) return;
+            let confirmed;
+            try {
+                confirmed = await ask(esc(question), {title: 'Empty Trash?', confirmText: 'Permanently delete', cancelText: 'Cancel'});
+            } finally {
+                dialogOnce.release();
+            }
+            if (!confirmed || !here() || accountId !== currentAccountId) return;
+            try {
+                const params = new URLSearchParams({account: accountId ?? ''});
+                const result = await api(`${BASE}/folders/empty?${params}`, 'POST', {path: folder.path, confirmed: true});
+                if (!here() || accountId !== currentAccountId) return;
+                E.toast(`Permanently deleted ${result.deleted} message${result.deleted === 1 ? '' : 's'} from Trash.`, {type: 'success'});
+                const open = currentFolder;
+                await loadFolders({quiet: true});
+                const shown = folders.find(f => f.path === open);
+                if (here() && accountId === currentAccountId && shown && currentFolder !== open) await selectFolder(shown);
+            } catch (err) {
+                E.toast(err.message || 'Trash could not be emptied.', {type: 'error'});
+            }
+        }
+
         /**
          * Delete a folder and everything inside it.
          *

package/plugins/_lib/mail/folders.js

@@ -190,3 +190,23 @@ export function resolveSubscriptions(boxes) {
     }
     return out;
 }
+
+/** Validate a folder move before sending an IMAP rename. */
+export function moveTarget(folder, parent, folders, delimiter) {
+    const allowed = canModifyFolder(folder, {action: 'move'});
+    if (!allowed.ok) return {...allowed, status: 409};
+    if (typeof parent !== 'string') return {ok: false, status: 400, error: 'Choose a destination folder.'};
+    if (!delimiter) return {ok: false, status: 400, error: 'This mailbox does not support nested folders.'};
+    if (parent === folder.path || parent.startsWith(`${folder.path}${delimiter}`)) {
+        return {ok: false, status: 400, error: 'A folder cannot be moved inside itself or its subfolders.'};
+    }
+    if (parent && !folders.some(f => f.path === parent)) {
+        return {ok: false, status: 404, error: 'That destination folder does not exist.'};
+    }
+    const name = folder.path.slice(folder.path.lastIndexOf(delimiter) + delimiter.length);
+    const path = buildFolderPath(parent, name, delimiter);
+    if (path !== folder.path && folders.some(f => f.path === path)) {
+        return {ok: false, status: 409, error: `"${path}" already exists.`};
+    }
+    return {ok: true, path};
+}

package/plugins/_lib/mail/write.js

@@ -471,3 +471,26 @@ export async function setSpamBulk({
         uidMap: moved.uidMap, keywords, mirrored: moved.mirrored
     };
 }
+
+/** Permanently empty a server-designated Trash folder, retaining the folder and its children. */
+export async function emptyTrash({pool, store, account, poolKey, connection, folder}) {
+    const boxes = await pool.withClient(poolKey, connection, client => client.list());
+    if (!boxes.some(box => box.path === folder && box.specialUse === '\\Trash')) {
+        const error = new Error('Only the server-designated Trash folder can be emptied.');
+        error.statusCode = 409;
+        throw error;
+    }
+    const deleted = await pool.withMailbox(poolKey, connection, folder, async (client, mailbox) => {
+        const count = Number(mailbox.exists);
+        if (count === 0) return 0;
+        const lastUid = Number(mailbox.uidNext) - 1;
+        if (!Number.isSafeInteger(count) || count < 0 || !Number.isSafeInteger(lastUid) || lastUid < 1) {
+            throw new Error('The Trash message count could not be verified. Refresh and try again.');
+        }
+        const result = await client.messageDelete({uid: `1:${lastUid}`}, {uid: true});
+        if (result === false) throw new Error('The server refused to empty Trash.');
+        return count;
+    }, {writable: true});
+    if (store) await store.clearFolder(account.id, folder);
+    return {deleted, path: folder, expunged: true};
+}