@bobfrankston/rmfmail 1.2.175 → 1.2.178

package/client/app.bundle.js

@@ -83,6 +83,7 @@ __export(api_client_exports, {
   logClientEvent: () => logClientEvent,
   markAsSpamMessages: () => markAsSpamMessages,
   markFolderRead: () => markFolderRead,
+  mergeReminderState: () => mergeReminderState,
   moveFolderToTrash: () => moveFolderToTrash,
   moveMessage: () => moveMessage,
   moveMessages: () => moveMessages,
@@ -616,6 +617,9 @@ function closeWordEdit(editId) {
 function showReminderPopup(opts) {
   return ipc().showReminderPopup?.(opts) ?? Promise.resolve({ button: "", reason: "no host" });
 }
+function mergeReminderState(patch) {
+  return ipc().mergeReminderState?.(patch) ?? Promise.resolve(null);
+}
 function consumePendingMailto() {
   return ipc().consumePendingMailto?.() ?? Promise.resolve(null);
 }
@@ -942,6 +946,16 @@ var init_groups = __esm({
   }
 });
 
+// packages/mailx-types/reminder-state.js
+var DISMISSED_RETENTION_MS, SNOOZED_RETENTION_MS;
+var init_reminder_state = __esm({
+  "packages/mailx-types/reminder-state.js"() {
+    "use strict";
+    DISMISSED_RETENTION_MS = 30 * 864e5;
+    SNOOZED_RETENTION_MS = 7 * 864e5;
+  }
+});
+
 // packages/mailx-types/index.js
 function _has(msg, flag) {
   return !!msg.flags && msg.flags.includes(flag);
@@ -960,6 +974,7 @@ var init_mailx_types = __esm({
     init_contact_rules();
     init_contacts_config();
     init_groups();
+    init_reminder_state();
     _SEEN = "\\Seen";
     _FLAGGED = "\\Flagged";
     _DRAFT = "\\Draft";
@@ -6089,6 +6104,48 @@ function pruneState(now) {
   }
   if (changed)
     saveSnoozed(snoozed);
+  const dismissed = loadDismissed();
+  let dChanged = false;
+  for (const [uuid, at] of Object.entries(dismissed)) {
+    if (typeof at === "number" && at < now - 30 * 864e5) {
+      delete dismissed[uuid];
+      dChanged = true;
+    }
+  }
+  if (dChanged)
+    saveDismissed(dismissed);
+}
+async function syncReminderState(force = false) {
+  const now = Date.now();
+  if (!force && now - _lastStateSync < STATE_SYNC_MIN_MS)
+    return false;
+  _lastStateSync = now;
+  try {
+    const merged = await mergeReminderState({
+      dismissed: loadDismissed(),
+      // `true` legacy values are normalized service-side
+      snoozed: loadSnoozed()
+    });
+    if (!merged)
+      return false;
+    const dm = loadDismissed();
+    for (const [k, v] of Object.entries(merged.dismissed)) {
+      const cur = dm[k];
+      if (cur === void 0 || cur === true || v > cur)
+        dm[k] = v;
+    }
+    saveDismissed(dm);
+    const sn = loadSnoozed();
+    for (const [k, v] of Object.entries(merged.snoozed)) {
+      if (!sn[k] || v > sn[k])
+        sn[k] = v;
+    }
+    saveSnoozed(sn);
+    return true;
+  } catch (e) {
+    alog("state sync failed", { err: e?.message || String(e) });
+    return false;
+  }
 }
 function occKey(uuid, ms) {
   return `${uuid}:${ms}`;
@@ -6141,7 +6198,7 @@ async function collectDueAlarms(now) {
             continue;
           const k = `${occBaseKey}@${offsetMs}`;
           if (!dismissed[k]) {
-            dismissed[k] = true;
+            dismissed[k] = Date.now();
             touched = true;
           }
         }
@@ -6231,9 +6288,8 @@ async function firePopupForItem(item) {
   if (openPopups.has(item.uuid))
     return;
   openPopups.add(item.uuid);
-  const buttons = ["snooze", "Dismiss"];
-  if (item.htmlLink)
-    buttons.push("Open");
+  const openUrl = item.kind === "calendar" ? item.htmlLink || "https://calendar.google.com/" : "https://tasks.google.com/";
+  const buttons = ["snooze", "Dismiss", "Open"];
   if (item.kind === "calendar")
     buttons.push("Delete");
   const icon = item.kind === "calendar" ? "\u{1F4C5}" : "\u2611";
@@ -6247,9 +6303,7 @@ async function firePopupForItem(item) {
     { label: "1d", minutes: 60 * 24 }
   ];
   const presetChips = presets.map((p) => `<button type="button" class="chip" data-snooze-min="${p.minutes}">${p.label}</button>`).join("");
-  const actionBtns = ["Dismiss"];
-  if (item.htmlLink)
-    actionBtns.push("Open");
+  const actionBtns = ["Dismiss", "Open"];
   if (item.kind === "calendar")
     actionBtns.push("Delete");
   const actionHtml = actionBtns.map((b) => `<button type="button" class="action" data-btn="${escapeHtml6(b)}">${escapeHtml6(b)}</button>`).join("");
@@ -6361,12 +6415,14 @@ async function firePopupForItem(item) {
   }
   const api = window.mailxapi;
   const openLink = () => {
-    if (!item.htmlLink)
+    if (item.kind === "calendar" && item.htmlLink && api?.openCalendarEvent) {
+      api.openCalendarEvent(item.htmlLink);
       return;
+    }
     if (api?.openExternal)
-      api.openExternal(item.htmlLink);
+      api.openExternal(openUrl);
     else
-      window.open(item.htmlLink, "_blank");
+      window.open(openUrl, "_blank");
   };
   try {
     switch (r.button) {
@@ -6408,7 +6464,7 @@ async function firePopupForItem(item) {
       case "closed":
         {
           const m = loadDismissed();
-          m[item.uuid] = true;
+          m[item.uuid] = Date.now();
           saveDismissed(m);
           alog("dismiss saved", { key: item.uuid, via: r.button });
         }
@@ -6416,7 +6472,7 @@ async function firePopupForItem(item) {
       case "Delete":
         {
           const m = loadDismissed();
-          m[item.uuid] = true;
+          m[item.uuid] = Date.now();
           saveDismissed(m);
         }
         firedThisSession.delete(item.uuid);
@@ -6426,7 +6482,7 @@ async function firePopupForItem(item) {
         alog("unknown popup result", { button: r.button, form: r.form });
         {
           const m = loadDismissed();
-          m[item.uuid] = true;
+          m[item.uuid] = Date.now();
           saveDismissed(m);
         }
         break;
@@ -6435,11 +6491,12 @@ async function firePopupForItem(item) {
     alog("action handler threw \u2014 forcing Dismiss", { key: item.uuid, err: e?.message || String(e) });
     try {
       const m = loadDismissed();
-      m[item.uuid] = true;
+      m[item.uuid] = Date.now();
       saveDismissed(m);
     } catch {
     }
   }
+  void syncReminderState(true);
 }
 function snoozeItem(item, minutes) {
   const now = Date.now();
@@ -6454,7 +6511,10 @@ async function pollAlarms() {
     return;
   const now = Date.now();
   pruneState(now);
-  const due = await collectDueAlarms(now);
+  let due = await collectDueAlarms(now);
+  if (due.length > 0 && await syncReminderState()) {
+    due = await collectDueAlarms(now);
+  }
   const fresh = due.filter((d) => !firedThisSession.has(d.uuid) && !openPopups.has(d.uuid));
   if (fresh.length === 0)
     return;
@@ -6468,6 +6528,7 @@ function startAlarmPoller() {
   if (window.__mailxAlarmPollerRunning)
     return;
   window.__mailxAlarmPollerRunning = true;
+  void syncReminderState(true);
   setTimeout(() => {
     pollAlarms().catch(() => {
     });
@@ -6482,7 +6543,7 @@ function startAlarmPoller() {
       });
   });
 }
-var DISMISSED_KEY, SNOOZED_KEY, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, _soundCache, _lastSoundAt, firedThisSession, openPopups;
+var DISMISSED_KEY, SNOOZED_KEY, LOOKBACK_MS, LOOKAHEAD_MS, POLL_INTERVAL_MS, _soundCache, _lastSoundAt, _lastStateSync, STATE_SYNC_MIN_MS, firedThisSession, openPopups;
 var init_alarms = __esm({
   "client/components/alarms.js"() {
     "use strict";
@@ -6494,6 +6555,8 @@ var init_alarms = __esm({
     POLL_INTERVAL_MS = 3e4;
     _soundCache = null;
     _lastSoundAt = 0;
+    _lastStateSync = 0;
+    STATE_SYNC_MIN_MS = 6e4;
     firedThisSession = /* @__PURE__ */ new Set();
     openPopups = /* @__PURE__ */ new Set();
   }