domma-cms 1.10.37 → 1.10.39

package/plugins/_lib/mail/unreadBadge.js

@@ -15,7 +15,7 @@
 const plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
 
 /**
- * @param   {{label?: string, unseen: number|null, error?: string}[]} boxes - one per mailbox
+ * @param   {{id?: string, label?: string, unseen: number|null, uidNext?: number|null, error?: string}[]} boxes - one per mailbox
  * @returns {{count: number, label: string, tone: string, details: object}}
  */
 export function unreadBadge(boxes = []) {
@@ -31,6 +31,7 @@ export function unreadBadge(boxes = []) {
         // shown even at 0 - otherwise a broken password reads as "all read".
         tone: failed ? 'danger' : 'info',
         ...(failed ? {showZero: true} : {}),
+        ...newMailNotice(known),
         details: {
             title: 'Mail',
             rows: boxes.map(b => ({
@@ -43,3 +44,25 @@ export function unreadBadge(boxes = []) {
         }
     };
 }
+
+/**
+ * The sidebar's "new mail" signal (admin/js/lib/sidebar-notify.js): one mark
+ * per mailbox with unread mail - the inbox's newest UID, which only rises when
+ * something arrives. STATUS has no sender or subject, so the notice says how
+ * many and where.
+ *
+ * @param   {object[]} boxes - the reachable ones
+ * @returns {{notify?: object}}
+ */
+function newMailNotice(boxes) {
+    const marks = {};
+    const where = [];
+    for (const box of boxes) {
+        const uidNext = Number(box.uidNext);
+        if (!box.id || !(box.unseen > 0) || !Number.isFinite(uidNext) || uidNext < 2) continue;
+        marks[box.id] = uidNext - 1;
+        where.push(`${plural(box.unseen, 'unread message')} in ${String(box.label || 'your inbox')}`);
+    }
+    if (!where.length) return {};
+    return {notify: {marks, title: 'New mail', body: where.join('; ')}};
+}

package/plugins/_lib/mail/vacationRunner.js

@@ -97,7 +97,10 @@ export async function runVacation({
                 // Not filed. One holiday produces a hundred of these, and a
                 // Sent folder that is mostly "Out of office" is one nobody can
                 // find anything in - the reply log is the audit trail instead.
-                fileCopy: false
+                fileCopy: false,
+                // So the mailbox's rules about leaving (secure delivery) apply
+                // to its away message too.
+                account
             });
 
             // Recorded AFTER it has gone. The other order would mean a send

package/server/routes/api/sidebar-counts.js

@@ -55,7 +55,7 @@ export async function sidebarCountRoutes(fastify, opts = {}) {
                     const count = Number(value);
                     if (value == null || !Number.isFinite(count) || count < 0) { answers.set(url, null); continue; }
                     if (typeof answer !== 'object') answers.set(url, count);
-                    else answers.set(url, Object.fromEntries(['count', 'label', 'tone', 'inventory', 'showZero', 'details']
+                    else answers.set(url, Object.fromEntries(['count', 'label', 'tone', 'inventory', 'showZero', 'details', 'notify']
                         .filter(key => answer[key] !== undefined).map(key => [key, answer[key]])));
                 } catch { answers.set(url, null); }
                 finally { clearTimeout(timer); }