@bobfrankston/rmfmail 1.2.322 → 1.2.324

package/client/app.bundle.js

@@ -3231,10 +3231,11 @@ Delivered by the ${spam.listId} mailing list, which your server proved sent it.
       const warn = document.createElement("div");
       warn.className = `mv-trust mv-trust-${worst}`;
       warn.innerHTML = (head ? `<div class="mv-trust-head">${head}</div>` : "") + trust.map((f) => `<div class="mv-trust-item mv-trust-${escapeText(f.severity)}"><div class="mv-trust-text">${escapeText(f.text)}</div><div class="mv-trust-detail">${escapeText(f.detail)}</div></div>`).join("") + (worst === "info" ? "" : `<div class="mv-trust-foot">Links and attachments here should not be opened.</div>`);
-      const spamOnly = trust.length === 1 && trust[0].id === "server-spam-verdict" && worst !== "danger";
+      const trustClearable = worst !== "danger" && trust.every((f) => f.id === "server-spam-verdict" || f.id === "redirector-link");
+      const senderProved = !!spam?.proved || trust.some((f) => !!f.sender);
       const fromAddr = (msg.from?.address || "").toLowerCase();
       const fromDomain = fromAddr.split("@")[1] || "";
-      if (spamOnly && spam?.proved && fromAddr) {
+      if (trustClearable && senderProved && fromAddr) {
         const actions = document.createElement("div");
         actions.className = "mv-trust-actions";
         for (const [label, type, value] of [
@@ -6791,7 +6792,7 @@ async function renderCalendarList() {
     if (list.length === 0) {
       host.innerHTML = "";
     } else {
-      const sorted = [...list].sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
+      const sorted = list.filter((c) => c.selected !== false).sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
       host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml6(c.name)} \u2014 untick to hide its events in this list. Which calendars are listed is set in Google Calendar: the ones selected there appear; use Refresh after changing it.">
                 <input type="checkbox" class="cal-side-cal-check" data-cal-id="${escapeHtml6(c.id)}" ${hiddenCalendars.has(c.id) ? "" : "checked"}>
                 ${calIconHtml(c)}
@@ -7245,7 +7246,11 @@ function openNewEventDialog() {
         opt.selected = true;
       calSelect.append(opt);
     }
-    calRow.hidden = writable.length < 2;
+    calRow.hidden = false;
+    calSelect.disabled = writable.length < 2;
+    if (writable.length < 2) {
+      calRow.title = writable.length ? `${writable[0].name} is the only calendar Google says you can add events to. The others are read-only (holidays, or shared without edit rights). To add or share a calendar, do that in Google Calendar and press Refresh.` : "Google reported no calendar you can add events to.";
+    }
   };
   if (calendarList.length)
     fillCalendars(calendarList);