@bobfrankston/rmfmail 1.0.696 → 1.0.698

package/client/app.bundle.js

@@ -998,10 +998,11 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     } catch {
     }
     if (!cachedMsg) {
-      bodyEl.innerHTML = `<div class="mv-preview-placeholder">${escapeHtml(cached.preview || "")}</div>`;
+      const previewText = (cached.preview || "").trim();
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Loading body\u2026</div>`;
     }
   } else if (!cachedMsg) {
-    bodyEl.innerHTML = "";
+    bodyEl.innerHTML = `<div class="mv-empty">Loading body\u2026</div>`;
     headerEl.hidden = true;
   }
   attEl.hidden = true;
@@ -1024,7 +1025,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         headerEl.hidden = false;
       } catch {
       }
-      bodyEl.innerHTML = `<div class="mv-preview-placeholder">${escapeHtml(msg.preview || cached?.preview || "")}</div>`;
+      const previewText = (msg.preview || cached?.preview || "").trim();
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Fetching body from server\u2026</div>`;
       const captureGen = gen;
       const off = onEvent((ev) => {
         if (!ev || ev.type !== "bodyAvailable")
@@ -1196,15 +1198,28 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
             const m = mailUrl.match(/^mailto:([^?]*)(?:\?(.*))?$/i);
             const to = m?.[1] ? decodeURIComponent(m[1]) : "";
             const qs = new URLSearchParams(m?.[2] || "");
-            const subject = qs.get("subject") || "Unsubscribe";
-            const body = qs.get("body") || "";
+            const origFrom = msg.from ? msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address : "";
+            const origSubject = msg.subject || "";
+            const origDate = msg.date ? new Date(msg.date).toLocaleString(void 0, { year: "numeric", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false }) : "";
+            const subject = qs.get("subject") || (origSubject ? `Unsubscribe: ${origSubject}` : "Unsubscribe");
+            const inlineBody = qs.get("body") || "";
+            const escape = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            const contextLines = [];
+            if (origFrom)
+              contextLines.push(`From: ${escape(origFrom)}`);
+            if (origSubject)
+              contextLines.push(`Subject: ${escape(origSubject)}`);
+            if (origDate)
+              contextLines.push(`Date: ${escape(origDate)}`);
+            const contextBlock = contextLines.length ? `<p>\u2014<br>${contextLines.join("<br>")}</p>` : "";
+            const bodyHtml = inlineBody ? `<p>${escape(inlineBody)}</p>${contextBlock}` : `<p>Please unsubscribe me from this list.</p>${contextBlock}`;
             const init = {
               mode: "new",
               accountId: currentAccountId,
               to: to ? [{ name: "", address: to }] : [],
               cc: [],
               subject,
-              bodyHtml: body ? `<p>${body}</p>` : "",
+              bodyHtml,
               inReplyTo: "",
               references: [],
               accounts: []
@@ -3157,8 +3172,13 @@ var init_message_list = __esm({
         }
         const body = this.el.parentElement;
         if (body?.classList.contains("multi-select-on")) {
-          this.setSelected(!this.isSelected);
+          const willBeSelected = !this.isSelected;
+          this.setSelected(willBeSelected);
           lastClickedRow = this.el;
+          if (willBeSelected) {
+            focusRow(this);
+            this.setUnreadClass(false);
+          }
           updateBulkBar();
           return;
         }
@@ -4423,7 +4443,9 @@ async function collectDueAlarms(now) {
       const startMs = ev.startMs || 0;
       if (!startMs)
         continue;
-      const offsets = Array.isArray(ev.reminderMinutes) && ev.reminderMinutes.length > 0 ? ev.reminderMinutes.map((m) => m * 6e4) : [CAL_LEAD_MS];
+      if (!Array.isArray(ev.reminderMinutes) || ev.reminderMinutes.length === 0)
+        continue;
+      const offsets = ev.reminderMinutes.map((m) => m * 6e4);
       for (const offsetMs of offsets) {
         const occBaseKey = occKey(ev.uuid, startMs);
         const key = `${occBaseKey}@${offsetMs}`;
@@ -4738,14 +4760,13 @@ function startAlarmPoller() {
       });
   });
 }
-var DISMISSED_KEY, SNOOZED_KEY, CAL_LEAD_MS, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, firedThisSession, openPopups;
+var DISMISSED_KEY, SNOOZED_KEY, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, firedThisSession, openPopups;
 var init_alarms = __esm({
   "client/components/alarms.js"() {
     "use strict";
     init_api_client();
     DISMISSED_KEY = "mailx-alarm-dismissed";
     SNOOZED_KEY = "mailx-alarm-snoozed";
-    CAL_LEAD_MS = 10 * 60 * 1e3;
     LOOKBACK_MS = 60 * 60 * 1e3;
     LOOKAHEAD_MS = 2 * 60 * 60 * 1e3;
     POLL_INTERVAL_MS = 3e4;